testrbl 0.1.17 → 0.2.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec
 
 gem 'test-unit'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    testrbl (0.1.17)
+    testrbl (0.2.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activesupport (2.3.14)
     bump (0.3.3)

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.1.17'
+  VERSION = '0.2.0'
 end

data/lib/testrbl.rb

@@ -7,6 +7,8 @@ module Testrbl
     /^(\s+)def\s+(test_)([a-z_\d]+)\s*(?:#.*)?$/
   ]
 
+  OPTION_WITH_ARGUMENT = ["-I", "-r", "-n", "-e"]
+
   # copied from minitest
   MINITEST_NAME_RE = if RUBY_VERSION >= "1.9"
     Regexp.new("[^[[:word:]]]+")
@@ -17,89 +19,113 @@ module Testrbl
   INTERPOLATION = /\\\#\\\{.*?\\\}/
 
   def self.run_from_cli(argv)
-    i_test, file, line = detect_usable(argv)
-    if file and line
-      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) } # testrb has a lot of weird issues vs test-unit, so try to avoid it
-      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
+    files, options = partition_argv(argv)
+    files = files.map { |f| localize(f) }
+    load_options, options = partition_options(options)
+
+    if files.size == 1 and files.first =~ /^(\S+):(\d+)$/
+      file = $1
+      line = $2
+      run(ruby + load_options + [file, "-n", "/#{pattern_from_file(File.readlines(file), line)}/"] + options)
+    else
+      if files.all? { |f| File.file?(f) } and options.none? { |arg| arg =~ /^-n/ }
+        run(ruby + load_options + files.map { |f| "-r#{f}" } + options + ["-e", ""])
+      else # pass though
+        # no bundle exec: projects with mini and unit-test do not run well via bundle exec testrb
+        run ["testrb"] + argv
+      end
     end
   end
 
-  # useable e.g. via zeus
+  # usable via external tools like zeus
   def self.pattern_from_file(lines, line)
-    search = lines[0..(line.to_i-1)].reverse
+    possible_lines = lines[0..(line.to_i-1)].reverse
 
     last_spaces = " " * 100
-    found = search.map{|line| pattern_from_line(line) }.compact
+    found = possible_lines.map { |line| test_pattern_from_line(line) }.compact
+
+    # pattern and the groups it is nested under (like describe - describe - it)
     patterns = found.select do |spaces, name|
       last_spaces = spaces if spaces.size < last_spaces.size
     end.map(&:last)
 
-    use = []
-    found_final = false
-    patterns.each do |pattern|
-      is_final = pattern.end_with?("$")
-      next if is_final && found_final
-      found_final = is_final
-      use << pattern
-    end
-
-    return use.reverse.join(".*") if found.size > 0
+    return filter_duplicate_final(patterns).reverse.join(".*") if found.size > 0
 
     raise "no test found before line #{line}"
   end
 
+  # only keep 1 pattern that stops matching via $
+  def self.filter_duplicate_final(patterns)
+    found_final = 0
+    patterns.reject { |p| p.end_with?("$") and (found_final += 1) > 1 }
+  end
+
   private
 
+  def self.partition_options(options)
+    next_is_before = false
+    options.partition do |option|
+      if next_is_before
+        next_is_before = false
+        true
+      else
+        if option =~ /^-(r|I)/
+          next_is_before = (option.size == 2)
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+
   # 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"))
-
-    return unless argv.size == 1
-
-    if argv.first =~ /^(\S+):(\d+)$/
-      [i_test, $1, $2]
-    elsif File.file?(argv.first)
-      [i_test, argv.first, false]
+  def self.partition_argv(argv)
+    next_is_option = false
+    argv.partition do |arg|
+      if next_is_option
+        next_is_option = false
+      else
+        if arg =~ /^-.$/ or  arg =~ /^--/ # single letter option followed by argument like -I test or long options like --verbose
+          next_is_option = true if OPTION_WITH_ARGUMENT.include?(arg)
+          false
+        elsif arg =~ /^-/ # multi letter option like -Itest
+          false
+        else
+          true
+        end
+      end
     end
   end
 
   def self.ruby
     if File.file?("Gemfile")
-      "ruby -rbundler/setup" # faster then bundle exec ruby
+      ["ruby", "-rbundler/setup"] # faster then bundle exec ruby
     else
-      "ruby"
+      ["ruby"]
     end
   end
 
   def self.run(command)
-    command = [*command]
     puts command.join(" ")
     STDOUT.flush # if exec fails horribly we at least see some output
     Kernel.exec *command
   end
 
-  def self.pattern_from_line(line)
+  def self.test_pattern_from_line(line)
     PATTERNS.each do |r|
       next unless line =~ r
       whitespace, method, test_name = $1, $2, $3
-      return [whitespace, pattern_from_match(method, test_name)]
+      return [whitespace, test_pattern_from_match(method, test_name)]
     end
     nil
   end
 
-  def self.pattern_from_match(method, test_name)
+  def self.test_pattern_from_match(method, test_name)
     regex = Regexp.escape(test_name).gsub("\\ "," ").gsub(INTERPOLATION, ".*")
 
     if method == "should"

data/spec/testrbl_spec.rb

@@ -383,24 +383,33 @@ describe Testrbl do
       before do
         write "backtrace_test.rb", <<-RUBY
           puts caller
+          require 'test/unit'
+
+          class Xxx1 < Test::Unit::TestCase
+            def test_xxx
+              puts 'BACKTRACE'
+            end
+          end
         RUBY
       end
 
       it "does not run via testrb if possible" do
-        result = testrbl "a/b/c_test.rb backtrace_test.rb"
+        result = testrbl "-Itest -I lib a/b/c_test.rb backtrace_test.rb -v"
         result.should include("CDE")
+        result.should include("BACKTRACE")
         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"
+      it "runs via testrb if unavoidable" do
+        result = testrbl "a/b/c_test.rb backtrace_test.rb -n '/xxx/'"
         result.should include("CDE")
+        result.should include("BACKTRACE")
         result.should include("bin/testrb:")
       end
     end
   end
 
-  describe ".pattern_from_file" do
+  describe ".test_pattern_from_file" do
     def call(content, line)
       lines = content.split("\n").map{|l| l + "\n" }
       Testrbl.pattern_from_file(lines, line)
@@ -425,9 +434,9 @@ describe Testrbl do
     end
   end
 
-  describe ".pattern_from_line" do
+  describe ".test_pattern_from_line" do
     def call(line)
-      Testrbl.pattern_from_line(line)
+      Testrbl.test_pattern_from_line(line)
     end
 
     it "finds simple tests" do
@@ -498,4 +507,34 @@ describe Testrbl do
       call("  context \"xx ' xx\" do\n").should == ["  ", "xx . xx"]
     end
   end
+
+  describe ".partition_argv" do
+    def call(*args)
+      Testrbl.send(:partition_argv, *args)
+    end
+
+    it "finds files" do
+      call(["xxx"]).should == [["xxx"], []]
+    end
+
+    it "finds files after multi-space options" do
+      call(["-I", "test", "xxx"]).should == [["xxx"], ["-I", "test"]]
+    end
+
+    it "finds options" do
+      call(["-I", "test"]).should == [[], ["-I", "test"]]
+    end
+
+    it "finds --verbose" do
+      call(["--verbose", "test"]).should == [["test"], ["--verbose"]]
+    end
+
+    it "finds -- options" do
+      call(["--foo", "test"]).should == [["test"], ["--foo"]]
+    end
+
+    it "finds mashed options" do
+      call(["-Itest"]).should == [[], ["-Itest"]]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2013-03-09 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: 3686334179144340123
+      hash: -866997392072142941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,10 +53,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3686334179144340123
+      hash: -866997392072142941
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Run ruby Test::Unit/Shoulda tests by line-number / folder / the dozen