retest 2.0.0.pre → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8619aafdd8a06156dcd417ca5ed6dcf453acacdf025a3fba15578d4caba4caf9
-  data.tar.gz: ecee718559ad1ace718eeec856bab148aa37aa05a75a427dc060f52c4961a2c2
+  metadata.gz: 8aa95d85d566c3271485de99e777fe77a8821e29a06332752ac5e9e4b3dcc7aa
+  data.tar.gz: 812a2acebb89af6544afbbb26b56f81c62c9cd5ef2cf41dd5b39f1a0d5f8c1b6
 SHA512:
-  metadata.gz: 3389785c3fdf525180b9203b87b316046a8ac4963f958ad70066d0a73be7fff879efd11878bfa12744aaf43b54c163ba509ec9248c104447b8746c8422f8ee1b
-  data.tar.gz: a59c5006a914117cda203394d3734660d496fc38e65633be54afe62b441e47d6ef4c4d4adccdba9a91cc4d73c02d9ab86527da3e8b3fb0d24a11892a6214d910
+  metadata.gz: d4e43b8ad34890700ff78ab2d66a594e102f23ff8144c3dc55a50b2a850b5ea6cbe8a09707348983e7518387e15759f972cb52275b7e3e94f47b4fd1a52ccf06
+  data.tar.gz: 7e51d2fd6ffcb78ca8739fb703a71161c84eb5ee3f3f4cd1b406bc7c364d92f04d077c720b4c94ead0faa0393df2209051a5abcaac86bed64e5b7ad091a76b7e

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 (2.0.0.pre)
+    retest (2.0.0.pre1)
       listen (~> 3.9)
       observer (~> 0.1)
       string-similarity (~> 2.1)
@@ -11,7 +11,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    ffi (1.17.0)
+    ffi (1.16.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)

data/exe/retest

@@ -4,6 +4,7 @@ require 'retest'
 
 $stdout.sync = true
 prompt_rd, prompt_wr = IO.pipe
+runner_rd, runner_wr = IO.pipe
 
 Signal.trap(:INT) do
   $stdout.puts "Goodbye"
@@ -27,9 +28,14 @@ end
 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)
@@ -41,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
@@ -74,12 +82,26 @@ end
 loop do
   print_interactive_message
 
-  input = $stdin.gets.chomp
+  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
@@ -90,27 +112,29 @@ loop do
   when 'e', 'exit'
     Process.kill("INT", 0)
   when ''
-    puts "Running last command\n"
-    runner.run(nil, repository: repository)
+    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"
-    tmp_opts = options.dup.tap { |opts| opts.params[:all] = true }
-    tmp_cmd = Retest::Command.for_options(tmp_opts)
-    tmp_runner = Retest::Runners.runner_for(tmp_cmd.to_s)
-    tmp_runner.add_observer(sounds)
-    tmp_runner.run
-    tmp_runner.delete_observers
+    all_test_runner.run
   when /^di?f?f?\s(.*)$/
     program.diff($1)
   when 'h', 'help'
     puts <<~HELP
 
-      * 'h' or 'help'    -> Prints help
-      * 'p' or 'pause'   -> Pauses Retest. Tests aren't run until unpaused.
-      * 'u' or 'unpause' -> Unpauses Retest
-      * <Enter>          -> Runs last changed triggered command
-      * 'ra', 'run all'  -> Runs all tests
-      * 'e' or 'exit'    -> Exits Retest
+      * '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"

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

@@ -28,7 +28,7 @@ module Retest
           Enter the file number now:
         QUESTION
         output.print("> ")
-        options.values[input.gets.chomp.to_i]
+        options.values[input.gets.to_s.chomp.to_i]
       end
     end
 

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 = "2.0.0.pre"
+  VERSION = "2.0.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -140,11 +140,11 @@ 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.5.3
+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.