testrbl 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbccd1a6f94867baccfe5fd8d126556becf51178
-  data.tar.gz: 2e7773b55e99111fbf76e5991077aa086236e1e9
+  metadata.gz: 41de53795f9dfc9c388d7a679b9e3fa0336502ed
+  data.tar.gz: 165b56a70195745fb791bf9a09dc2247478d85c7
 SHA512:
-  metadata.gz: aacc4824f127a55004a7147e47921fcc40fe0b0efd36590147b37faa31a22ee9583714d1978d3d8b3896d5c3f9647764f556a820e0fea42256beb73b1ad80a5d
-  data.tar.gz: f9573ad68354f53411a8b8fffc7fb6acff26cccc814eb35fc6d39bb4da057877fe09ed8504c12e9180f47dec82a7712b7b0d30241b07b44006ae7da556b70936
+  metadata.gz: 3c1598370bd30c669105fe7a808501f5f90b1570313eb953600715b4a0dc121bc8e3e3711c06b024eca2632e2b295db839e28c4d63ae159b38863443d02938d7
+  data.tar.gz: 8f0e555db895d530e65f8c1b54fb4499736b6399bd58f66e0b132d6baa1c2c48a6d4f29f466205f8789a7ce4c05df944e34ad35033d9084be3b454f1eb5b6e95

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    testrbl (0.4.1)
+    testrbl (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Readme.md

@@ -4,14 +4,19 @@ Instant execution, 0 wait-time!
 
 Install
 =======
-    gem install testrbl
+```Bash
+gem install testrbl
+```
 
 Usage
 =====
-    testrbl test/unit/xxx_test.rb:123 # test by line number
-    testrbl test/unit                 # everything _test.rb in a folder (on 1.8 this would be test/unit/*)
-    testrbl xxx_test.rb yyy_test.rb   # multiple files
-    testrbl --changed                 # run changed tests
+
+```Bash
+testrbl test/unit/xxx_test.rb:123 # test by line number
+testrbl test/unit                 # everything _test.rb in a folder (on 1.8 this would be test/unit/*)
+testrbl xxx_test.rb yyy_test.rb   # multiple files
+testrbl --changed                 # run changed tests
+```
 
 Tips
 ====
@@ -19,7 +24,6 @@ Tips
 
 TODO
 ====
- - fix tests on ree/1.9.2
  - alternate minitest syntax: test_0017_should not link already linked URLs
 
 Author
@@ -27,4 +31,4 @@ Author
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
-[![Build Status](https://secure.travis-ci.org/grosser/testrbl.png)](http://travis-ci.org/grosser/testrbl)
+[![Build Status](https://travis-ci.org/grosser/testrbl.png)](https://travis-ci.org/grosser/testrbl)

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/testrbl.rb

@@ -19,7 +19,7 @@ module Testrbl
     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)
+      run(ruby + load_options + line_pattern_option(file, line) + options)
     else
       if files.size == 1 and File.file?(files.first)
         run(ruby + load_options + files + options)
@@ -33,6 +33,11 @@ module Testrbl
     end
   end
 
+  # overwritten by maxitest to just return line
+  def self.line_pattern_option(file, line)
+    [file, "-n", "/#{pattern_from_file(File.readlines(file), line)}/"]
+  end
+
   # usable via external tools like zeus
   def self.pattern_from_file(lines, line)
     possible_lines = lines[0..(line.to_i-1)].reverse
@@ -140,18 +145,17 @@ module Testrbl
   def self.test_pattern_from_match(method, test_name)
     regex = Regexp.escape(test_name).gsub("\\ "," ").gsub(INTERPOLATION, ".*")
 
-    regex = case method
-    when "should"
-      optional_test_name = "(?:\(.*\))?"
-      "#{method} #{regex}\. #{optional_test_name}$"
-    when "describe"
-      "#{test_name}(::)?"
-    when "test"
+    regex = if method == "test"
       # test "xxx -_ yyy"
       # test-unit:     "test: xxx -_ yyy"
       # activesupport: "test_xxx_-__yyy"
       "^test(: |_)#{regex.gsub(" ", ".")}$"
-    when "it"
+    elsif method == "describe" || (method == "context" && !via_shoulda?)
+      "#{test_name}(::)?"
+    elsif method == "should" && via_shoulda?
+      optional_test_name = "(?:\(.*\))?"
+      "#{method} #{regex}\. #{optional_test_name}$"
+    elsif ["it", "should"].include?(method) # minitest aliases for shoulda
       "#test_\\d+_#{test_name}$"
     else
       regex
@@ -159,4 +163,9 @@ module Testrbl
 
     regex.gsub("'", ".")
   end
+
+  def self.via_shoulda?
+    return @via_shoulda if defined?(@via_shoulda)
+    @via_shoulda = !File.exist?("Gemfile.lock") || File.read("Gemfile.lock").include?(" shoulda-context ")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -17,7 +17,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -38,17 +38,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Run ruby Test::Unit/Shoulda tests by line-number / folder / the dozen