retest 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1d5cde47e268fbb49f94510bb8bde3398974672fae9ad770dbe85f542764e6d
-  data.tar.gz: db1d76a1b2329a2e1619a34778c305280cbc50d2b99fd87998ae0c1b3406fb1b
+  metadata.gz: 91733d40e95f4722f63219c301063e4bb74fe6f543f9cdb709795bdb432ec7a0
+  data.tar.gz: 7796cbfb877e2065a7ede16e80bbd41f8f0f106f105cbde1c28d734239da084e
 SHA512:
-  metadata.gz: 9ed11c05236d2f50d54b644d02fa1c37c9d928f7a6b452e60a5ea9c23deab95d6e7a3e178f3047b3dcbce945c0cf9bee3e31682fd9b53d1f7df4b01a2303d476
-  data.tar.gz: 417d8fb0439869a1be651efa2daece0cf1a1fab705495a4bc72b9827355fb054f34e3c93d92177be8a43aba028b36c2c876bc70801ba71083ca832da9efda731
+  metadata.gz: fbc2dc22da11f0aeaaf0e8616caa1ca68f05074298506144ef510acb53ea7a8dba96252e40f7755c826a1d2f4f30648e7a0bf6016829d62681afbea50e08f494
+  data.tar.gz: 14400ccfe165b8c7d2ce20824bd1b7e742eaa6a42c1c5d3d5e42b80f280a51c7ddb26ec8b6ddf20ab50a7d124c16521a045d2eb688e362822de28854619e9749

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    retest (0.6.0)
+    retest (0.8.0)
       listen (~> 3.2)
       string-similarity (~> 2.1)
+      tty-option (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -61,7 +62,7 @@ GEM
     ffi (1.13.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    listen (3.3.1)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     middleware (0.1.0)
@@ -85,6 +86,7 @@ GEM
       ffi (>= 1.0.0)
     thor (1.0.1)
     thread_safe (0.3.6)
+    tty-option (0.1.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     zeitwerk (2.4.0)

data/README.md

@@ -16,29 +16,46 @@ For fully fledged solutions, some cli tools already exists: [autotest](https://g
 Install it on your machine with:
 
     $ gem install retest
+    $ retest 'bundle exec rspec <test>'
 
 ## Usage
 
 Launch `retest` in your terminal after accessing your ruby project folder.
 
-Pass the test command surrounded by quotes. Use the placeholder `<test>` in your command to let `retest` find the matching test and replace the placeholder with the path of the test file.
+Pass the test command surrounded by quotes. Use the placeholder `<test>` in your command to tell `retest` where to put the path of the test file in your command. Example: `retest 'bundle exec rspec <test>'`. When a file is changed `retest` will find its matching test and run it.
 
-```bash
-# Let retest find the test file and replace the placeholder with the path of the test file
-$ retest 'bundle exec rake test TEST=<test>'
-$ retest 'rails test <test>'
-$ retest 'rspec <test>'
-$ retest 'ruby <test>'
-$ retest 'docker-compose exec web bundle exec rails test <test>'
-
-# Run the same command after a file change like all the spec files
-$ retest 'bundle exec rake test'
-$ retest 'rails test'
-$ retest 'rspec'
-$ retest 'docker-compose exec web bundle exec rails test'
-
-# Hardcode a test file to run independently from the file you change
-$ retest 'ruby all_tests.rb'
+Learn more by running `retest -h`
+
+```
+Usage: retest  [OPTIONS] [COMMAND]
+
+Watch a file change and run it matching spec.
+
+Arguments:
+  COMMAND  The test command to rerun when a file changes.
+           Use <test> placeholder to tell retest where to put the matching
+           spec.
+
+
+Options:
+      --all    Run all the specs of a specificied ruby setup
+  -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>'
+
+Examples:
+  Runs a matching rails test after a file change
+    $ retest 'bundle exec rails test <test>'
+    $ retest --rails
+
+  Runs all rails tests after a file change
+    $ retest 'bundle exec rails test'
+    $ retest --rails --all
+
+  Runs a hardcoded command after a file change
+    $ retest 'ruby lib/bottles_test.rb'
 ```
 
 The gem works as follows:
@@ -47,25 +64,23 @@ The gem works as follows:
 * When a test file is changed, retest will run the file test.
 * 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.
-* Works with RSpec, MiniTest, Rake commands & bash commands (not aliases).
-* Works when installed and run in a Docker container.
 
 ### Docker
 
-Installing & launching the gem in a Docker container seems to work
+Retest works in Docker too. You can install the gem and launch retest in your container while refactoring.
 ```bash
-$ docker-compose run web bash
+$ docker-compose run web bash # enter your container
 $ gem install retest
 $ retest 'bundle exec rails test <test>'
 ```
 
-**Disclaimer:**
+### Disclaimer
 * If an error comes in try using `bundle exec` like so: `$ retest 'bundle exec rake test <test>'`
 * Aliases saved on ~/.bashrc or ~/.zshrc cannot be run that way with the `retest` command
 
 ## Ruby Support
 
-Retest supports ruby 2.5 and above.
+Retest supports ruby 2.4 and above.
 
 ## Roadmap
 

data/exe/retest

@@ -4,12 +4,10 @@ require 'retest'
 
 $stdout.sync = true
 
-puts "Launching Retest..."
+options = Retest::Options.new(ARGV)
 
-Retest
-  .build(command: Retest::Command.for(ARGV.join))
-  .start # not blocking
+return puts options.help if options.help?
 
-puts "Ready to refactor! You can make file changes now"
+Retest.start(options.command) # not blocking
 
 sleep

data/lib/retest.rb

@@ -2,23 +2,39 @@ require 'listen'
 require 'string/similarity'
 
 require "retest/version"
-require "retest/command"
+require "retest/runner"
 require "retest/repository"
 require "retest/test_options"
-require "retest/listen_options"
+require "retest/options"
+require "retest/version_control"
 
 module Retest
   class Error < StandardError; end
 
-  def self.build(command:)
-    Listen.to('.', ListenOptions.to_h) do |modified, added, removed|
-      begin
-        if modified.any?
+  class << self
+    def start(command)
+      puts "Launching Retest..."
+
+      build(
+        runner: Runner.for(command),
+        repository: Repository.new(files: VersionControl.files)
+      ).start
+
+      puts "Ready to refactor! You can make file changes now"
+    end
+
+    def build(runner:, repository:)
+      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')
-          command.run(modified.first.strip)
+
+          runner.run repository.find_test (modified + added).first
+        rescue => e
+          puts "Something went wrong: #{e.message}"
         end
-      rescue => e
-        puts "Something went wrong: #{e.message}"
       end
     end
   end

data/lib/retest/options.rb

@@ -0,0 +1,114 @@
+require 'tty-option'
+
+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>"
+    NO_COMMAND    = "echo You have no command assigned"
+
+    ALL_RAKE_COMMAND  = "bundle exec rake test"
+    ALL_RAILS_COMMAND = "bundle exec rails test"
+    ALL_RSPEC_COMMAND = "bundle exec rspec"
+
+    usage do
+      program "retest"
+
+      command nil
+
+      desc "Watch a file change and run it matching spec."
+
+      example <<~EOS
+      Runs a matching rails test after a file change
+        $ retest 'bundle exec rails test <test>'
+        $ retest --rails
+      EOS
+
+      example <<~EOS
+      Runs all rails tests after a file change
+        $ retest 'bundle exec rails test'
+        $ retest --rails --all
+      EOS
+
+      example <<~EOS
+      Runs a hardcoded command after a file change
+        $ retest 'ruby lib/bottles_test.rb'
+      EOS
+    end
+
+    argument :command do
+      optional
+      desc <<~EOS
+      The test command to rerun when a file changes.
+      Use <test> placeholder to tell retest where to put the matching spec.
+      EOS
+    end
+
+    flag :all do
+      long "--all"
+      desc "Run all the specs of a specificied ruby setup"
+    end
+
+    flag :help do
+      short "-h"
+      long "--help"
+      desc "Print usage"
+    end
+
+    flag :rspec do
+      long "--rspec"
+      desc "Shortcut for '#{RSPEC_COMMAND}'"
+    end
+
+    flag :rake do
+      long "--rake"
+      desc "Shortcut for '#{RAKE_COMMAND}'"
+    end
+
+    flag :rails do
+      long "--rails"
+      desc "Shortcut for '#{RAILS_COMMAND}'"
+    end
+
+    flag :ruby do
+      long "--ruby"
+      desc "Shortcut for '#{RUBY_COMMAND}'"
+    end
+
+    attr_reader :args
+
+    def self.command(args)
+      new(args).command
+    end
+
+    def initialize(args = [])
+      self.args = args
+    end
+
+    def command
+      if params[:rspec]
+        params[:all] ? ALL_RSPEC_COMMAND : RSPEC_COMMAND
+      elsif params[:rake]
+        params[:all] ? ALL_RAKE_COMMAND : RAKE_COMMAND
+      elsif params[:rails]
+        params[:all] ? ALL_RAILS_COMMAND : RAILS_COMMAND
+      elsif params[:ruby]
+        params[:all] ? NO_COMMAND : RUBY_COMMAND
+      else
+        params[:command] || NO_COMMAND
+      end
+    end
+
+    def args=(args)
+      @args = args
+      parse args
+    end
+
+    def help?
+      params[:help]
+    end
+  end
+end

data/lib/retest/repository.rb

@@ -2,17 +2,37 @@ module Retest
   class Repository
     attr_accessor :files, :cache, :input_stream, :output_stream
 
-    def initialize(files: nil, cache: {}, input_stream: nil, output_stream: nil)
+    def initialize(files: [], cache: {}, input_stream: nil, output_stream: nil)
       @cache         = cache
-      @files         = files || default_files
+      @files         = files
       @input_stream  = input_stream || STDIN
       @output_stream = output_stream|| STDOUT
     end
 
     def find_test(path)
+      return unless path
+      return if path.empty?
+
       cache[path] ||= select_from TestOptions.for(path, files: files)
     end
 
+    def add(added)
+      return if added && added.empty?
+
+      files.push(*added)
+      files.sort!
+    end
+
+    def remove(removed)
+      return if removed && removed.empty?
+
+      if removed.is_a?(Array)
+        removed.each { |file| files.delete(file) }
+      else
+        files.delete(removed)
+      end
+    end
+
     private
 
     def select_from(tests)
@@ -25,10 +45,6 @@ module Retest
       end
     end
 
-    def default_files
-      @default_files ||= Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
-    end
-
     def ask_question(tests)
       output_stream.puts <<~QUESTION
         We found few tests matching:

data/lib/retest/runner.rb

@@ -0,0 +1,70 @@
+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
+      end
+
+      def cached_test_file
+        @cached_test_file
+      end
+
+      def cached_test_file=(value)
+        @cached_test_file = value || @cached_test_file
+      end
+
+      def run(test_file = nil)
+        self.cached_test_file = test_file
+
+        if cached_test_file
+          puts "Test File Selected: #{cached_test_file}"
+          system command.gsub('<test>', cached_test_file)
+        else
+          puts <<~ERROR
+            404 - Test File Not Found
+            Retest could not find a matching test file to run.
+          ERROR
+        end
+      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
+
+      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
+    end
+  end
+end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/lib/retest/version_control.rb

@@ -0,0 +1,38 @@
+module Retest
+  class VersionControl
+    def self.files
+      [Git, NoVersionControl].select(&:installed?).first.new.files
+    end
+
+    def name; end
+    alias :to_s :name
+
+    class NoVersionControl
+      def self.installed?
+        true
+      end
+
+      def name
+        'default'
+      end
+
+      def files
+        Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
+      end
+    end
+
+    class Git
+      def self.installed?
+        system "git -C . rev-parse 2>/dev/null"
+      end
+
+      def name
+        'git'
+      end
+
+      def files
+        `git ls-files`.split("\n")
+      end
+    end
+  end
+end

data/retest.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "string-similarity", ["~> 2.1"]
   spec.add_runtime_dependency "listen", ["~> 3.2"]
+  spec.add_runtime_dependency "tty-option", ["~> 0.1"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexandre Barret
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -38,7 +38,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-description: 
+- !ruby/object:Gem::Dependency
+  name: tty-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+description:
 email:
 - alex@abletech.nz
 executables:
@@ -59,11 +73,12 @@ files:
 - bin/setup
 - exe/retest
 - lib/retest.rb
-- lib/retest/command.rb
-- lib/retest/listen_options.rb
+- lib/retest/options.rb
 - lib/retest/repository.rb
+- lib/retest/runner.rb
 - lib/retest/test_options.rb
 - lib/retest/version.rb
+- lib/retest/version_control.rb
 - retest.gemspec
 homepage: https://github.com/AlexB52/retest
 licenses:
@@ -71,7 +86,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/AlexB52/retest
   source_code_uri: https://github.com/AlexB52/retest
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A simple command line tool to watch file change and run its matching spec.
 test_files: []

data/lib/retest/command.rb

@@ -1,46 +0,0 @@
-module Retest
-  class Command
-    def self.for(test_command)
-      if test_command.include? '<test>'
-        VariableCommand
-      else
-        HardcodedCommand
-      end.new test_command
-    end
-
-    class VariableCommand
-      attr_reader :command, :repository, :cached_test_file
-
-      def initialize(command, repository: nil)
-        @repository = repository || Repository.new
-        @command = command
-      end
-
-      def ==(obj)
-        command == obj.command
-      end
-
-      def run(file_changed)
-        if @cached_test_file = test_file(file_changed)
-          puts "Test File Selected: #{cached_test_file}"
-          system command.gsub('<test>', cached_test_file)
-        else
-          puts <<~ERROR
-            404 - Test File Not Found
-            Retest could not find a matching test file to run.
-          ERROR
-        end
-      end
-
-      def test_file(file_changed)
-        repository.find_test(file_changed) || cached_test_file
-      end
-    end
-
-    HardcodedCommand = Struct.new(:command) do
-      def run(_)
-        system command
-      end
-    end
-  end
-end

data/lib/retest/listen_options.rb

@@ -1,36 +0,0 @@
-module Retest
-  class ListenOptions
-    IGNORE_REGEX = /node_modules|tmp|\.sqlite|\.byebug_history/
-
-    class << self
-      def to_h(tool = GitTool.new)
-        return {ignore: IGNORE_REGEX, relative: true} unless tool.installed?
-
-        {only: regex_for(tool.files), relative: true}
-      end
-
-      private
-
-      def regex_for(files)
-        Regexp.new files.split("\n").join('|')
-      end
-    end
-  end
-
-  class GitTool
-    attr_reader :name
-    alias :to_s :name
-
-    def initialize
-      @name = 'git'
-    end
-
-    def installed?
-      system "git -C . rev-parse 2>/dev/null"
-    end
-
-    def files
-      `git ls-files`
-    end
-  end
-end