testrbl 0.1.10 → 0.1.11

data/Gemfile.lock

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

data/Readme.md

@@ -1,5 +1,6 @@
 Run ruby Test::Unit/Shoulda/Minitest tests by line-number / folder / the dozen.<br/>
-(everything not matching "file:line" is simply passed to testrb)
+(everything not matching "file:line" is simply passed to testrb)<br/>
+Instant execution, 0 wait-time!
 
 Install
 =======

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/lib/testrbl.rb

@@ -21,7 +21,7 @@ module Testrbl
     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)}/'"
+      run "#{bundle_exec}ruby #{file} -n '/#{pattern_from_file(File.readlines(file), line)}/'"
     elsif File.file?(command)
       run "#{bundle_exec}ruby #{command}"
     else # pass though
@@ -41,17 +41,25 @@ module Testrbl
     exec command
   end
 
-  def self.pattern_from_file(file, line)
-    content = File.readlines(file)
-    search = content[0..(line.to_i-1)].reverse
+  def self.pattern_from_file(lines, line)
+    search = lines[0..(line.to_i-1)].reverse
 
     last_spaces = " " * 100
     found = search.map{|line| pattern_from_line(line) }.compact
-    found = found.select do |spaces, name|
+    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 found.reverse.map(&:last).join(".*") if found.size > 0
+    return use.reverse.join(".*") if found.size > 0
 
     raise "no test found before line #{line}"
   end

data/spec/testrbl_spec.rb

@@ -331,6 +331,31 @@ describe Testrbl do
     end
   end
 
+  describe ".pattern_from_file" do
+    def call(content, line)
+      lines = content.split("\n").map{|l| l + "\n" }
+      Testrbl.pattern_from_file(lines, line)
+    end
+
+    after do
+      @result.should include("xxx")
+      @result.should_not include("yyy")
+      @result.should include("zzz")
+    end
+
+    it "does not find nested should calls" do
+      @result = call("  context \"xxx\" do\n    test \"yyy\" do\n    if true do\n      test \"zzz\" do\n", 4)
+    end
+
+    it "does not find nested test calls" do
+      @result = call("  context \"xxx\" do\n    test \"yyy\" do\n    if true do\n      test \"zzz\" do\n", 4)
+    end
+
+    it "does not find nested it calls" do
+      @result = call("  context \"xxx\" do\n    it \"yyy\" do\n    if true do\n      it \"zzz\" do\n", 4)
+    end
+  end
+
   describe ".pattern_from_line" do
     def call(line)
       Testrbl.pattern_from_line(line)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-14 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: 3990631787065738982
+      hash: -4483421695493014766
 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: 3990631787065738982
+      hash: -4483421695493014766
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24