retest 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4abc5ba23e0eb0898fcf7858d8427371023ff44243cf1df5b0ca7dda24eaa1ac
-  data.tar.gz: 0d9fdf6b3db016da549af61ec4ad68716d21ec7a636f767a5459cbe94e51f9c4
+  metadata.gz: 1a3b868e7a077e45f1da38813aa62efe2bdefcc776c504b243d33f9841740420
+  data.tar.gz: 1dbb3a5cd581604f4c74122d9902f795aa59e508c3b479b667b6529e8e9d6f55
 SHA512:
-  metadata.gz: 9792fd804aa16d444dc7dbc4df93e4f392ed357ee5d4a885a0626df919ced06aee336704a6d35b75a118642f09ad18929a132d3e5fa2416bb3353cbcdf084510
-  data.tar.gz: e66b40a449245c4a7975502558d44b68b3093b5650d55a063f6db6bdca17022e327ff32a9ae3b3cc1c23a2ff18dc731585936f4a9122f41de64f90d7d8058524
+  metadata.gz: ec65a2b54baf8eabcd7f9159992cf9e90adcf111a71f258a589678305758c79ae7459bf4481d3838abff5bfc0b3acd72d7454c648fdd19105bbecc217a694142
+  data.tar.gz: 59f4ff3692c64c50b6a6721d1ee096150b9b8c28501ec8769f788164c8353d3e87865750c045d83c8bb22f37af081b97489ee2b83b79253420b5c364f08404c7

data/.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
             ruby: 2.5
     name: Ruby ${{ matrix.ruby }} test (${{ matrix.os }})
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -54,7 +54,7 @@ jobs:
           - rspec-ruby
           - bundler-app
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    retest (1.12.0)
-      listen (~> 3.2)
+    retest (1.13.0)
+      listen (~> 3.9)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
 
@@ -11,7 +11,7 @@ GEM
   specs:
     byebug (11.1.3)
     ffi (1.16.3)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.15.0)

data/lib/retest/prompt.rb

@@ -19,17 +19,19 @@ module Retest
     def ask_which_test_to_use(path, files)
       changed
       notify_observers(:question)
+      options = options(files)
 
       output.puts(<<~QUESTION)
         We found few tests matching: #{path}
 
-        #{list_options(files)}
+        #{list_options(options.keys)}
 
         Which file do you want to use?
         Enter the file number now:
       QUESTION
+      output.print("> ")
 
-      files[input.gets.chomp.to_i]
+      options.values[input.gets.chomp.to_i]
     end
 
     def puts(*args)
@@ -42,8 +44,15 @@ module Retest
 
     private
 
-    def list_options(files)
-      files
+    def options(files, blank_option: 'none')
+      result = {}
+      files.each { |file| result[file] = file }
+      result[blank_option] = nil # blank option last
+      result
+    end
+
+    def list_options(options)
+      options
         .map
         .with_index { |file, index| "[#{index}] - #{file}" }
         .join("\n")

data/lib/retest/repository.rb

@@ -12,8 +12,14 @@ module Retest
       return unless path
       return if path.empty?
 
-      @path = path
-      cache[@path] ||= select_from MatchingOptions.for(@path, files: files)
+      unless cache.key?(path)
+        ok_to_cache, test_file = select_from path, MatchingOptions.for(path, files: files)
+        if ok_to_cache
+          cache[path] = test_file
+        end
+      end
+
+      cache[path]
     end
 
     def find_tests(paths)
@@ -49,12 +55,14 @@ module Retest
 
     private
 
-    def select_from(tests)
-      case tests.count
-      when 0, 1
-        tests.first
+    def select_from(path, matching_tests)
+      case matching_tests.count
+      when 0
+        [false, nil]
+      when  1
+        [true, matching_tests.first]
       else
-        prompt.ask_which_test_to_use(@path, tests)
+        [true, prompt.ask_which_test_to_use(path, matching_tests)]
       end
     end
   end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/lib/retest.rb

@@ -1,5 +1,4 @@
 require 'listen'
-require 'config/listen'
 
 require 'string/similarity'
 require 'observer'
@@ -17,6 +16,8 @@ require "retest/program"
 require "retest/prompt"
 require "retest/sounds"
 
+Listen.adapter_warn_behavior = :log
+
 module Retest
   class Error < StandardError; end
 

data/retest.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "string-similarity", ["~> 2.1"]
-  spec.add_runtime_dependency "listen", ["~> 3.2"]
+  spec.add_runtime_dependency "listen", ["~> 3.9"]
   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: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: tty-option
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,6 @@ files:
 - bin/test/ruby-app
 - bin/test/ruby-bare
 - exe/retest
-- lib/config/listen.rb
 - lib/retest.rb
 - lib/retest/command.rb
 - lib/retest/command/rails.rb

data/lib/config/listen.rb

@@ -1,29 +0,0 @@
-# lib/config/listen.rb:4: warning: method redefined; discarding old _fail
-# ~/.rbenv/versions/3.1.2/lib/ruby/gems/3.1.0/gems/listen-3.8.0/lib/listen/record/symlink_detector.rb:35: warning: previous definition of _fail was here
-
-# Runs a block of code without warnings.
-def silence_warnings(&block)
-  warn_level = $VERBOSE
-  $VERBOSE = nil
-  result = block.call
-  $VERBOSE = warn_level
-  result
-end
-
-silence_warnings do
-
-  # TODO: Update monkey patch when decision is made about
-  #       https://github.com/guard/listen/issues/572
-
-  module Listen
-    class Record
-      class SymlinkDetector
-        def _fail(symlinked, real_path)
-          Listen.logger.warn(format(SYMLINK_LOOP_ERROR, symlinked, real_path))
-          raise Error, "Don't watch locally-symlinked directory twice"
-        end
-      end
-    end
-  end
-
-end