testrbl 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    testrbl (0.2.0)
+    testrbl (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -9,7 +9,7 @@ GEM
     activesupport (2.3.14)
     bump (0.3.3)
     diff-lcs (1.1.3)
-    minitest (3.4.0)
+    minitest (5.0.3)
     rake (0.9.2.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)

data/lib/testrbl/version.rb

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

data/lib/testrbl.rb

@@ -3,19 +3,11 @@ require 'testrbl/version'
 module Testrbl
   PATTERNS = [
     /^(\s+)(should|test|it)\s+['"](.*)['"]\s+do\s*(?:#.*)?$/,
-    /^(\s+)(context)\s+['"]?(.*?)['"]?\s+do\s*(?:#.*)?$/,
+    /^(\s+)(context|describe)\s+['"]?(.*?)['"]?\s+do\s*(?:#.*)?$/,
     /^(\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:]]]+")
-  else
-    /\W+/u
-  end
-
   INTERPOLATION = /\\\#\\\{.*?\\\}/
 
   def self.run_from_cli(argv)
@@ -128,16 +120,21 @@ module Testrbl
   def self.test_pattern_from_match(method, test_name)
     regex = Regexp.escape(test_name).gsub("\\ "," ").gsub(INTERPOLATION, ".*")
 
-    if method == "should"
+    regex = case method
+    when "should"
       optional_test_name = "(?:\(.*\))?"
-      regex = "#{method} #{regex}\. #{optional_test_name}$"
-    elsif method == "test"
+      "#{method} #{regex}\. #{optional_test_name}$"
+    when "describe"
+      "#{test_name}(::)?"
+    when "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}$"
+      "^test(: |_)#{regex.gsub(" ", ".")}$"
+    when "it"
+      "#test_\\d+_#{test_name}$"
+    else
+      regex
     end
 
     regex.gsub("'", ".")

data/spec/testrbl_spec.rb

@@ -296,20 +296,51 @@ describe Testrbl do
 
         describe "a-a" do
           it "b./_-b" do
-            puts "ABC"
+            puts "-ABC-"
           end
 
           it "c-c" do
-            puts "BCD"
+            puts "-BCD-"
+          end
+
+          describe "a-b" do
+            it "d-d" do
+              puts "-CDE-"
+            end
+
+            it "d-e" do
+              puts "-DEF-"
+            end
+          end
+        end
+
+        describe "a-c" do
+          it "b./_-d" do
+            puts "-EFG-"
           end
         end
       RUBY
     end
 
+    def run_line(number)
+      result = testrbl "a_test.rb:#{number}"
+      result.scan(/-[A-Z]{3}-/).map { |s| s.gsub("-", "") }.sort
+    end
+
     it "runs" do
-      result = testrbl "a_test.rb:4"
-      result.should include "ABC\n"
-      result.should_not include "BCD"
+      run_line("4").should == ["ABC"]
+    end
+
+    it "runs describes" do
+      run_line("3").should == ["ABC", "BCD", "CDE", "DEF"]
+    end
+
+    it "runs nested describes" do
+      run_line("12").should == ["CDE", "DEF"]
+    end
+
+    it "runs nested it" do
+      run_line("13").should == ["CDE"]
     end
   end
 
@@ -488,15 +519,15 @@ describe Testrbl do
     end
 
     it "finds minitest it do calls" do
-      call("  it \"xx xx\" do\n").should == ["  ", "^test_\\d+_xx xx$"]
+      call("  it \"xx xx\" do\n").should == ["  ", "#test_\\d+_xx xx$"]
     end
 
     it "finds complex minitest it do calls" do
-      call("  it \"xX ._-..  ___ Xx\" do\n").should == ["  ", "^test_\\d+_xX ._-..  ___ Xx$"]
+      call("  it \"xX ._-..  ___ Xx\" do\n").should == ["  ", "#test_\\d+_xX ._-..  ___ Xx$"]
     end
 
-    it "does not find minitest describe do calls since we cannot run them" do
-      call("  describe Foobar do\n").should == nil
+    it "finds minitest describe do calls" do
+      call("  describe Foobar do\n").should == ["  ", "Foobar(::)?"]
     end
 
     it "escapes regex chars" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-06-07 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: -866997392072142941
+      hash: -4240182073636530469
 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: -866997392072142941
+      hash: -4240182073636530469
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25