retest 2.0.0.pre4 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba870b22885e9928d0224cef1147fb2caced390abf7d86777dfc500ac83777c
-  data.tar.gz: 6aafc91c49b9243590d590a6a0debc3faedd797926a4a34f54b03bf28d4dc74a
+  metadata.gz: 754751292557705217a2e6010b5fda60d10fffbdf5a1b66ffe48976841407e09
+  data.tar.gz: 2156346b0cd5caa0d5dcf329391a0b84a85fc88342a97fe2e3150ba196fdd7c5
 SHA512:
-  metadata.gz: 61b46cf027a29b0c8478ce27d848ebc7086cb2db1b2d7992032d9ebc6bf04e00d7c662c1b1cf73851c6c99404f168c6359d1f6d0bb952afa4655fe93cfd4ed8f
-  data.tar.gz: 517f06d9b1c65288ae74e6cc459692d9458ae62e03089f7c18e642137bba5180945f210ba7cb5bf458feda0c0fe19887dd91ef6ca864c0306518f5e60d7cfaa1
+  metadata.gz: 328df6d6fe4153956230bb4029337f68f20ef8a796337b7c423ce2cd07ddf01ce3c69d531e3daac5babe17dae6c266053919246f6f2e93e69ecf56704cf52cc1
+  data.tar.gz: ea86b8e02ddced2b484c780ca8ec673098d23a8e86cde6f0f11b15d903e7206bcb88840b61438aa947cbac4b72c34ad8831bc2d2c76f205c6bcf2f73ff75a97f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (2.0.0.pre4)
+    retest (2.0.0.pre5)
       listen (~> 3.9)
       observer (~> 0.1)
       string-similarity (~> 2.1)
@@ -48,4 +48,4 @@ DEPENDENCIES
   retest!
 
 BUNDLED WITH
-   2.4.21
+   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,12 +14,12 @@ 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
 
@@ -28,6 +28,7 @@ repository = Retest::Repository.new(files: Retest::VersionControl.files, prompt:
 command    = Retest::Command.for_options(options)
 runner     = Retest::Runner.new(command)
 sounds     = Retest::Sounds.for(options)
+watcher    = Retest::Watcher.for(options.watcher)
 
 sounds.play(:start)
 runner.add_observer(sounds)
@@ -43,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..."
@@ -50,18 +57,18 @@ 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:)
   program.clear_terminal

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/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "2.0.0.pre4"
+  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

@@ -15,6 +15,7 @@ require "retest/file_system"
 require "retest/program"
 require "retest/prompt"
 require "retest/sounds"
+require "retest/watcher"
 
 Listen.adapter_warn_behavior = :log
 
@@ -22,9 +23,9 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -97,6 +97,7 @@ files:
 - README.md
 - README/demo.gif
 - Rakefile
+- bin/build/watchexec
 - bin/console
 - bin/debug
 - bin/setup
@@ -109,6 +110,7 @@ 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
@@ -135,6 +137,7 @@ files:
 - 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: