testrbl 0.1.16 → 0.1.17

data/Gemfile

@@ -7,3 +7,4 @@ gem 'activesupport', '2.3.14'
 gem 'rake'
 gem 'rspec', '~>2'
 gem 'shoulda'
+gem 'bump'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    testrbl (0.1.16)
+    testrbl (0.1.17)
 
 GEM
   remote: http://rubygems.org/
   specs:
     activesupport (2.3.14)
+    bump (0.3.3)
     diff-lcs (1.1.3)
     minitest (3.4.0)
     rake (0.9.2.2)
@@ -30,6 +31,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (= 2.3.14)
+  bump
   minitest
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   # tests do not run with test-unit 1.x.x or <=2.3 since it defines testrb and overshadows 1.9s native testrb
@@ -9,20 +10,3 @@ task :default do
 
   sh "rspec spec/"
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/testrbl/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/lib/testrbl/version.rb

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

data/lib/testrbl.rb

@@ -2,9 +2,9 @@ require 'testrbl/version'
 
 module Testrbl
   PATTERNS = [
-    /^(\s+)(should|test|it)\s+['"](.*)['"]\s+do\s*$/,
-    /^(\s+)(context)\s+['"]?(.*?)['"]?\s+do\s*$/,
-    /^(\s+)def\s+(test_)([a-z_\d]+)\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
@@ -23,7 +23,7 @@ module Testrbl
       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) }
+    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

data/spec/testrbl_spec.rb

@@ -135,13 +135,17 @@ describe Testrbl do
             puts 'BCD'
           end
 
-          test "c -__.BLA:" do
+          test "c -__.BLA:" do # line 12
             puts 'CDE'
           end
 
-          test "c" do
+          test "c" do # line 16
             puts 'DEF'
           end
+
+          test "x / y" do # line 20
+            puts "XY"
+          end
         end
       RUBY
     end
@@ -173,6 +177,12 @@ describe Testrbl do
           result.should include "CDE\n"
           result.should_not include "DEF\n"
         end
+
+        it "runs with / in name" do
+          result = testrbl "a_test.rb:20"
+          result.should include "XY\n"
+          result.should_not include "DEF\n"
+        end
       end
     end
   end
@@ -440,6 +450,10 @@ describe Testrbl do
       call("  test \"c -__.BLA:\" do\n").should == ["  ", "^test(: |_)c.\\-__\\.BLA:$"]
     end
 
+    it "finds test do calls with comments" do
+      call("  test \"x / y\" do # line 20\n").should == ["  ", "^test(: |_)x./.y$"]
+    end
+
     it "finds interpolated test do calls" do
       call("  test \"c\#{111}b\" do\n").should == ["  ", "^test(: |_)c.*b$"]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-29 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: 3813406408488973454
+      hash: 3686334179144340123
 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: 3813406408488973454
+      hash: 3686334179144340123
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24