retest 1.2.0 → 1.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ce5e74ba4682f3777259a6565c585271dd7db5f6d753c4e5d6836f5c457634
-  data.tar.gz: bfc62c5fd481982435b3ee8e372839b7678e489d8123bbcd629c5ba56c2b7012
+  metadata.gz: fa015efc571907fe2ad6fda917ea82471435de7c1ac37b23a2f3a9944f39b00a
+  data.tar.gz: b3899a60b7f08faa776df749f3b266ba045a9b1f9bb8d03dbef967605fd26707
 SHA512:
-  metadata.gz: ef3ee2efb84b012c5b6ba340d81e578ec512960e7fc28516abbc23689c8ad43f3c3a5ecd1855d51df1bcee5a426fdd92aef3f460a65fbb7c39d35d83ad08c735
-  data.tar.gz: e5af1bbe78c6bfa347088fc0ec3c8e985a1dbad5393f47640b7885cf4a0bbdd5cbc8c8922f7b189794027af4e7091dc36fd81693e5d785cf11e330fd2ea78dc0
+  metadata.gz: ece665996aadbc266ed44aa2984abaacb7be1beb6649ff19c901ea023787801f11544331ff392679c2200e887d0bdbf3cbc94dac11e321ba4807041399b883bb
+  data.tar.gz: 70bd6e9761f7392885a65e135f7dcc94a1c1a59d6d4096fb62d951b8080b7c650487f18a09aef259cd2775b0b8f42294a588ca0ee12515228b72f3cf335e34c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (1.2.0)
+    retest (1.3.0.pre)
       listen (~> 3.2)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
@@ -10,8 +10,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    ffi (1.15.0)
-    listen (3.5.0)
+    ffi (1.15.3)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.1)

data/README.md

@@ -65,13 +65,16 @@ Arguments:
            
 
 Options:
-      --all    Run all the specs of a specificied ruby setup
-      --auto   Indentify repository setup and runs appropriate command
-  -h, --help   Print usage
-      --rails  Shortcut for 'bundle exec rails test <test>'
-      --rake   Shortcut for 'bundle exec rake test TEST=<test>'
-      --rspec  Shortcut for 'bundle exec rspec <test>'
-      --ruby   Shortcut for 'bundle exec ruby <test>'
+      --all              Run all the specs of a specificied ruby setup
+      --auto             Indentify repository setup and runs appropriate
+                         command
+      --diff=git-branch  Pipes all matching tests from diffed branch to test
+                         command
+  -h, --help             Print usage
+      --rails            Shortcut for a standard Rails setup
+      --rake             Shortcut for a standard Rake setup
+      --rspec            Shortcut for a standard RSpec setup
+      --ruby             Shortcut for a Ruby project
 
 Examples:
   Runs a matching rails test after a file change

data/bin/debug

@@ -13,9 +13,14 @@ if options.help?
   return
 end
 
+repository = Retest::Repository.new(files: Retest::VersionControl.files)
+command    = Retest::Command.for_options(options)
+runner     = Retest::Runner.for(command.to_s)
+
 program = Retest::Program.new(
-  repository: Retest::Repository.new(files: Retest::VersionControl.files),
-  runner: Retest::Runner.for(Retest::Command.for_options(options))
+  repository: repository,
+  command: command,
+  runner: runner
 )
 
 if options.params[:diff]

data/exe/retest

@@ -11,9 +11,14 @@ if options.help?
   return
 end
 
+repository = Retest::Repository.new(files: Retest::VersionControl.files)
+command    = Retest::Command.for_options(options)
+runner     = Retest::Runner.for(command.to_s)
+
 program = Retest::Program.new(
-  repository: Retest::Repository.new(files: Retest::VersionControl.files),
-  runner: Retest::Runner.for(Retest::Command.for_options(options))
+  repository: repository,
+  command: command,
+  runner: runner
 )
 
 if options.params[:diff]

data/lib/retest.rb

@@ -10,53 +10,8 @@ require "retest/version_control"
 require "retest/setup"
 require "retest/command"
 require "retest/file_system"
+require "retest/program"
 
 module Retest
   class Error < StandardError; end
-
-  class Program
-    attr_accessor :runner, :repository
-    def initialize(runner: nil, repository: nil)
-      @runner = runner
-      @repository = repository
-    end
-
-    def start
-      puts "Launching Retest..."
-      build.start
-      puts "Ready to refactor! You can make file changes now"
-    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}" }
-
-      puts "Running tests..."
-      test_files.each { |test_file| runner.run test_file }
-    end
-
-    private
-
-    def build
-      Listen.to('.', only: /\.rb$/, relative: true) do |modified, added, removed|
-        begin
-          repository.add(added)
-          repository.remove(removed)
-          runner.remove(removed)
-          system('clear 2>/dev/null') || system('cls 2>/dev/null')
-
-          runner.run test_file_to_run(modified + added)
-        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/command.rb

@@ -59,19 +59,19 @@ module Retest
     private
 
     def rspec_command
-      Rspec.command(all: full_suite?)
+      Rspec.new(all: full_suite?)
     end
 
     def rails_command
-      Rails.command(all: full_suite?)
+      Rails.new(all: full_suite?)
     end
 
     def rake_command
-      Rake.command(all: full_suite?)
+      Rake.new(all: full_suite?)
     end
 
     def ruby_command
-      Ruby.command(all: full_suite?)
+      Ruby.new(all: full_suite?)
     end
   end
 end

data/lib/retest/command/rails.rb

@@ -1,15 +1,22 @@
 module Retest
   class Command
-    Rails = Struct.new(:all, :file_system) do
-      def self.command(all:, file_system: FileSystem)
-        new(all, file_system).command
+    class Rails
+      attr_reader :all, :file_system
+
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
       end
 
-      def command
+      def to_s
         return "#{root_command} <test>" unless all
         root_command
       end
 
+      def run_all(*files, runner:)
+        runner.run files.join(' ')
+      end
+
       private
 
       def root_command
@@ -19,4 +26,4 @@ module Retest
       end
     end
   end
-end
+end

data/lib/retest/command/rake.rb

@@ -1,15 +1,22 @@
 module Retest
   class Command
-    Rake = Struct.new(:all, :file_system) do
-      def self.command(all:, file_system: FileSystem)
-        new(all, file_system).command
+    class Rake
+      attr_reader :all, :file_system
+
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
       end
 
-      def command
+      def to_s
         return "#{root_command} TEST=<test>" unless all
         root_command
       end
 
+      def run_all(*files, runner:)
+        runner.run files.size > 1 ? "\"{#{files.join(',')}}\"" : files.first
+      end
+
       private
 
       def root_command
@@ -19,4 +26,4 @@ module Retest
       end
     end
   end
-end
+end

data/lib/retest/command/rspec.rb

@@ -1,15 +1,22 @@
 module Retest
   class Command
-    Rspec = Struct.new(:all, :file_system) do
-      def self.command(all:, file_system: FileSystem)
-        new(all, file_system).command
+    class Rspec
+      attr_reader :all, :file_system
+
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
       end
 
-      def command
+      def to_s
         return "#{root_command} <test>" unless all
         root_command
       end
 
+      def run_all(*files, runner:)
+        runner.run files.join(' ')
+      end
+
       private
 
       def root_command

data/lib/retest/command/ruby.rb

@@ -1,9 +1,19 @@
 module Retest
   class Command
-    module Ruby
-      module_function
+    class Ruby
+      attr_reader :all, :file_system
 
-      def command(all: false, file_system: FileSystem)
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
+      end
+
+      def run_all(*files, runner:)
+        paths = files.map { |file| "require './#{file}';" }.join
+        runner.run %Q{-e "#{paths}"}
+      end
+
+      def to_s
         if file_system.exist? 'Gemfile.lock'
           'bundle exec ruby <test>'
         else

data/lib/retest/options.rb

@@ -4,15 +4,6 @@ module Retest
   class Options
     include TTY::Option
 
-    RSPEC_COMMAND = "bundle exec rspec <test>"
-    RAILS_COMMAND = "bundle exec rails test <test>"
-    RAKE_COMMAND  = "bundle exec rake test TEST=<test>"
-    RUBY_COMMAND  = "bundle exec ruby <test>"
-
-    ALL_RAKE_COMMAND  = "bundle exec rake test"
-    ALL_RAILS_COMMAND = "bundle exec rails test"
-    ALL_RSPEC_COMMAND = "bundle exec rspec"
-
     usage do
       program "retest"
 
@@ -87,22 +78,22 @@ module Retest
 
     flag :rspec do
       long "--rspec"
-      desc "Shortcut for '#{RSPEC_COMMAND}'"
+      desc "Shortcut for a standard RSpec setup"
     end
 
     flag :rake do
       long "--rake"
-      desc "Shortcut for '#{RAKE_COMMAND}'"
+      desc "Shortcut for a standard Rake setup"
     end
 
     flag :rails do
       long "--rails"
-      desc "Shortcut for '#{RAILS_COMMAND}'"
+      desc "Shortcut for a standard Rails setup"
     end
 
     flag :ruby do
       long "--ruby"
-      desc "Shortcut for '#{RUBY_COMMAND}'"
+      desc "Shortcut for a Ruby project"
     end
 
     attr_reader :args

data/lib/retest/program.rb

@@ -0,0 +1,48 @@
+module Retest
+  class Program
+    attr_accessor :runner, :repository, :command
+    def initialize(runner: nil, repository: nil, command: nil)
+      @runner = runner
+      @repository = repository
+      @command = command
+    end
+
+    def start
+      puts "Launching Retest..."
+      build.start
+      puts "Ready to refactor! You can make file changes now"
+    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}" }
+
+      puts "Running tests..."
+      command.run_all *test_files, runner: runner
+    end
+
+    private
+
+    def build
+      Listen.to('.', only: /\.rb$/, relative: true) do |modified, added, removed|
+        begin
+          repository.add(added)
+          repository.remove(removed)
+          runner.remove(removed)
+          system('clear 2>/dev/null') || system('cls 2>/dev/null')
+
+          runner.run test_file_to_run(modified + added)
+        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/runner.rb

@@ -17,7 +17,7 @@ module Retest
       end
 
       def ==(obj)
-        command == obj.command
+        command == obj.command && obj.class == self.class
       end
 
       def cached_test_file

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "1.2.0"
+  VERSION = "1.3.0.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.pre
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -88,6 +88,7 @@ files:
 - lib/retest/command/ruby.rb
 - lib/retest/file_system.rb
 - lib/retest/options.rb
+- lib/retest/program.rb
 - lib/retest/repository.rb
 - lib/retest/runner.rb
 - lib/retest/setup.rb
@@ -114,9 +115,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.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
 signing_key: