retest 1.0.0.pre2 → 1.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a66f6a72a5f0e26fd60a1426b38c2bc179c56937b0c5a38ecbe354863f00b92
-  data.tar.gz: 3eb1fa4f48f60db34dc185d5f7b431725c1096ac4ce0200146b34e7c4c79a28e
+  metadata.gz: fa015efc571907fe2ad6fda917ea82471435de7c1ac37b23a2f3a9944f39b00a
+  data.tar.gz: b3899a60b7f08faa776df749f3b266ba045a9b1f9bb8d03dbef967605fd26707
 SHA512:
-  metadata.gz: 9b6bdf72eb1aa0f8acdbea0cd360a25aab3d7e34e116dffcdfa2b77288c03df7eb069d99fd18767d61fbe593f19f4a2d0c73e10e1c2c7999f239647b421973a8
-  data.tar.gz: 7a7ce5af2c787ab6e35133733c491ee9d02a4e4d628ee836c7642f75210deb9bb79b54f3d679cbde7517c1bd4d4b50e33ab979df361f6b889e210f2aa212962e
+  metadata.gz: ece665996aadbc266ed44aa2984abaacb7be1beb6649ff19c901ea023787801f11544331ff392679c2200e887d0bdbf3cbc94dac11e321ba4807041399b883bb
+  data.tar.gz: 70bd6e9761f7392885a65e135f7dcc94a1c1a59d6d4096fb62d951b8080b7c650487f18a09aef259cd2775b0b8f42294a588ca0ee12515228b72f3cf335e34c0

data/.github/workflows/ci.yml

@@ -44,11 +44,12 @@ jobs:
       matrix:
         repo:
           - ruby-app
-          - rails-app
+          - ruby-bare
+          - git-ruby
           - hanami-app
+          - rails-app
           - rspec-rails
           - rspec-ruby
-          - git-ruby
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (1.0.0.pre2)
+    retest (1.3.0.pre)
       listen (~> 3.2)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
@@ -10,13 +10,13 @@ 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)
     rake (12.3.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     string-similarity (2.1.0)

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/retest.svg)](https://badge.fury.io/rb/retest)
+
 # Retest
 
 Retest is a small command-line tool to help you refactor code by watching a file change and running its matching spec. Designed to be dev-centric and project independent, it can be used on the fly. No Gemfile updates, no commits to a repo or configuration files required to start refactoring. Works with every Ruby projects (at least that is the end goal)
@@ -13,6 +15,7 @@ Install it on your machine without adding it on a Gemfile:
     $ gem install retest
 
 ## Usage
+### Refactoring
 
 Launch `retest` in your terminal after accessing your ruby repository.
 
@@ -28,11 +31,10 @@ Few shortcut flags exist to avoid writing the full test command.
     $ retest --rails
     $ retest --rake --all
 
-Finally let retest automatically find your ruby setup and run the appropriate command using:
+Or let retest find your ruby setup and run the appropriate command using:
 
     $ retest
-    $ retest --auto
-    $ retest --auto --all
+    $ retest --all
 
 The gem works as follows:
 
@@ -41,7 +43,15 @@ The gem works as follows:
 * When multiple matching test files are found, retest asks you to confirm the file and save the answer.
 * When a test file is not found, retest runs the last run command or throw a 404.
 
-See more example with `retest -h`
+### Diff Check
+
+You can diff a branch and test all the relevant test files before pushing your branch and trigger the full CI suite. 
+
+    $ retest --diff origin/main
+
+### Help
+
+See more examples with `retest -h`
 
 ```
 Usage: retest  [OPTIONS] [COMMAND]
@@ -55,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(options.command)
+  repository: repository,
+  command: command,
+  runner: runner
 )
 
 if options.params[:diff]

data/bin/test/ruby-bare

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+bundle install
+bundle exec rake build
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-bare/retest.gem
+docker-compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest

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(options.command)
+  repository: repository,
+  command: command,
+  runner: runner
 )
 
 if options.params[:diff]

data/lib/retest.rb

@@ -8,53 +8,10 @@ require "retest/test_options"
 require "retest/options"
 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

@@ -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.new(all: full_suite?)
+    end
+
+    def rails_command
+      Rails.new(all: full_suite?)
+    end
+
+    def rake_command
+      Rake.new(all: full_suite?)
+    end
+
+    def ruby_command
+      Ruby.new(all: full_suite?)
+    end
+  end
+end

data/lib/retest/command/rails.rb

@@ -0,0 +1,29 @@
+module Retest
+  class Command
+    class Rails
+      attr_reader :all, :file_system
+
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
+      end
+
+      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
+        return 'bin/rails test' if file_system.exist? 'bin/rails'
+
+        'bundle exec rails test'
+      end
+    end
+  end
+end

data/lib/retest/command/rake.rb

@@ -0,0 +1,29 @@
+module Retest
+  class Command
+    class Rake
+      attr_reader :all, :file_system
+
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
+      end
+
+      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
+        return 'bin/rake test' if file_system.exist? 'bin/rake'
+
+        'bundle exec rake test'
+      end
+    end
+  end
+end

data/lib/retest/command/rspec.rb

@@ -0,0 +1,29 @@
+module Retest
+  class Command
+    class Rspec
+      attr_reader :all, :file_system
+
+      def initialize(all:, file_system: FileSystem)
+        @file_system = file_system
+        @all = all
+      end
+
+      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
+        return 'bin/rspec' if file_system.exist? 'bin/rspec'
+
+        'bundle exec rspec'
+      end
+    end
+  end
+end

data/lib/retest/command/ruby.rb

@@ -0,0 +1,25 @@
+module Retest
+  class Command
+    class Ruby
+      attr_reader :all, :file_system
+
+      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
+          'ruby <test>'
+        end
+      end
+    end
+  end
+end

data/lib/retest/file_system.rb

@@ -0,0 +1,9 @@
+module Retest
+  module FileSystem
+    module_function
+
+    def exist?(value)
+      File.exist? value
+    end
+  end
+end

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
@@ -111,22 +102,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 +115,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/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/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.pre2"
+  VERSION = "1.3.0.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.3.0.pre
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -78,9 +78,17 @@ files:
 - bin/test/rspec-rails
 - bin/test/rspec-ruby
 - bin/test/ruby-app
+- bin/test/ruby-bare
 - 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/file_system.rb
 - lib/retest/options.rb
+- lib/retest/program.rb
 - lib/retest/repository.rb
 - lib/retest/runner.rb
 - lib/retest/setup.rb