test_launcher 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab1010406bbd20148694b51995b73b183d05c6e0
-  data.tar.gz: d46b2f16b1ca1c0a73acafb7a20293569e807788
+  metadata.gz: f9fcdbdd5ed1a8eb6fc871ec897647a78fdfb3b1
+  data.tar.gz: 2d87fa49f026322a2786e31a34ab5a73aac6e9e6
 SHA512:
-  metadata.gz: 747cf2f747cff578ada42e051d174a2f59a1dfe330fa274ec00d286bbb3c786106381336ccbaa99e79f4fe619e40b0115030d995de8429eec8f76cb49037de7a
-  data.tar.gz: bfe7e480ac1839ad59ac4b0035831dc7a0503220e0b221eed670b5a80992f9d92c37f80f987f242d25139f0a77e7a1de11c1f8676947d9af11e4fe4f60c23ed3
+  metadata.gz: a01f5d870505778646f8b267a61874b67be0c37edd6d567fff1a9ba542f3ef71ab4249c24fc8c93768df2b27fb25a0bfcc90150051b880c2967e364a86392163
+  data.tar.gz: 221391e05a08f49b8b15f05466c2cfae573cbbfa552471e8f8b3ff7acfa5326356f6f1ad9dae0757765997c461d7365a7cd9c4f965f01d4e426e309895ec787c

data/README.md

@@ -1,10 +1,12 @@
 #Test Launcher -->
 
-Test Launcher takes some input and tries to figure out what test you want to run. It makes running tests on the command line much easier.  Test Launcher works with Minitest.  RSpec support is in its infancy.  You should try it and let me know!
+Test Launcher takes some input and tries to figure out what test you want to run. It makes running tests on the command line much easier.  Test Launcher always outputs the command that it has decided to run so that you can verify that it is running the test you want it to run.
+
+Test Launcher works with Minitest.  RSpec support is in its infancy.  You should try it and let me know!
 
 ### Usage
 
-Let's suppose you want to run the test `test_name` in your `blog_post_test.rb`.  
+Let's suppose you want to run the test `test_name` in your `blog_post_test.rb`.
 
 Without Test Launcher, you might type this:
 
@@ -86,11 +88,18 @@ Test Launcher will not use spring if the `DISABLE_SPRING=1` environment variable
 
 ### Running all tests you've changed:
 
-This will find all `*_test.rb` files in your status and pass them to test_launcher to be run.  Use this before you commit so you don't accidentally commit a test you've broken.
+This will find all uncommitted `*_test.rb` files  and pass them to test_launcher to be run.  Use this before you commit so you don't accidentally commit a test you've broken.
+
+```
+git diff --name-only --diff-filter=ACMTUXB | grep _test.rb | xargs test_launcher
+```
+
+If you've already committed your changes, but want to double check before you push, diff your changes with origin/master:
 
 ```
-git status | grep -Eo "([A-z\/]+_test.rb)" | xargs test_launcher
+git diff --name-only --diff-filter=ACMTUXB origin/master | grep _test.rb | xargs test_launcher
 ```
+(see https://git-scm.com/docs/git-diff)
 
 #Installation
 
@@ -100,7 +109,7 @@ To install:
 gem install test_launcher
 ```
 
-Under the hood it uses git to search for files and to grep, so it will only work in git repositories. 
+Under the hood it uses git to search for files and to grep, so it will only work in git repositories.
 
 
 #Setup
@@ -178,7 +187,7 @@ By default, RVM installs a hook to remove the need to run `bundle exec`.  When y
 
 Test Launcher is not installed in your bundle.  This means that the time that Bundler spends resolving your Gemfile to check if there's a test\_launcher executable in your bundle is wasted.  For most projects, the amount of time this takes is probably unnoticeable.
 
-On projects with lots of dependencies, this wasted time can be significant.  
+On projects with lots of dependencies, this wasted time can be significant.
 
 For example, in a large project, we get a nice improvement:
 

data/bin/test_launcher

@@ -3,10 +3,6 @@
 require "test_launcher/cli/input_parser"
 require "test_launcher"
 
-input = TestLauncher::CLI::InputParser.new(ARGV)
+cli = TestLauncher::CLI::InputParser.new(ARGV)
 
-TestLauncher.launch(
-  input.query,
-  run_all: input.options[:run_all],
-  framework: input.options[:framework]
-)
+TestLauncher.launch(cli.request)

data/lib/test_launcher/base_error.rb

@@ -0,0 +1,4 @@
+module TestLauncher
+  class BaseError < StandardError
+  end
+end

data/lib/test_launcher/cli/input_parser.rb

@@ -1,6 +1,8 @@
-require "test_launcher/version"
 require "optparse"
 
+require "test_launcher/version"
+require "test_launcher/request"
+
 module TestLauncher
   module CLI
     class InputParser
@@ -28,13 +30,18 @@ VERSION: #{TestLauncher::VERSION}
         exit
       end
 
-      def query
+      def request
         if @query.size == 0
           puts option_parser
           exit
         end
 
-        @query.join(" ")
+        Request.new(
+          query: @query.join(" "),
+          run_all: @options[:run_all],
+          disable_spring: ENV["DISABLE_SPRING"],
+          framework: @options[:framework]
+        )
       end
 
       def options

data/lib/test_launcher/frameworks/base.rb

@@ -44,7 +44,7 @@ module TestLauncher
       end
 
       class TestCase < Implementation::TestCase
-        def test_root_folder_name
+        def test_root_dir_name
           # directory where tests are found
           raise NotImplementedError
         end

data/lib/test_launcher/frameworks/implementation/locator.rb

@@ -1,18 +1,21 @@
+require "test_launcher/base_error"
 require "test_launcher/frameworks/implementation/test_case"
 require "test_launcher/frameworks/implementation/collection"
 
 module TestLauncher
   module Frameworks
     module Implementation
+      UnsupportedSearchError = Class.new(BaseError)
+
       class Locator < Struct.new(:request, :searcher)
         private :request, :searcher
 
         def prioritized_results
-          return files_found_by_absolute_path unless files_found_by_absolute_path.empty?
+          return files_found_by_path unless files_found_by_path.empty?
 
           return examples_found_by_name unless examples_found_by_name.empty?
 
-          return files_found_by_file_name unless files_found_by_file_name.empty?
+          return files_found_by_file_name_regex unless files_found_by_file_name_regex.empty?
 
           return files_found_by_full_regex unless files_found_by_full_regex.empty?
 
@@ -21,25 +24,37 @@ module TestLauncher
 
         private
 
-        def files_found_by_absolute_path
-          potential_file_paths = request.query.split(" ")
-          return [] unless potential_file_paths.all? {|fp| File.exist?(fp)}
+        def files_found_by_path
+          # TODO: this needs some love
 
-          Collection.new(
-            results:  potential_file_paths.map {|fp| build_result(file: fp)},
-            run_all: true
-          )
+          @files_found_by_path ||= begin
+            potential_file_paths = request.query.split(" ")
+            if potential_file_paths.all? {|fp| fp.match(file_name_regex)}
+
+              found_files = potential_file_paths.map {|fp| searcher.find_files(fp) }
+              if found_files.any?(&:empty?)
+                raise UnsupportedSearchError, file_term_failure_message
+              end
+
+              Collection.new(
+                results: found_files.flatten.map {|fp| build_result(file: fp)},
+                run_all: request.run_all? || potential_file_paths.size > 1
+              )
+            else
+              []
+            end
+          end
         end
 
         def examples_found_by_name
           @examples_found_by_name ||= Collection.new(
             results: full_regex_search(regex_pattern).map {|r| build_result(file: r[:file], query: request.query)},
-            run_all: request.run_all
+            run_all: request.run_all?
           )
         end
 
-        def files_found_by_file_name
-          @files_found_by_file_name ||= begin
+        def files_found_by_file_name_regex
+          @files_found_by_file_name_regex ||= begin
             potential_file_paths = request.query.split(" ")
             split_query_results = potential_file_paths.map {|fp| searcher.find_files(fp).select {|f| f.match(file_name_regex) } }
 
@@ -56,7 +71,7 @@ module TestLauncher
           # we ignore the matched line since we don't know what to do with it
           @files_found_by_full_regex ||= Collection.new(
             results: full_regex_search(request.query).map {|r| build_result(file: r[:file]) },
-            run_all: request.run_all
+            run_all: request.run_all?
           )
         end
 
@@ -65,7 +80,7 @@ module TestLauncher
         end
 
         def build_result(file:, query: nil)
-          test_case_class.from_search(file: file, query: query)
+          test_case_class.from_search(file: file, query: query, request: request)
         end
 
         def file_name_regex
@@ -83,6 +98,20 @@ module TestLauncher
         def test_case_class
           raise NotImplementedError
         end
+
+        def file_term_failure_message
+          <<-MSG
+At least one of your search terms was identified as a file.
+
+At least one of your *other* search terms was identified to not be a file.
+
+This is a case that is not currently supported.
+
+It is possible that one of the test files you wish to run is not currently known to git (e.g. it is ignored or unstaged)
+
+If that's not the case, let me know what you're trying to do by filing an issue at http://github.com/petekinnecom/test_launcher/issues
+          MSG
+        end
       end
     end
   end

data/lib/test_launcher/frameworks/implementation/test_case.rb

@@ -4,15 +4,16 @@ module TestLauncher
   module Frameworks
     module Implementation
       class TestCase
-        attr_reader :file, :example
+        attr_reader :file, :example, :request
 
-        def self.from_search(file:, query: nil)
-          new(file: file, example: query)
+        def self.from_search(file:, query:, request:)
+          new(file: file, example: query, request: request)
         end
 
-        def initialize(file:, example: nil)
+        def initialize(file:, example: nil, request:)
           @file = file
           @example = example
+          @request = request
         end
 
         def is_example?
@@ -24,43 +25,32 @@ module TestLauncher
         end
 
         def app_root
-          # TODO: untested - If we have more than one /test/ folder in the path, we search for a Gemfile or gemspec
-          if exploded_path.select { test_root_folder_name }.size > 1
-            exploded_path.each_with_index do |folder_name, i|
-              next unless folder_name == test_root_folder_name
+          if exploded_path.select { |dir| dir == test_root_dir_name }.size > 1
+            candidates = exploded_path
 
-              root_path = File.join("/", exploded_path[0...i])
-              if Dir.entries(root_path).any? {|e| e.match /Gemfile|gemspec/}
-                return root_path
+            while !candidates.empty?
+              if candidates.last == test_root_dir_name
+                root_path = File.join("/", candidates[0..-2])
+                return root_path if Dir.entries(root_path).any? {|e| e.match /Gemfile|gemspec/}
               end
+
+              candidates.pop
             end
           end
 
-          # default to our best guess
-          path = exploded_path[0...exploded_path.rindex(test_root_folder_name)]
+          path = exploded_path[0...exploded_path.index(test_root_dir_name)]
           File.join("/", path)
         end
 
         def test_root
-          File.join(app_root, test_root_folder_name)
-        end
-
-        def spring_enabled?
-          return false if ENV['DISABLE_SPRING']
-
-          [
-            "bin/spring",
-            "bin/testunit"
-          ].any? {|f|
-            File.exist?(File.join(app_root, f))
-          }
+          File.join(app_root, test_root_dir_name)
         end
 
         def runner
           raise NotImplementedError
         end
 
-        def test_root_folder_name
+        def test_root_dir_name
           raise NotImplementedError
         end
 

data/lib/test_launcher/frameworks/minitest.rb

@@ -58,9 +58,22 @@ module TestLauncher
           end
         end
 
-        def test_root_folder_name
+        def test_root_dir_name
           "test"
         end
+
+        def spring_enabled?
+          # TODO: move ENV reference to options hash
+          return false if request.disable_spring?
+
+          [
+            "bin/spring",
+            "bin/testunit"
+          ].any? {|f|
+            File.exist?(File.join(app_root, f))
+          }
+        end
+
       end
     end
   end

data/lib/test_launcher/frameworks/rspec.rb

@@ -41,7 +41,7 @@ module TestLauncher
       end
 
       class TestCase < Base::TestCase
-        def test_root_folder_name
+        def test_root_dir_name
           "spec"
         end
       end

data/lib/test_launcher/frameworks.rb

@@ -1,19 +1,10 @@
-require "test_launcher/frameworks/base"
-require "test_launcher/frameworks/minitest"
-require "test_launcher/frameworks/rspec"
+require "test_launcher/frameworks/implementation/consolidator"
 
-class Request < Struct.new(:query, :run_all)
-end
 
 module TestLauncher
   module Frameworks
-    def self.locate(framework_name:, input:, run_all:, shell:, searcher:)
-
-      request = Request.new(input, run_all)
-
-      frameworks = guess_frameworks(framework_name)
-
-      frameworks.each do |framework|
+    def self.locate(request:, shell:, searcher:)
+      request.frameworks.each do |framework|
         search_results = framework::Locator.new(request, searcher).prioritized_results
         runner = framework::Runner.new
 
@@ -25,14 +16,5 @@ module TestLauncher
       nil
     end
 
-    def self.guess_frameworks(framework_name)
-      if framework_name == "rspec"
-        [RSpec]
-      elsif framework_name == "minitest"
-        [Minitest]
-      else
-        [Minitest, RSpec].select(&:active?)
-      end
-    end
   end
 end

data/lib/test_launcher/request.rb

@@ -0,0 +1,36 @@
+require "test_launcher/frameworks/minitest"
+require "test_launcher/frameworks/rspec"
+
+module TestLauncher
+  class Request
+    def initialize(query:, framework: "guess", run_all: false, disable_spring: false)
+      @query = query
+      @framework = framework
+      @run_all = run_all
+      @disable_spring = disable_spring
+    end
+
+    def query
+      @query
+    end
+
+    def run_all?
+      @run_all
+    end
+
+    def disable_spring?
+      @disable_spring
+    end
+
+    def frameworks
+      if @framework == "rspec"
+        [Frameworks::RSpec]
+      elsif @framework == "minitest"
+        [Frameworks::Minitest]
+      else
+        [Frameworks::Minitest, Frameworks::RSpec].select(&:active?)
+      end
+    end
+
+  end
+end

data/lib/test_launcher/rubymine/launcher.rb

@@ -1,12 +1,24 @@
+require "test_launcher/request"
 require "test_launcher/frameworks/minitest"
 require "test_launcher/shell/runner"
 
 module TestLauncher
   module Rubymine
+    class MinimalRequest
+      def initialize(disable_spring:)
+        @disable_spring = disable_spring
+      end
+
+      def disable_spring?
+        @disable_spring
+      end
+    end
+
     class Launcher
-      def initialize(args:, shell:)
+      def initialize(args:, shell:, request:)
         @args = args
         @shell = shell
+        @request = request
       end
 
       def launch
@@ -36,10 +48,17 @@ module TestLauncher
 
       def test_case
         @test_case ||=
-          if args[-1].match('--name=')
-            Frameworks::Minitest::TestCase.new(file: args[-2], example: args[-1][/--name=(.*)/, 1])
+          if args[-1].match("--name=")
+            Frameworks::Minitest::TestCase.new(
+              file: args[-2],
+              example: args[-1][/--name=(.*)/, 1],
+              request: request
+            )
           else
-            Frameworks::Minitest::TestCase.new(file: args[-1])
+            Frameworks::Minitest::TestCase.new(
+              file: args[-1],
+              request: request
+            )
           end
       end
 
@@ -50,6 +69,10 @@ module TestLauncher
       def shell
         @shell
       end
+
+      def request
+        @request
+      end
     end
   end
 end

data/lib/test_launcher/rubymine.rb

@@ -1,5 +1,6 @@
 require "test_launcher/rubymine/launcher"
 require "test_launcher/shell/runner"
+require "test_launcher/request"
 
 # To allow us to simply specify our run configuration as:
 #
@@ -19,8 +20,15 @@ require "test_launcher/shell/runner"
 # So we throw them in the same bucket and let the launcher figure it
 # out.  It doesn't matter since we will `exec` a new command anyway.
 
+dummy_request = TestLauncher::Request.new(
+  query: nil,
+  framework: nil,
+  run_all: false,
+  disable_spring: ENV["DISABLE_SPRING"]
+)
 
 TestLauncher::Rubymine::Launcher.new(
   args: [$0].concat(ARGV),
-  shell: TestLauncher::Shell::Runner.new(log_path: "/dev/null")
+  shell: TestLauncher::Shell::Runner.new(log_path: "/dev/null"),
+  request: dummy_request
 ).launch

data/lib/test_launcher/search/git.rb

@@ -1,22 +1,48 @@
+require "test_launcher/base_error"
+
 module TestLauncher
-  module Searchers
+  module Search
     class Git
+      NotInRepoError = Class.new(BaseError)
+
+      class Interface
+        attr_reader :shell
+
+        def initialize(shell)
+          @shell = shell
+        end
 
-      def self.valid?
+        def ls_files(pattern)
+          shell.run("git ls-files '*#{pattern}*'")
+        end
+
+        def grep(regex, file_pattern)
+          shell.run("git grep --untracked --extended-regexp '#{regex}' -- '#{file_pattern}'")
+        end
 
+        def root_path
+          shell.run("git rev-parse --show-toplevel").first.tap do
+            if $? != 0
+              raise NotInRepoError, "test_launcher must be used in a git repository"
+            end
+          end
+        end
       end
 
-      def initialize(shell)
-        @shell = shell
-        Dir.chdir(root_path)
+      attr_reader :interface
+
+      def initialize(shell, interface=Interface.new(shell))
+        @interface = interface
+        Dir.chdir(root_path) # MOVE ME!
       end
 
       def find_files(pattern)
-        shell.run("git ls-files '*#{pattern}*'").map {|f| system_path(f)}
+        relative_pattern = strip_system_path(pattern)
+        interface.ls_files(relative_pattern).map {|f| system_path(f)}
       end
 
       def grep(regex, file_pattern: '*')
-        results = shell.run("git grep --untracked --extended-regexp '#{regex}' -- '#{file_pattern}'")
+        results = interface.grep(regex, file_pattern)
         results.map do |result|
           interpret_grep_result(result)
         end
@@ -47,13 +73,12 @@ module TestLauncher
         File.join(root_path, file)
       end
 
+      def strip_system_path(file)
+        file.sub(/^#{root_path}\//, '')
+      end
+
       def root_path
-        @root_path ||= %x[ git rev-parse --show-toplevel ].chomp.tap do
-          if $? != 0
-            shell.warn "test_launcher must be used in a git repository"
-            exit
-          end
-        end
+        @root_path ||= interface.root_path
       end
 
       def shell

data/lib/test_launcher/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/lib/test_launcher.rb

@@ -1,20 +1,19 @@
 require "test_launcher/version"
 
+require "test_launcher/base_error"
 require "test_launcher/shell/runner"
 require "test_launcher/search/git"
 require "test_launcher/frameworks"
 
 module TestLauncher
-  def self.launch(input, framework: "guess", run_all: false)
-    shell = Shell::Runner.new(log_path: '/tmp/test_launcher.log')
-    searcher = Searchers::Git.new(shell)
+  def self.launch(request)
+    shell = Shell::Runner.new(log_path: "/tmp/test_launcher.log")
+    searcher = Search::Git.new(shell)
 
     command = Frameworks.locate(
-      framework_name: framework,
+      request: request,
       shell: shell,
-      searcher: searcher,
-      input: input,
-      run_all: run_all
+      searcher: searcher
     )
 
     if command
@@ -22,5 +21,7 @@ module TestLauncher
     else
       shell.warn "No tests found."
     end
+  rescue BaseError => e
+    shell.warn(e)
   end
 end

data/test/test_launcher/frameworks/implementation/locator_test.rb

@@ -0,0 +1,166 @@
+require "test_helper"
+require "test_launcher/frameworks/implementation/test_case"
+require "test_launcher/frameworks/implementation/locator"
+
+module TestLauncher
+  module Frameworks
+    module Implementation
+      class LocatorTest < ::TestCase
+        class DummyTestCase < Implementation::TestCase
+        end
+
+        class DummyLocator < Implementation::Locator
+          def file_name_regex
+            /_test.rb/
+          end
+
+          def file_name_pattern
+            "*"
+          end
+
+          def regex_pattern
+            /.*/
+          end
+
+          def test_case_class
+            DummyTestCase
+          end
+        end
+
+        def test_prioritized_results__files_found_by_path__does_not_run_if_not_matching_regex__one_arg
+          searcher = mock {
+            stubs(:grep).returns([{file: "dummy_result"}])
+            expects(:find_files).never
+          }
+
+          request = stub(query: "file_not_matching_regex.js", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert_equal 1, locator.prioritized_results.file_count
+
+          result = locator.prioritized_results.first
+          assert_equal "dummy_result", result.file
+        end
+
+        def test_prioritized_results__files_found_by_path__does_not_run_if_not_matching_regex__all_args
+          searcher = mock {
+            stubs(:grep).returns([{file: "dummy_result"}])
+            expects(:find_files).never
+          }
+
+          request = stub(query: "matching_test.rb non_matching.js", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert_equal 1, locator.prioritized_results.file_count
+
+          result = locator.prioritized_results.first
+          assert_equal "dummy_result", result.file
+        end
+
+        def test_prioritized_results__files_found_by_path__uses_searcher_if_all_files_match_regex
+          searcher = mock {
+            expects(:find_files).with("matching_test.rb").returns(["/path/to/matching_test.rb"])
+          }
+
+          request = stub(query: "matching_test.rb ", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert_equal 1, locator.prioritized_results.file_count
+
+          result = locator.prioritized_results.first
+          assert_equal "/path/to/matching_test.rb", result.file
+        end
+
+        def test_prioritized_results__files_found_by_path__uses_searcher_if_all_files_match_regex__multiple_results
+          searcher = mock {
+            expects(:find_files).with("matching_test.rb").returns(["/path1/to/matching_test.rb", "/path2/to/matching_test.rb"])
+          }
+
+          request = stub(query: "matching_test.rb ", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert_equal 2, locator.prioritized_results.file_count
+
+          assert_equal "/path1/to/matching_test.rb", locator.prioritized_results.first.file
+          assert_equal "/path2/to/matching_test.rb", locator.prioritized_results.last.file
+        end
+
+        def test_prioritized_results__files_found_by_path__uses_searcher_if_all_files_match_regex__multiple_args
+          searcher = mock {
+            expects(:find_files).with("matching_1_test.rb").returns(["/path1/to/matching_1_test.rb", "/path2/to/matching_1_test.rb"])
+            expects(:find_files).with("matching_2_test.rb").returns(["/path1/to/matching_2_test.rb", "/path2/to/matching_2_test.rb"])
+          }
+
+          request = stub(query: "matching_1_test.rb matching_2_test.rb", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert_equal 4, locator.prioritized_results.file_count
+
+          file_results = locator.prioritized_results.map(&:file)
+
+          assert file_results.include?("/path1/to/matching_1_test.rb")
+          assert file_results.include?("/path2/to/matching_1_test.rb")
+          assert file_results.include?("/path1/to/matching_2_test.rb")
+          assert file_results.include?("/path2/to/matching_2_test.rb")
+        end
+
+        def test_prioritized_results__files_found_by_path__raises_unsupported_search_error
+          # if we find results for one path, but not for the other
+          # then we are confused as to what to do.
+
+          searcher = mock {
+            expects(:find_files).with("matching_1_test.rb").returns(["/path1/to/matching_1_test.rb", "/path2/to/matching_1_test.rb"])
+            expects(:find_files).with("matching_2_test.rb").returns([])
+          }
+          request = stub(query: "matching_1_test.rb matching_2_test.rb", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert_raises Implementation::UnsupportedSearchError do
+            locator.prioritized_results
+          end
+        end
+
+        def test_prioritized_results__files_found_by_path__runs_all_if_multiple_searches
+          searcher = mock {
+            expects(:find_files).with("matching_1_test.rb").returns(["/path1/to/matching_1_test.rb", "/path2/to/matching_1_test.rb"])
+            expects(:find_files).with("matching_2_test.rb").returns(["/path1/to/matching_2_test.rb", "/path2/to/matching_2_test.rb"])
+          }
+          request = stub(query: "matching_1_test.rb matching_2_test.rb", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert locator.prioritized_results.run_all?
+        end
+
+        def test_prioritized_results__files_found_by_path__does_not_run_all_if_single_search
+          searcher = mock {
+            expects(:find_files).with("matching_test.rb").returns(["/path1/to/matching_1_test.rb", "/path2/to/matching_1_test.rb"])
+          }
+          request = stub(query: "matching_test.rb", run_all?: false)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert ! locator.prioritized_results.run_all?
+        end
+
+        def test_prioritized_results__files_found_by_path__does_not_run_all_if_single_search_unless_override
+          searcher = mock {
+            expects(:find_files).with("matching_test.rb").returns(["/path1/to/matching_1_test.rb", "/path2/to/matching_1_test.rb"])
+          }
+
+          request = stub(query: "matching_test.rb", run_all?: true)
+
+          locator = DummyLocator.new(request, searcher)
+
+          assert locator.prioritized_results.run_all?
+        end
+      end
+    end
+  end
+end

data/test/test_launcher/frameworks/implementation/test_case_test.rb

@@ -0,0 +1,63 @@
+require "test_helper"
+require "test_launcher/frameworks/implementation/test_case"
+
+
+module TestLauncher
+  module Frameworks
+    module Implementation
+      class TestCaseTest < ::TestCase
+        class DummyTestCase < Implementation::TestCase
+          def initialize(file:)
+            super(file: file, request: nil)
+          end
+
+          def test_root_dir_name
+            "test"
+          end
+        end
+
+        def test_app_root__one_test_dir
+          test_case = DummyTestCase.new(file: "/path/root/test/thing_test.rb")
+
+          assert_equal "/path/root", test_case.app_root
+        end
+
+        def test_app_root__multiple_test_dirs__find_gemfile
+          test_case = DummyTestCase.new(file: "/path/root/test/inline_gem/test/thing_test.rb")
+
+          Dir.stubs(:entries).with("/path/root").returns([".", "..", "Gemfile", "other_stuff.rb"])
+          Dir.stubs(:entries).with("/path/root/test/inline_gem").returns([".", "..", "other_stuff.rb"])
+
+          assert_equal "/path/root", test_case.app_root
+        end
+
+        def test_app_root__multiple_test_dirs__find_gemspec
+          test_case = DummyTestCase.new(file: "/path/root/test/inline_gem/test/thing_test.rb")
+
+          Dir.stubs(:entries).with("/path/root").returns([".", "..", "gem.gemspec", "other_stuff.rb"])
+          Dir.stubs(:entries).with("/path/root/test/inline_gem").returns([".", "..", "other_stuff.rb"])
+
+          assert_equal "/path/root", test_case.app_root
+        end
+
+        def test_app_root__multiple_test_dirs__prefers_deeply_nested_dirs
+          test_case = DummyTestCase.new(file: "/path/root/test/inline_gem/test/thing_test.rb")
+
+          Dir.stubs(:entries).with("/path/root").returns(["Gemfile"])
+          Dir.stubs(:entries).with("/path/root/test/inline_gem").returns(["Gemfile"])
+
+          assert_equal "/path/root/test/inline_gem", test_case.app_root
+        end
+
+        def test_app_root__multiple_test_dirs__finds_no_info__defaults_outward
+          test_case = DummyTestCase.new(file: "/path/root/test/inline_gem/test/thing_test.rb")
+
+          Dir.stubs(:entries).with("/path/root").returns([".", ".."])
+          Dir.stubs(:entries).with("/path/root/test/inline_gem").returns([".", ".."])
+
+          assert_equal "/path/root", test_case.app_root
+        end
+      end
+    end
+  end
+end

data/test/test_launcher/minitest_integration_test.rb

@@ -1,65 +1,66 @@
 require "test_helper"
+require "test_launcher/request"
 
 module TestLauncher
   class MinitestIntegrationTest < TestCase
     def test__single_method
-      TestLauncher.launch("file_name_1__method_name_1", framework: "minitest")
+      launch("file_name_1__method_name_1")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")} --name=/file_name_1__method_name_1/", Shell::Runner.recall_exec
     end
 
     def test__multiple_methods__same_file
-      TestLauncher.launch("file_name_1", framework: "minitest")
+      launch("file_name_1")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")} --name=/file_name_1/", Shell::Runner.recall_exec
     end
 
     def test__multiple_methods__different_files
-      TestLauncher.launch("multiple_files__same_method", framework: "minitest")
+      launch("multiple_files__same_method")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test #{system_path("test/test_launcher/fixtures/minitest/test/class_2_test.rb")} --name=/multiple_files__same_method/", Shell::Runner.recall_exec
     end
 
     def test__single_file
-      TestLauncher.launch("class_1_test", framework: "minitest")
+      launch("class_1_test")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__uses_spring
-      TestLauncher.launch("different_roo""t_test", framework: "minitest") # don't trigger the find in *this* file
+      launch("different_roo""t_test") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest/test/different_root")} && bundle exec spring testunit #{system_path("test/test_launcher/fixtures/minitest/test/different_root/test/different_root_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_files__found
-      TestLauncher.launch("Root1""Dum""myTest""Class", framework: "minitest") # don't trigger the find in *this* file
+      launch("Root1""Dum""myTest""Class") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_2_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_files__found__all
-      TestLauncher.launch("Root1""DummyTest""Class", run_all: true, framework: "minitest") # don't trigger the find in *this* file
+      launch("Root1""DummyTest""Class", run_all: true) # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")} #{system_path("test/test_launcher/fixtures/minitest/test/class_2_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_file_paths
-      TestLauncher.launch("class_1_tes""t.rb class_2_test.rb", framework: "minitest") # don't trigger the find in *this* file
+      launch("class_1_tes""t.rb class_2_test.rb") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")} #{system_path("test/test_launcher/fixtures/minitest/test/class_2_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_files__different_roots__all
-      TestLauncher.launch("DummyTest""Class", run_all: true, framework: "minitest") # don't trigger the find in *this* file
+      launch("DummyTest""Class", run_all: true) # don't trigger the find in *this* file
       expected = "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")} #{system_path("test/test_launcher/fixtures/minitest/test/class_2_test.rb")}; cd -;\n\ncd #{system_path("test/test_launcher/fixtures/minitest/test/different_root")} && bundle exec spring testunit #{system_path("test/test_launcher/fixtures/minitest/test/different_root/test/different_root_test.rb")}"
       assert_equal expected, Shell::Runner.recall_exec
     end
 
     def test__regex
-      TestLauncher.launch("Root1""DummyTest""Class1""Test", framework: "minitest") # don't trigger the find in *this* file
+      launch("Root1""DummyTest""Class1""Test") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__regex__does_not_test_helper__methods
-      TestLauncher.launch("helper_meth""od", framework: "minitest") # don't trigger the find in *this* file
+      launch("helper_meth""od") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/minitest")} && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' #{system_path("test/test_launcher/fixtures/minitest/test/class_1_test.rb")}", Shell::Runner.recall_exec
     end
 
     def test__not_found
-      TestLauncher.launch("not_found""thing", framework: "minitest")
+      launch("not_found""thing")
       assert_equal nil, Shell::Runner.recall_exec
     end
 
@@ -68,5 +69,16 @@ module TestLauncher
     def system_path(relative_dir)
       File.join(Dir.pwd, relative_dir)
     end
+
+    def launch(query, run_all: false)
+      request = Request.new(
+        query: query,
+        run_all: run_all,
+        framework: "minitest"
+      )
+
+      TestLauncher.launch(request)
+    end
+
   end
 end

data/test/test_launcher/rspec_integration_test.rb

@@ -1,65 +1,66 @@
 require "test_helper"
+require "test_launcher/request"
 
 module TestLauncher
   class RspecIntegrationTest < TestCase
     def test__single_method
-      TestLauncher.launch("file_name_1 example_name_""1", framework: "rspec")
+      launch("file_name_1 example_name_""1")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} --example file_name_1\\ example_name_1", Shell::Runner.recall_exec
     end
 
     def test__single_context
-      TestLauncher.launch("file_name_1 con""text_1", framework: "rspec")
+      launch("file_name_1 con""text_1")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} --example file_name_1\\ context_1", Shell::Runner.recall_exec
     end
 
     def test__single_describe
-      TestLauncher.launch("Root1DummyTes""tClass1", framework: "rspec")
+      launch("Root1DummyTes""tClass1")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} --example Root1DummyTes""tClass1", Shell::Runner.recall_exec
     end
 
     def test__multiple_methods__same_file
-      TestLauncher.launch("file_name_1", framework: "rspec")
+      launch("file_name_1")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} --example file_name_1", Shell::Runner.recall_exec
     end
 
     def test__multiple_methods__different_files
-      TestLauncher.launch("multiple_files same_example", framework: "rspec")
+      launch("multiple_files same_example")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_2_spec.rb")} --example multiple_files\\ same_example", Shell::Runner.recall_exec
     end
 
     def test__single_file
-      TestLauncher.launch("class_1_spec", framework: "rspec")
+      launch("class_1_spec")
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_files__found
-      TestLauncher.launch("Root1", framework: "rspec") # don't trigger the find in *this* file
+      launch("Root1") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_2_spec.rb")} --example Roo""t1", Shell::Runner.recall_exec
     end
 
     def test__multiple_files__found__all
-      TestLauncher.launch("Root1""DummyTest""Class", run_all: true, framework: "rspec") # don't trigger the find in *this* file
+      launch("Root1""DummyTest""Class", run_all: true) # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} #{system_path("test/test_launcher/fixtures/rspec/spec/class_2_spec.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_file_paths
-      TestLauncher.launch("class_1_spec.rb class_2_spec.rb", framework: "rspec") # don't trigger the find in *this* file
+      launch("class_1_spec.rb class_2_spec.rb") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} #{system_path("test/test_launcher/fixtures/rspec/spec/class_2_spec.rb")}", Shell::Runner.recall_exec
     end
 
     def test__multiple_files__different_roots__all
-      TestLauncher.launch("DummyTest""Class", run_all: true, framework: "rspec") # don't trigger the find in *this* file
+      launch("DummyTest""Class", run_all: true) # don't trigger the find in *this* file
       expected = "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_1_spec.rb")} #{system_path("test/test_launcher/fixtures/rspec/spec/class_2_spec.rb")}; cd -;\n\ncd #{system_path("test/test_launcher/fixtures/rspec/spec/different_root")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/different_root/spec/different_root_spec.rb")}"
       assert_equal expected, Shell::Runner.recall_exec
     end
 
     def test__regex
-      TestLauncher.launch("a_test_that_u""ses", framework: "rspec") # don't trigger the find in *this* file
+      launch("a_test_that_u""ses") # don't trigger the find in *this* file
       assert_equal "cd #{system_path("test/test_launcher/fixtures/rspec")} && rspec #{system_path("test/test_launcher/fixtures/rspec/spec/class_2_spec.rb")}", Shell::Runner.recall_exec
     end
 
     def test__not_found
-      TestLauncher.launch("not_found""thing", framework: "minitest")
+      launch("not_found""thing")
       assert_equal nil, Shell::Runner.recall_exec
     end
 
@@ -68,5 +69,15 @@ module TestLauncher
     def system_path(relative_dir)
       File.join(Dir.pwd, relative_dir)
     end
+
+    def launch(query, run_all: false)
+      request = Request.new(
+        query: query,
+        run_all: run_all,
+        framework: "rspec"
+      )
+
+      TestLauncher.launch(request)
+    end
   end
 end

data/test/test_launcher/rubymine_test.rb

@@ -34,15 +34,17 @@ module TestLauncher
     private
 
     def assert_executes(expected_command, args)
+      dummy_request = mock { stubs(:disable_spring?).returns(true) }
+
       launcher = Rubymine::Launcher.new(
         args: args.split(" "),
-        shell: dummy_shell
+        shell: dummy_shell,
+        request: dummy_request
       )
 
       launcher.launch
       assert_equal 1, dummy_shell.recall(:exec).size
       assert_equal [[expected_command]], dummy_shell.recall(:exec)
-
     end
   end
 end

data/test/test_launcher/search/git_test.rb

@@ -0,0 +1,26 @@
+require "test_helper"
+require "test_launcher/search/git"
+
+module TestLauncher
+  module Search
+    class GitTest < TestCase
+
+      def setup
+        super
+        Dir.stubs(:chdir)
+      end
+
+      def test_find_files__strips_absolute_path_for_search_and_replaces_it
+        interface = mock {
+          expects(:root_path).returns("/path/to/repo")
+          expects(:ls_files).with("relative/file_test.rb").returns(["inline_gem/relative/file_test.rb"])
+        }
+
+        searcher = Git.new(nil, interface)
+        files = searcher.find_files("/path/to/repo/relative/file_test.rb")
+
+        assert_equal ["/path/to/repo/inline_gem/relative/file_test.rb"], files
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - Rakefile
 - bin/test_launcher
 - lib/test_launcher.rb
+- lib/test_launcher/base_error.rb
 - lib/test_launcher/cli/input_parser.rb
 - lib/test_launcher/frameworks.rb
 - lib/test_launcher/frameworks/base.rb
@@ -62,6 +63,7 @@ files:
 - lib/test_launcher/frameworks/implementation/test_case.rb
 - lib/test_launcher/frameworks/minitest.rb
 - lib/test_launcher/frameworks/rspec.rb
+- lib/test_launcher/request.rb
 - lib/test_launcher/rubymine.rb
 - lib/test_launcher/rubymine/launcher.rb
 - lib/test_launcher/search/git.rb
@@ -70,16 +72,23 @@ files:
 - lib/test_launcher/version.rb
 - test/install
 - test/test_helper.rb
+- test/test_launcher/fixtures/minitest/Gemfile
 - test/test_launcher/fixtures/minitest/test/class_1_test.rb
 - test/test_launcher/fixtures/minitest/test/class_2_test.rb
+- test/test_launcher/fixtures/minitest/test/different_root/Gemfile
 - test/test_launcher/fixtures/minitest/test/different_root/bin/spring
 - test/test_launcher/fixtures/minitest/test/different_root/test/different_root_test.rb
+- test/test_launcher/fixtures/rspec/Gemfile
 - test/test_launcher/fixtures/rspec/spec/class_1_spec.rb
 - test/test_launcher/fixtures/rspec/spec/class_2_spec.rb
+- test/test_launcher/fixtures/rspec/spec/different_root/Gemfile
 - test/test_launcher/fixtures/rspec/spec/different_root/spec/different_root_spec.rb
+- test/test_launcher/frameworks/implementation/locator_test.rb
+- test/test_launcher/frameworks/implementation/test_case_test.rb
 - test/test_launcher/minitest_integration_test.rb
 - test/test_launcher/rspec_integration_test.rb
 - test/test_launcher/rubymine_test.rb
+- test/test_launcher/search/git_test.rb
 - test_launcher.gemspec
 homepage: http://github.com/petekinnecom/test_launcher
 licenses:
@@ -108,13 +117,20 @@ summary: Easily run tests
 test_files:
 - test/install
 - test/test_helper.rb
+- test/test_launcher/fixtures/minitest/Gemfile
 - test/test_launcher/fixtures/minitest/test/class_1_test.rb
 - test/test_launcher/fixtures/minitest/test/class_2_test.rb
+- test/test_launcher/fixtures/minitest/test/different_root/Gemfile
 - test/test_launcher/fixtures/minitest/test/different_root/bin/spring
 - test/test_launcher/fixtures/minitest/test/different_root/test/different_root_test.rb
+- test/test_launcher/fixtures/rspec/Gemfile
 - test/test_launcher/fixtures/rspec/spec/class_1_spec.rb
 - test/test_launcher/fixtures/rspec/spec/class_2_spec.rb
+- test/test_launcher/fixtures/rspec/spec/different_root/Gemfile
 - test/test_launcher/fixtures/rspec/spec/different_root/spec/different_root_spec.rb
+- test/test_launcher/frameworks/implementation/locator_test.rb
+- test/test_launcher/frameworks/implementation/test_case_test.rb
 - test/test_launcher/minitest_integration_test.rb
 - test/test_launcher/rspec_integration_test.rb
 - test/test_launcher/rubymine_test.rb
+- test/test_launcher/search/git_test.rb