test_launcher 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccdfde0aec34dd6c9644f3985b2fec6c8b80d65a
-  data.tar.gz: a580b9f1354854325582f98d02a42626065cca23
+  metadata.gz: ee375d2d54fa4515002e279d1be2d1311265ef15
+  data.tar.gz: 45d2b818b60b50a9b1a973b41cba18ad49d79518
 SHA512:
-  metadata.gz: 264cb91173593078f956c8a76e527494cd033a3d647d31d1527528eef1afb84d0273707004c55d0057bfdc7f15411384be3da46af1197d942fb05a8ee55b1be7
-  data.tar.gz: 509301a76e17513abaeb8952230a43844392f09ca0d7ae520b8909faedde428a485bf02c44ba40b17c5a9ee371f0890eae053bfd56ea1996d1fc7984aed02241
+  metadata.gz: a2eba4180a96e7ddb178ff3516106cb1ad600782f864b8c0f5125cc19950610e3d593d99bf1f6febbf690d3bb3346096953061928682a34f76bb1084b27525c1
+  data.tar.gz: 9452932c5136e3fd33d7616c65d33d52a992df0e1f397e7618a2180c1eaa2b6f8c20dfce23eec1053420a18cbb279e57bff83226b4c4e408212ac60cd55b792a

data/README.md

@@ -95,11 +95,18 @@ test_launcher blog_post_test.rb comment_test.rb
 
 #=> ruby -I test -e 'ARGV.each {|f| require(f)}' test/models/blog_post_test.rb test/models/comment_test.rb
 ```
+Or maybe you've got multiple test methods you want to run:
+
+```
+test_launcher test_name_1 test_name_2
+
+#=> ruby -I test -e "ARGV.push('--name=/test_name_1|test_name_2/')" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb
+```
 
 Or maybe you'd like to run all test methods that match a regular expression:
 
 ```
-test_launcher 'hello_\w*|goodbye_\w+'
+test_launcher 'hello_\w*|goodbye_\w+' --all
 
 #=> Found 2 methods in 2 files.
 #=> bundle exec ruby -I test -e "ARGV.push('--name=/hello_\w*|goodbye_\w+/')" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb
@@ -149,7 +156,7 @@ Suppose you type `test_launcher thing`.  It will run tests using this priority p
 1. Any test file based on a generic search
   - runs `stuff_test.rb` because it found the word `thing` inside of it
 
-If your looks like it's specifying a line number (e.g. `file_test.rb:17`), that search will be preferred.
+If your query looks like it's specifying a line number (e.g. `file_test.rb:17`), that search will be preferred.
 
 Any time it matches multiple files, it will default to running the most recently edited file.  You can append `--all` if you want to run all matching tests, even if they are in different engines/gems!
 
@@ -167,9 +174,8 @@ If you've already committed your changes, but want to double check before you pu
 ```
 git diff --name-only --diff-filter=ACMTUXB origin/master | grep _test.rb | xargs test_launcher
 ```
-(see https://git-scm.com/docs/git-diff)
-
 
+Add this to your `~/.bash_profile` and enjoy!
 ```
 function tdiff()
 {
@@ -253,14 +259,14 @@ $:time test_launcher something_that_no_test_says
 
 #=> real	0m2.214s
 #=> user	0m1.407s
-#=> sys	0m1.062s
+#=> sys	  0m1.062s
 
-$:time NOEXEC_DISABLE=1 test_launcher something_that_no_test_might_say
+$:time NOEXEC_DISABLE=1 test_launcher something_that_no_test_says
 #=> Could not find any tests.
 
 #=> real	0m1.412s
 #=> user	0m0.745s
-#=> sys	0m0.945s
+#=> sys	  0m0.945s
 ```
 
 I suggest that if you are using RVM, you may as well make this your alias:

data/lib/test_launcher/frameworks/ex_unit.rb

@@ -44,7 +44,7 @@ module TestLauncher
         end
 
         def example_name_regex(query="")
-          "^\s*test\s+\".*#{query}.*\"\s+do"
+          "^\s*test\s+\".*(#{query}).*\"\s+do"
         end
       end
 

data/lib/test_launcher/frameworks/minitest.rb

@@ -64,9 +64,9 @@ module TestLauncher
 
         def example_name_regex(query="")
           if query.match(/^test_/)
-            "^\s*def\s+#{query}.*"
+            "^\s*def\s+(#{query}).*"
           else
-            "^\s*def\s+test_.*#{query}.*"
+            "^\s*def\s+test_.*(#{query }).*"
           end
         end
 
@@ -96,12 +96,12 @@ Open an issue on https://github.com/petekinnecom/test_launcher if this is someth
         def single_example(test_case, name: test_case.example, exact_match: false)
           name_arg =
             if exact_match
-              Shellwords.escape(name)
+              name
             else
-              "/#{Shellwords.escape(name)}/"
+              "/#{name}/"
             end
 
-          %{cd #{test_case.app_root} && #{test_case.example_runner} #{test_case.file} --name=#{name_arg}}
+          %{cd #{test_case.app_root} && #{test_case.example_runner} #{test_case.file} --name='#{name_arg}'}
         end
 
         def multiple_examples_same_file(test_cases)
@@ -110,7 +110,7 @@ Open an issue on https://github.com/petekinnecom/test_launcher if this is someth
         end
 
         def multiple_examples_same_root(test_cases)
-          %{cd #{test_cases.first.app_root} && bundle exec ruby -I test -e "ARGV.push('--name=/#{test_cases.first.example}/')" #{test_cases.map {|tc| "-r #{tc.file}"}.uniq.join(" ")}}
+          %{cd #{test_cases.first.app_root} && bundle exec ruby -I test -r bundler/setup -e "ARGV.push('--name=/#{test_cases.first.example}/')" #{test_cases.map {|tc| "-r #{tc.file}"}.uniq.join(" ")}}
         end
 
         def one_or_more_files(test_cases)

data/lib/test_launcher/frameworks/rspec.rb

@@ -45,7 +45,7 @@ module TestLauncher
         end
 
         def example_name_regex(query)
-          "^\s*(it|context|(RSpec.)?describe) .*#{query}.* do.*"
+          "^\s*(it|context|(RSpec.)?describe) .*(#{query}).* do.*"
         end
       end
 
@@ -55,7 +55,7 @@ module TestLauncher
         end
 
         def single_example(test_case, **_)
-          %{cd #{test_case.app_root} && bundle exec rspec #{test_case.file} --example #{Shellwords.escape(test_case.example)}}
+          multiple_examples_same_root([test_case])
         end
 
         def multiple_examples_same_file(test_cases)
@@ -64,7 +64,7 @@ module TestLauncher
         end
 
         def multiple_examples_same_root(test_cases)
-          one_or_more_files(test_cases.uniq {|tc| tc.file})
+          %{cd #{test_cases.first.app_root} && bundle exec rspec #{test_cases.map(&:file).join(" ")} --example #{Shellwords.escape(test_cases.first.example)}}
         end
 
         def one_or_more_files(test_cases)

data/lib/test_launcher/queries.rb

@@ -9,8 +9,8 @@ module TestLauncher
         commandify(SpecifiedNameQuery)
       end
 
-      def multi_search_term
-        commandify(MultiTermQuery)
+      def multi_path_query
+        commandify(MultiPathQuery)
       end
 
       def by_path
@@ -21,6 +21,10 @@ module TestLauncher
         commandify(ExampleNameQuery)
       end
 
+      def multi_example_name
+        commandify(MultiExampleNameQuery)
+      end
+
       def from_full_regex
         commandify(FullRegexQuery)
       end
@@ -137,7 +141,7 @@ module TestLauncher
       end
     end
 
-    class MultiTermQuery < BaseQuery
+    class MultiPathQuery < BaseQuery
       def command
         return if test_cases.empty?
 
@@ -225,7 +229,7 @@ module TestLauncher
       end
 
       def test_cases
-        @test_cases ||=
+        @test_cases ||= begin
           examples_found_by_name.map { |grep_result|
             request.test_case(
               file: grep_result[:file],
@@ -234,6 +238,7 @@ module TestLauncher
               request: request
             )
           }
+        end
       end
 
       def examples_found_by_name
@@ -245,6 +250,48 @@ module TestLauncher
       end
     end
 
+    class MultiExampleNameQuery < BaseQuery
+      def command
+        return if test_cases.empty?
+
+        if one_example?
+          shell.notify("Found 1 example in 1 file.")
+          runner.single_example(test_cases.first)
+        elsif one_file?
+          shell.notify("Found #{test_cases.size} examples in 1 file.")
+          runner.multiple_examples_same_file(test_cases) # it will regex with the query
+        else
+          shell.notify "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."
+          runner.multiple_examples(test_cases)
+        end
+      end
+
+      def test_cases
+        return [] if joined_query == request.search_string
+
+        @test_cases_found_by_joining_query ||= examples_found.map { |grep_result|
+          request.test_case(
+            file: grep_result[:file],
+            example: joined_query,
+            line_number: grep_result[:line_number],
+            request: request
+          )
+        }
+      end
+
+      def examples_found
+        @examples_found_by_joining_query ||= searcher.examples(joined_query)
+      end
+
+      def joined_query
+        @joined_query ||= request.search_string.squeeze(" ").gsub(" ", "|")
+      end
+
+      def one_example?
+        test_cases.size == 1
+      end
+    end
+
     class FullRegexQuery < BaseQuery
       def command
         return if test_cases.empty?
@@ -264,7 +311,7 @@ module TestLauncher
 
       def test_cases
         @test_cases ||=
-          files_found_by_full_regex
+          files_found
             .uniq { |grep_result| grep_result[:file] }
             .map { |grep_result|
               request.test_case(
@@ -274,9 +321,22 @@ module TestLauncher
             }
       end
 
+      def files_found
+        if files_found_by_full_regex.any?
+          files_found_by_full_regex
+        else
+          files_found_by_joining_terms
+        end
+      end
+
       def files_found_by_full_regex
         @files_found_by_full_regex ||= searcher.grep(request.search_string)
       end
+
+      def files_found_by_joining_terms
+        joined_query = request.search_string.squeeze(" ").gsub(" ", "|")
+        @files_found_by_joining_terms ||= searcher.grep(joined_query)
+      end
     end
 
     class LineNumberQuery < BaseQuery
@@ -323,6 +383,7 @@ module TestLauncher
         [
           :by_path,
           :example_name,
+          :multi_example_name,
           :from_full_regex,
         ]
           .each { |command_type|
@@ -336,7 +397,7 @@ module TestLauncher
     class SearchQuery < BaseQuery
       def command
         {
-          multi_search_term: request.search_string.include?(" "),
+          multi_path_query: request.search_string.include?(" "),
           line_number: request.search_string.include?(":"),
           single_search_term: true
         }.each {|command_type, valid|

data/lib/test_launcher/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/test/test_launcher/frameworks/minitest/runner_test.rb

@@ -18,7 +18,7 @@ module TestLauncher
             example_runner: "example_runner",
             file: "file"
           )
-          assert_equal "cd app_root && example_runner file --name=/example_name/", Runner.new.single_example(test_case)
+          assert_equal "cd app_root && example_runner file --name='/example_name/'", Runner.new.single_example(test_case)
         end
 
         def test_multiple_examples_same_file
@@ -36,7 +36,7 @@ module TestLauncher
               file: "file"
             )
           ]
-          assert_equal "cd app_root && example_runner file --name=/example_name/", Runner.new.multiple_examples_same_file(test_cases)
+          assert_equal "cd app_root && example_runner file --name='/example_name/'", Runner.new.multiple_examples_same_file(test_cases)
         end
 
         def test_single_file

data/test/test_launcher/frameworks/minitest/searcher_test.rb

@@ -13,7 +13,7 @@ module TestLauncher
           mocks Search::Git
 
           impl :grep do |regex, file_pattern:|
-            example_name_regex = "^ *def +test_.*.*" #TODO: no bueno copying this
+            example_name_regex = "^ *def +test_.*().*" #TODO: no bueno copying this
             case [regex, file_pattern]
             when [example_name_regex, "test/test_launcher/single_test.rb"]
               [
@@ -34,7 +34,6 @@ module TestLauncher
                 "test/dir/2_multiple_test.rb:30:    def test__second",
               ]
             else
-              require "pry";binding.pry
               raise "unmocked search: #{regex}, #{file_pattern}"
             end
           end

data/test/test_launcher/minitest_integration_test.rb

@@ -25,10 +25,10 @@ module TestLauncher
       end
 
       launch("test_name", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name=/test_name/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name='/test_name/'", shell_mock.recall_exec
 
       launch("n", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name=/n/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name='/n/'", shell_mock.recall_exec
     end
 
     def test__by_example__multiple_methods__same_file
@@ -48,7 +48,7 @@ module TestLauncher
       end
 
       launch("name_", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name=/name_/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name='/name_/'", shell_mock.recall_exec
     end
 
     def test__by_example__multiple_methods__regex_issue
@@ -71,7 +71,7 @@ module TestLauncher
       end
 
       launch("test_name", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name=/test_name/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name='/test_name/'", shell_mock.recall_exec
 
       skip
       # not seeing a good solution here...
@@ -79,7 +79,7 @@ module TestLauncher
       # might need to do two passes: first with user input, then
       # filter down to those that match test_...would that work?
       launch("_name", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name=/test_name/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_1_test.rb --name='/test_name/'", shell_mock.recall_exec
     end
 
     def test__by_example__multiple_methods__different_files
@@ -112,19 +112,19 @@ module TestLauncher
       end
 
       launch("name_1", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_2_test.rb --name=/name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_2_test.rb --name='/name_1/'", shell_mock.recall_exec
 
       launch("name_2", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_2_test.rb --name=/name_2/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/class_2_test.rb --name='/name_2/'", shell_mock.recall_exec
 
       launch("name_1 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test -e \"ARGV.push('--name=/name_1/')\" -r /src/test/class_1_test.rb -r /src/test/class_2_test.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/name_1/')\" -r /src/test/class_1_test.rb -r /src/test/class_2_test.rb", shell_mock.recall_exec
 
       launch("name_2 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test -e \"ARGV.push('--name=/name_2/')\" -r /src/test/class_1_test.rb -r /src/test/class_2_test.rb -r /src/test/class_3_test.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/name_2/')\" -r /src/test/class_1_test.rb -r /src/test/class_2_test.rb -r /src/test/class_3_test.rb", shell_mock.recall_exec
 
       launch("name_1|name_2 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test -e \"ARGV.push('--name=/name_1|name_2/')\" -r /src/test/class_1_test.rb -r /src/test/class_2_test.rb -r /src/test/class_3_test.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/name_1|name_2/')\" -r /src/test/class_1_test.rb -r /src/test/class_2_test.rb -r /src/test/class_3_test.rb", shell_mock.recall_exec
     end
 
     def test__by_filename
@@ -341,7 +341,66 @@ module TestLauncher
       end
 
       launch("regex_match", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/regex_match/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/regex_match/'", shell_mock.recall_exec
+    end
+
+    def test__multiple_queries__generic_regex__prefers_to_keep_spaces
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/test/file_1_test.rb"
+          f.mtime Time.new(2013, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            this matches
+          RB
+        end
+
+        searcher.mock_file do |f|
+          f.path "/src/test/file_2_test.rb"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            this
+            matches
+          RB
+        end
+
+        launch("this matches", searcher: searcher)
+        assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb", shell_mock.recall_exec
+
+        launch("this matches --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb", shell_mock.recall_exec
+
+        launch("matches this --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb /src/test/file_2_test.rb", shell_mock.recall_exec
+      end
+    end
+
+    def test__multiple_queries__splits_spaces_for_test_names
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/test/file_1_test.rb"
+          f.mtime Time.new(2013, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            def test_this
+          RB
+        end
+
+        searcher.mock_file do |f|
+          f.path "/src/test/file_2_test.rb"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            def test_matches
+          RB
+        end
+
+        launch("this matches", searcher: searcher)
+        assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/this|matches/')\" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb", shell_mock.recall_exec
+
+        launch("this matches --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/this|matches/')\" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb", shell_mock.recall_exec
+
+        launch("this    matches", searcher: searcher)
+        assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/this|matches/')\" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb", shell_mock.recall_exec
+      end
     end
 
     def test__helper_methods_are_considered_regexes
@@ -379,16 +438,16 @@ module TestLauncher
       end
 
       launch("test_name_1$", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_1\\$/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_1$/'", shell_mock.recall_exec
 
       launch("test_name_2|test_name_1", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_2_test.rb --name=/test_name_2\\|test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_2_test.rb --name='/test_name_2|test_name_1/'", shell_mock.recall_exec
 
       launch('test_name_\d', searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_2_test.rb --name=/test_name_\\\\d/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_2_test.rb --name='/test_name_\\d/'", shell_mock.recall_exec
 
       launch('test_name_\d --all', searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test -e \"ARGV.push('--name=/test_name_\\d/')\" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb", shell_mock.recall_exec
+      assert_equal %{cd /src && bundle exec ruby -I test -r bundler/setup -e "ARGV.push('--name=/test_name_\\d/')" -r /src/test/file_1_test.rb -r /src/test/file_2_test.rb}, shell_mock.recall_exec
     end
 
     def test__not_found
@@ -434,10 +493,10 @@ module TestLauncher
       end
 
       launch("test_name_1", searcher: searcher)
-      assert_equal "cd /src/inline/gem && bundle exec ruby -I test /src/inline/gem/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src/inline/gem && bundle exec ruby -I test /src/inline/gem/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
 
       launch("test_name_1 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test -e \"ARGV.push('--name=/test_name_1/')\" -r /src/test/file_1_test.rb; cd -;\n\ncd /src/inline/gem && bundle exec ruby -I test -e \"ARGV.push('--name=/test_name_1/')\" -r /src/inline/gem/test/file_1_test.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/test_name_1/')\" -r /src/test/file_1_test.rb; cd -;\n\ncd /src/inline/gem && bundle exec ruby -I test -r bundler/setup -e \"ARGV.push('--name=/test_name_1/')\" -r /src/inline/gem/test/file_1_test.rb", shell_mock.recall_exec
 
       launch("file --all", searcher: searcher)
       assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb /src/test/file_2_test.rb; cd -;\n\ncd /src/inline/gem && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/inline/gem/test/file_1_test.rb", shell_mock.recall_exec
@@ -469,10 +528,10 @@ module TestLauncher
       end
 
       launch("file_1 --name test_name_1", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
 
       launch("file_2 --name test_name_2", searcher: searcher)
-      assert_equal "cd /src/inline/gem && bundle exec ruby -I test /src/inline/gem/test/file_2_test.rb --name=/test_name_2/", shell_mock.recall_exec
+      assert_equal "cd /src/inline/gem && bundle exec ruby -I test /src/inline/gem/test/file_2_test.rb --name='/test_name_2/'", shell_mock.recall_exec
     end
 
     def test__specified_example_name__multiple_files_same_name
@@ -495,7 +554,7 @@ module TestLauncher
       end
 
       launch("file_1 --name test_name_1", searcher: searcher)
-      assert_equal "cd /src/inline/gem && bundle exec ruby -I test /src/inline/gem/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src/inline/gem && bundle exec ruby -I test /src/inline/gem/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
     end
 
     def test__by_line_number
@@ -521,25 +580,25 @@ module TestLauncher
       assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb", shell_mock.recall_exec
 
       launch("file_1_test.rb:2", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
 
       launch("file_1_test.rb:3", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
 
       launch("file_1_test.rb:4", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
 
       launch("file_1_test.rb:5", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_1/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_1/'", shell_mock.recall_exec
 
       launch("file_1_test.rb:6", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_2/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_2/'", shell_mock.recall_exec
 
       launch("file_1_test.rb:7", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_2/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_2/'", shell_mock.recall_exec
 
       launch("file_1_test.rb:8", searcher: searcher)
-      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name=/test_name_2/", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec ruby -I test /src/test/file_1_test.rb --name='/test_name_2/'", shell_mock.recall_exec
     end
 
     def test__by_line_number__multiple_files

data/test/test_launcher/queries/{multi_term_query_test.rb → multi_path_query_test.rb}

@@ -4,7 +4,7 @@ require "test_launcher/queries"
 
 module TestLauncher
   module Queries
-    class MultiTermQueryTest < TestCase
+    class MultiPathQueryTest < TestCase
       include DefaultMocks
 
       def searcher
@@ -69,7 +69,7 @@ module TestLauncher
           runner: default_runner,
           searcher: searcher
         )
-        command = MultiTermQuery.new(request, default_command_finder).command
+        command = MultiPathQuery.new(request, default_command_finder).command
 
         assert_equal nil, command
       end
@@ -81,7 +81,7 @@ module TestLauncher
           runner: default_runner,
           searcher: searcher
         )
-        command = MultiTermQuery.new(request, default_command_finder).command
+        command = MultiPathQuery.new(request, default_command_finder).command
 
         assert_equal nil, command
       end
@@ -92,7 +92,7 @@ module TestLauncher
           shell: default_shell,
           searcher: searcher
         )
-        command = MultiTermQuery.new(request, default_command_finder).command
+        command = MultiPathQuery.new(request, default_command_finder).command
 
         assert_equal 1, default_shell.recall(:warn).size
       end
@@ -104,7 +104,7 @@ module TestLauncher
           runner: default_runner,
           searcher: searcher,
         )
-        command = MultiTermQuery.new(request, default_command_finder).command
+        command = MultiPathQuery.new(request, default_command_finder).command
 
         assert_equal [[[file_1_test_case, file_2_test_case]]], default_runner.recall(:multiple_files)
         assert_equal "multiple_files_return", command
@@ -117,7 +117,7 @@ module TestLauncher
           runner: default_runner,
           searcher: searcher,
         )
-        command = MultiTermQuery.new(request, default_command_finder).command
+        command = MultiPathQuery.new(request, default_command_finder).command
         assert_equal [[[file_1_test_case, file_3_test_case, file_4_test_case]]], default_runner.recall(:multiple_files)
         assert_equal "multiple_files_return", command
       end

data/test/test_launcher/queries/search_query_test.rb

@@ -8,14 +8,14 @@ module TestLauncher
       include DefaultMocks
 
       def test__multi_search_term__hits
-        command_finder = Mock.new(Queries::CommandFinder, multi_search_term: :multi_search_term)
+        command_finder = Mock.new(Queries::CommandFinder, multi_path_query: :multi_path_query)
         request = MockRequest.new(search_string: "a b")
 
-        assert_equal :multi_search_term, SearchQuery.new(request, command_finder).command
+        assert_equal :multi_path_query, SearchQuery.new(request, command_finder).command
       end
 
       def test__multi_search_term__misses
-        command_finder = Mock.new(Queries::CommandFinder, multi_search_term: nil, single_search_term: :single_search_term)
+        command_finder = Mock.new(Queries::CommandFinder, multi_path_query: nil, single_search_term: :single_search_term)
         request = MockRequest.new(search_string: "a b")
 
         assert_equal :single_search_term, SearchQuery.new(request, command_finder).command

data/test/test_launcher/rspec_integration_test.rb

@@ -83,10 +83,10 @@ module TestLauncher
       assert_equal "cd /src && bundle exec rspec /src/spec/class_2_spec.rb --example name_2", shell_mock.recall_exec
 
       launch("name_1 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec rspec /src/spec/class_1_spec.rb /src/spec/class_2_spec.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec rspec /src/spec/class_1_spec.rb /src/spec/class_2_spec.rb --example name_1", shell_mock.recall_exec
 
       launch("name_2 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec rspec /src/spec/class_1_spec.rb /src/spec/class_2_spec.rb /src/spec/class_3_spec.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec rspec /src/spec/class_1_spec.rb /src/spec/class_2_spec.rb /src/spec/class_3_spec.rb --example name_2", shell_mock.recall_exec
     end
 
     def test__by_filename
@@ -176,6 +176,66 @@ module TestLauncher
       assert_equal "cd /src && bundle exec rspec /src/spec/name_spec.rb", shell_mock.recall_exec
     end
 
+    def test__multiple_queries__generic_regex__prefers_to_keep_spaces
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/spec/file_1_spec.rb"
+          f.mtime Time.new(2013, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            this matches
+          RB
+        end
+
+        searcher.mock_file do |f|
+          f.path "/src/spec/file_2_spec.rb"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            this
+            matches
+          RB
+        end
+
+        launch("this matches", searcher: searcher)
+        assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb", shell_mock.recall_exec
+
+        launch("this matches --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb", shell_mock.recall_exec
+
+        launch("matches this --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb", shell_mock.recall_exec
+      end
+    end
+
+    def test__multiple_queries__splits_spaces_for_test_names
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/spec/file_1_spec.rb"
+          f.mtime Time.new(2013, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            it "this" do
+          RB
+        end
+
+        searcher.mock_file do |f|
+          f.path "/src/spec/file_2_spec.rb"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+          f.contents <<-RB
+            it "matches" do
+          RB
+        end
+
+        launch("this matches", searcher: searcher)
+        assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb --example this\\|matches", shell_mock.recall_exec
+
+        skip "not supported in rspec yet"
+        launch("this matches --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb --example this\\|matches", shell_mock.recall_exec
+
+        launch("matches this --all", searcher: searcher)
+        assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb --example this\\|matches", shell_mock.recall_exec
+      end
+    end
+
     def test__by_multiple_filenames__multiple_files_found
       searcher = MemorySearcher.new do |searcher|
         searcher.mock_file do |f|
@@ -335,7 +395,7 @@ module TestLauncher
       assert_equal "cd /src && bundle exec rspec /src/spec/file_2_spec.rb --example test_name_\\\\d", shell_mock.recall_exec
 
       launch('test_name_\d --all', searcher: searcher)
-      assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb --example test_name_\\\\d", shell_mock.recall_exec
     end
 
     def test__not_found
@@ -384,7 +444,7 @@ module TestLauncher
       assert_equal "cd /src/inline/gem && bundle exec rspec /src/inline/gem/spec/file_1_spec.rb --example test_name_1", shell_mock.recall_exec
 
       launch("test_name_1 --all", searcher: searcher)
-      assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb; cd -;\n\ncd /src/inline/gem && bundle exec rspec /src/inline/gem/spec/file_1_spec.rb", shell_mock.recall_exec
+      assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb --example test_name_1; cd -;\n\ncd /src/inline/gem && bundle exec rspec /src/inline/gem/spec/file_1_spec.rb --example test_name_1", shell_mock.recall_exec
 
       launch("file --all", searcher: searcher)
       assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb /src/spec/file_2_spec.rb; cd -;\n\ncd /src/inline/gem && bundle exec rspec /src/inline/gem/spec/file_1_spec.rb", shell_mock.recall_exec

data/test/test_launcher/rubymine_test.rb

@@ -12,7 +12,7 @@ module TestLauncher
 
     def test_launch__run__example
       args = "/Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb --name=some_test_name"
-      expected_command = "cd /Users/username/some_app/engines/some_engine && bundle exec ruby -I test /Users/username/some_app/engines/some_engine/test/does_something_test.rb --name=some_test_name"
+      expected_command = "cd /Users/username/some_app/engines/some_engine && bundle exec ruby -I test /Users/username/some_app/engines/some_engine/test/does_something_test.rb --name='some_test_name'"
 
       assert_executes expected_command, args
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,17 +82,6 @@ files:
 - test/test_helpers/mocks/searcher_mock.rb
 - test/test_launcher/cli/input_parser_test.rb
 - test/test_launcher/ex_unit_integration_test.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/test_case_test.rb
 - test/test_launcher/frameworks/minitest/runner_test.rb
 - test/test_launcher/frameworks/minitest/searcher_test.rb
@@ -103,10 +92,9 @@ files:
 - test/test_launcher/queries/full_regex_query_test.rb
 - test/test_launcher/queries/generic_query_test.rb
 - test/test_launcher/queries/line_number_query_test.rb
-- test/test_launcher/queries/multi_term_query_test.rb
+- test/test_launcher/queries/multi_path_query_test.rb
 - test/test_launcher/queries/path_query_test.rb
 - test/test_launcher/queries/search_query_test.rb
-- test/test_launcher/queries/single_term_query_test.rb
 - test/test_launcher/rspec_integration_test.rb
 - test/test_launcher/rubymine_test.rb
 - test/test_launcher/search/git_test.rb
@@ -145,17 +133,6 @@ test_files:
 - test/test_helpers/mocks/searcher_mock.rb
 - test/test_launcher/cli/input_parser_test.rb
 - test/test_launcher/ex_unit_integration_test.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/test_case_test.rb
 - test/test_launcher/frameworks/minitest/runner_test.rb
 - test/test_launcher/frameworks/minitest/searcher_test.rb
@@ -166,10 +143,9 @@ test_files:
 - test/test_launcher/queries/full_regex_query_test.rb
 - test/test_launcher/queries/generic_query_test.rb
 - test/test_launcher/queries/line_number_query_test.rb
-- test/test_launcher/queries/multi_term_query_test.rb
+- test/test_launcher/queries/multi_path_query_test.rb
 - test/test_launcher/queries/path_query_test.rb
 - test/test_launcher/queries/search_query_test.rb
-- test/test_launcher/queries/single_term_query_test.rb
 - test/test_launcher/rspec_integration_test.rb
 - test/test_launcher/rubymine_test.rb
 - test/test_launcher/search/git_test.rb

data/test/test_launcher/fixtures/minitest/test/class_1_test.rb

@@ -1,6 +0,0 @@
-require 'minitest/autorun'
-class Class1Test < Minitest::Test
-  def test_1
-    assert false, "1 was run"
-  end
-end

data/test/test_launcher/fixtures/minitest/test/class_2_test.rb

@@ -1,9 +0,0 @@
-require 'minitest/autorun'
-class Class2Test < Minitest::Test
-  def test_1
-    assert false, "Class2: test_1 was run"
-  end
-  def test_2
-    assert false, "Class2: test_2 was run"
-  end
-end

data/test/test_launcher/fixtures/minitest/test/different_root/bin/spring

@@ -1 +0,0 @@
-# stub to indicate that spring is active in this root

data/test/test_launcher/fixtures/minitest/test/different_root/test/different_root_test.rb

@@ -1,2 +0,0 @@
-class Root2DummyTestClass1Test
-end

data/test/test_launcher/fixtures/rspec/spec/class_1_spec.rb

@@ -1,16 +0,0 @@
-describe Root1DummyTestClass1 do
-
-  context "file_name_1 context_1" do
-    it "file_name_1 example_name_1 '\" " do
-      test_unit_test_method_body
-    end
-
-    it 'file_name_1 example_name_2' do
-      test_unit_test_method_body
-    end
-
-    it "multiple_files same_example" do
-
-    end
-  end
-end

data/test/test_launcher/fixtures/rspec/spec/class_2_spec.rb

@@ -1,6 +0,0 @@
-describe Root1DummyTestClass2 do
-
-  it "multiple_files same_example" do
-    a_test_that_uses(Root1DummyTestClass1)
-  end
-end

data/test/test_launcher/fixtures/rspec/spec/different_root/spec/different_root_spec.rb

@@ -1,2 +0,0 @@
-describe Root2DummyTestClass1 do
-end

data/test/test_launcher/queries/single_term_query_test.rb

@@ -1,36 +0,0 @@
-require "test_helper"
-require "test_helpers/mocks"
-require "test_launcher/queries"
-
-module TestLauncher
-  module Queries
-    class SingleTermQueryTest < TestCase
-      include DefaultMocks
-
-      def test__by_path
-        command_finder = Mock.new(Queries::CommandFinder, by_path: :by_path)
-
-        assert_equal :by_path, SingleTermQuery.new(MockRequest.new, command_finder).command
-      end
-
-      def test__example_name
-        command_finder = Mock.new(Queries::CommandFinder, by_path: nil, example_name: :example_name)
-
-        assert_equal :example_name, SingleTermQuery.new(MockRequest.new, command_finder).command
-      end
-
-      def test__from_full_regex
-        command_finder = Mock.new(Queries::CommandFinder, by_path: nil, example_name: nil, from_full_regex: :from_full_regex)
-
-        assert_equal :from_full_regex, SingleTermQuery.new(MockRequest.new, command_finder).command
-      end
-
-      def test__none
-        command_finder = Mock.new(Queries::CommandFinder, by_path: nil, example_name: nil, from_full_regex: nil)
-
-        assert_equal nil, SingleTermQuery.new(MockRequest.new, command_finder).command
-      end
-
-    end
-  end
-end