testrbl 0.1.15 → 0.1.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    testrbl (0.1.15)
+    testrbl (0.1.16)
 
 GEM
   remote: http://rubygems.org/

data/Rakefile

@@ -2,9 +2,9 @@ require 'bundler/setup'
 require 'bundler/gem_tasks'
 
 task :default do
-  # tests do not run with test-unit 1.x.x since it defines testrb and overshadows 1.9s native testrb
+  # tests do not run with test-unit 1.x.x or <=2.3 since it defines testrb and overshadows 1.9s native testrb
   if `which testrb`.include?("/gems/")
-    raise "tests do not run with test-unit 1.x.x installed\nyes | gem uninstall -a test-unit && bundle"
+    raise "tests do not run with test-unit testrb installed\nyes | gem uninstall -a test-unit && bundle"
   end
 
   sh "rspec spec/"

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

data/lib/testrbl.rb

@@ -19,13 +19,15 @@ module Testrbl
   def self.run_from_cli(argv)
     i_test, file, line = detect_usable(argv)
     if file and line
-      file = "./#{file}" if file =~ /^[a-z]/ # fix 1.9 not being able to load local files
+      file = localize(file)
       run "#{ruby} #{i_test}#{file} -n '/#{pattern_from_file(File.readlines(file), line)}/'"
     elsif file
       run "#{ruby} #{i_test}#{file}"
+    elsif argv.all?{|f| File.file?(f) }
+      run "#{ruby} #{argv.map{|f| "-r #{localize(f)}" }.join(" ")} -e ''"
     else # pass though
       # no bundle exec: projects with mini and unit-test do not run well via bundle exec testrb
-      run "testrb #{argv.map{|a| a.include?(' ') ? "'#{a}'" : a }.join(' ')}"
+      run ["testrb"] + argv
     end
   end
 
@@ -55,6 +57,11 @@ module Testrbl
 
   private
 
+  # fix 1.9 not being able to load local files
+  def self.localize(file)
+    file =~ /^[-a-z\d_]/ ? "./#{file}" : file
+  end
+
   def self.detect_usable(argv)
     argv = argv.dup # do not mess up args
     i_test = "-Itest " if ((argv.delete("-I") and argv.delete("test")) or argv.delete("-Itest"))
@@ -77,9 +84,10 @@ module Testrbl
   end
 
   def self.run(command)
-    puts command
+    command = [*command]
+    puts command.join(" ")
     STDOUT.flush # if exec fails horribly we at least see some output
-    exec command
+    Kernel.exec *command
   end
 
   def self.pattern_from_line(line)

data/spec/testrbl_spec.rb

@@ -368,6 +368,26 @@ describe Testrbl do
       result.should include "CDE\n"
       result.should include "DEF\n"
     end
+
+    context "avoiding testrb" do
+      before do
+        write "backtrace_test.rb", <<-RUBY
+          puts caller
+        RUBY
+      end
+
+      it "does not run via testrb if possible" do
+        result = testrbl "a/b/c_test.rb backtrace_test.rb"
+        result.should include("CDE")
+        result.should_not include("bin/testrb:")
+      end
+
+      it "runs via testrb if not possible via ruby" do
+        result = testrbl "a/b/c_test.rb backtrace_test.rb -v"
+        result.should include("CDE")
+        result.should include("bin/testrb:")
+      end
+    end
   end
 
   describe ".pattern_from_file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3074574819033279983
+      hash: 3813406408488973454
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3074574819033279983
+      hash: 3813406408488973454
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24