testrbl 0.1.6 → 0.1.7

data/Gemfile

@@ -2,6 +2,7 @@ source :rubygems
 gemspec
 
 gem 'test-unit'
+gem 'minitest'
 gem 'rake'
 gem 'rspec', '~>2'
 gem 'shoulda'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    testrbl (0.1.6)
+    testrbl (0.1.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    minitest (3.0.1)
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -21,12 +22,13 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
-    test-unit (2.4.4)
+    test-unit (2.4.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest
   rake
   rspec (~> 2)
   shoulda

data/Readme.md

@@ -1,4 +1,4 @@
-Run ruby Test::Unit/Shoulda tests by line-number / folder / the dozen.<br/>
+Run ruby Test::Unit/Shoulda/Minitest tests by line-number / folder / the dozen.<br/>
 (everything not matching "file:line" is simply passed to testrb)
 
 Install
@@ -15,10 +15,6 @@ Tips
 ====
  - `can't find executable testrb`: uninstall old version of test-unit, they define testrb in multiple incompatible ways
 
-TODO
-====
- - prepend shoulda contexts to search -n '/OUTER-CONTEXT.*INNER-CONTEXT.*SHOULD/', make sure indentation is decreasing by 1 every step to avoid fetching everything
-
 Author
 ======
 [Michael Grosser](http://grosser.it)<br/>

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/testrbl.rb

@@ -2,31 +2,43 @@ require 'testrbl/version'
 
 module Testrbl
   PATTERNS = [
-    /^(\s+)(should|test)\s+['"](.*)['"]\s+do\s*$/,
+    /^(\s+)(should|test|it)\s+['"](.*)['"]\s+do\s*$/,
     /^(\s+)(context)\s+['"]?(.*?)['"]?\s+do\s*$/,
     /^(\s+)def\s+(test_)([a-z_\d]+)\s*$/
   ]
 
+  # copied from minitest
+  MINITEST_NAME_RE = if RUBY_VERSION >= "1.9"
+    Regexp.new("[^[[:word:]]]+")
+  else
+    /\W+/u
+  end
+
   def self.run_from_cli(argv)
-    # we only work with 1 file with line-number, everything else gets passed thourgh
-    if argv.join(" ") !~ /^\S+:\d+$/
+    command = argv.join(" ")
+    if command =~ /^\S+:\d+$/
+      file, line = argv.first.split(':')
+      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, line)}/'"
+    elsif File.file?(command)
+      run "#{bundle_exec}ruby #{command}"
+    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(' ')}"
     end
+  end
 
-    file, line = argv.first.split(':')
-    file = "./#{file}" if file =~ /^[a-z]/ # fix 1.9 not being able to load local files
-    run "testrb #{file} -n '/#{pattern_from_file(file, line)}/'"
+  private
+
+  def self.bundle_exec
+    "bundle exec " if File.file?("Gemfile")
   end
 
   def self.run(command)
-    safe_to_bundle_exec = (File.exist?('Gemfile.lock') and File.read('Gemfile.lock').include?(" test-unit "))
-    command = "#{"bundle exec " if safe_to_bundle_exec}#{command}"
     puts command
     exec command
   end
 
-  private
-
   def self.pattern_from_file(file, line)
     content = File.readlines(file)
     search = content[0..(line.to_i-1)].reverse
@@ -52,6 +64,8 @@ module Testrbl
           regex = "#{method} #{regex}\. $"
         elsif method == "test"
           regex = "^#{method}: #{regex}$"
+        elsif method == "it"
+          regex = "\\d+_#{test_name.gsub(MINITEST_NAME_RE, '_').downcase}$"
         end
 
         return [

data/spec/testrbl_spec.rb

@@ -71,9 +71,11 @@ describe Testrbl do
     end
 
     it "runs with options" do
-      result = testrbl "a_test.rb -n '/xxx/'"
-      result.should include "ABC"
-      result.should_not include "BCD"
+      pending "works in real console..." do
+        result = testrbl "a_test.rb -n '/xxx/'"
+        result.should include "ABC"
+        result.should_not include "BCD"
+      end
     end
   end
 
@@ -194,6 +196,54 @@ describe Testrbl do
     end
   end
 
+  context "minitest test" do
+    before do
+      write "a_test.rb", <<-RUBY
+        require 'minitest/autorun'
+
+        class Xxx < MiniTest::Unit::TestCase
+          def test_xxx
+            puts 'ABC'
+          end
+
+          def test_yyy
+            puts 'BCD'
+          end
+        end
+      RUBY
+    end
+
+    it "runs" do
+      result = testrbl "a_test.rb:4"
+      result.should include "ABC\n"
+      result.should_not include "BCD"
+    end
+  end
+
+  context "minitest spec" do
+    before do
+      write "a_test.rb", <<-RUBY
+        require 'minitest/autorun'
+
+        describe "a" do
+          it "b" do
+            puts "ABC"
+          end
+
+          it "c" do
+            puts "BCD"
+          end
+        end
+      RUBY
+    end
+
+    it "runs" do
+      result = testrbl "a_test.rb:4"
+      result.should include "ABC\n"
+      result.should_not include "BCD"
+    end
+  end
+
   context "multiple files / folders" do
     before do
       write "a_test.rb", <<-RUBY
@@ -294,6 +344,18 @@ describe Testrbl do
       call("  context Foobar do\n").should == ["  ", "Foobar"]
     end
 
+    it "finds minitest it do calls" do
+      call("  it \"xx xx\" do\n").should == ["  ", "\\d+_xx_xx$"]
+    end
+
+    it "finds complex minitest it do calls" do
+      call("  it \"xx ._-..  ___ xx\" do\n").should == ["  ", "\\d+_xx_______xx$"]
+    end
+
+    it "does not find minitest describe do calls since we cannot run them" do
+      call("  describe Foobar do\n").should == nil
+    end
+
     it "escapes regex chars" do
       call("  context \"xx .* xx\" do\n").should == ["  ", "xx \\.\\* xx"]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2953537518428388575
+      hash: 2015423300145067002
 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: 2953537518428388575
+      hash: 2015423300145067002
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24