sfb_scripts 1.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7279bb5e7fffd4a2b44fad0f7ae8f2b6cf0ce7
-  data.tar.gz: 8a1131704ff90b965179f71f41ea62f68de24482
+  metadata.gz: f85e393c87cefd7c1457d0cdb1ef0e4701619a34
+  data.tar.gz: d6dfb9262c26a4914f92a6bb0aa4cb7ee0830c84
 SHA512:
-  metadata.gz: 31638c99f1501a7b035bdda11105e69792722269ece7d8ac5add2ce85d1ff85d092a75979df327361e4dfbaf0fa35f67d5644996a910fd9afe55006b9f323da1
-  data.tar.gz: 8005900cb970a8725b2e2f97d518485b2ce93fc7f1d89e1a80617fb8045bc7775bf07c60344da99eaf007ceaaf3d70b1530881b411f5dd327892df62eb22c9e1
+  metadata.gz: d350584195bd7d960fb1c635a3e72f0c7de42fbffeecf8332fc987d80176b58a68d3230dae49152431903ae85808f05b97e8f9d2e9ad99242a9f954f6a73319b
+  data.tar.gz: eedf607c18f39d291863208cf6d777a5fbc1d7f834236060b416fe536f104f2c77a08173aa57cbd8a001960539a720499965084bf87c851d5ffc907115aa330b

data/bin/test_runner

@@ -22,6 +22,7 @@ class CLI < Thor
   desc "find", <<-DESC
     Find tests and run them. By trying to match an individual test or the name of a test file(s).
   DESC
+  option :timid, type: :boolean, desc: "Always ask user which tests to run if multiple test files are found. Defaults to false", default: false
   def find(input)
     if input == '--help'
       puts "use 'test_runner --help find' to see the help"

data/lib/sfb_scripts/needs_manager.rb

@@ -83,7 +83,8 @@ class NeedsManager
   def create_test_runner
     env[:test_runner] = TestRunner.new(
       shell: env[:shell],
-      all_engines: options[:all_engines]
+      all_engines: options[:all_engines],
+      always_ask_before_grouping_tests: options[:timid]
     )
   end
 

data/lib/sfb_scripts/shells/shell_runner.rb

@@ -39,6 +39,19 @@ class ShellRunner
     return answer != 'n'
   end
 
+  def get_number_list_for_question(question)
+    warn question 
+    answer = STDIN.gets.strip
+
+    answer.split(',').map do |term|
+      if term.include?('-')
+        (term.split('-')[0].to_i..term.split('-')[1].to_i).to_a
+      else
+        term.to_i
+      end
+    end.flatten
+  end
+
   def deny?(question)
     ! confirm?(question)
   end

data/lib/sfb_scripts/test_running/test_collection.rb

@@ -7,11 +7,16 @@ class TestCollection
   def initialize(tests_data=[], query: '')
     @query = query
     @tests = tests_data.map do |test_data|
-      test_data = {file: test_data} if test_data.is_a?(String)
-      TestCase.new(
-        full_path: test_data[:file],
-        line: test_data[:line]
-      )
+      if test_data.is_a? TestCase
+        test_data
+      else
+        test_data = {file: test_data} if test_data.is_a?(String)
+
+        TestCase.new(
+          full_path: test_data[:file],
+          line: test_data[:line]
+        )
+      end
     end.compact
   end
 
@@ -19,6 +24,10 @@ class TestCollection
     tests.empty?
   end
 
+  def uniq!
+    @tests = @tests.uniq {|e| "#{e.full_path} #{e.test_name} #{e.working_dir}" }
+  end
+
   def present?
     ! empty?
   end

data/lib/sfb_scripts/test_running/test_runner.rb

@@ -1,9 +1,10 @@
 class TestRunner
 
-  attr_reader :shell, :all_engines_param
+  attr_reader :shell, :all_engines_param, :always_ask_before_grouping_tests
   def initialize(env)
     @shell = env[:shell]
     @all_engines_param = env[:all_engines]
+    @always_ask_before_grouping_tests = env[:always_ask_before_grouping_tests]
   end
 
   # Hack: this could use *a lot* of love
@@ -17,7 +18,8 @@ class TestRunner
     elsif tests.is_one_test_method?
       test = tests.first
       run_method(path: test.relative_path, name: test.test_name, dir: test.working_dir)
-
+    elsif always_ask_before_grouping_tests
+      ask_user_which_tests_to_run(tests)
     elsif tests.in_one_file? && tests.all? {|t| t.is_method? }
       shell.notify "Multiple matches in same file. Running those tests"
       test = tests.first
@@ -32,20 +34,31 @@ class TestRunner
       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
-
+      ask_user_which_tests_to_run(tests)
     end
   end
 
   def run_method(path:, name:, dir:)
     test_runner = named_test_runner(dir)
-
     shell.exec("#{test_runner} #{path} --name=/#{name}/", dir: dir)
   end
 
+  def ask_user_which_tests_to_run(tests)
+      shell.warn 'Found too many tests. Please choose which matches you would like to run:'
+
+      tests.uniq!.each_with_index do |t, index| 
+        shell.notify "(#{index}) #{t.full_path}: #{t.test_name}" 
+      end
+
+      tests_to_run = shell.get_number_list_for_question('Please enter the match numbers you would like to run(comma seperated)')
+
+      new_tests = tests_to_run.map do |index|
+        tests[index]
+      end
+      @always_ask_before_grouping_tests = false
+      run(TestCollection.new(new_tests))
+  end
+
   def run_files(tests)
     begin
       test_runner = test_collection_runner(tests.working_dir)

data/lib/sfb_scripts/version.rb

@@ -0,0 +1,3 @@
+module SfbScripts
+  VERSION = "1.7.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: 1.7.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,6 +86,7 @@ files:
 - lib/sfb_scripts/test_running/test_runner.rb
 - lib/sfb_scripts/tester.rb
 - lib/sfb_scripts/upper.rb
+- lib/sfb_scripts/version.rb
 homepage: http://github.com/petekinnecom/sfb_scripts/
 licenses:
 - MIT