testrbl 0.1.12 → 0.1.13

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    testrbl (0.1.12)
+    testrbl (0.1.13)
 
 GEM
   remote: http://rubygems.org/
   specs:
     activesupport (2.3.14)
     diff-lcs (1.1.3)
-    minitest (3.0.1)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    minitest (3.4.0)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
     shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
-    test-unit (2.4.8)
+    test-unit (2.5.2)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,6 +1,9 @@
 require 'bundler/gem_tasks'
 
 task :default do
+  # tests do not run with test-unit 1 since it defines testrb and overshadows 1.9s native testrb
+  raise "yes | gem uninstall -a test-unit && bundle" if `gem list test-unit | grep 'test-unit '` =~ /[\( ]1\./
+
   sh "rspec spec/"
 end
 

data/Readme.md

@@ -18,6 +18,7 @@ Tips
 
 TODO
 ====
+ - fix tests on ree/1.9.2
  - alternate minitest syntax: test_0017_should not link already linked URLs
 
 Author

data/lib/testrbl.rb

@@ -17,13 +17,12 @@ module Testrbl
   INTERPOLATION = /\\\#\\\{.*?\\\}/
 
   def self.run_from_cli(argv)
-    command = argv.join(" ")
-    if command =~ /^\S+:\d+$/
-      file, line = argv.first.split(':')
+    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
-      run "#{bundle_exec}ruby #{file} -n '/#{pattern_from_file(File.readlines(file), line)}/'"
-    elsif File.file?(command)
-      run "#{bundle_exec}ruby #{command}"
+      run "#{bundle_exec}ruby #{i_test}#{file} -n '/#{pattern_from_file(File.readlines(file), line)}/'"
+    elsif file
+      run "#{bundle_exec}ruby #{i_test}#{file}"
     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(' ')}"
@@ -56,12 +55,26 @@ module Testrbl
 
   private
 
+  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"))
+
+    return unless argv.size == 1
+
+    if argv.first =~ /^(\S+):(\d+)$/
+      [i_test, $1, $2]
+    elsif File.file?(argv.first)
+      [i_test, argv.first, false]
+    end
+  end
+
   def self.bundle_exec
     "bundle exec " if File.file?("Gemfile")
   end
 
   def self.run(command)
     puts command
+    STDOUT.flush # if exec fails horribly we at least see some output
     exec command
   end
 
@@ -80,7 +93,7 @@ module Testrbl
           # activesupport: "test_xxx_-__yyy"
           regex = "^test(: |_)#{regex.gsub(" ", ".")}$"
         elsif method == "it"
-          regex = "\\d+_#{test_name.gsub(MINITEST_NAME_RE, '_').downcase}$"
+          regex = "^test_\\d+_#{test_name}$"
         end
 
         return [

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/spec/testrbl_spec.rb

@@ -6,7 +6,7 @@ describe Testrbl do
     Dir.chdir "tmp" do
       example.call
     end
-    run "rm -rf tmp"
+    #run "rm -rf tmp"
   end
 
   def run(cmd, options={})
@@ -33,6 +33,45 @@ describe Testrbl do
     Testrbl::VERSION.should =~ /^[\.\da-z]+$/
   end
 
+  context "-Itest" do
+    before do
+      write "a_test.rb", <<-RUBY
+        require 'test/unit'
+        require 'xxx'
+
+        class Xxx < Test::Unit::TestCase
+          def test_xxx
+            puts 'ABC'
+          end
+
+          def test_yyy
+            puts 'BCD'
+          end
+        end
+      RUBY
+      write("test/xxx.rb", "puts 'XXX LOADED'")
+    end
+
+    it "does not include test by default" do
+      result = testrbl "a_test.rb:6", :fail => true
+      result.should_not include "ABC\n"
+    end
+
+    it "can use -Itest for line execution" do
+      result = testrbl "-Itest a_test.rb:6"
+      result.should include "ABC\n"
+      result.should include "XXX LOADED\n"
+      result.should_not include "BCD"
+    end
+
+    it "can use -I test for line execution" do
+      result = testrbl "-I test a_test.rb:6"
+      result.should include "ABC\n"
+      result.should include "XXX LOADED\n"
+      result.should_not include "BCD"
+    end
+  end
+
   context "def test_" do
     before do
       write "a_test.rb", <<-RUBY
@@ -75,11 +114,11 @@ describe Testrbl do
     end
 
     it "runs with options" do
-      pending "works in real console..." do
-        result = testrbl "a_test.rb -n '/xxx/'"
-        result.should include "ABC"
-        result.should_not include "BCD"
-      end
+      # TODO does not work with files in root folder ... WTF (only happens with a script that runs testrb)
+      write("foo/a_test.rb", read("a_test.rb"))
+      result = testrbl "foo/a_test.rb -n '/xxx/'"
+      result.should include "ABC"
+      result.should_not include "BCD"
     end
   end
 
@@ -245,12 +284,12 @@ describe Testrbl do
       write "a_test.rb", <<-RUBY
         require 'minitest/autorun'
 
-        describe "a" do
-          it "b" do
+        describe "a-a" do
+          it "b./_-b" do
             puts "ABC"
           end
 
-          it "c" do
+          it "c-c" do
             puts "BCD"
           end
         end
@@ -406,11 +445,11 @@ describe Testrbl do
     end
 
     it "finds minitest it do calls" do
-      call("  it \"xx xx\" do\n").should == ["  ", "\\d+_xx_xx$"]
+      call("  it \"xx xx\" do\n").should == ["  ", "^test_\\d+_xx xx$"]
     end
 
     it "finds complex minitest it do calls" do
-      call("  it \"xx ._-..  ___ xx\" do\n").should == ["  ", "\\d+_xx_______xx$"]
+      call("  it \"xX ._-..  ___ Xx\" do\n").should == ["  ", "^test_\\d+_xX ._-..  ___ Xx$"]
     end
 
     it "does not find minitest describe do calls since we cannot run them" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-09-16 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: 2301740719579311166
+      hash: 1427861218457478477
 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: 2301740719579311166
+      hash: 1427861218457478477
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24