Merge branch 'v2.0' into 2.0/stdin

Author: AlexB52

exe/retest

@@ -83,7 +83,7 @@ loop do
   print_interactive_message
 
   puts "waiting for input"
-  input = $stdin.gets.chomp
+  input = $stdin.gets.to_s.chomp
 
   puts "input is: #{input.inspect}"
 
@@ -128,12 +128,13 @@ loop do
   when 'h', 'help'
     puts <<~HELP
 
-      * 'h' or 'help'    -> Prints help
-      * 'p' or 'pause'   -> Pauses Retest. Tests aren't run until unpaused.
-      * 'u' or 'unpause' -> Unpauses Retest
-      * <Enter>          -> Runs last changed triggered command
-      * 'ra', 'run all'  -> Runs all tests
-      * 'e' or 'exit'    -> Exits Retest
+      * 'h', 'help'              # Prints help
+      * 'p', 'pause'             # Pauses Retest. Tests aren't run until unpaused.
+      * 'u', 'unpause'           # Unpauses Retest
+      * <ENTER>                  # Runs last changed triggered command
+      * 'ra, 'run all'           # Runs all tests
+      * 'd', 'diff' [GIT BRANCH] # Run matching specs that changed from a target branch
+      * 'e', 'exit'              # Exits Retest
     HELP
   else
     puts "Unknown interactive command #{input}\n"

features/ruby-bare/retest/flags/version.rb

@@ -6,12 +6,12 @@ def teardown
   def test_version
     launch_retest 'retest --version'
 
-    assert_match /^1\.\d+\.\d+/, @output.read
+    assert_match /^2\.\d+\.\d+/, @output.read
   end
 
   def test_version_short_flag
     launch_retest 'retest -v'
 
-    assert_match /^1\.\d+\.\d+/, @output.read
+    assert_match /^2\.\d+\.\d+/, @output.read
   end
 end

lib/retest/prompt.rb

@@ -28,7 +28,7 @@ def ask_which_test_to_use(path, files)
           Enter the file number now:
         QUESTION
         output.print("> ")
-        options.values[input.gets.chomp.to_i]
+        options.values[input.gets.to_s.chomp.to_i]
       end
     end
 

lib/retest/runners.rb

@@ -5,6 +5,8 @@
 
 module Retest
   module Runners
+    class NotSupportedError < StandardError; end
+
     module_function
 
     def runner_for(command, **opts)

lib/retest/runners/runner.rb

@@ -19,8 +19,7 @@ def run(changed_file = nil, repository: nil)
       end
 
       def run_all_tests(tests_string)
-        log("Test File Selected: #{tests_string}")
-        system_run command.gsub('<test>', tests_string)
+        raise NotSupportedError, 'cannot run multiple test files against this command'
       end
 
       def sync(added:, removed:)

lib/retest/runners/test_runner.rb

@@ -14,6 +14,11 @@ def run(changed_file, repository:)
         system_run command.gsub('<test>', cached_test_file)
       end
 
+      def run_all_tests(tests_string)
+        log("Test File Selected: #{tests_string}")
+        system_run command.gsub('<test>', tests_string)
+      end
+
       def sync(added:, removed:)
         purge_test_file(removed)
       end

test/retest/runners/change_runner_test.rb

@@ -42,6 +42,10 @@ def test_run_with_a_file_found
 
         assert_match "touch file_path.rb", out
       end
+
+      def test_run_all_tests
+        assert_raises(NotSupportedError) { @subject.run_all_tests('file_path.rb file_path_two.rb') }
+      end
     end
   end
 end

test/retest/runners/runner_test.rb

@@ -35,17 +35,7 @@ def test_run
       end
 
       def test_run_all_tests
-        runner = Runner.new("echo '<test>'", stdout: StringIO.new)
-
-        out, _ = capture_subprocess_io { runner.run_all_tests('file_path.rb file_path_two.rb') }
-
-        assert_equal(<<~EXPECATIONS, runner.stdout.string)
-        Test File Selected: file_path.rb file_path_two.rb
-        EXPECATIONS
-
-        assert_equal(<<~EXPECATIONS, out)
-        file_path.rb file_path_two.rb
-        EXPECATIONS
+        assert_raises(NotSupportedError) { @subject.run_all_tests('file_path.rb file_path_two.rb') }
       end
     end
   end

test/retest/runners/test_runner_test.rb

@@ -74,6 +74,18 @@ def test_sync_files
         @subject.sync(added: 'a.rb', removed:'file_path_test.rb')
         assert_nil @subject.cached_test_file
       end
+
+      def test_run_all_tests
+        out, _ = capture_subprocess_io { @subject.run_all_tests('file_path.rb file_path_two.rb') }
+
+        assert_equal(<<~EXPECATIONS, @subject.stdout.string)
+          Test File Selected: file_path.rb file_path_two.rb
+        EXPECATIONS
+
+        assert_equal(<<~EXPECATIONS, out)
+          touch file_path.rb file_path_two.rb
+        EXPECATIONS
+      end
     end
   end
 end

test/retest/runners/variable_runner_test.rb

@@ -85,6 +85,10 @@ def test_sync_files
         @subject.sync(added: 'a.rb', removed:'file_path_test.rb')
         assert_nil @subject.cached_test_file
       end
+
+      def test_run_all_tests
+        assert_raises(NotSupportedError) { @subject.run_all_tests('file_path.rb file_path_two.rb') }
+      end
     end
   end
 end