retest 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09eb72dbc99fae984bbd2d445461bc8f6cb16fd68c2f176a510dab1836e2f93a'
-  data.tar.gz: ff5d41621be25bb672f4167804b5e443924a55b87836baa8a49f603eebab0688
+  metadata.gz: 2a4544ea33941c52a493aab49a02f293cf6539e08db2482a858840f49e1ea1e6
+  data.tar.gz: fe2125582bec55b07b0e224ec196f37ed9f9c78c7f21dfd91e5e518ccb92c3d4
 SHA512:
-  metadata.gz: 403fb9d6050a23b540868ccb1bd2c2f98f2851ff18a0549efccfe1ba78f90e7c3593937dfc4aba0f7df51195c1c3022cf70175b1d593e6a3a63baf3fba440584
-  data.tar.gz: e75d88c1b43ed89afc25673be7a913c3f4156f6e3259584d470f0f757810c7a73e934d94a0087e56643d246830cdc130f18340a62eb24afcbb75bb10fd028a36
+  metadata.gz: 7971f9c3dc66d7e0389d859f8ddb6d817474c000da3314f4fd4a916fd35c4ea34bd0d0663884769e149739384785a7bd702c72df2b0e898f0e963ba9edd4425c
+  data.tar.gz: 7c3e6a114f9693c2d47fb9ed59e5c5d8337eeb9b1df02bd0cb1f7519128a63b9618ec5873a66264d712d009532153c4917f9f81e1207e561a0e729e31ab8e082

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (2.0.0.pre2)
+    retest (2.0.0.pre3)
       listen (~> 3.9)
       observer (~> 0.1)
       string-similarity (~> 2.1)

data/exe/retest

@@ -3,13 +3,11 @@
 require 'retest'
 
 $stdout.sync = true
-prompt_rd, prompt_wr = IO.pipe
-runner_rd, runner_wr = IO.pipe
-
+listen_rd, listen_wr = IO.pipe
 Signal.trap(:INT) do
   $stdout.puts "Goodbye"
-  prompt_rd.close
-  prompt_wr.close
+  listen_rd.close
+  listen_wr.close
   exit
 end
 
@@ -25,10 +23,10 @@ if options.version?
   return
 end
 
-prompt     = Retest::Prompt.new(input: prompt_rd)
+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, command_stdin: runner_rd)
+runner     = Retest::Runners.runner_for(command.to_s)
 sounds     = Retest::Sounds.for(options)
 
 # All test runner
@@ -47,7 +45,7 @@ program = Retest::Program.new(
 )
 
 if options.params[:diff]
-  program.run_synchronously { program.diff(options.params[:diff]) }
+  program.diff(options.params[:diff])
   return
 end
 
@@ -61,46 +59,21 @@ end
 $stdout.puts launching_message
 Retest.listen(options) do |modified, added, removed|
   begin
-    program.run(modified, added, removed) do
-      print_interactive_message
-    end
+    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}"
   end
 end
 $stdout.puts "Ready to refactor! You can make file changes now"
 
-# not blocking
-
-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
-
+def run_command(input:, program:, all_test_runner:)
   case input
+  when /^file changed:\s(.*)$/
+    puts "File changed: #{$1}"
+    program.run($1)
   when 'p', 'pause'
     program.pause
     puts "Program is paused\n"
@@ -111,12 +84,12 @@ loop do
     Process.kill("INT", 0)
   when ''
     puts "Running last command\n"
-    program.run_synchronously { runner.run(nil, repository: repository) }
+    program.run(nil, force_run: true)
   when 'ra', 'run all'
     puts "Running all tests\n"
     all_test_runner.run
   when /^di?f?f?\s(.*)$/
-    program.run_synchronously { program.diff($1) }
+    program.diff($1)
   when 'h', 'help'
     puts <<~HELP
 
@@ -132,3 +105,16 @@ loop do
     puts "Unknown interactive command #{input}\n"
   end
 end
+
+connections = [$stdin, listen_rd]
+loop do
+  puts "\nType interactive command and press enter"
+  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)
+  end
+end

data/lib/retest/program/pausable.rb

@@ -14,4 +14,8 @@ module Pausable
   def resume
     @paused = false
   end
+
+  def running_state
+    @paused
+  end
 end

data/lib/retest/program.rb

@@ -4,56 +4,37 @@ module Retest
   class Program
     include Pausable
 
-    attr_accessor :runner, :repository, :command
-    def initialize(runner: nil, repository: nil, command: nil, clear_window: true)
+    attr_accessor :runner, :repository, :command, :stdout
+    def initialize(runner: nil, repository: nil, command: nil, clear_window: true, stdout: $stdout)
       @runner = runner
       @repository = repository
       @command = command
       @clear_window = clear_window
+      @stdout = stdout
       initialize_pause(false)
     end
 
-    def run(modified, added, removed)
-      repository.sync(added: added, removed: removed)
-      runner.sync(added: added, removed: removed)
-
-      return if paused?
+    def run(file, force_run: false)
+      if paused? && !force_run
+        @stdout.puts "Main program paused. Please resume program first."
+        return
+      end
 
       clear_terminal
-      runner.run (modified + added).first, repository: repository
-      yield if block_given?
+      runner.run file, repository: repository
     end
 
     def diff(branch)
       raise "Git not installed" unless VersionControl::Git.installed?
       test_files = repository.find_tests VersionControl::Git.diff_files(branch)
 
-      puts "Tests found:"
-      test_files.each { |test_file| puts "  - #{test_file}" }
+      @stdout.puts "Tests found:"
+      test_files.each { |test_file| @stdout.puts "  - #{test_file}" }
 
-      puts "Running tests..."
+      @stdout.puts "Running tests..."
       runner.run_all_tests command.format_batch(*test_files)
     end
 
-    def run_synchronously(runner: @runner, prompt: @repository.prompt)
-      raise ArgumentError, 'need a block' unless block_given?
-
-      begin
-        pause
-        old_command_stdin = runner.command_stdin
-        old_prompt_stdin = prompt.input
-        prompt.input = $stdin
-        runner.command_stdin = $stdin
-        yield
-      ensure
-        resume
-        runner.command_stdin = old_command_stdin
-        prompt.input = old_prompt_stdin
-      end
-    end
-
-    private
-
     def clear_terminal
       return unless @clear_window
 

data/lib/retest/runners/runner.rb

@@ -3,11 +3,10 @@ module Retest
     class Runner
       include Observable
 
-      attr_accessor :command, :stdout, :command_stdin
-      def initialize(command, stdout: $stdout, command_stdin: $stdin)
+      attr_accessor :command, :stdout
+      def initialize(command, stdout: $stdout)
         @stdout  = stdout
         @command = command
-        @command_stdin = command_stdin
       end
 
       def ==(obj)
@@ -33,7 +32,7 @@ module Retest
 
       def system_run(command)
         @running = true
-        result = system(command, in: @command_stdin) ? :tests_pass : :tests_fail
+        result = system(command) ? :tests_pass : :tests_fail
         changed
         notify_observers(result)
         @running = false

data/lib/retest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-20 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity