retest 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f19bab47f8e8f925e239af074d1de4c8cf78cbcbd3376929d37ac5f71345cf4
-  data.tar.gz: 683e67b4262a8265eb7b40e06f0199f98626f1df0071a0a006086accf18a4a05
+  metadata.gz: 7cec5f35b345630339ca56cfd0c1bc88be03596ca4d8369695f2e87f66e7c608
+  data.tar.gz: db0b1f966bb2ebe14183e17e93003c0d504881dc2a7d8fe2614f5c202b0fcf55
 SHA512:
-  metadata.gz: 92fc110c595888136791a61b7327f79fd1f678b1b720da4cc5f1c4394b844e45a97c41bac2d3b7694747ecf7058fc207211e11260fa6f0261a53ed28d30ed2fd
-  data.tar.gz: cb15584a8a240c75b8adc59d4ab57495a6aa3e5981cf8cb7a4590614e0b90ea9068ac211a063eba5dbb7e88ef0536489b2f67224e5e1c9e06752d029829fd857
+  metadata.gz: 2b191a17f73446b41fd5fdf9bc7495f4ea0535c05681e1d14e191cb62f6cadc83d09454ad501fc98ce503db6a169b628b6d205328ca4a236ddf56bbc75d78bff
+  data.tar.gz: e1089b2d8c64c380c2fd08935f8b0ded1dee4ccb2f265ff20c6f12eeea91942ef0e4c9a6a154b48a270a4c3281fa2e3edf981925f50c6767c98a2bbcbd1cd6f3

data/Gemfile.lock

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

data/bin/debug

@@ -15,7 +15,7 @@ end
 
 program = Retest::Program.new(
   repository: Retest::Repository.new(files: Retest::VersionControl.files),
-  runner: Retest::Runner.for(options.command)
+  runner: Retest::Runner.for(Retest::Command.for_options(options))
 )
 
 if options.params[:diff]

data/exe/retest

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

data/lib/retest.rb

@@ -8,6 +8,7 @@ require "retest/test_options"
 require "retest/options"
 require "retest/version_control"
 require "retest/setup"
+require "retest/command"
 
 module Retest
   class Error < StandardError; end

data/lib/retest/command.rb

@@ -0,0 +1,77 @@
+require_relative 'command/rails'
+require_relative 'command/rake'
+require_relative 'command/rspec'
+require_relative 'command/ruby'
+
+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
+    end
+
+    def_delegator :setup, :type
+    def_delegators :options, :params, :full_suite?, :auto?
+
+    attr_accessor :options, :setup
+    def initialize(options: Options.new, setup: Setup.new, output_stream: STDOUT)
+      @options = options
+      @setup = setup
+      @output_stream = output_stream
+    end
+
+    def command
+      return default_command if auto?
+      options_command || default_command
+    end
+
+    def options_command
+      return params[:command] if params[:command]
+
+      if    params[:rspec] then rspec_command
+      elsif params[:rails] then rails_command
+      elsif params[:ruby]  then ruby_command
+      elsif params[:rake]  then rake_command
+      else
+      end
+    end
+
+    def setup_command
+      case type
+      when :rake  then rake_command
+      when :rspec then rspec_command
+      when :rails then rails_command
+      when :ruby  then ruby_command
+      else             ruby_command
+      end
+    end
+
+    def default_command
+      @output_stream.puts "Setup identified: [#{type.upcase}]. Using command: '#{setup_command}'"
+      setup_command
+    end
+
+    private
+
+    def rspec_command
+      Rspec.command(all: full_suite?)
+    end
+
+    def rails_command
+      Rails.command(all: full_suite?)
+    end
+
+    def rake_command
+      Rake.command(all: full_suite?)
+    end
+
+    def ruby_command
+      Ruby.command(all: full_suite?)
+    end
+  end
+end

data/lib/retest/command/rails.rb

@@ -0,0 +1,22 @@
+module Retest
+  class Command
+    Rails = Struct.new(:all, :bin_file) do
+      def self.command(all:, bin_file: File.exist?('bin/rails'))
+        new(all, bin_file).command
+      end
+
+      def command
+        return "#{root_command} <test>" unless all
+        root_command
+      end
+
+      private
+
+      def root_command
+        return 'bin/rails test' if bin_file
+
+        'bundle exec rails test'
+      end
+    end
+  end
+end

data/lib/retest/command/rake.rb

@@ -0,0 +1,22 @@
+module Retest
+  class Command
+    Rake = Struct.new(:all, :bin_file) do
+      def self.command(all:, bin_file: File.exist?('bin/rake'))
+        new(all, bin_file).command
+      end
+
+      def command
+        return "#{root_command} TEST=<test>" unless all
+        root_command
+      end
+
+      private
+
+      def root_command
+        return 'bin/rake test' if bin_file
+
+        'bundle exec rake test'
+      end
+    end
+  end
+end

data/lib/retest/command/rspec.rb

@@ -0,0 +1,22 @@
+module Retest
+  class Command
+    Rspec = Struct.new(:all, :bin_file) do
+      def self.command(all:, bin_file: File.exist?('bin/rspec'))
+        new(all, bin_file).command
+      end
+
+      def command
+        return "#{root_command} <test>" unless all
+        root_command
+      end
+
+      private
+
+      def root_command
+        return 'bin/rspec' if bin_file
+
+        'bundle exec rspec'
+      end
+    end
+  end
+end

data/lib/retest/command/ruby.rb

@@ -0,0 +1,13 @@
+module Retest
+  class Command
+    Ruby = Struct.new(:all, :bin_file) do
+      def self.command(all: false, bin_file: false)
+        new(false, false).command
+      end
+
+      def command
+        'bundle exec ruby <test>'
+      end
+    end
+  end
+end

data/lib/retest/options.rb

@@ -111,22 +111,8 @@ module Retest
       new(args).command
     end
 
-    def initialize(args = [], output_stream: STDOUT, setup: Setup)
+    def initialize(args = [])
       self.args = args
-      @output_stream = output_stream
-      @setup = setup
-    end
-
-    def command
-      return params[:command] if params[:command]
-
-      if    params[:rspec] then rspec_command
-      elsif params[:rake]  then rake_command
-      elsif params[:rails] then rails_command
-      elsif params[:ruby]  then ruby_command
-      elsif params[:auto]  then default_command
-      else                      default_command
-      end
     end
 
     def args=(args)
@@ -138,45 +124,19 @@ module Retest
       params[:help]
     end
 
-    private
-
     def full_suite?
       params[:all]
     end
 
-    def default_command
-      choose_command @setup.type, command_for(@setup.type)
-    end
-
-    def command_for(type)
-      case type
-      when :rspec then rspec_command
-      when :rails then rails_command
-      when :rake  then rake_command
-      when :ruby  then ruby_command
-      else             ruby_command
-      end
+    def auto?
+      return true if no_options_passed?
+      params[:auto]
     end
 
-    def choose_command(type, command)
-      @output_stream.puts "Setup identified: [#{type.upcase}]. Using command: '#{command}'"
-      command
-    end
-
-    def rspec_command
-      full_suite? ? ALL_RSPEC_COMMAND : RSPEC_COMMAND
-    end
-
-    def rails_command
-      full_suite? ? ALL_RAILS_COMMAND : RAILS_COMMAND
-    end
-
-    def rake_command
-      full_suite? ? ALL_RAKE_COMMAND : RAKE_COMMAND
-    end
+    private
 
-    def ruby_command
-      RUBY_COMMAND
+    def no_options_passed?
+      params.to_h.values.compact.uniq == [false]
     end
   end
 end

data/lib/retest/setup.rb

@@ -31,7 +31,7 @@ module Retest
     end
 
     def rails?
-      File.exist? 'bin/rails'
+      has_gem? 'rails'
     end
 
     def rake?

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -80,6 +80,11 @@ files:
 - bin/test/ruby-app
 - exe/retest
 - lib/retest.rb
+- lib/retest/command.rb
+- lib/retest/command/rails.rb
+- lib/retest/command/rake.rb
+- lib/retest/command/rspec.rb
+- lib/retest/command/ruby.rb
 - lib/retest/options.rb
 - lib/retest/repository.rb
 - lib/retest/runner.rb