retest 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5dc87b26d27197158d859e17e179f9dc0b00ec2280dfefff165da388c77eb6
-  data.tar.gz: cffbfbf72ea1b51e7f63e288fba08727498ec582192536a54ad9d2b47f04d1d2
+  metadata.gz: ce75120a1212540c1e510e4fd3d28e505f68d79e4e557b48e34cfda769d35613
+  data.tar.gz: ff2a3cc3644ce392adb38d8a87ffea711bbc6baaeb20f70099b2c0771cce3cf6
 SHA512:
-  metadata.gz: ad4051278ba14ff9f7284de5f8f643bdec7512864bb330aac803f6e3c672cc24f5584eb4b26be9f4a2b533a229fd5366a0eece8b4aa53eb816ff3e9c6575f200
-  data.tar.gz: 3b52308adcef24e6098f40ee07d55848f39104838c4db404394ee33a8ffe38466478cd18f347aa73b3a0072fc0c263592a9eecf1ed98e459345be160c02ed30f
+  metadata.gz: 6741101b8345dfcba37002b1265d6ed5170c8b82eccc8a143b20a7fb77d196f05b9c4b4af142a7fed62952aa5251769523243c997884334cc8a3d484f93f3207
+  data.tar.gz: 3c4f2484eb2400a47d35c22a33f6db47ede1e0fc401dccdede644114f90bc2765f1e1e6df5b2fea7e761d77983a863f2c917cfb5afd71ffabd89e884f1ad85c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (1.4.0)
+    retest (1.5.0)
       listen (~> 3.2)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)

data/bin/debug

@@ -15,7 +15,7 @@ end
 
 repository = Retest::Repository.new(files: Retest::VersionControl.files)
 command    = Retest::Command.for_options(options)
-runner     = Retest::Runner.for(command.to_s)
+runner     = Retest::Runners.runner_for(command.to_s)
 
 program = Retest::Program.new(
   extension: options.extension,

data/exe/retest

@@ -13,7 +13,7 @@ end
 
 repository = Retest::Repository.new(files: Retest::VersionControl.files)
 command    = Retest::Command.for_options(options)
-runner     = Retest::Runner.for(command.to_s)
+runner     = Retest::Runners.runner_for(command.to_s)
 
 program = Retest::Program.new(
   extension: options.extension,

data/lib/retest/command/rails.rb

@@ -13,8 +13,8 @@ module Retest
         root_command
       end
 
-      def run_all(*files, runner:)
-        runner.run files.join(' ')
+      def format_batch(*files)
+        files.join(' ')
       end
 
       private

data/lib/retest/command/rake.rb

@@ -13,8 +13,8 @@ module Retest
         root_command
       end
 
-      def run_all(*files, runner:)
-        runner.run files.size > 1 ? "\"{#{files.join(',')}}\"" : files.first
+      def format_batch(*files)
+        files.size > 1 ? "\"{#{files.join(',')}}\"" : files.first
       end
 
       private

data/lib/retest/command/rspec.rb

@@ -13,8 +13,8 @@ module Retest
         root_command
       end
 
-      def run_all(*files, runner:)
-        runner.run files.join(' ')
+      def format_batch(*files)
+        files.join(' ')
       end
 
       private

data/lib/retest/command/ruby.rb

@@ -8,9 +8,8 @@ module Retest
         @all = all
       end
 
-      def run_all(*files, runner:)
-        paths = files.map { |file| "require './#{file}';" }.join
-        runner.run %Q{-e "#{paths}"}
+      def format_batch(*files)
+        %Q{-e "#{files.map { |file| "require './#{file}';" }.join}"}
       end
 
       def to_s

data/lib/retest/program.rb

@@ -22,7 +22,7 @@ module Retest
       test_files.each { |test_file| puts "  - #{test_file}" }
 
       puts "Running tests..."
-      command.run_all *test_files, runner: runner
+      runner.run_all_tests command.format_batch(test_files)
     end
 
     private
@@ -30,20 +30,15 @@ module Retest
     def build
       Listen.to('.', only: extension, relative: true) do |modified, added, removed|
         begin
-          repository.add(added)
-          repository.remove(removed)
-          runner.remove(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 test_file_to_run(modified + added)
+          runner.run (modified + added).first, repository: repository
         rescue => e
           puts "Something went wrong: #{e.message}"
         end
       end
     end
-
-    def test_file_to_run(changed_files)
-      repository.find_test changed_files.first if runner.matching?
-    end
   end
 end

data/lib/retest/repository.rb

@@ -26,6 +26,11 @@ module Retest
         .sort
     end
 
+    def sync(added:, removed:)
+      add(added)
+      remove(removed)
+    end
+
     def add(added)
       return if added&.empty?
 
@@ -56,7 +61,7 @@ module Retest
     end
 
     def ask_question(tests)
-      output_stream.puts <<~QUESTION
+      output_stream.puts(<<~QUESTION)
         We found few tests matching: #{@path}
         #{list_options(tests)}
 

data/lib/retest/runners/change_runner.rb

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

data/lib/retest/runners/runner.rb

@@ -0,0 +1,26 @@
+module Retest
+  module Runners
+    class Runner
+      attr_accessor :command
+      def initialize(command)
+        @command = command
+      end
+
+      def ==(obj)
+        command == obj.command && obj.class == self.class
+      end
+
+      def run(changed_file = nil, repository: nil)
+        system command
+      end
+
+      def run_all_tests(tests_string)
+        puts "Test File Selected: #{tests_string}"
+        system command.gsub('<test>', tests_string)
+      end
+
+      def sync(added:, removed:)
+      end
+    end
+  end
+end

data/lib/retest/{runner.rb → runners/test_runner.rb}

@@ -1,25 +1,6 @@
 module Retest
-  class Runner
-    def self.for(test_command)
-      if test_command.include? '<test>'
-        VariableRunner
-      else
-        HardcodedRunner
-      end.new test_command
-    end
-
-    class VariableRunner
-      attr_reader :command
-
-      def initialize(command)
-        @command = command
-        @cached_test_file = nil
-      end
-
-      def ==(obj)
-        command == obj.command && obj.class == self.class
-      end
-
+  module Runners
+    class TestRunner < Runner
       def cached_test_file
         @cached_test_file
       end
@@ -28,8 +9,8 @@ module Retest
         @cached_test_file = value || @cached_test_file
       end
 
-      def run(test_file = nil)
-        self.cached_test_file = test_file
+      def run(changed_file, repository:)
+        self.cached_test_file = repository.find_test(changed_file)
 
         if cached_test_file
           puts "Test File Selected: #{cached_test_file}"
@@ -42,6 +23,12 @@ module Retest
         end
       end
 
+      def sync(added:, removed:)
+        remove(removed)
+      end
+
+      private
+
       def remove(purged)
         return if purged.empty?
 
@@ -52,35 +39,9 @@ module Retest
         end
       end
 
-      def unmatching?
-        !matching?
-      end
-
-      def matching?
-        true
-      end
-
-      private
-
       def purge_cache
         @cached_test_file = nil
       end
     end
-
-    HardcodedRunner = Struct.new(:command) do
-      def run(_ = nil)
-        system command
-      end
-
-      def remove(_ = nil); end
-
-      def unmatching?
-        !matching?
-      end
-
-      def matching?
-        false
-      end
-    end
   end
-end
+end

data/lib/retest/runners/variable_runner.rb

@@ -0,0 +1,57 @@
+module Retest
+  module Runners
+    class VariableRunner < Runner
+      def cached_test_file
+        @cached_test_file
+      end
+
+      def cached_test_file=(value)
+        @cached_test_file = value || @cached_test_file
+      end
+
+      def run(changed_file, repository:)
+        self.cached_test_file = repository.find_test(changed_file)
+
+        return print_test_file_not_found unless cached_test_file
+
+        puts(<<~FILES)
+          Files Selected:
+            - file: #{changed_file}
+            - test: #{cached_test_file}
+
+        FILES
+
+        system command
+          .gsub('<test>', cached_test_file)
+          .gsub('<changed>', changed_file)
+      end
+
+      def sync(added:, removed:)
+        remove(removed)
+      end
+
+      private
+
+      def print_test_file_not_found
+        puts <<~ERROR
+          404 - Test File Not Found
+          Retest could not find a matching test file to run.
+        ERROR
+      end
+
+      def remove(purged)
+        return if purged.empty?
+
+        if purged.is_a? Array
+          purge_cache if purged.include? cached_test_file
+        elsif purged.is_a? String
+          purge_cache if purged == cached_test_file
+        end
+      end
+
+      def purge_cache
+        @cached_test_file = nil
+      end
+    end
+  end
+end

data/lib/retest/runners.rb

@@ -0,0 +1,22 @@
+require_relative 'runners/runner'
+require_relative 'runners/test_runner'
+require_relative 'runners/change_runner'
+require_relative 'runners/variable_runner'
+
+module Retest
+  module Runners
+    module_function
+
+    def runner_for(command)
+      if command.include?('<test>') && command.include?('<changed>')
+        VariableRunner
+      elsif command.include?('<test>')
+        TestRunner
+      elsif command.include?('<changed>')
+        ChangeRunner
+      else
+        Runner
+      end.new command
+    end
+  end
+end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/lib/retest.rb

@@ -2,7 +2,7 @@ require 'listen'
 require 'string/similarity'
 
 require "retest/version"
-require "retest/runner"
+require "retest/runners"
 require "retest/repository"
 require "retest/test_options"
 require "retest/options"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -90,7 +90,11 @@ files:
 - lib/retest/options.rb
 - lib/retest/program.rb
 - lib/retest/repository.rb
-- lib/retest/runner.rb
+- lib/retest/runners.rb
+- lib/retest/runners/change_runner.rb
+- lib/retest/runners/runner.rb
+- lib/retest/runners/test_runner.rb
+- lib/retest/runners/variable_runner.rb
 - lib/retest/setup.rb
 - lib/retest/test_options.rb
 - lib/retest/version.rb