retest 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 357f54e47d0b81d02f32e097cc6a0ed43b850a144bd3d368cd1a29d8d7db9b8a
-  data.tar.gz: e60ae5e97ffb0a75a4c75792d0ff04e8d79a3daab5ad8eaf30a300ce6ad0a858
+  metadata.gz: 1574e44c17347c9a6e737481bfcbff782800cf68baef56f7f1dc2e1006f4f5b6
+  data.tar.gz: abe7fda8889c342859457f87b44a91e6e9e4a8cd0d8c764d6738422a8c9ed087
 SHA512:
-  metadata.gz: c33d9188ecedb9b19b73b9bd0c0f7e88096d94101aa1e213dae692c6e1fe6b431f081fa7da19fcadaef1fc8984e7e7167e7f0ea269fc055a0d773afa228d6c19
-  data.tar.gz: 3901346f228ce16d193407fcd47cabadad28989e5d32c4d89d59bbf3344871021033b340663d634e1b3dc4478dc7e479be7351a7a7b546ba914b7de06add19c3
+  metadata.gz: 9732e40769bbdc74ec7783dede4255c6cfb64a2517a8a92cffcbb838b54b714cd71f4244f7c06c6e238ce008facbd4e49f5fd0e6a4c5d73e2c225328254cf427
+  data.tar.gz: 791f6b3bf4d6b8b1eec931bff738bd6e795d51a41c17263c9ab6c0e47d15e1acfd70d18679387ce40520b871c8aabb184f4298f84a965c8e4c43b0b990465b62

data/bin/debug

@@ -1,36 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "retest"
 require "byebug"
 
-$stdout.sync = true
-
-options = Retest::Options.new(ARGV)
-
-if options.help?
-  $stdout.puts options.help
-  return
-end
-
-repository = Retest::Repository.new(files: Retest::VersionControl.files)
-command    = Retest::Command.for_options(options)
-runner     = Retest::Runners.runner_for(command.to_s)
-sounds     = Retest::Sounds.for(options)
-
-sounds.play(:tests_pass)
-runner.add_observer(sounds)
-
-program = Retest::Program.new(
-  extension: options.extension,
-  repository: repository,
-  command: command,
-  runner: runner
-)
-
-if options.params[:diff]
-  program.diff(options.params[:diff])
-else
-  program.start # not blocking
-  sleep
-end
+eval(File.read("exe/retest"))

data/exe/retest

@@ -20,7 +20,6 @@ sounds.play(:tests_pass)
 runner.add_observer(sounds)
 
 program = Retest::Program.new(
-  extension: options.extension,
   repository: repository,
   command: command,
   runner: runner
@@ -28,7 +27,21 @@ program = Retest::Program.new(
 
 if options.params[:diff]
   program.diff(options.params[:diff])
-else
-  program.start # not blocking
-  sleep
+  return
 end
+
+# Main action
+
+$stdout.puts "Launching Retest..."
+Listen.to('.', only: options.extension, relative: true) do |modified, added, removed|
+  begin
+    program.run(modified, added, removed)
+  rescue => e
+    $stdout.puts "Something went wrong: #{e.message}"
+  end
+end.start
+$stdout.puts "Ready to refactor! You can make file changes now"
+
+# not blocking
+
+sleep

data/lib/retest/command.rb

@@ -19,10 +19,10 @@ module Retest
     def_delegators :options, :params, :full_suite?, :auto?
 
     attr_accessor :options, :setup
-    def initialize(options: Options.new, setup: Setup.new, output_stream: STDOUT)
+    def initialize(options: Options.new, setup: Setup.new, stdout: $stdout)
       @options = options
       @setup = setup
-      @output_stream = output_stream
+      @stdout = stdout
     end
 
     def command
@@ -52,7 +52,7 @@ module Retest
     end
 
     def default_command
-      @output_stream.puts "Setup identified: [#{type.upcase}]. Using command: '#{setup_command}'"
+      @stdout.puts "Setup identified: [#{type.upcase}]. Using command: '#{setup_command}'"
       setup_command
     end
 

data/lib/retest/program.rb

@@ -1,17 +1,18 @@
 module Retest
   class Program
-    attr_accessor :runner, :repository, :command, :extension
-    def initialize(runner: nil, repository: nil, command: nil, extension: /\.rb$/)
+    attr_accessor :runner, :repository, :command
+    def initialize(runner: nil, repository: nil, command: nil)
       @runner = runner
       @repository = repository
       @command = command
-      @extension = extension
     end
 
-    def start
-      puts "Launching Retest..."
-      build.start
-      puts "Ready to refactor! You can make file changes now"
+    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')
+
+      runner.run (modified + added).first, repository: repository
     end
 
     def diff(branch)
@@ -24,21 +25,5 @@ module Retest
       puts "Running tests..."
       runner.run_all_tests command.format_batch(test_files)
     end
-
-    private
-
-    def build
-      Listen.to('.', only: extension, relative: true) do |modified, added, removed|
-        begin
-          repository.sync(added: added, removed: removed)
-          runner.sync(added: added, removed: removed)
-          system('clear 2>/dev/null') || system('cls 2>/dev/null')
-
-          runner.run (modified + added).first, repository: repository
-        rescue => e
-          puts "Something went wrong: #{e.message}"
-        end
-      end
-    end
   end
 end

data/lib/retest/repository.rb

@@ -1,12 +1,12 @@
 module Retest
   class Repository
-    attr_accessor :files, :cache, :input_stream, :output_stream
+    attr_accessor :files, :cache, :stdin, :stdout
 
-    def initialize(files: [], cache: {}, input_stream: nil, output_stream: nil)
-      @cache         = cache
-      @files         = files
-      @input_stream  = input_stream || STDIN
-      @output_stream = output_stream|| STDOUT
+    def initialize(files: [], cache: {}, stdin: $stdin, stdout: $stdout)
+      @cache  = cache
+      @files  = files
+      @stdin  = stdin
+      @stdout = stdout
     end
 
     def find_test(path)
@@ -61,7 +61,7 @@ module Retest
     end
 
     def ask_question(tests)
-      output_stream.puts(<<~QUESTION)
+      stdout.puts(<<~QUESTION)
         We found few tests matching: #{@path}
         #{list_options(tests)}
 
@@ -77,7 +77,7 @@ module Retest
     end
 
     def get_input
-      input_stream.gets.chomp.to_i
+      stdin.gets.chomp.to_i
     end
   end
 end

data/lib/retest/runners/change_runner.rb

@@ -3,10 +3,10 @@ module Retest
     class ChangeRunner < Runner
       def run(changed_file = nil, repository: nil)
         if changed_file
-          puts "Changed File Selected: #{changed_file}"
+          log("Changed File Selected: #{changed_file}")
           system_run command.gsub('<changed>', changed_file)
         else
-          puts <<~ERROR
+          log(<<~ERROR)
             404 - Test File Not Found
             Retest could not find a changed file to run.
           ERROR

data/lib/retest/runners/runner.rb

@@ -3,8 +3,9 @@ module Retest
     class Runner
       include Observable
 
-      attr_accessor :command
-      def initialize(command)
+      attr_accessor :command, :stdout
+      def initialize(command, stdout: $stdout)
+        @stdout  = stdout
         @command = command
       end
 
@@ -17,7 +18,7 @@ module Retest
       end
 
       def run_all_tests(tests_string)
-        puts "Test File Selected: #{tests_string}"
+        log("Test File Selected: #{tests_string}")
         system_run command.gsub('<test>', tests_string)
       end
 
@@ -31,6 +32,10 @@ module Retest
         changed
         notify_observers(result)
       end
+
+      def log(message)
+        stdout.puts(message)
+      end
     end
   end
 end

data/lib/retest/runners/test_runner.rb

@@ -13,10 +13,10 @@ module Retest
         self.cached_test_file = repository.find_test(changed_file)
 
         if cached_test_file
-          puts "Test File Selected: #{cached_test_file}"
+          log("Test File Selected: #{cached_test_file}")
           system_run command.gsub('<test>', cached_test_file)
         else
-          puts <<~ERROR
+          log(<<~ERROR)
             404 - Test File Not Found
             Retest could not find a matching test file to run.
           ERROR

data/lib/retest/runners/variable_runner.rb

@@ -14,7 +14,7 @@ module Retest
 
         return print_test_file_not_found unless cached_test_file
 
-        puts(<<~FILES)
+        log(<<~FILES)
           Files Selected:
             - file: #{changed_file}
             - test: #{cached_test_file}
@@ -33,7 +33,7 @@ module Retest
       private
 
       def print_test_file_not_found
-        puts <<~ERROR
+        log(<<~ERROR)
           404 - Test File Not Found
           Retest could not find a matching test file to run.
         ERROR

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity