retest 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e161cc74886493796c719db9fae3f3d7b7dc31dfedc701539383e406d97336f
-  data.tar.gz: dd6489fed59acfa0ccede581cae6a6e719a6c803a83214536e1aeed3173d6565
+  metadata.gz: ba9ca783c69da878dff89276c488918b06d8436aa2eaeabeaeb292faa27b4ba3
+  data.tar.gz: c4bc3fd1a10673be4dcd32fc51f6d332a08a2e73ba44b3253cc9b857bcc19091
 SHA512:
-  metadata.gz: 9b4a4c521cc8f24d4f03e496aff11dee753e57e33e072e05dd24e01be82e300ad01a0d4f895f65115904395dde3833ee927932ba9b94a03f69fcbefe39e7c6ae
-  data.tar.gz: a9d7acc12519dc1be69be17c36f504035a7a2505d248636090e008ae1555e1d69eca7f85c0ceb9fdc6b5b8868a1f79083ae06673f762315a7f88dffd22f00009
+  metadata.gz: 6ae36ae04af283b34823305cc7f15174e65002c01f301262eb573b6dff9ba5a492db3be1891ddcdcb2840a5a404e0f571548853bb4a0215d817fb99d075df2b0
+  data.tar.gz: 911e035acbde5d9d88dd23ad98ab136e1dcbf3adadf6db9a78e60665a304aacc5feeb27903fd87ff2cfb65e490893956a8e70b63c1f454635fbf607dcb6e76de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (0.7.0)
+    retest (0.8.1)
       listen (~> 3.2)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
@@ -62,7 +62,7 @@ GEM
     ffi (1.13.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    listen (3.3.3)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     middleware (0.1.0)

data/README.md

@@ -22,11 +22,11 @@ Install it on your machine with:
 
 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.
 
 Learn more by running `retest -h`
 
-```bash
+```
 Usage: retest  [OPTIONS] [COMMAND]
 
 Watch a file change and run it matching spec.

data/lib/retest.rb

@@ -5,30 +5,36 @@ require "retest/version"
 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.start(command)
-    puts "Launching Retest..."
+  class << self
+    def start(command)
+      puts "Launching Retest..."
 
-    build(runner: Retest::Runner.for(command))
-      .start
+      build(
+        runner: Runner.for(command),
+        repository: Repository.new(files: VersionControl.files)
+      ).start
 
-    puts "Ready to refactor! You can make file changes now"
-  end
+      puts "Ready to refactor! You can make file changes now"
+    end
 
-  def self.build(runner:)
-    Listen.to('.', ListenOptions.to_h) do |modified, added, removed|
-      begin
-        if modified.any?
+    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')
-          runner.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/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

@@ -9,19 +9,29 @@ module Retest
     end
 
     class VariableRunner
-      attr_reader :command, :repository, :cached_test_file
+      attr_reader :command
 
-      def initialize(command, repository: nil)
-        @repository = repository || Repository.new
+      def initialize(command)
         @command = command
+        @cached_test_file = nil
       end
 
       def ==(obj)
         command == obj.command
       end
 
-      def run(file_changed)
-        if @cached_test_file = test_file(file_changed)
+      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
@@ -32,15 +42,29 @@ module Retest
         end
       end
 
-      def test_file(file_changed)
-        repository.find_test(file_changed) || cached_test_file
+      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(_)
+      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.7.0"
+  VERSION = "0.8.1"
 end

data/lib/retest/version_control.rb

@@ -0,0 +1,48 @@
+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
+        (untracked_files + tracked_files).sort
+      end
+
+      private
+
+      def untracked_files
+        `git ls-files --other --exclude-standard -z`.split("\x0")
+      end
+
+      def tracked_files
+        `git ls-files -z`.split("\x0")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -73,12 +73,12 @@ files:
 - bin/setup
 - exe/retest
 - lib/retest.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:

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