sfb_scripts 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aab86c1ecf4b9c1691a7a4e686c823c10f9b6c36
-  data.tar.gz: b8ad1717e0cc3bbe363db504efb78e655c870d43
+  metadata.gz: 4331f2d765b901cc8d384db62ef40894242fdb51
+  data.tar.gz: 125839c5dad8e1a67f06843fea59984d59144367
 SHA512:
-  metadata.gz: 1765662a968df5a669370bf54287973a8b7726e921e6f1cd809b750387edc3ef39c904f5f5fdc9b8f0bed37e13c95acf87de5e28fb71de23ef27784a81626012
-  data.tar.gz: 09179f2e6c970043af511743ec2a6ca46793850dc1fb7acb092bcdd251351bb4d3d52e02501d04bfe6f1e5b9dfb4d724765da1392d0ad9828bce06765d34a04f
+  metadata.gz: e4723d8f8bae2f59d0227dae4ed102d818d3b8d8e3517cefc18872cb9cee9bde635568c81e3c037e3708f23de9941ce4fdf8132e62a7f6357507bf2f252a25a7
+  data.tar.gz: c59b89377676bfa2ddc96544009a095844ffc63d6a939c4bdd15ff4b5dc9c316e3400b648969e35139d0ecf650f4fba8deb421937fa04fad5bbafe8afd8da24e

data/lib/sfb_scripts/test_running/test_collection.rb

@@ -2,10 +2,11 @@ class TestCollection
 
   MultipleWorkingDirectoriesError = Class.new(StandardError)
 
-  attr_reader :tests
+  attr_reader :tests, :query
 
-  def initialize(tests_data=[])
-    @tests = tests_data.map do |test_data|
+  def initialize(tests_matches: [], query:)
+    @query = query
+    @tests = tests_matches.map do |test_data|
       test_data = {file: test_data} if test_data.is_a?(String)
       TestCase.new(
         full_path: test_data[:file],

data/lib/sfb_scripts/test_running/test_finder.rb

@@ -47,7 +47,7 @@ class TestFinder
           # git grep returns 1 if no results found
         end
 
-        TestCollection.new(test_matches)
+        TestCollection.new(tests_matches: test_matches, query: query)
       end
   end
 

data/lib/sfb_scripts/test_running/test_runner.rb

@@ -6,34 +6,44 @@ class TestRunner
     @all_engines_param = env[:all_engines]
   end
 
+  # Hack: this could use *a lot* of love
   # this could use some love
   def run(tests)
+
     if tests.empty?
       shell.warn "Unable to identify any tests."
       exit
+
     elsif tests.is_one_test_method?
-      run_method(tests.first)
+      test = tests.first
+      run_method(path: test.relative_path, name: test.test_name, dir: test.working_dir)
+
     elsif tests.in_one_file? && tests.all? {|t| t.is_method? }
-      shell.notify "Multiple matches in same file. Running that file."
-      run_files(tests)
-    elsif tests.in_one_file?
-      shell.notify "Matched one file."
+      shell.notify "Multiple matches in same file. Running those tests"
+      test = tests.first
+      run_method(path: test.relative_path, name: tests.query, dir: test.working_dir)
+
+    elsif tests.in_one_file? #catches regex that matched a test file or other regex that matched in the body
+      shell.notify "Matched one file. Running that file."
       run_files(tests)
+
     elsif tests.in_one_engine? && tests.full_paths.size < 4 # hack: maybe should ask here?
       shell.notify "Multiple matches across files in same engine. Running those files."
       run_files(tests)
+
     else
       shell.warn 'Found too many tests:'
       tests[0..10].each {|t| shell.notify "#{t.full_path}: #{t.test_name}" }
       shell.notify '...'
       exit
+
     end
   end
 
-  def run_method(test)
-    test_runner = named_test_runner(test.working_dir)
+  def run_method(path:, name:, dir:)
+    test_runner = named_test_runner(dir)
 
-    shell.exec("#{test_runner} #{test.relative_path} --name=#{test.test_name}", dir: test.working_dir)
+    shell.exec("#{test_runner} #{path} --name=/#{name}/", dir: dir)
   end
 
   def run_files(tests)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -60,6 +60,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/app_up
+- bin/git_up
+- bin/test_runner
 - lib/sfb_scripts/bundler/bundle_manager.rb
 - lib/sfb_scripts/dependency_loader.rb
 - lib/sfb_scripts/folder_guard.rb
@@ -83,9 +86,6 @@ files:
 - lib/sfb_scripts/test_running/test_runner.rb
 - lib/sfb_scripts/tester.rb
 - lib/sfb_scripts/upper.rb
-- bin/test_runner
-- bin/app_up
-- bin/git_up
 homepage: http://github.com/petekinnecom/sfb_scripts/
 licenses:
 - MIT
@@ -106,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily update your rails app and run tests from command line
 test_files: []
-has_rdoc: