testrbl 0.1.13 → 0.1.14

data/Gemfile.lock

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

data/Rakefile

@@ -1,8 +1,11 @@
+require 'bundler/setup'
 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\./
+  # tests do not run with test-unit 1.x.x since it defines testrb and overshadows 1.9s native testrb
+  if `which testrb`.include?("/gems/")
+    raise "tests do not run with test-unit 1.x.x installed\nyes | gem uninstall -a test-unit && bundle"
+  end
 
   sh "rspec spec/"
 end

data/lib/testrbl/version.rb

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

data/lib/testrbl.rb

@@ -80,28 +80,28 @@ module Testrbl
 
   def self.pattern_from_line(line)
     PATTERNS.each do |r|
-      if line =~ r
-        whitespace, method, test_name = $1, $2, $3
-        regex = Regexp.escape(test_name).gsub("'",".").gsub("\\ "," ").gsub(INTERPOLATION, ".*")
-
-        if method == "should"
-          optional_test_name = "(?:\(.*\))?"
-          regex = "#{method} #{regex}\. #{optional_test_name}$"
-        elsif method == "test"
-          # test "xxx -_ yyy"
-          # test-unit:     "test: xxx -_ yyy"
-          # activesupport: "test_xxx_-__yyy"
-          regex = "^test(: |_)#{regex.gsub(" ", ".")}$"
-        elsif method == "it"
-          regex = "^test_\\d+_#{test_name}$"
-        end
-
-        return [
-          whitespace,
-          regex
-        ]
-      end
+      next unless line =~ r
+      whitespace, method, test_name = $1, $2, $3
+      return [whitespace, pattern_from_match(method, test_name)]
     end
     nil
   end
+
+  def self.pattern_from_match(method, test_name)
+    regex = Regexp.escape(test_name).gsub("\\ "," ").gsub(INTERPOLATION, ".*")
+
+    if method == "should"
+      optional_test_name = "(?:\(.*\))?"
+      regex = "#{method} #{regex}\. #{optional_test_name}$"
+    elsif method == "test"
+      # test "xxx -_ yyy"
+      # test-unit:     "test: xxx -_ yyy"
+      # activesupport: "test_xxx_-__yyy"
+      regex = "^test(: |_)#{regex.gsub(" ", ".")}$"
+    elsif method == "it"
+      regex = "^test_\\d+_#{test_name}$"
+    end
+
+    regex.gsub("'", ".")
+  end
 end

metadata

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