retest 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ffe53d75f1b6c84ecdc5506c13a5798fba6e1c6801d816c98fec97912adf890
-  data.tar.gz: 3fd96dfa07a53ca007474b6dcbdfb7c1c542207c46b738736594b8a72e330d4f
+  metadata.gz: b785b5164606d944a470b42899d1a7c6d4fa77f3d0d3a3850e4adc1e81d61db6
+  data.tar.gz: d722fe7580cc3f24587322ee9d0dcc47efc4bded149d59461eb7408398f78b73
 SHA512:
-  metadata.gz: abe51dbcf57d44462117ad547d5e084973e6b3efbcf9e2a4450458e9f24b6e1f6a42e9bb1ee1ef20b48de8f42e4b3f12808765a8830432bddc94809c5705f1eb
-  data.tar.gz: f0f018c5553e34ca7bcf10411f73b9e6008936b877454a2a90f1bca8f6fcd30d0f5c9158ae2cef71484b3faca2db68b4b43b1d53063cdcd07eae1609bd802b0a
+  metadata.gz: 9e7ebd3a5dd1eb6d1a09bcae184d749ac59b49cd928f845c3fcbf5d47e067e9623388167ffad4e7dc186e0aec22178444409e0da3978083107e57e7b7abcd453
+  data.tar.gz: f0cd1516119abcc62c4dfb73d317097dc5f57d3ed741bc7ff44455c0518646c6c4ffcf44686e6ee939053a7bd435acd72fc8d4f6653123fa2816634e7abbb5a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (0.2.0)
+    retest (0.3.0)
       listen (~> 3.2)
       string-similarity (~> 2.1)
 

data/README.md

@@ -25,7 +25,7 @@ Pass the test command surrounded with quotes. Use the placeholder `<test>` in yo
 
 ```bash
 # Let retest find the test file and replace the placeholder with the path of the test file
-$ retest 'bundle exec rake test <test>'
+$ retest 'bundle exec rake test TEST=<test>'
 $ retest 'rails test <test>'
 $ retest 'rspec <test>'
 $ retest 'ruby <test>'
@@ -46,7 +46,7 @@ $ retest 'ruby all_tests.rb'
 Installing & launching the gem in the Docker container seem to work
 ```bash
 $ docker-compose run web bash 
-$ gem install retests
+$ gem install retest
 $ retest 'bundle exec rails test <test>'
 ```
 

data/exe/retest

@@ -8,8 +8,12 @@ puts "Launching Retest..."
 command = Retest::Command.for(ARGV.join)
 
 listener = Listen.to('.', ignore: /node_modules|tmp/, relative: true) do |modified, added, removed|
-  system("clear") || system("cls")
-  command.run(modified.first.strip)
+  if modified.any?
+    system("clear") || system("cls")
+    command.run(modified.first.strip)
+  end
+rescue => e
+  puts "Something went wrong: #{e.message}"
 end
 
 listener.start # not blocking

data/lib/retest.rb

@@ -1,21 +1,8 @@
 require "retest/version"
 require "retest/command"
+require "retest/repository"
 require 'string/similarity'
 
 module Retest
   class Error < StandardError; end
-
-  def find_test(path, files: nil)
-    files
-      .select { |file| regex(path) =~ file }
-      .max_by { |file| String::Similarity.cosine(path, file) }
-  end
-
-  private
-
-  def regex(path)
-    extname = File.extname(path)
-    basename = File.basename(path, extname)
-    Regexp.new(".*#{basename}_(?:spec|test)#{extname}")
-  end
 end

data/lib/retest/command.rb

@@ -11,12 +11,11 @@ module Retest
     end
 
     class VariableCommand
-      attr_reader :command, :files, :cache
+      attr_reader :command, :repository, :cached_test_file
 
-      def initialize(command, files: nil, cache: {})
+      def initialize(command, repository: nil)
+        @repository = repository || Repository.new
         @command = command
-        @cache = cache
-        @files = files || default_files
       end
 
       def ==(obj)
@@ -24,34 +23,21 @@ module Retest
       end
 
       def run(file_changed)
-        if find_test(file_changed)
-          system command.gsub('<test>', find_test(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 'Could not find a file test matching'
         end
       end
 
-      private
-
-      def find_test(path)
-        cache[path] ||= files
-          .select { |file| regex(path) =~ file }
-          .max_by { |file| String::Similarity.cosine(path, file) }
-      end
-
-      def regex(path)
-        extname = File.extname(path)
-        basename = File.basename(path, extname)
-        Regexp.new(".*#{basename}_(?:spec|test)#{extname}")
-      end
-
-      def default_files
-        @default_files ||= Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
+      def test_file(file_changed)
+        repository.find_test(file_changed) || cached_test_file
       end
     end
 
     HardcodedCommand = Struct.new(:command) do
-      def run(file_changed)
+      def run(_)
         system command
       end
     end

data/lib/retest/repository.rb

@@ -0,0 +1,62 @@
+module Retest
+  class Repository
+    attr_accessor :files, :cache, :input_stream, :output_stream
+
+    def initialize(files: nil, cache: {}, input_stream: nil, output_stream: nil)
+      @cache         = cache
+      @files         = files || default_files
+      @input_stream  = input_stream || STDIN
+      @output_stream = output_stream|| STDOUT
+    end
+
+    def find_test(path)
+      cache[path] ||= select_test(path)
+    end
+
+    private
+
+    def select_test(path)
+      tests = files.select { |file| regex(path) =~ file }
+        .sort_by { |file| String::Similarity.levenshtein(path, file) }
+        .reverse
+
+      case tests.count
+      when 0, 1
+        tests.first
+      else
+        ask_question tests.first(5)
+        tests[get_input]
+      end
+    end
+
+    def default_files
+      @default_files ||= Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
+    end
+
+    def regex(path)
+     extname  = File.extname(path)
+     basename = File.basename(path, extname)
+     Regexp.new(".*#{basename}_(?:spec|test)#{extname}")
+    end
+
+    def ask_question(tests)
+      output_stream.puts <<~QUESTION
+      We found few tests matching:
+      #{list_options(tests)}
+
+      Which file do you want to use?
+      Enter the file number now:
+      QUESTION
+    end
+
+    def list_options(tests)
+      tests.map.with_index do |file, index|
+        "[#{index}] - #{file}"
+      end.join("\n")
+    end
+
+    def get_input
+      input_stream.gets.chomp.to_i
+    end
+  end
+end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -86,6 +86,7 @@ files:
 - exe/retest
 - lib/retest.rb
 - lib/retest/command.rb
+- lib/retest/repository.rb
 - lib/retest/version.rb
 - retest.gemspec
 homepage: https://github.com/AlexB52/retest