retest 1.13.2 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf29e5c176c0f84ae2ca5b8dcf61dc3a4abb89e8ad36992e805ba9e43cc821f1
-  data.tar.gz: 79c4edd5d130562e6233efa43e498db22b4d25923308c51874624f80ae8558a0
+  metadata.gz: 8aa95d85d566c3271485de99e777fe77a8821e29a06332752ac5e9e4b3dcc7aa
+  data.tar.gz: 812a2acebb89af6544afbbb26b56f81c62c9cd5ef2cf41dd5b39f1a0d5f8c1b6
 SHA512:
-  metadata.gz: 0efaaa77b690428189e0fb29796f85633484f84ae1cf98365cd368b340a149eff93b712d8257c18eb77231f945175ed43bfe7a21f2fd2742338e9852d155bc9c
-  data.tar.gz: 1f0ec6e1c61e0908b536bc10325829cf0bb5b14e0ac2ff8bb29018de824ff4fd6ea0e0fcd93d8ef9bf1c2bc3c9bcb67fc3bc18120ad3383dc3388864049e9562
+  metadata.gz: d4e43b8ad34890700ff78ab2d66a594e102f23ff8144c3dc55a50b2a850b5ea6cbe8a09707348983e7518387e15759f972cb52275b7e3e94f47b4fd1a52ccf06
+  data.tar.gz: 7e51d2fd6ffcb78ca8739fb703a71161c84eb5ee3f3f4cd1b406bc7c364d92f04d077c720b4c94ead0faa0393df2209051a5abcaac86bed64e5b7ad091a76b7e

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, v2.0 ]
 
 jobs:
   unit-tests:
@@ -28,7 +28,7 @@ jobs:
           - 3.2
           - 3.3
         include:
-          - os: macos-latest
+          - os: macos-13
             ruby: 2.5
     name: Ruby ${{ matrix.ruby }} test (${{ matrix.os }})
     steps:

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-.ruby-version
+.ruby-version
+*.DS_Store

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 
 gem "rake", "~> 13.0"
 gem "minitest", "~> 5.0"
-gem "byebug"
+gem "byebug", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (1.13.2)
+    retest (2.0.0.pre1)
       listen (~> 3.9)
       observer (~> 0.1)
       string-similarity (~> 2.1)
@@ -19,7 +19,7 @@ GEM
     observer (0.1.2)
     rake (13.0.6)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     string-similarity (2.1.0)
     tty-option (0.3.0)

data/bin/test/bundler-app

@@ -2,5 +2,6 @@
 
 bundle install
 bundle exec rake build
+cp -R features/support features/bundler-app/retest
 ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/bundler-app/retest.gem
-docker-compose -f features/bundler-app/docker-compose.yml up --build --exit-code-from retest
+docker compose -f features/bundler-app/docker-compose.yml up --build --exit-code-from retest

data/bin/test/git-ruby

@@ -2,5 +2,6 @@
 
 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
+docker compose -f features/git-ruby/docker-compose.yml up --build --exit-code-from retest

data/bin/test/hanami-app

@@ -2,7 +2,8 @@
 
 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
+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

data/bin/test/rails-app

@@ -2,5 +2,6 @@
 
 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
+docker compose -f features/rails-app/docker-compose.yml up --build --exit-code-from retest

data/bin/test/reset_helpers

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+%w[
+  ruby-app
+  ruby-bare
+  git-ruby
+  hanami-app
+  rails-app
+  rspec-rails
+  rspec-ruby
+  bundler-app
+].each do |folder|
+  `cp -R ./features/support ./features/#{folder}/retest`
+end

data/bin/test/rspec-rails

@@ -2,5 +2,6 @@
 
 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
+docker compose -f features/rspec-rails/docker-compose.yml up --build --exit-code-from retest

data/bin/test/rspec-ruby

@@ -2,5 +2,6 @@
 
 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
+docker compose -f features/rspec-ruby/docker-compose.yml up --build --exit-code-from retest

data/bin/test/ruby-app

@@ -2,5 +2,6 @@
 
 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
+docker compose -f features/ruby-app/docker-compose.yml up --build --exit-code-from retest

data/bin/test/ruby-bare

@@ -2,5 +2,6 @@
 
 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
+docker compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest

data/exe/retest

@@ -3,8 +3,15 @@
 require 'retest'
 
 $stdout.sync = true
+prompt_rd, prompt_wr = IO.pipe
+runner_rd, runner_wr = IO.pipe
 
-Signal.trap(:INT) { $stdout.puts "Goodbye"; exit }
+Signal.trap(:INT) do
+  $stdout.puts "Goodbye"
+  prompt_rd.close
+  prompt_wr.close
+  exit
+end
 
 options = Retest::Options.new(ARGV)
 
@@ -18,12 +25,17 @@ if options.version?
   return
 end
 
-prompt     = Retest::Prompt.new
+prompt     = Retest::Prompt.new(input: prompt_rd)
 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::Runners.runner_for(command.to_s, command_stdin: runner_rd)
 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)
+
 sounds.play(:start)
 runner.add_observer(sounds)
 prompt.add_observer(sounds)
@@ -35,6 +47,8 @@ program = Retest::Program.new(
 )
 
 if options.params[:diff]
+  prompt.input = $stdin
+  runner.command_stdin = $stdin
   program.diff(options.params[:diff])
   return
 end
@@ -49,7 +63,9 @@ end
 $stdout.puts launching_message
 Retest.listen(options) do |modified, added, removed|
   begin
-    program.run(modified, added, removed)
+    program.run(modified, added, removed) do
+      print_interactive_message
+    end
   rescue => e
     $stdout.puts "Something went wrong: #{e.message}"
   end
@@ -58,4 +74,69 @@ $stdout.puts "Ready to refactor! You can make file changes now"
 
 # not blocking
 
-sleep
+def print_interactive_message
+  puts "\nType interactive command and press enter"
+  print(">\s")
+end
+
+loop do
+  print_interactive_message
+
+  puts "waiting for input"
+  input = $stdin.gets.to_s.chomp
+
+  puts "input is: #{input.inspect}"
+
+  if prompt.question_asked?
+    prompt_wr.puts input
+    next
+  end
+
+  if all_test_runner.running?
+    $stdin.puts input
+    next
+  end
+
+  if runner.running?
+    runner_wr.puts input
+    next
+  end
+
+  case input
+  when 'p', 'pause'
+    program.pause
+    puts "Program is paused\n"
+  when 'u', 'unpause'
+    program.resume
+    puts "Program has been resumed\n"
+  when 'e', 'exit'
+    Process.kill("INT", 0)
+  when ''
+    begin
+      puts "Running last command\n"
+      old_stdin = runner.command_stdin
+      runner.command_stdin = $stdin
+      runner.run(nil, repository: repository)
+    ensure
+      runner.command_stdin = old_stdin
+    end
+  when 'ra', 'run all'
+    puts "Running all tests\n"
+    all_test_runner.run
+  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
+    HELP
+  else
+    puts "Unknown interactive command #{input}\n"
+  end
+end

data/lib/retest/command.rb

@@ -7,12 +7,8 @@ module Retest
   class Command
     extend Forwardable
 
-    def self.for_options(options)
-      new(options: options).command
-    end
-
-    def self.for_setup(setup)
-      new(setup: setup).command
+    def self.for_options(options, stdout: $stdout)
+      new(options: options, stdout: stdout).command
     end
 
     def_delegator :setup, :type
@@ -51,12 +47,16 @@ module Retest
     end
 
     def default_command
-      @stdout.puts "Setup identified: [#{type.upcase}]. Using command: '#{setup_command}'"
+      log "Setup identified: [#{type.upcase}]. Using command: '#{setup_command}'"
       setup_command
     end
 
     private
 
+    def log(message)
+      @stdout&.puts(message)
+    end
+
     def rspec_command
       Rspec.new(all: full_suite?)
     end

data/lib/retest/options.rb

@@ -158,5 +158,9 @@ module Retest
     def extension
       Regexp.new(params[:ext])
     end
+
+    def merge(options = [])
+      self.class.new(@args.dup.concat(options))
+    end
   end
 end

data/lib/retest/program/pausable.rb

@@ -0,0 +1,17 @@
+module Pausable
+  def initialize_pause(value = false)
+    @paused = value
+  end
+
+  def pause
+    @paused = true
+  end
+
+  def paused?
+    @paused
+  end
+
+  def resume
+    @paused = false
+  end
+end

data/lib/retest/program.rb

@@ -1,18 +1,27 @@
+require_relative 'program/pausable'
+
 module Retest
   class Program
+    include Pausable
+
     attr_accessor :runner, :repository, :command
-    def initialize(runner: nil, repository: nil, command: nil)
+    def initialize(runner: nil, repository: nil, command: nil, clear_window: true)
       @runner = runner
       @repository = repository
       @command = command
+      @clear_window = clear_window
+      initialize_pause(false)
     end
 
     def run(modified, added, removed)
       repository.sync(added: added, removed: removed)
       runner.sync(added: added, removed: removed)
-      system('clear 2>/dev/null') || system('cls 2>/dev/null')
 
+      return if paused?
+
+      clear_terminal
       runner.run (modified + added).first, repository: repository
+      yield if block_given?
     end
 
     def diff(branch)
@@ -25,5 +34,13 @@ module Retest
       puts "Running tests..."
       runner.run_all_tests command.format_batch(*test_files)
     end
+
+    private
+
+    def clear_terminal
+      return unless @clear_window
+
+      system('clear 2>/dev/null') || system('cls 2>/dev/null')
+    end
   end
 end

data/lib/retest/prompt.rb

@@ -2,36 +2,34 @@ module Retest
   class Prompt
     include Observable
 
-    def self.ask_which_test_to_use(path, files)
-      new.ask_which_test_to_use(path, files)
-    end
-
-    def self.puts(*args)
-      new.puts(*args)
-    end
-
     attr_accessor :input, :output
     def initialize(input: nil, output: nil)
       @input  = input || $stdin
       @output = output || $stdout
+      @question_asked = false
     end
 
-    def ask_which_test_to_use(path, files)
-      changed
-      notify_observers(:question)
-      options = options(files)
+    def question_asked?
+      @question_asked
+    end
 
-      output.puts(<<~QUESTION)
-        We found few tests matching: #{path}
+    def ask_which_test_to_use(path, files)
+      ask_question do
+        changed
+        notify_observers(:question)
+        options = options(files)
 
-        #{list_options(options.keys)}
+        output.puts(<<~QUESTION)
+          We found few tests matching: #{path}
 
-        Which file do you want to use?
-        Enter the file number now:
-      QUESTION
-      output.print("> ")
+          #{list_options(options.keys)}
 
-      options.values[input.gets.chomp.to_i]
+          Which file do you want to use?
+          Enter the file number now:
+        QUESTION
+        output.print("> ")
+        options.values[input.gets.to_s.chomp.to_i]
+      end
     end
 
     def puts(*args)
@@ -42,6 +40,14 @@ module Retest
       output.tap(&:rewind).read
     end
 
+    def ask_question
+      old_question_asked = @question_asked
+      @question_asked = true
+      yield
+    ensure
+      @question_asked = old_question_asked
+    end
+
     private
 
     def options(files, blank_option: 'none')

data/lib/retest/runners/runner.rb

@@ -3,10 +3,11 @@ module Retest
     class Runner
       include Observable
 
-      attr_accessor :command, :stdout
-      def initialize(command, stdout: $stdout)
+      attr_accessor :command, :stdout, :command_stdin
+      def initialize(command, stdout: $stdout, command_stdin: $stdin)
         @stdout  = stdout
         @command = command
+        @command_stdin = command_stdin
       end
 
       def ==(obj)
@@ -18,19 +19,24 @@ module Retest
       end
 
       def run_all_tests(tests_string)
-        log("Test File Selected: #{tests_string}")
-        system_run command.gsub('<test>', tests_string)
+        raise NotSupportedError, 'cannot run multiple test files against this command'
       end
 
       def sync(added:, removed:)
       end
 
+      def running?
+        @running
+      end
+
       private
 
       def system_run(command)
-        result = system(command) ? :tests_pass : :tests_fail
+        @running = true
+        result = system(command, in: @command_stdin) ? :tests_pass : :tests_fail
         changed
         notify_observers(result)
+        @running = false
       end
 
       def log(message)

data/lib/retest/runners/test_runner.rb

@@ -14,6 +14,11 @@ module Retest
         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

data/lib/retest/runners.rb

@@ -5,9 +5,11 @@ require_relative 'runners/variable_runner'
 
 module Retest
   module Runners
+    class NotSupportedError < StandardError; end
+
     module_function
 
-    def runner_for(command)
+    def runner_for(command, **opts)
       for_test   = command.include?('<test>')
       for_change = command.include?('<changed>')
 
@@ -15,7 +17,7 @@ module Retest
       elsif for_test            then TestRunner
       elsif for_change          then ChangeRunner
       else                           Runner
-      end.new command
+      end.new command, **opts
     end
   end
 end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "1.13.2"
+  VERSION = "2.0.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Alexandre Barret
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: 
+description:
 email:
 - alex@abletech.nz
 executables:
@@ -90,6 +90,7 @@ files:
 - bin/test/git-ruby
 - bin/test/hanami-app
 - bin/test/rails-app
+- bin/test/reset_helpers
 - bin/test/rspec-rails
 - bin/test/rspec-ruby
 - bin/test/ruby-app
@@ -106,6 +107,7 @@ files:
 - lib/retest/matching_options/path.rb
 - lib/retest/options.rb
 - lib/retest/program.rb
+- lib/retest/program/pausable.rb
 - lib/retest/prompt.rb
 - lib/retest/repository.rb
 - lib/retest/runners.rb
@@ -127,7 +129,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/AlexB52/retest
   source_code_uri: https://github.com/AlexB52/retest
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,12 +140,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A simple command line tool to watch file change and run its matching spec.
 test_files: []