retest 2.0.0.pre3 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a4544ea33941c52a493aab49a02f293cf6539e08db2482a858840f49e1ea1e6
-  data.tar.gz: fe2125582bec55b07b0e224ec196f37ed9f9c78c7f21dfd91e5e518ccb92c3d4
+  metadata.gz: 754751292557705217a2e6010b5fda60d10fffbdf5a1b66ffe48976841407e09
+  data.tar.gz: 2156346b0cd5caa0d5dcf329391a0b84a85fc88342a97fe2e3150ba196fdd7c5
 SHA512:
-  metadata.gz: 7971f9c3dc66d7e0389d859f8ddb6d817474c000da3314f4fd4a916fd35c4ea34bd0d0663884769e149739384785a7bd702c72df2b0e898f0e963ba9edd4425c
-  data.tar.gz: 7c3e6a114f9693c2d47fb9ed59e5c5d8337eeb9b1df02bd0cb1f7519128a63b9618ec5873a66264d712d009532153c4917f9f81e1207e561a0e729e31ab8e082
+  metadata.gz: 328df6d6fe4153956230bb4029337f68f20ef8a796337b7c423ce2cd07ddf01ce3c69d531e3daac5babe17dae6c266053919246f6f2e93e69ecf56704cf52cc1
+  data.tar.gz: ea86b8e02ddced2b484c780ca8ec673098d23a8e86cde6f0f11b15d903e7206bcb88840b61438aa947cbac4b72c34ad8831bc2d2c76f205c6bcf2f73ff75a97f

data/.github/workflows/ci.yml

@@ -20,13 +20,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
+          - '2.5'
+          - '2.6'
+          - '2.7'
           - '3.0'
-          - 3.1
-          - 3.2
-          - 3.3
+          - '3.1'
+          - '3.2'
+          - '3.3'
         include:
           - os: macos-13
             ruby: 2.5

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    retest (2.0.0.pre3)
+    retest (2.0.0.pre5)
       listen (~> 3.9)
       observer (~> 0.1)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
+      tty-prompt (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -17,12 +18,25 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.15.0)
     observer (0.1.2)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     string-similarity (2.1.0)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
     tty-option (0.3.0)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.2)
+    wisper (2.0.1)
 
 PLATFORMS
   ruby
@@ -34,4 +48,4 @@ DEPENDENCIES
   retest!
 
 BUNDLED WITH
-   2.3.22
+   2.3.27

data/bin/build/watchexec

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+docker buildx build \
+  --platform linux/amd64,linux/arm64 \
+  -t ghcr.io/alexb52/slim-bullseye-watchexec:latest \
+  -f builds/dockerfiles/WatchexecSlimBullseye \
+  --push .

data/bin/test/ruby-app

@@ -2,6 +2,6 @@
 
 bundle install
 bundle exec rake build
-cp -R features/support features/ruby-app/retest
+# 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
+docker compose -f features/ruby-app/docker-compose.yml up --build --exit-code-from retest

data/builds/dockerfiles/WatchexecSlimBullseye

@@ -0,0 +1,12 @@
+# Stage 1: Build watchexec with Rust
+FROM rust:1.83.0-slim-bullseye AS rust-builder
+
+# Install necessary dependencies for Rust
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential git
+
+# Install watchexec
+RUN cargo install watchexec-cli
+
+# Verify installation
+RUN watchexec --version

data/exe/retest

@@ -5,7 +5,7 @@ require 'retest'
 $stdout.sync = true
 listen_rd, listen_wr = IO.pipe
 Signal.trap(:INT) do
-  $stdout.puts "Goodbye"
+  puts "Goodbye"
   listen_rd.close
   listen_wr.close
   exit
@@ -14,25 +14,21 @@ end
 options = Retest::Options.new(ARGV)
 
 if options.help?
-  $stdout.puts options.help
+  puts options.help
   return
 end
 
 if options.version?
-  $stdout.puts Retest::VERSION
+  puts Retest::VERSION
   return
 end
 
 prompt     = Retest::Prompt.new
 repository = Retest::Repository.new(files: Retest::VersionControl.files, prompt: prompt)
 command    = Retest::Command.for_options(options)
-runner     = Retest::Runners.runner_for(command.to_s)
+runner     = Retest::Runner.new(command)
 sounds     = Retest::Sounds.for(options)
-
-# All test runner
-all_test_command = Retest::Command.for_options(options.merge(%w[--all]), stdout: nil)
-all_test_runner = Retest::Runners.runner_for(all_test_command.to_s)
-all_test_runner.add_observer(sounds)
+watcher    = Retest::Watcher.for(options.watcher)
 
 sounds.play(:start)
 runner.add_observer(sounds)
@@ -40,7 +36,6 @@ prompt.add_observer(sounds)
 
 program = Retest::Program.new(
   repository: repository,
-  command: command,
   runner: runner
 )
 
@@ -49,6 +44,12 @@ if options.params[:diff]
   return
 end
 
+if watcher == Retest::Watcher::Watchexec
+  puts "Watcher: [WATCHEXEC]"
+else Retest::Watcher::Default
+  puts "Watcher: [LISTEN]"
+end
+
 launching_message = "Launching Retest..."
 if options.force_polling?
   launching_message = "Launching Retest with polling method..."
@@ -56,21 +57,22 @@ end
 
 # Main action
 
-$stdout.puts launching_message
-Retest.listen(options) do |modified, added, removed|
+puts launching_message
+Retest.listen(options, listener: watcher) do |modified, added, removed|
   begin
     repository.sync(added: added, removed: removed)
     runner.sync(added: added, removed: removed)
 
     listen_wr.puts "file changed: #{(modified + added).first}"
   rescue => e
-    $stdout.puts "Something went wrong: #{e.message}"
+    puts "Something went wrong: #{e.message}"
   end
 end
-$stdout.puts "Ready to refactor! You can make file changes now"
+puts "Ready to refactor! You can make file changes now"
 
-def run_command(input:, program:, all_test_runner:)
-  case input
+def run_command(input:, program:)
+  program.clear_terminal
+  case input.strip
   when /^file changed:\s(.*)$/
     puts "File changed: #{$1}"
     program.run($1)
@@ -82,24 +84,38 @@ def run_command(input:, program:, all_test_runner:)
     puts "Program has been resumed\n"
   when 'e', 'exit'
     Process.kill("INT", 0)
-  when ''
-    puts "Running last command\n"
+  when 'r', 'reset'
+    program.reset_selection
+    puts "command reset to '#{program.runner.command.to_s}'"
+  when 'f', 'force'
+    require 'tty-prompt'
+    prompt = TTY::Prompt.new
+    program.force_selection prompt.multi_select(
+      "What test files do you want to run when saving a file?",
+      program.repository.test_files,
+      filter: true, min: 1
+    )
     program.run(nil, force_run: true)
+  when ''
+    puts "Running last command: '#{program.last_command}'\n"
+    program.run_last_command
   when 'ra', 'run all'
     puts "Running all tests\n"
-    all_test_runner.run
+    program.run_all
   when /^di?f?f?\s(.*)$/
     program.diff($1)
   when 'h', 'help'
     puts <<~HELP
 
-      * '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
+      * 'h', 'help'              # Prints help.
+      * 'p', 'pause'             # Pauses Retest. Tests aren't run on file change events until unpaused.
+      * 'u', 'unpause'           # Unpauses Retest.
+      * <ENTER>                  # Runs last changed triggered command.
+      * 'ra, 'run all'           # Runs all tests.
+      * 'f', 'force'             # Forces a selection of test to run on every file change.
+      * 'r', 'reset'             # Disables forced selection.
+      * 'd', 'diff' [GIT BRANCH] # Runs matching specs that changed from a target branch.
+      * 'e', 'exit'              # Exits Retest.
     HELP
   else
     puts "Unknown interactive command #{input}\n"
@@ -108,13 +124,13 @@ end
 
 connections = [$stdin, listen_rd]
 loop do
-  puts "\nType interactive command and press enter"
+  puts "\nType interactive command and press enter. Enter 'h' for help."
   print(">\s")
 
   ready = IO.select(connections)
   readable_connections = ready[0]
   readable_connections.each do |conn|
     data = conn.readpartial(4096)
-    run_command(input: data.to_s.chomp, program: program, all_test_runner: all_test_runner)
+    run_command(input: data.to_s.chomp, program: program)
   end
 end

data/lib/retest/command/base.rb

@@ -0,0 +1,53 @@
+module Retest
+  class Command
+    class MultipleTestsNotSupported < StandardError; end
+
+    class Base
+      def initialize(all: false, file_system: FileSystem, command: nil)
+        @file_system = file_system
+        @all = all
+        @command = command
+      end
+
+      def clone(params = {})
+        self.class.new(**{ all: all, file_system: file_system, command: command }.merge(params))
+      end
+
+      def has_changed?
+        to_s.include?('<changed>')
+      end
+
+      def has_test?
+        to_s.include?('<test>')
+      end
+
+      def changed_type?
+        !has_test? && has_changed?
+      end
+
+      def test_type?
+        has_test? && !has_changed?
+      end
+
+      def variable_type?
+        has_test? && has_changed?
+      end
+
+      def hardcoded_type?
+        !has_test? && !has_changed?
+      end
+
+      def to_s
+        @command
+      end
+
+      def format_batch(*files)
+        raise MultipleTestsNotSupported, "Multiple test files run not supported for '#{to_s}'"
+      end
+
+      private
+
+      attr_reader :all, :file_system, :command
+    end
+  end
+end

data/lib/retest/command/hardcoded.rb

@@ -0,0 +1,5 @@
+module Retest
+  class Command
+    class Hardcoded < Base; end
+  end
+end

data/lib/retest/command/rails.rb

@@ -1,16 +1,12 @@
 module Retest
   class Command
-    class Rails
-      attr_reader :all, :file_system
-
-      def initialize(all:, file_system: FileSystem)
-        @file_system = file_system
-        @all = all
-      end
-
+    class Rails < Base
       def to_s
-        return "#{root_command} <test>" unless all
-        root_command
+        if all
+          root_command
+        else
+          "#{root_command} <test>"
+        end
       end
 
       def format_batch(*files)
@@ -20,9 +16,11 @@ module Retest
       private
 
       def root_command
-        return 'bin/rails test' if file_system.exist? 'bin/rails'
-
-        'bundle exec rails test'
+        if file_system.exist? 'bin/rails'
+          'bin/rails test'
+        else
+          'bundle exec rails test'
+        end
       end
     end
   end

data/lib/retest/command/rake.rb

@@ -1,28 +1,26 @@
 module Retest
   class Command
-    class Rake
-      attr_reader :all, :file_system
-
-      def initialize(all:, file_system: FileSystem)
-        @file_system = file_system
-        @all = all
-      end
-
+    class Rake < Base
       def to_s
-        return "#{root_command} TEST=<test>" unless all
-        root_command
+        if all
+          root_command
+        else
+          "#{root_command} TEST=<test>"
+        end
       end
 
       def format_batch(*files)
-        files.size > 1 ? "\"{#{files.join(',')}}\"" : files.first
+        files.size > 1 ? %Q{"{#{files.join(',')}}"} : files.first
       end
 
       private
 
       def root_command
-        return 'bin/rake test' if file_system.exist? 'bin/rake'
-
-        'bundle exec rake test'
+        if file_system.exist? 'bin/rake'
+          'bin/rake test'
+        else
+          'bundle exec rake test'
+        end
       end
     end
   end

data/lib/retest/command/rspec.rb

@@ -1,16 +1,12 @@
 module Retest
   class Command
-    class Rspec
-      attr_reader :all, :file_system
-
-      def initialize(all:, file_system: FileSystem)
-        @file_system = file_system
-        @all = all
-      end
-
+    class Rspec < Base
       def to_s
-        return "#{root_command} <test>" unless all
-        root_command
+        if all
+          root_command
+        else
+          "#{root_command} <test>"
+        end
       end
 
       def format_batch(*files)
@@ -20,9 +16,11 @@ module Retest
       private
 
       def root_command
-        return 'bin/rspec' if file_system.exist? 'bin/rspec'
-
-        'bundle exec rspec'
+        if file_system.exist? 'bin/rspec'
+          'bin/rspec'
+        else
+          'bundle exec rspec'
+        end
       end
     end
   end

data/lib/retest/command/ruby.rb

@@ -1,17 +1,6 @@
 module Retest
   class Command
-    class Ruby
-      attr_reader :all, :file_system
-
-      def initialize(all:, file_system: FileSystem)
-        @file_system = file_system
-        @all = all
-      end
-
-      def format_batch(*files)
-        %Q{-e "#{files.map { |file| "require './#{file}';" }.join}"}
-      end
-
+    class Ruby < Base
       def to_s
         if file_system.exist? 'Gemfile.lock'
           'bundle exec ruby <test>'
@@ -19,6 +8,10 @@ module Retest
           'ruby <test>'
         end
       end
+
+      def format_batch(*files)
+        files.size > 1 ? %Q{-e "#{files.map { |file| "require './#{file}';" }.join}"} : files.first
+      end
     end
   end
 end

data/lib/retest/command.rb

@@ -1,3 +1,5 @@
+require_relative 'command/base'
+require_relative 'command/hardcoded'
 require_relative 'command/rails'
 require_relative 'command/rake'
 require_relative 'command/rspec'
@@ -26,7 +28,9 @@ module Retest
     end
 
     def options_command
-      return params[:command] if params[:command]
+      if params[:command]
+        return hardcoded_command(params[:command])
+      end
 
       if    params[:rspec] then rspec_command
       elsif params[:rails] then rails_command
@@ -57,6 +61,10 @@ module Retest
       @stdout&.puts(message)
     end
 
+    def hardcoded_command(command)
+      Hardcoded.new(command: command)
+    end
+
     def rspec_command
       Rspec.new(all: full_suite?)
     end

data/lib/retest/options.rb

@@ -63,10 +63,19 @@ module Retest
       long "--diff=git-branch"
     end
 
-    option :ext do
-      desc "Regex of file extensions to listen to"
-      long "--ext=regex"
-      default "\\.rb$"
+    option :exts do
+      desc "Comma separated of filenames extensions to filter to"
+      long "--exts=<EXTENSIONS>"
+      default "rb"
+      convert :list
+    end
+
+    option :watcher do
+      desc "Tool used to watch file events"
+      permit %i[listen watchexec]
+      long "--watcher=<WATCHER>"
+      short "-w"
+      convert :sym
     end
 
     flag :all do
@@ -155,8 +164,12 @@ module Retest
       params[:polling]
     end
 
-    def extension
-      Regexp.new(params[:ext])
+    def extensions
+      params[:exts]
+    end
+
+    def watcher
+      params[:watcher] || :installed
     end
 
     def merge(options = [])

data/lib/retest/program/forced_selection.rb

@@ -0,0 +1,19 @@
+module ForcedSelection
+  attr_reader :selected_test_files
+
+  def initialize_forced_selection(value = [])
+    @selected_test_files = value
+  end
+
+  def forced_selection?
+    !@selected_test_files.empty?
+  end
+
+  def reset_selection
+    @selected_test_files = []
+  end
+
+  def force_selection(test_files)
+    @selected_test_files = Array(test_files)
+  end
+end

data/lib/retest/program.rb

@@ -1,17 +1,24 @@
 require_relative 'program/pausable'
+require_relative 'program/forced_selection'
 
 module Retest
   class Program
+    extend Forwardable
     include Pausable
+    include ForcedSelection
 
-    attr_accessor :runner, :repository, :command, :stdout
-    def initialize(runner: nil, repository: nil, command: nil, clear_window: true, stdout: $stdout)
+    attr_accessor :runner, :repository, :stdout
+
+    def_delegators :runner,
+      :run_last_command, :last_command
+
+    def initialize(runner: nil, repository: nil, clear_window: true, stdout: $stdout)
       @runner = runner
       @repository = repository
-      @command = command
       @clear_window = clear_window
       @stdout = stdout
       initialize_pause(false)
+      initialize_forced_selection([])
     end
 
     def run(file, force_run: false)
@@ -20,19 +27,37 @@ module Retest
         return
       end
 
-      clear_terminal
-      runner.run file, repository: repository
+      if forced_selection?
+        @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)
+        return
+      end
+
+      test_file = if runner.has_test?
+        repository.find_test(file)
+      end
+
+      runner.run changed_files: [file], test_files: [test_file]
     end
 
     def diff(branch)
       raise "Git not installed" unless VersionControl::Git.installed?
+
       test_files = repository.find_tests VersionControl::Git.diff_files(branch)
+      run_selected(test_files)
+    end
 
-      @stdout.puts "Tests found:"
-      test_files.each { |test_file| @stdout.puts "  - #{test_file}" }
+    def run_all
+      runner.run_all
+    end
 
-      @stdout.puts "Running tests..."
-      runner.run_all_tests command.format_batch(*test_files)
+    def run_selected(test_files)
+      runner.run(test_files: test_files)
     end
 
     def clear_terminal

data/lib/retest/repository.rb

@@ -31,6 +31,10 @@ module Retest
         .sort
     end
 
+    def test_files
+      files.select { |file| MatchingOptions::Path.new(file).test? }
+    end
+
     def sync(added:, removed:)
       add(added)
       remove(removed)

data/lib/retest/runner/cached_test_file.rb

@@ -0,0 +1,19 @@
+module Retest
+  module CachedTestFile
+    attr_reader :cached_test_file
+
+    def cached_test_file=(value)
+      @cached_test_file = value || cached_test_file
+    end
+
+    def purge_test_file(purged)
+      return if purged.empty?
+
+      if purged.is_a?(Array) && purged.include?(cached_test_file)
+        @cached_test_file = nil
+      elsif purged.is_a?(String) && purged == cached_test_file
+        @cached_test_file = nil
+      end
+    end
+  end
+end

data/lib/retest/runner.rb

@@ -0,0 +1,98 @@
+require_relative "runner/cached_test_file"
+
+module Retest
+  class Runner
+    extend Forwardable
+    include Observable
+    include CachedTestFile
+
+    def_delegators :command,
+      :has_changed?, :has_test?,
+      :changed_type?, :test_type?, :variable_type?, :harcoded_type?
+
+    attr_accessor :command, :stdout, :last_command
+    def initialize(command, stdout: $stdout)
+      @stdout  = stdout
+      @command = command
+    end
+
+    def run_last_command
+      system_run last_command
+    end
+
+    def run(changed_files: [], test_files: [])
+      self.last_command = format_instruction(changed_files: changed_files, test_files: test_files)
+      system_run last_command
+    rescue FileNotFound => e
+      log("FileNotFound - #{e.message}")
+    rescue Command::MultipleTestsNotSupported => e
+      log("Command::MultipleTestsNotSupported - #{e.message}")
+    end
+
+    def run_all
+      system_run command.clone(all: true).to_s
+    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:")
+        test_files.each { |test_file| log("  - #{test_file}") }
+        return instruction.gsub('<test>', tests_string)
+      end
+
+      instruction = command.to_s
+      instruction = format_changed_files(instruction: instruction, files: changed_files)
+      instruction = format_test_files(instruction: instruction, files: test_files)
+    end
+
+    def format_test_files(instruction:, files:)
+      return instruction unless has_test?
+
+      self.cached_test_file = files.first
+
+      if cached_test_file.nil?
+        raise FileNotFound, "Retest could not find a matching test file to run."
+      end
+
+      log("Test file: #{cached_test_file}")
+      instruction.gsub('<test>', cached_test_file)
+    end
+
+    def format_changed_files(instruction:, files:)
+      return instruction unless has_changed?
+      changed_file = files.first
+
+      if changed_file.nil?
+        raise FileNotFound, "Retest could not find a changed file to run."
+      end
+
+      log("Changed file: #{changed_file}")
+      instruction.gsub('<changed>', changed_file)
+    end
+
+    def sync(added:, removed:)
+      purge_test_file(removed)
+    end
+
+    private
+
+    def print_test_file_not_found
+      log(<<~ERROR)
+        FileNotFound - Retest could not find a matching test file to run.
+      ERROR
+    end
+
+    def system_run(command)
+      log("\n")
+      result = system(command) ? :tests_pass : :tests_fail
+      changed
+      notify_observers(result)
+    end
+
+    def log(message)
+      stdout.puts(message)
+    end
+  end
+end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "2.0.0.pre3"
+  VERSION = "2.0.0.pre5"
 end

data/lib/retest/version_control/git.rb

@@ -12,8 +12,12 @@ module Retest
         'git'
       end
 
-      def files
-        (untracked_files + tracked_files).sort
+      def files(extensions: [])
+        result = (untracked_files + tracked_files).sort
+        unless extensions.empty?
+          result.select! { |file| /\.(?:#{extensions.join('|')})$/.match?(file) }
+        end
+        result
       end
 
       def diff_files(branch)

data/lib/retest/version_control/no_version_control.rb

@@ -12,8 +12,14 @@ module Retest
         'default'
       end
 
-      def files
-        Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
+      def files(extensions: [])
+        result = if extensions.empty?
+          Dir.glob('**/*')
+        else
+          Dir.glob("**/*.{#{extensions.join(',')}}")
+        end
+
+        result - Dir.glob('{tmp,node_modules}/**/*')
       end
     end
   end

data/lib/retest/version_control.rb

@@ -6,8 +6,8 @@ module Retest
 
     module_function
 
-    def files
-      [Git, NoVersionControl].find(&:installed?).files
+    def files(extensions: [])
+      [Git, NoVersionControl].find(&:installed?).files(extensions: extensions)
     end
   end
 end

data/lib/retest/watcher.rb

@@ -0,0 +1,122 @@
+module Retest
+  module Watcher
+    def self.for(watcher)
+      tool = case watcher.to_s
+        when 'listen'        then Default
+        when 'watchexec'     then Watchexec
+        when '', 'installed' then installed
+        else                  raise ArgumentError, "Unknown #{watcher}"
+        end
+
+      unless tool.installed?
+        raise ArgumentError, "#{watcher} not installed on machine"
+      end
+
+      tool
+    end
+
+    def self.installed
+      [Watchexec, Default].find(&:installed?)
+    end
+
+    module Default
+      def self.installed?
+        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
+    end
+
+    module Watchexec
+      def self.installed?
+        system "watchexec --version > /dev/null 2>&1"
+      end
+
+      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)
+        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 = /^(?: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
+
+        # 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
+end

data/lib/retest.rb

@@ -4,7 +4,7 @@ require 'string/similarity'
 require 'observer'
 
 require "retest/version"
-require "retest/runners"
+require "retest/runner"
 require "retest/repository"
 require "retest/matching_options"
 require "retest/options"
@@ -15,15 +15,17 @@ require "retest/file_system"
 require "retest/program"
 require "retest/prompt"
 require "retest/sounds"
+require "retest/watcher"
 
 Listen.adapter_warn_behavior = :log
 
 module Retest
   class Error < StandardError; end
+  class FileNotFound < StandardError; end
 
-  def self.listen(options, listener: Listen)
-    listener.to('.', only: options.extension, relative: true, force_polling: options.force_polling?) do |modified, added, removed|
+  def self.listen(options, listener: Watcher::Default)
+    listener.watch(dir: '.', extensions: options.extensions, polling: options.force_polling?) do |modified, added, removed|
       yield modified, added, removed
-    end.start
+    end
   end
 end

data/retest.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "string-similarity", ["~> 2.1"]
   spec.add_runtime_dependency "listen", ["~> 3.9"]
   spec.add_runtime_dependency "tty-option", ["~> 0.1"]
+  spec.add_runtime_dependency "tty-prompt", ["~> 0.1"]
   spec.add_runtime_dependency "observer", ["~> 0.1"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre5
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: observer
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +97,7 @@ files:
 - README.md
 - README/demo.gif
 - Rakefile
+- bin/build/watchexec
 - bin/console
 - bin/debug
 - bin/setup
@@ -95,9 +110,12 @@ files:
 - bin/test/rspec-ruby
 - bin/test/ruby-app
 - bin/test/ruby-bare
+- builds/dockerfiles/WatchexecSlimBullseye
 - exe/retest
 - lib/retest.rb
 - lib/retest/command.rb
+- lib/retest/command/base.rb
+- lib/retest/command/hardcoded.rb
 - lib/retest/command/rails.rb
 - lib/retest/command/rake.rb
 - lib/retest/command/rspec.rb
@@ -107,21 +125,19 @@ files:
 - lib/retest/matching_options/path.rb
 - lib/retest/options.rb
 - lib/retest/program.rb
+- lib/retest/program/forced_selection.rb
 - lib/retest/program/pausable.rb
 - lib/retest/prompt.rb
 - lib/retest/repository.rb
-- lib/retest/runners.rb
-- lib/retest/runners/cached_test_file.rb
-- lib/retest/runners/change_runner.rb
-- lib/retest/runners/runner.rb
-- lib/retest/runners/test_runner.rb
-- lib/retest/runners/variable_runner.rb
+- lib/retest/runner.rb
+- lib/retest/runner/cached_test_file.rb
 - lib/retest/setup.rb
 - lib/retest/sounds.rb
 - lib/retest/version.rb
 - lib/retest/version_control.rb
 - lib/retest/version_control/git.rb
 - lib/retest/version_control/no_version_control.rb
+- lib/retest/watcher.rb
 - retest.gemspec
 homepage: https://github.com/AlexB52/retest
 licenses:
@@ -144,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: A simple command line tool to watch file change and run its matching spec.

data/lib/retest/runners/cached_test_file.rb

@@ -1,23 +0,0 @@
-module Retest
-  module Runners
-    module CachedTestFile
-      def cached_test_file
-        @cached_test_file
-      end
-
-      def cached_test_file=(value)
-        @cached_test_file = value || @cached_test_file
-      end
-
-      def purge_test_file(purged)
-        return if purged.empty?
-
-        if purged.is_a?(Array) && purged.include?(cached_test_file)
-          @cached_test_file = nil
-        elsif purged.is_a?(String) && purged == cached_test_file
-          @cached_test_file = nil
-        end
-      end
-    end
-  end
-end

data/lib/retest/runners/change_runner.rb

@@ -1,21 +0,0 @@
-module Retest
-  module Runners
-    class ChangeRunner < Runner
-      def run(changed_file = nil, repository: nil)
-        return print_file_not_found unless changed_file
-
-        log("Changed File Selected: #{changed_file}")
-        system_run command.gsub('<changed>', changed_file)
-      end
-
-      private
-
-      def print_file_not_found
-        log(<<~ERROR)
-          404 - File Not Found
-          Retest could not find a changed file to run.
-        ERROR
-      end
-    end
-  end
-end

data/lib/retest/runners/runner.rb

@@ -1,46 +0,0 @@
-module Retest
-  module Runners
-    class Runner
-      include Observable
-
-      attr_accessor :command, :stdout
-      def initialize(command, stdout: $stdout)
-        @stdout  = stdout
-        @command = command
-      end
-
-      def ==(obj)
-        command == obj.command && obj.class == self.class
-      end
-
-      def run(changed_file = nil, repository: nil)
-        system_run command
-      end
-
-      def run_all_tests(tests_string)
-        raise NotSupportedError, 'cannot run multiple test files against this command'
-      end
-
-      def sync(added:, removed:)
-      end
-
-      def running?
-        @running
-      end
-
-      private
-
-      def system_run(command)
-        @running = true
-        result = system(command) ? :tests_pass : :tests_fail
-        changed
-        notify_observers(result)
-        @running = false
-      end
-
-      def log(message)
-        stdout.puts(message)
-      end
-    end
-  end
-end

data/lib/retest/runners/test_runner.rb

@@ -1,36 +0,0 @@
-require_relative "cached_test_file"
-
-module Retest
-  module Runners
-    class TestRunner < Runner
-      include CachedTestFile
-
-      def run(changed_file, repository:)
-        self.cached_test_file = repository.find_test(changed_file)
-
-        return print_file_not_found unless cached_test_file
-
-        log("Test File Selected: #{cached_test_file}")
-        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
-
-      private
-
-      def print_file_not_found
-        log(<<~ERROR)
-          404 - Test File Not Found
-          Retest could not find a matching test file to run.
-        ERROR
-      end
-    end
-  end
-end

data/lib/retest/runners/variable_runner.rb

@@ -1,39 +0,0 @@
-require_relative "cached_test_file"
-
-module Retest
-  module Runners
-    class VariableRunner < Runner
-      include CachedTestFile
-
-      def run(changed_file, repository:)
-        self.cached_test_file = repository.find_test(changed_file)
-
-        return print_file_not_found unless cached_test_file
-
-        log(<<~FILES)
-          Files Selected:
-            - changed: #{changed_file}
-            - test: #{cached_test_file}
-
-        FILES
-
-        system_run command
-          .gsub('<test>', cached_test_file)
-          .gsub('<changed>', changed_file)
-      end
-
-      def sync(added:, removed:)
-        purge_test_file(removed)
-      end
-
-      private
-
-      def print_file_not_found
-        log(<<~ERROR)
-          404 - Test File Not Found
-          Retest could not find a matching test file to run.
-        ERROR
-      end
-    end
-  end
-end

data/lib/retest/runners.rb

@@ -1,23 +0,0 @@
-require_relative 'runners/runner'
-require_relative 'runners/test_runner'
-require_relative 'runners/change_runner'
-require_relative 'runners/variable_runner'
-
-module Retest
-  module Runners
-    class NotSupportedError < StandardError; end
-
-    module_function
-
-    def runner_for(command, **opts)
-      for_test   = command.include?('<test>')
-      for_change = command.include?('<changed>')
-
-      if for_test && for_change then VariableRunner
-      elsif for_test            then TestRunner
-      elsif for_change          then ChangeRunner
-      else                           Runner
-      end.new command, **opts
-    end
-  end
-end