retest 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4173047ece3fb83e7ffc7e9cf871266054fc3dc49974f55a7df1afa6957afd73
-  data.tar.gz: c4c5a285c4d2f9195b289ca6746d1adba4f77f3fd76d5006c70b10c003fa8a2d
+  metadata.gz: 7eb4992f6d7149b443a2833f6481694b551fcf3ca98355acbe014f9209ed68c0
+  data.tar.gz: f1c50bb7340803ae2abc65178c204b983fe0a99471ac502ad0726d94d7219638
 SHA512:
-  metadata.gz: 9d66970c4c9f952d936cd34fc5291ea7bb8a0f2366d90b2c2f647991b4e286936c1c8e37a8dcca8151954c8bd353dbe79321b23ea22e6a2ecf8a39b1ae2dcaf2
-  data.tar.gz: 3c172835d39561da42eee00fc99a6561f57854d6f9f6fb59c50613ac8619d8ee56a4349404d45228f87ba37bd95a6fec39b4b445cc81c0fee958c6aaa972fef8
+  metadata.gz: 69b59be1bf2c414d66fa9b80eb656e430d32ede6fd88734169096d7b0b7c1f64d48edfcceabc4b48676a5dcf36cf307379926030b75e6fffa95525a504c9e279
+  data.tar.gz: c063a98b171140f21e66567a2c37d1014f8a3aed5c85f935e6a2e99f8d0845db84c046ccd47f7e739cc115e894111afc07d08b3564f02bdce09698c1a6674f03

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (2.0.1)
+    retest (2.1.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

@@ -39,25 +39,38 @@ 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}'"
+
+# === 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)

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

@@ -35,17 +35,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

data/lib/retest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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.