[前][次][番号順一覧][スレッド一覧]

ruby-changes:8080

From: nobu <ko1@a...>
Date: Sun, 28 Sep 2008 18:40:11 +0900 (JST)
Subject: [ruby-changes:8080] Ruby:r19606 (trunk): * lib/mini/test.rb (MINI_DIR): loaded path is expanded.

nobu	2008-09-28 18:39:53 +0900 (Sun, 28 Sep 2008)

  New Revision: 19606

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19606

  Log:
    * lib/mini/test.rb (MINI_DIR): loaded path is expanded.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mini/test.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19605)
+++ ChangeLog	(revision 19606)
@@ -1,3 +1,7 @@
+Sun Sep 28 18:39:51 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mini/test.rb (MINI_DIR): loaded path is expanded.
+
 Sun Sep 28 12:36:09 2008  Koichi Sasada  <ko1@a...>
 
 	* vm_exec.c (vm_exec_core): add an UNLIKELY() hint.
Index: lib/mini/test.rb
===================================================================
--- lib/mini/test.rb	(revision 19605)
+++ lib/mini/test.rb	(revision 19606)
@@ -13,28 +13,18 @@
 module Mini
   class Assertion < Exception; end
 
-  file = if __FILE__ =~ /^[^\.]/ then # OMG ruby 1.9 is so lame (rubinius too)
-           require 'pathname'
-           pwd = Pathname.new(Dir.pwd)
-           pn = Pathname.new(File.expand_path(__FILE__))
-           pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
-           pn.to_s
-         else
-           __FILE__
-         end
+  MINI_DIR = File.expand_path("../..", __FILE__)
 
-  MINI_DIR = File.dirname(File.dirname(file))
-
   def self.filter_backtrace bt
     return ["No backtrace"] unless bt
 
     new_bt = []
     bt.each do |line|
-      break if line.index(MINI_DIR) == 0
+      break if line.index(MINI_DIR, 0)
       new_bt << line
     end
 
-    new_bt = bt.reject { |line| line.index(MINI_DIR) == 0 } if
+    new_bt = bt.reject { |line| line.index(MINI_DIR, 0) } if
       new_bt.empty?
     new_bt = bt.dup if new_bt.empty?
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]