sfb_scripts 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c4ffa5f6768611b201947a331bc2d19b6c4f33e
-  data.tar.gz: 1e12c961a87746e5887e2b816dd3fc9471b1a677
+  metadata.gz: aa1bfa22f42bad325e3fae6d68a8cf56ae0ddadf
+  data.tar.gz: ef3751b60b61a8ccf310cb1f4bc6ccd08dd54361
 SHA512:
-  metadata.gz: 06b67e433f81d759194d524ea86ae36fabbd883ed5479f3de148c392d42ed0e289ba2e922bc59dcef4e75feddf07c81ba07bf1829495619e2ed210fce8338a49
-  data.tar.gz: 9317810f154b2ab142732c27c11e5855c38a00ae08175166961ff3718a52188300620d891e77ffa9b08f2054b70f308ff36cf2b6208d2ea9b55587060db27b4a
+  metadata.gz: 623055c0dbf1357e7ca7c91ea2d1632d6456c5e842e89cc7d7691dcb0e2d98ce1b20902b28ef8b30d5af6a8d81fcbaba21ffd8fac848bc3b9f669d099ae54154
+  data.tar.gz: 12c2377cf70bbfab5505e18847994f2538cc747a5ed6b6836e86b462877e13693da6e515f70b4a0aace25487ffeecf92f4522f15ce2733b935e1a52956bfd5df

data/lib/sfb_scripts/test_running/test_collection.rb

@@ -84,7 +84,8 @@ class TestCollection
   private
 
   def find_test_name(grepped_line)
-    return nil unless grepped_line
+    return nil unless grepped_line && grepped_line.match(/^\s*def\s+test_/)
+
     grepped_line.strip.gsub(/^\s*def /, '').strip
   end
 
@@ -92,7 +93,6 @@ class TestCollection
     file_path = test_data[:file]
     test_name = find_test_name(test_data[:line])
     return nil if ! file_path.match(/_test\.rb/)
-    return nil if (test_name && ! test_name.match(/^test_/))
 
     TestCase.new(
       full_path: file_path,

data/lib/sfb_scripts/test_running/test_file_runner.rb

@@ -21,11 +21,9 @@ class TestFileRunner
     inputs.each {|input| files << repo.find_files(input).map {|f| {:file => f} } }
     files.flatten!
     @tests = TestCollection.new(files)
-    if @tests.present?
-      test_runner.run_files(tests)
-    else
-      shell.notify "Could not find matching test file."
-    end
+
+    return false unless @tests.present?
+    test_runner.run_files(tests)
   end
 
   def status

data/lib/sfb_scripts/test_running/test_method_runner.rb

@@ -4,11 +4,16 @@ class TestMethodRunner
     new(env).run(regex)
   end
 
+  def self.run_file_with_match(regex, env)
+    new(env, pure_regex: true).run(regex)
+  end
+
   attr_reader :regex, :repo, :shell, :test_runner
-  def initialize(env)
+  def initialize(env, pure_regex: false)
     @repo = env[:repo]
     @shell = env[:shell]
     @test_runner = env[:test_runner]
+    @pure_regex = pure_regex
   end
 
   def run(regex)
@@ -18,7 +23,11 @@ class TestMethodRunner
       shell.notify "Could not find matching test method."
       return false
     elsif tests.size == 1
-      test_runner.run_method(tests.first)
+      if @pure_regex
+        test_runner.run_files(tests)
+      else
+        test_runner.run_method(tests.first)
+      end
     elsif tests.in_one_file?
       shell.notify "Multiple matches in same file. Running that file."
       test_runner.run_files(tests)
@@ -38,7 +47,7 @@ class TestMethodRunner
   end
 
   def find_tests_by_name
-    test_def_regex = "^\s*def .*#{regex}.*"
+    test_def_regex = @pure_regex ? regex : "^\s*def .*#{regex}.*"
     begin
       return repo.grep(test_def_regex, file_pattern: '*_test.rb')
     rescue ShellRunner::CommandFailureError

data/lib/sfb_scripts/tester.rb

@@ -32,7 +32,11 @@ class Tester
     if query_might_be_method?(inputs)
       TestMethodRunner.run(inputs.first, env)
     end
+
     TestFileRunner.find(inputs, env)
+
+    TestMethodRunner.run_file_with_match(inputs.first, env)
+
     env[:shell].warn "Giving up :("
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Pete Kinnecom