retest 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4173047ece3fb83e7ffc7e9cf871266054fc3dc49974f55a7df1afa6957afd73
-  data.tar.gz: c4c5a285c4d2f9195b289ca6746d1adba4f77f3fd76d5006c70b10c003fa8a2d
+  metadata.gz: af4a7f8046c06b50e0d59639373c1cd9fac41a99f3a68a7529b98095b2ef10ae
+  data.tar.gz: 93e64c8ac28fe1ae32bc79e5719a8a775c5524544a0c7bd96ede1a3668dd8c6c
 SHA512:
-  metadata.gz: 9d66970c4c9f952d936cd34fc5291ea7bb8a0f2366d90b2c2f647991b4e286936c1c8e37a8dcca8151954c8bd353dbe79321b23ea22e6a2ecf8a39b1ae2dcaf2
-  data.tar.gz: 3c172835d39561da42eee00fc99a6561f57854d6f9f6fb59c50613ac8619d8ee56a4349404d45228f87ba37bd95a6fec39b4b445cc81c0fee958c6aaa972fef8
+  metadata.gz: b7142bef6579a44f0534253113f4646823a83fbe50b9417cdb0009ba9d99d01fe800fbf93500657343a626cd60efac2848852b1527f355144d901f128d8ea45d
+  data.tar.gz: 48c33eb530ca3752430afd48b3968fb8359b6fb88007e304b7b47b14da2d7283a4401f46d034429623efd804165c26e0928734b541f3f223f2f9f8ba12db7e96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (2.0.1)
+    retest (2.2.0)
       listen (~> 3.9)
       observer (~> 0.1)
       string-similarity (~> 2.1)

data/README.md

@@ -48,8 +48,10 @@ retest --diff origin/main                           # Test changes from a branch
 Stay in control with an interactive shell for test management. Start Retest and enter `h` to explore available commands.  
 
 ```
-Setup identified: [RAKE]. Using command: 'bundle exec rake test TEST=<test>'
+Setup: [RAKE]
+Command: 'bundle exec rake test TEST=<test>'
 Watcher: [WATCHEXEC]
+
 Launching Retest...
 Ready to refactor! You can make file changes now
 

data/bin/test/bundler-app

@@ -4,10 +4,10 @@ FOLDER="features/bundler-app"
 
 bundle install
 bundle exec rake build
-cp -R features/support features/bundler-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} "$FOLDER/retest.gem"
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
 
-if [[ "$1" == "--no-build" ]]; then
+if [[ "$1" == "--nobuild" ]]; then
 	docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
 else
 	docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest

data/bin/test/git-ruby

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/git-ruby"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/git-ruby/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/git-ruby/retest.gem
-docker compose -f features/git-ruby/docker-compose.yml up --build --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

data/bin/test/hanami-app

@@ -1,9 +1,17 @@
 #!/usr/bin/env bash
 
+FOLDER="features/hanami-app"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/hanami-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/hanami-app/retest.gem
-docker compose -f features/hanami-app/docker-compose.yml build
-docker compose -f features/hanami-app/docker-compose.yml run retest sh bin/test_setup
-docker compose -f features/hanami-app/docker-compose.yml up --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f $FOLDER/docker-compose.yml run retest sh bin/test_setup
+  docker compose -f $FOLDER/docker-compose.yml up --exit-code-from retest
+else
+  docker compose -f $FOLDER/docker-compose.yml build
+  docker compose -f $FOLDER/docker-compose.yml run retest sh bin/test_setup
+  docker compose -f $FOLDER/docker-compose.yml up --exit-code-from retest
+fi

data/bin/test/rails-app

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/rails-app"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/rails-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rails-app/retest.gem
-docker compose -f features/rails-app/docker-compose.yml up --build --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

data/bin/test/rspec-rails

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/rspec-rails"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/rspec-rails/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-rails/retest.gem
-docker compose -f features/rspec-rails/docker-compose.yml up --build --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

data/bin/test/rspec-ruby

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/rspec-ruby"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/rspec-ruby/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-ruby/retest.gem
-docker compose -f features/rspec-ruby/docker-compose.yml up --build --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

data/bin/test/ruby-app

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/ruby-app"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/ruby-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-app/retest.gem
-docker compose -f features/ruby-app/docker-compose.yml up --build --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

data/bin/test/ruby-bare

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/ruby-bare"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/ruby-bare/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-bare/retest.gem
-docker compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi

data/exe/retest

@@ -4,12 +4,6 @@ require 'retest'
 
 $stdout.sync = true
 listen_rd, listen_wr = IO.pipe
-Signal.trap(:INT) do
-  puts "Goodbye"
-  listen_rd.close
-  listen_wr.close
-  exit
-end
 
 options = Retest::Options.new(ARGV)
 
@@ -39,25 +33,48 @@ program = Retest::Program.new(
   runner: runner
 )
 
+# === LOGGING ===
+case command
+when Retest::Command::Rails then puts "Setup: [RAILS]"
+when Retest::Command::Rspec then puts "Setup: [RSPEC]"
+when Retest::Command::Rake  then puts "Setup: [RAKE]"
+when Retest::Command::Ruby  then puts "Setup: [RUBY]"
+else                             puts "Setup: [UNKNOWN]"
+end
+
+puts "Command: '#{command}'"
+
+# === TRAP INTERRUPTION ===
+Signal.trap(:INT) do
+  if !runner.interrupt_run
+    puts "Goodbye"
+    listen_rd.close
+    listen_wr.close
+    exit
+  end
+end
+
+# === DIFF ACTION ===
 if options.params[:diff]
   program.diff(options.params[:diff])
   return
 end
 
+# === LOGGING ===
 if watcher == Retest::Watcher::Watchexec
   puts "Watcher: [WATCHEXEC]"
 else
   puts "Watcher: [LISTEN]"
 end
 
-launching_message = "Launching Retest..."
+launching_message = "\nLaunching Retest..."
 if options.force_polling?
   launching_message = "Launching Retest with polling method..."
 end
 
-# Main action
-
 puts launching_message
+
+# === MAIN ACTION ===
 Retest.listen(options, listener: watcher) do |modified, added, removed|
   begin
     repository.sync(added: added, removed: removed)
@@ -85,7 +102,7 @@ def run_command(input:, program:)
     Process.kill("INT", 0)
   when 'r', 'reset'
     program.reset_selection
-    puts "command reset to '#{program.runner.command.to_s}'"
+    puts "command reset to '#{program.runner.command}'"
   when 'f', 'force'
     require 'tty-prompt'
     prompt = TTY::Prompt.new

data/lib/retest/command/base.rb

@@ -1,16 +1,35 @@
 module Retest
   class Command
     class MultipleTestsNotSupported < StandardError; end
+    class AllTestsNotSupported < StandardError; end
 
     class Base
+      attr_reader :file_system, :command
+
       def initialize(all: false, file_system: FileSystem, command: nil)
         @file_system = file_system
-        @all = all
-        @command = command
+        @command = command || default_command(all: all)
       end
 
-      def clone(params = {})
-        self.class.new(**{ all: all, file_system: file_system, command: command }.merge(params))
+      def to_s
+        all ? all_command : batched_command
+      end
+
+      def eql?(other)
+        hash == other.hash
+      end
+      alias == eql?
+
+      def hash
+        [self.class, file_system, command].hash
+      end
+
+      def switch_to(type)
+        case type.to_s
+        when 'all'     then clone(command: all_command)
+        when 'batched' then clone(command: batched_command)
+        else raise ArgumentError, "unknown type to switch to: #{type}"
+        end
       end
 
       def hardcoded?
@@ -18,24 +37,42 @@ module Retest
       end
 
       def has_changed?
-        to_s.include?('<changed>')
+        command.include?('<changed>')
       end
 
       def has_test?
-        to_s.include?('<test>')
-      end
-
-      def to_s
-        @command
+        command.include?('<test>')
       end
 
       def format_batch(*files)
-        raise MultipleTestsNotSupported, "Multiple test files run not supported for '#{to_s}'"
+        raise_multiple_test_not_supported
       end
 
       private
 
-      attr_reader :all, :file_system, :command
+      def all
+        !has_test?
+      end
+
+      def batched_command
+        raise NotImplementedError, 'must define a BATCHED command'
+      end
+
+      def all_command
+        raise NotImplementedError, 'must define a ALL command'
+      end
+
+      def default_command(all: false)
+        raise NotImplementedError, 'must define a DEFAULT command'
+      end
+
+      def clone(params = {})
+        self.class.new(**{ all: all, file_system: file_system, command: command }.merge(params))
+      end
+
+      def raise_multiple_test_not_supported
+        raise MultipleTestsNotSupported, "Multiple test files run not supported for command: '#{to_s}'"
+      end
     end
   end
 end

data/lib/retest/command/hardcoded.rb

@@ -1,5 +1,18 @@
 module Retest
   class Command
-    class Hardcoded < Base; end
+    class Hardcoded < Base
+      private
+
+      def all_command
+        command
+      end
+
+      def batched_command
+        command
+      end
+
+      def default_command(all: false)
+      end
+    end
   end
 end

data/lib/retest/command/rails.rb

@@ -1,26 +1,17 @@
 module Retest
   class Command
-    class Rails < Base
-      def to_s
-        if all
-          root_command
-        else
-          "#{root_command} <test>"
-        end
-      end
-
-      def format_batch(*files)
-        files.join(' ')
-      end
+    class Rails < Rspec
 
       private
 
-      def root_command
-        if file_system.exist? 'bin/rails'
+      def default_command(all:)
+        command = if file_system&.exist? 'bin/rails'
           'bin/rails test'
         else
           'bundle exec rails test'
         end
+
+        all ? command : "#{command} <test>"
       end
     end
   end

data/lib/retest/command/rake.rb

@@ -1,26 +1,32 @@
 module Retest
   class Command
     class Rake < Base
-      def to_s
-        if all
-          root_command
-        else
-          "#{root_command} TEST=<test>"
-        end
-      end
-
       def format_batch(*files)
         files.size > 1 ? %Q{"{#{files.join(',')}}"} : files.first
       end
 
       private
 
-      def root_command
-        if file_system.exist? 'bin/rake'
+      def default_command(all: false)
+        command = if file_system&.exist? 'bin/rake'
           'bin/rake test'
         else
           'bundle exec rake test'
         end
+
+        all ? command : "#{command} TEST=<test>"
+      end
+
+      def all_command
+        return command if all
+
+        command.gsub('TEST=<test>', '').strip
+      end
+
+      def batched_command
+        return command unless all
+
+        "#{command} TEST=<test>"
       end
     end
   end

data/lib/retest/command/rspec.rb

@@ -1,26 +1,32 @@
 module Retest
   class Command
     class Rspec < Base
-      def to_s
-        if all
-          root_command
-        else
-          "#{root_command} <test>"
-        end
-      end
-
       def format_batch(*files)
         files.join(' ')
       end
 
       private
 
-      def root_command
-        if file_system.exist? 'bin/rspec'
+      def all_command
+        return command if all
+
+        command.gsub('<test>', '').strip
+      end
+
+      def batched_command
+        return command unless all
+
+        "#{command} <test>"
+      end
+
+      def default_command(all:)
+        command = if file_system&.exist? 'bin/rspec'
           'bin/rspec'
         else
           'bundle exec rspec'
         end
+
+        all ? command : "#{command} <test>"
       end
     end
   end

data/lib/retest/command/ruby.rb

@@ -1,16 +1,26 @@
 module Retest
   class Command
     class Ruby < Base
-      def to_s
-        if file_system.exist? 'Gemfile.lock'
+      def format_batch(*files)
+        files.size > 1 ? %Q{-e "#{files.map { |file| "require './#{file}';" }.join}"} : files.first
+      end
+
+      private
+
+      def default_command(all: false)
+        if file_system&.exist? 'Gemfile.lock'
           'bundle exec ruby <test>'
         else
           'ruby <test>'
         end
       end
 
-      def format_batch(*files)
-        files.size > 1 ? %Q{-e "#{files.map { |file| "require './#{file}';" }.join}"} : files.first
+      def all_command
+        raise AllTestsNotSupported, "All tests run not supported for Ruby command: '#{to_s}'"
+      end
+
+      def batched_command
+        command
       end
     end
   end

data/lib/retest/command.rb

@@ -1,50 +1,46 @@
 require_relative 'command/base'
 require_relative 'command/hardcoded'
+require_relative 'command/rspec'
 require_relative 'command/rails'
 require_relative 'command/rake'
-require_relative 'command/rspec'
 require_relative 'command/ruby'
 
 module Retest
   class Command
     extend Forwardable
 
-    def self.for_options(options, stdout: $stdout)
-      new(options: options, stdout: stdout).command
+    def self.for_options(options)
+      new(options: options).command
     end
 
-    def_delegator :setup, :type
     def_delegators :options, :params, :full_suite?, :auto?
 
-    attr_accessor :options, :setup
-    def initialize(options: Options.new, setup: Setup.new, stdout: $stdout)
+    attr_accessor :options, :setup, :setup_identified
+    def initialize(options: Options.new, setup: Setup.new)
       @options = options
       @setup = setup
-      @stdout = stdout
+      @setup_identified = nil
     end
 
     def command
-      options_command || default_command
+      options_command || setup_command
     end
 
     private
 
     def options_command
-      if    params[:command] then hardcoded_command(params[:command])
-      elsif params[:rspec]   then rspec_command
-      elsif params[:rails]   then rails_command
-      elsif params[:ruby]    then ruby_command
-      elsif params[:rake]    then rake_command
-      end
-    end
+      command_input = params[:command]
 
-    def default_command
-      log "Setup identified: [#{type.upcase}]. Using command: '#{setup_command}'"
-      setup_command
+      if    params[:rspec] then rspec_command(command: command_input)
+      elsif params[:rails] then rails_command(command: command_input)
+      elsif params[:ruby]  then ruby_command(command: command_input)
+      elsif params[:rake]  then rake_command(command: command_input)
+      elsif command_input  then hardcoded_command(command: command_input)
+      end
     end
 
     def setup_command
-      case type
+      case setup.type
       when :rake  then rake_command
       when :rspec then rspec_command
       when :rails then rails_command
@@ -53,28 +49,24 @@ module Retest
       end
     end
 
-    def log(message)
-      @stdout&.puts(message)
-    end
-
-    def hardcoded_command(command)
+    def hardcoded_command(command:)
       Hardcoded.new(command: command)
     end
 
-    def rspec_command
-      Rspec.new(all: full_suite?)
+    def rspec_command(command: nil)
+      Rspec.new(all: full_suite?, command: command)
     end
 
-    def rails_command
-      Rails.new(all: full_suite?)
+    def rails_command(command: nil)
+      Rails.new(all: full_suite?, command: command)
     end
 
-    def rake_command
-      Rake.new(all: full_suite?)
+    def rake_command(command: nil)
+      Rake.new(all: full_suite?, command: command)
     end
 
-    def ruby_command
-      Ruby.new(all: full_suite?)
+    def ruby_command(command: nil)
+      Ruby.new(all: full_suite?, command: command)
     end
   end
 end

data/lib/retest/program.rb

@@ -30,7 +30,6 @@ module Retest
         @stdout.puts <<~HINT
           Forced selection enabled.
           Reset to default settings by typing 'r' in the interactive console.
-
         HINT
 
         runner.run(test_files: selected_test_files)
@@ -48,17 +47,13 @@ module Retest
       raise "Git not installed" unless VersionControl::Git.installed?
 
       test_files = repository.find_tests VersionControl::Git.diff_files(branch)
-      run_selected(test_files)
+      runner.run(test_files: test_files)
     end
 
     def run_all
       runner.run_all
     end
 
-    def run_selected(test_files)
-      runner.run(test_files: test_files)
-    end
-
     def clear_terminal
       system('clear 2>/dev/null') || system('cls 2>/dev/null')
     end

data/lib/retest/runner.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require_relative "runner/cached_test_file"
 
 module Retest
@@ -17,6 +18,14 @@ module Retest
       end
     end
 
+    def interrupt_run
+      return false unless @pid
+
+      Process.kill('INT', @pid)
+    rescue Errno::ESRCH
+      false
+    end
+
     def run_last_command
       unless last_command
         return log('Error - Not enough information to run a command. Please trigger a run first.')
@@ -35,17 +44,20 @@ module Retest
     end
 
     def run_all
-      self.last_command = command.clone(all: true).to_s
+      self.last_command = command.switch_to(:all).to_s
       run_last_command
+    rescue Command::AllTestsNotSupported => e
+      log("Command::AllTestsNotSupported - #{e.message}")
     end
 
     def format_instruction(changed_files: [], test_files: [])
       if changed_files.empty? && test_files.size >= 1
-        instruction = command.clone(all: false).to_s
-        tests_string = command.format_batch(*test_files)
-        log("Tests selected:")
+        new_command = command.switch_to(:batched)
+
+        log("\nTests selected:")
         test_files.each { |test_file| log("  - #{test_file}") }
-        return instruction.gsub('<test>', tests_string)
+
+        return new_command.to_s.gsub('<test>', new_command.format_batch(*test_files))
       end
 
       instruction = command.to_s
@@ -86,7 +98,10 @@ module Retest
 
     def system_run(command)
       log("\n")
-      result = system(command) ? :tests_pass : :tests_fail
+      @pid = spawn(command)
+      Process.wait
+      @pid = nil
+      result = $?.exitstatus&.zero? ? :tests_pass : :tests_fail
       changed
       notify_observers(result)
     end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "2.0.1"
+  VERSION = "2.2.0"
 end

data/lib/retest/version_control/git.rb

@@ -21,7 +21,7 @@ module Retest
       end
 
       def diff_files(branch)
-        `git diff #{branch} --name-only --diff-filter=ACMRT -z`.split("\x0")
+        `git diff #{branch}...HEAD --name-only --diff-filter=ACMRT -z`.split("\x0")
       end
 
       def untracked_files

data/lib/retest/watcher.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Retest
   module Watcher
     def self.for(watcher)
@@ -24,15 +26,49 @@ module Retest
         true
       end
 
-      def self.watch(dir:, extensions:, polling: false)
-        Listen.to(dir, only: extensions_regex(extensions), relative: true, polling: polling) do |modified, added, removed|
-          yield modified, added, removed
-        end.start
-      end
-
       def self.extensions_regex(extensions)
         Regexp.new("\\.(?:#{extensions.join("|")})$")
       end
+
+      def self.watch(dir:, extensions:, polling: false)
+        executable = File.expand_path("../../scripts/listen", __FILE__)
+        command = "#{executable} --exts #{extensions.join(',')} -w #{dir} --polling #{polling}"
+
+        watch_rd, watch_wr = IO.pipe
+        # Process needs its own process group otherwise the process gets killed on INT signal
+        # We need the process to still run when trying to stop the current test run
+        # Maybe there is another way to prevent killing these but for now a new process groups works
+        # Process group created with: pgroup: true
+        pid = Process.spawn(command, out: watch_wr, pgroup: true)
+
+        at_exit do
+          Process.kill("TERM", pid) if pid
+          watch_rd.close
+          watch_wr.close
+        end
+
+        Thread.new do
+          loop do
+            ready = IO.select([watch_rd])
+            readable_connections = ready[0]
+            readable_connections.each do |conn|
+              data = conn.readpartial(4096)
+              change = /^(?<action>create|remove|modify):(?<path>.*)/.match(data.strip)
+
+              next unless change
+
+              modified, added, removed = result = [[], [], []]
+              case change[:action]
+              when 'modify' then modified << change[:path]
+              when 'create' then added << change[:path]
+              when 'remove' then removed << change[:path]
+              end
+
+              yield result
+            end
+          end
+        end
+      end
     end
 
     module Watchexec
@@ -42,10 +78,14 @@ module Retest
 
       def self.watch(dir:, extensions:, polling: false)
         command = "watchexec --exts #{extensions.join(',')} -w #{dir} --emit-events-to stdio --no-meta --only-emit-events"
-        files = VersionControl.files(extensions: extensions).zip([]).to_h
 
         watch_rd, watch_wr = IO.pipe
-        pid = Process.spawn(command, out: watch_wr)
+        # Process needs its own process group otherwise the process gets killed on INT signal
+        # We need the process to still run when trying to stop the current test run
+        # Maybe there is another way to prevent killing these but for now a new process groups works
+        # Process group created with: pgroup: true
+        pid = Process.spawn(command, out: watch_wr, pgroup: true)
+
         at_exit do
           Process.kill("TERM", pid) if pid
           watch_rd.close
@@ -53,11 +93,15 @@ module Retest
         end
 
         Thread.new do
+          files = VersionControl.files(extensions: extensions).zip([]).to_h
+
           loop do
             ready = IO.select([watch_rd])
             readable_connections = ready[0]
             readable_connections.each do |conn|
               data = conn.readpartial(4096)
+              # Watchexec is not great at figuring out whether a file has been deleted and comes as an update.
+              # This is why we're not looking at the action like we do with Listen.
               change = /^(?:create|remove|rename|modify):(?<path>.*)/.match(data.strip)
 
               next unless change
@@ -81,41 +125,6 @@ module Retest
             end
           end
         end
-
-        # require 'open3'
-        # Thread.new do
-        #   files = VersionControl.files(extensions: extensions).zip([]).to_h
-
-        #   Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-        #     loop do
-        #       ready = IO.select([stdout])
-        #       readable_connections = ready[0]
-        #       readable_connections.each do |conn|
-        #         data = conn.readpartial(4096)
-        #         change = /^(?:create|remove|rename|modify):(?<path>.*)/.match(data.strip)
-
-        #         next unless change
-
-        #         path = Pathname(change[:path]).relative_path_from(Dir.pwd).to_s
-        #         file_exist = File.exist?(path)
-        #         file_cached = files.key?(path)
-
-        #         modified, added, removed = result = [[], [], []]
-        #         if file_exist && file_cached
-        #           modified << path
-        #         elsif file_exist && !file_cached
-        #           added << path
-        #           files[path] = nil
-        #         elsif !file_exist && file_cached
-        #           removed << path
-        #           files.delete(path)
-        #         end
-
-        #         yield result
-        #       end
-        #     end
-        #   end
-        # end
       end
     end
   end

data/lib/retest.rb

@@ -1,5 +1,3 @@
-require 'listen'
-
 require 'string/similarity'
 require 'observer'
 
@@ -17,8 +15,6 @@ require "retest/prompt"
 require "retest/sounds"
 require "retest/watcher"
 
-Listen.adapter_warn_behavior = :log
-
 module Retest
   class Error < StandardError; end
   class FileNotFound < StandardError; end

data/lib/scripts/listen

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+$stdout.sync = true
+
+require 'listen'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: scripts/listen.rb [options]"
+
+  opts.on("--exts rb,js,ts", Array, "Extensions to watch for") do |list|
+    options[:extensions] = list
+  end
+
+  opts.on("--polling BOOLEAN", "Force Listen to use polling") do |value|
+    options[:polling] = value
+  end
+
+  opts.on("-w", "--watch .", "Directory to listen to") do |value|
+    options[:dir] = value
+  end
+
+  opts.on("-h", "--help", "Prints help") do
+    puts opts
+    exit
+  end
+end.parse!
+
+unless options.key?(:extensions)
+  raise ArgumentError, 'must provide the files extensions to watch for'
+end
+
+unless options.key?(:polling)
+  raise ArgumentError, 'must provide the polling option'
+end
+
+unless options.key?(:dir)
+  raise ArgumentError, 'must provide the directory path to watch'
+end
+
+def extensions_regex(extensions)
+  Regexp.new("\\.(?:#{extensions.join("|")})$")
+end
+
+Listen.adapter_warn_behavior = :log
+
+Listen.to(options[:dir], only: extensions_regex(options[:extensions]), relative: true, polling: options[:polling]) do |modified, added, removed|
+  if modified.any?
+    $stdout.puts "modify:#{modified.first}"
+  elsif added.any?
+    $stdout.puts "create:#{added.first}"
+  elsif removed.any?
+    $stdout.puts "remove:#{removed.first}"
+  end
+end.start
+sleep

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -138,6 +138,7 @@ files:
 - lib/retest/version_control/git.rb
 - lib/retest/version_control/no_version_control.rb
 - lib/retest/watcher.rb
+- lib/scripts/listen
 - retest.gemspec
 homepage: https://github.com/AlexB52/retest
 licenses: