test_launcher 2.19.1 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1cea86b871cfd55f6a1d7a3390d5dc9e8417de
-  data.tar.gz: c38d40a89c9c4699b77ee0731b152bcd9b89a05b
+  metadata.gz: 017ac5a09f32c03998d5cdb68d599400e27cfb04
+  data.tar.gz: 2168a5a5cb13ca67279c4c03666b6aeb0529449f
 SHA512:
-  metadata.gz: 1047fcb1c44a83debd18da19e0a64b2f78d5ba2a87d017f67495d73db80aa6199f5d4d42b009b10c43eb225b80d540bd23b6b76a5c38e7ea6d4fdde45c354c3d
-  data.tar.gz: 99ce91ee9646982ea07dc5ea933c489e671515732a81f1125fd9f5127f73a4cfe9c2a4cd8f0a31a0d7552a74185beb654f97723ea9274660d6d2b178e6bcad02
+  metadata.gz: 0f2c3c95245f9a959819840149c062731943d557a94efefa164d2b29079a2ae359276e58750e671b389a7c2f0b9ec7a5ed7d31f7c7886d7e8adf9c57c9eb796a
+  data.tar.gz: eefc60ad5e7eaf9f8a46495b2bbf9fec044feed800a01454a314aefe02f715407ccd2f33875123ec087bf99b5a9485b979dfc3d7afce28d0d5a68b7281c54f75

data/lib/test_launcher/cli.rb

@@ -7,51 +7,18 @@ require "test_launcher/cli/request"
 module TestLauncher
   module CLI
     class MultiFrameworkQuery < Struct.new(:cli_options)
-      @@mutex = Mutex.new
-
       def command
-        # do them all at the same time!
-        @count = cli_options.frameworks.count
-        @finished = 0
-        @value = nil
-        @now = Time.now.to_f
-        @generic_default = nil
-
-        cli_options.frameworks.each do |framework|
-          Thread.new do
-            finder = Queries::CommandFinder.new(request_for(framework))
-            ex = nil
-
-            begin
-              val = finder.generic_search
-            rescue => e
-              ex = e
-            end
-
-            @@mutex.synchronize do
-              @finished += 1
-
-              if framework == Frameworks::Generic
-                @generic_default = val
-              else
-                if ex && !@exception
-                  @exception = ex
-                elsif val && !@value
-                  @value = val
-                end
-              end
-            end
-          end
-        end
-
-        while (@finished < @count && !@value && !@exception) do
-          sleep(0.05)
+        command = nil
+        command_finders.each do |command_finder|
+          command = command_finder.generic_search
+          break if command
         end
+        command
+      end
 
-        if @exception
-          raise @exception
-        else
-          @value || @generic_default
+      def command_finders
+        cli_options.frameworks.map do |framework|
+          Queries::CommandFinder.new(request_for(framework))
         end
       end
 
@@ -80,9 +47,7 @@ module TestLauncher
 
       if options.rerun
         shell.reexec
-      elsif result = MultiFrameworkQuery.new(options).command
-        result.fetch(:notifies, []).each {|n| shell.notify(n)}
-        command = result.fetch(:command)
+      elsif command = MultiFrameworkQuery.new(options).command
         command = yield(command) if block_given?
         if command
           shell.exec(command)

data/lib/test_launcher/frameworks/rspec.rb

@@ -51,7 +51,7 @@ module TestLauncher
 
       class Runner < Base::Runner
         def by_line_number(test_case)
-          %{cd #{test_case.app_root} && bundle exec rspec #{test_case.file}:#{test_case.line_number}}
+          %{cd #{test_case.app_root} && #{test_case.runner} #{test_case.file}:#{test_case.line_number}}
         end
 
         def single_example(test_case, **_)
@@ -64,11 +64,11 @@ module TestLauncher
         end
 
         def multiple_examples_same_root(test_cases)
-          %{cd #{test_cases.first.app_root} && bundle exec rspec #{test_cases.map(&:file).join(" ")} --example #{Shellwords.escape(test_cases.first.example)}}
+          %{cd #{test_cases.first.app_root} && #{test_cases.first.runner} #{test_cases.map(&:file).join(" ")} --example #{Shellwords.escape(test_cases.first.example)}}
         end
 
         def one_or_more_files(test_cases)
-          %{cd #{test_cases.first.app_root} && bundle exec rspec #{test_cases.map(&:file).join(" ")}}
+          %{cd #{test_cases.first.app_root} && #{test_cases.first.runner} #{test_cases.map(&:file).join(" ")}}
         end
       end
 
@@ -76,6 +76,16 @@ module TestLauncher
         def test_root_dir_name
           "spec"
         end
+
+        def runner
+          @runner ||= begin
+            if File.exist?(File.join(app_root, "bin/rspec"))
+              "bin/rspec"
+            else
+              "bundle exec rspec"
+            end
+          end
+        end
       end
     end
   end

data/lib/test_launcher/queries.rb

@@ -117,18 +117,12 @@ module TestLauncher
         if test_cases.empty?
           shell.warn("Could not identify file: #{request.search_string}")
         elsif test_cases.size == 1
-          {
-            notifies: ["Found 1 example in 1 file."],
-            command: runner.single_example(test_cases.first)
-          }
+          shell.notify("Found 1 example in 1 file.")
+          runner.single_example(test_cases.first)
         else
-          {
-            notifies: [
-              "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}.",
-              "Running most recently edited. Run with '--all' to run all the tests."
-            ],
-            command: runner.single_example(most_recently_edited_test_case)
-          }
+          shell.notify "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."
+          shell.notify "Running most recently edited. Run with '--all' to run all the tests."
+          runner.single_example(most_recently_edited_test_case)
         end
       end
 
@@ -150,9 +144,7 @@ module TestLauncher
     class RerunQuery < BaseQuery
       def command
         if File.exists?("/tmp/test_launcher__last_run")
-          {
-            command: File.read("/tmp/test_launcher__last_run").chomp
-          }
+          File.read("/tmp/test_launcher__last_run").chomp
         end
       end
     end
@@ -162,10 +154,8 @@ module TestLauncher
         return unless request.search_string.include?(" ")
         return if test_cases.empty?
 
-        {
-          notifies: ["Found #{pluralize(file_count, "file")}."],
-          command: runner.multiple_files(test_cases)
-        }
+        shell.notify("Found #{pluralize(file_count, "file")}.")
+        runner.multiple_files(test_cases)
       end
 
       def test_cases
@@ -204,24 +194,15 @@ module TestLauncher
         return if test_cases.empty?
 
         if one_file?
-          {
-            notifies: ["Found #{pluralize(file_count, "file")}."],
-            command: runner.single_file(test_cases.first)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          runner.single_file(test_cases.first)
         elsif request.run_all?
-          {
-            notifies: ["Found #{pluralize(file_count, "file")}."],
-            command: runner.multiple_files(test_cases)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          runner.multiple_files(test_cases)
         else
-          {
-            notifies: [
-              "Found #{pluralize(file_count, "file")}.",
-              "Running most recently edited. Run with '--all' to run all the tests.",
-
-            ],
-            command: runner.single_file(most_recently_edited_test_case)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          shell.notify "Running most recently edited. Run with '--all' to run all the tests."
+          runner.single_file(most_recently_edited_test_case)
         end
       end
 
@@ -241,28 +222,18 @@ module TestLauncher
         return if test_cases.empty?
 
         if one_example?
-          {
-            notifies: ["Found 1 example in 1 file."],
-            command: runner.single_example(test_cases.first)
-          }
+          shell.notify("Found 1 example in 1 file.")
+          runner.single_example(test_cases.first)
         elsif one_file?
-          {
-            notifies: ["Found #{test_cases.size} examples in 1 file."],
-            command: runner.multiple_examples_same_file(test_cases) # it will regex with the query
-          }
+          shell.notify("Found #{test_cases.size} examples in 1 file.")
+          runner.multiple_examples_same_file(test_cases) # it will regex with the query
         elsif request.run_all?
-          {
-            notifies: ["Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."],
-            command: runner.multiple_examples(test_cases)
-          }
+          shell.notify "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."
+          runner.multiple_examples(test_cases)
         else
-          {
-            notifies: [
-              "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}.",
-              "Running most recently edited. Run with '--all' to run all the tests.",
-            ],
-            command: runner.single_example(most_recently_edited_test_case) # let it regex the query
-          }
+          shell.notify "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."
+          shell.notify "Running most recently edited. Run with '--all' to run all the tests."
+          runner.single_example(most_recently_edited_test_case) # let it regex the query
         end
       end
 
@@ -293,20 +264,14 @@ module TestLauncher
         return if test_cases.empty?
 
         if one_example?
-          {
-            notifies: ["Found 1 example in 1 file."],
-            command: runner.single_example(test_cases.first)
-          }
+          shell.notify("Found 1 example in 1 file.")
+          runner.single_example(test_cases.first)
         elsif one_file?
-          {
-            notifies: ["Found #{test_cases.size} examples in 1 file."],
-            command: runner.multiple_examples_same_file(test_cases) # it will regex with the query
-          }
+          shell.notify("Found #{test_cases.size} examples in 1 file.")
+          runner.multiple_examples_same_file(test_cases) # it will regex with the query
         else
-          {
-            notifies: ["Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."],
-            command: runner.multiple_examples(test_cases)
-          }
+          shell.notify "Found #{pluralize(test_cases.size, "example")} in #{pluralize(file_count, "file")}."
+          runner.multiple_examples(test_cases)
         end
       end
 
@@ -341,23 +306,15 @@ module TestLauncher
         return if test_cases.empty?
 
         if one_file?
-          {
-            notifies: ["Found #{pluralize(file_count, "file")}."],
-            command: runner.single_file(test_cases.first)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          runner.single_file(test_cases.first)
         elsif request.run_all?
-          {
-            notifies: ["Found #{pluralize(file_count, "file")}."],
-            command: runner.multiple_files(test_cases)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          runner.multiple_files(test_cases)
         else
-          {
-            notifies: [
-              "Found #{pluralize(file_count, "file")}.",
-              "Running most recently edited. Run with '--all' to run all the tests.",
-            ],
-            command: runner.single_file(most_recently_edited_test_case)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          shell.notify "Running most recently edited. Run with '--all' to run all the tests."
+          runner.single_file(most_recently_edited_test_case)
         end
       end
 
@@ -400,18 +357,12 @@ module TestLauncher
         return unless test_cases.any?
 
         if one_file?
-          {
-            notifies: ["Found #{pluralize(file_count, "file")}."],
-            command: runner.by_line_number(test_cases.first)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          runner.by_line_number(test_cases.first)
         else
-          {
-            notifies: [
-              "Found #{pluralize(file_count, "file")}.",
-              "Cannot run all tests with --all because test frameworks don't accept multiple file/lines combos."
-            ],
-            command: runner.by_line_number(most_recently_edited_test_case)
-          }
+          shell.notify "Found #{pluralize(file_count, "file")}."
+          shell.notify "Cannot run all tests with --all because test frameworks don't accept multiple file/lines combos."
+          runner.by_line_number(most_recently_edited_test_case)
         end
       end
 

data/lib/test_launcher/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "2.19.1"
+  VERSION = "2.20.0"
 end

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

@@ -15,7 +15,8 @@ module TestLauncher
           test_case = MockTestCase.new(
             example: "example_name",
             app_root: "app_root",
-            file: "file"
+            file: "file",
+            runner: "bundle exec rspec"
           )
           assert_equal "cd app_root && bundle exec rspec file --example example_name", Runner.new.single_example(test_case)
         end
@@ -24,7 +25,8 @@ module TestLauncher
           test_case = MockTestCase.new(
             example: "this is it's name :(",
             app_root: "app_root",
-            file: "file"
+            file: "file",
+            runner: "bundle exec rspec"
           )
           assert_equal "cd app_root && bundle exec rspec file --example this\\ is\\ it\\'s\\ name\\ :\\(", Runner.new.single_example(test_case)
         end
@@ -35,12 +37,14 @@ module TestLauncher
             MockTestCase.new(
               example: "example_name",
               app_root: "app_root",
-              file: "file"
+              file: "file",
+              runner: "bundle exec rspec"
             ),
             MockTestCase.new(
               example: "example_name",
               app_root: "app_root",
-              file: "file"
+              file: "file",
+              runner: "bundle exec rspec"
             )
           ]
           assert_equal "cd app_root && bundle exec rspec file --example example_name", Runner.new.multiple_examples_same_file(test_cases)
@@ -50,7 +54,8 @@ module TestLauncher
           test_case = MockTestCase.new(
             example: "example_name",
             app_root: "app_root",
-            file: "file"
+            file: "file",
+            runner: "bundle exec rspec"
           )
           assert_equal "cd app_root && bundle exec rspec file", Runner.new.single_file(test_case)
         end
@@ -60,15 +65,17 @@ module TestLauncher
             MockTestCase.new(
               example: "example_name",
               app_root: "app_root",
-              file: "file_1"
+              file: "file_1",
+              runner: "bin/rspec"
             ),
             MockTestCase.new(
               example: "example_name",
               app_root: "app_root",
-              file: "file_2"
+              file: "file_2",
+              runner: "bin/rspec"
             )
           ]
-          assert_equal "cd app_root && bundle exec rspec file_1 file_2", Runner.new.one_or_more_files(test_cases)
+          assert_equal "cd app_root && bin/rspec file_1 file_2", Runner.new.one_or_more_files(test_cases)
         end
       end
     end

data/test/test_launcher/queries/example_name_query_test.rb

@@ -106,7 +106,7 @@ module TestLauncher
 
         command = ExampleNameQuery.new(request, default_command_finder).command
 
-        assert_equal "single_example file_1_test.rb one_example", command[:command]
+        assert_equal "single_example file_1_test.rb one_example", command
       end
 
       def test_command__one_example_found__notifies
@@ -120,9 +120,9 @@ module TestLauncher
         command = ExampleNameQuery.new(request, default_command_finder).command
 
         messages = [
-          "Found 1 example in 1 file.",
+          ["Found 1 example in 1 file."],
         ]
-        assert_equal messages, command[:notifies]
+        assert_equal messages, default_shell.recall(:notify)
       end
 
       def test_command__multiple_examples__one_file
@@ -135,7 +135,7 @@ module TestLauncher
 
         command = ExampleNameQuery.new(request, default_command_finder).command
 
-        assert_equal "multiple_examples_same_file file_1_test.rb same_file", command[:command]
+        assert_equal "multiple_examples_same_file file_1_test.rb same_file", command
       end
 
       def test_command__multiple_examples__one_file__notifies
@@ -149,9 +149,9 @@ module TestLauncher
         command = ExampleNameQuery.new(request, default_command_finder).command
 
         messages = [
-          "Found 2 examples in 1 file.",
+          ["Found 2 examples in 1 file."],
         ]
-        assert_equal messages, command[:notifies]
+        assert_equal messages, default_shell.recall(:notify)
       end
 
       def test_command__multiple_examples__multiple_files__no_all
@@ -165,7 +165,7 @@ module TestLauncher
 
         command = ExampleNameQuery.new(request, default_command_finder).command
 
-        assert_equal "single_example file_2_test.rb different_files", command[:command]
+        assert_equal "single_example file_2_test.rb different_files", command
       end
 
       def test_command__multiple_examples__multiple_files__no_all__notifies
@@ -180,10 +180,10 @@ module TestLauncher
         command = ExampleNameQuery.new(request, default_command_finder).command
 
         messages = [
-          "Found 2 examples in 2 files.",
-          "Running most recently edited. Run with '--all' to run all the tests.",
+          ["Found 2 examples in 2 files."],
+          ["Running most recently edited. Run with '--all' to run all the tests."],
         ]
-        assert_equal messages, command[:notifies]
+        assert_equal messages, default_shell.recall(:notify)
       end
 
       def test_command__multiple_examples__multiple_files__all
@@ -197,7 +197,7 @@ module TestLauncher
 
         command = ExampleNameQuery.new(request, default_command_finder).command
 
-        assert_equal "multiple_examples file_1_test.rb file_2_test.rb", command[:command]
+        assert_equal "multiple_examples file_1_test.rb file_2_test.rb", command
       end
 
       def test_command__multiple_examples__multiple_files__all__notifies
@@ -212,9 +212,9 @@ module TestLauncher
         command = ExampleNameQuery.new(request, default_command_finder).command
 
         messages = [
-          "Found 2 examples in 2 files.",
+          ["Found 2 examples in 2 files."],
         ]
-        assert_equal messages, command[:notifies]
+        assert_equal messages, default_shell.recall(:notify)
       end
     end
   end

data/test/test_launcher/queries/full_regex_query_test.rb

@@ -105,7 +105,7 @@ module TestLauncher
 
         command = FullRegexQuery.new(request, default_command_finder).command
 
-        assert_equal "single_file single_test.rb", command[:command]
+        assert_equal "single_file single_test.rb", command
       end
 
       def test_command__multiple_matches_same_file
@@ -118,7 +118,7 @@ module TestLauncher
 
         command = FullRegexQuery.new(request, default_command_finder).command
 
-        assert_equal "single_file multiple_matches_1_test.rb", command[:command]
+        assert_equal "single_file multiple_matches_1_test.rb", command
       end
 
       def test_command__multiple_matches_different_files__no_all
@@ -132,7 +132,7 @@ module TestLauncher
 
         command = FullRegexQuery.new(request, default_command_finder).command
 
-        assert_equal "single_file multiple_matches_2_test.rb", command[:command]
+        assert_equal "single_file multiple_matches_2_test.rb", command
       end
 
       def test_command__multiple_matches_different_files__all
@@ -146,7 +146,7 @@ module TestLauncher
 
         command = FullRegexQuery.new(request, default_command_finder).command
 
-        assert_equal "multiple_files multiple_matches_1_test.rb multiple_matches_2_test.rb", command[:command]
+        assert_equal "multiple_files multiple_matches_1_test.rb multiple_matches_2_test.rb", command
       end
     end
   end

data/test/test_launcher/queries/line_number_query_test.rb

@@ -84,7 +84,7 @@ module TestLauncher
 
         assert_equal [[whole_file_test_case]], default_runner.recall(:by_line_number)
 
-        assert_equal "by_line_number_return", command[:command]
+        assert_equal "by_line_number_return", command
       end
 
 
@@ -100,7 +100,7 @@ module TestLauncher
 
         assert_equal [[example_name_test_case]], default_runner.recall(:by_line_number)
 
-        assert_equal "by_line_number_return", command[:command]
+        assert_equal "by_line_number_return", command
       end
     end
   end

data/test/test_launcher/queries/multi_path_query_test.rb

@@ -107,7 +107,7 @@ module TestLauncher
         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[:command]
+        assert_equal "multiple_files_return", command
       end
 
       def test_command__finds_files_for_2_of_2_terms__extra_files_found
@@ -119,7 +119,7 @@ module TestLauncher
         )
         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[:command]
+        assert_equal "multiple_files_return", command
       end
     end
   end

data/test/test_launcher/queries/path_query_test.rb

@@ -92,7 +92,7 @@ module TestLauncher
         command = PathQuery.new(request, default_command_finder).command
 
         assert_equal [[normal_test_case]], default_runner.recall(:single_file)
-        assert_equal "single_file_return", command[:command]
+        assert_equal "single_file_return", command
       end
 
       def test_command__one_file_found__has_correct_test_case
@@ -120,7 +120,7 @@ module TestLauncher
 
         command = PathQuery.new(request, default_command_finder).command
 
-        assert_equal ["Found 1 file."], command[:notifies]
+        assert_equal [["Found 1 file."]], default_shell.recall(:notify)
       end
 
       def test_command__multiple_files_found__no_all__runs_single_file
@@ -135,7 +135,7 @@ module TestLauncher
         command = PathQuery.new(request, default_command_finder).command
 
         assert_equal [[new_test_case]], default_runner.recall(:single_file)
-        assert_equal "single_file_return", command[:command]
+        assert_equal "single_file_return", command
       end
 
       def test_command__multiple_files_found__no_all__notifies
@@ -150,10 +150,10 @@ module TestLauncher
         command = PathQuery.new(request, default_command_finder).command
 
         messages = [
-          "Found 3 files.",
-          "Running most recently edited. Run with '--all' to run all the tests."
+          ["Found 3 files."],
+          ["Running most recently edited. Run with '--all' to run all the tests."]
         ]
-        assert_equal messages, command[:notifies]
+        assert_equal messages, default_shell.recall(:notify)
       end
 
       def test_command__multiple_files_found__all__runs_single_file
@@ -168,7 +168,7 @@ module TestLauncher
         command = PathQuery.new(request, default_command_finder).command
 
         assert_equal [[[old_test_case, older_test_case, new_test_case]]], default_runner.recall(:multiple_files)
-        assert_equal "multiple_files_return", command[:command]
+        assert_equal "multiple_files_return", command
       end
 
       def test_command__multiple_files_found__all__notifies
@@ -183,9 +183,9 @@ module TestLauncher
         command = PathQuery.new(request, default_command_finder).command
 
         messages = [
-          "Found 3 files."
+          ["Found 3 files."]
         ]
-        assert_equal messages, command[:notifies]
+        assert_equal messages, default_shell.recall(:notify)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.20.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler