retest 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e115f99996becceaa5a11f81f938afa18571c8bdcb3e3fe5e500bb4d2eaa647
-  data.tar.gz: 003bfb6679ddcfc531666fe397121170926248792503834f14e79566022da274
+  metadata.gz: 1a3b868e7a077e45f1da38813aa62efe2bdefcc776c504b243d33f9841740420
+  data.tar.gz: 1dbb3a5cd581604f4c74122d9902f795aa59e508c3b479b667b6529e8e9d6f55
 SHA512:
-  metadata.gz: 7c71cb0291862bdd2cdda6ca37a7d199b6ad95c48812ff099e26ceef5505bb138cd01ea230fcbf7627c051de1760393850f129c59066f4ca45db21310114bf66
-  data.tar.gz: eac9a20b762eea7d8706d4754f2894659c8aafb4f3930d99d8d5b730fe1e47ae4341538bf1616569e3d01f9a8555b3b1ec5c33be60c4db699d13d639947de285
+  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.11.0)
-      listen (~> 3.2)
+    retest (1.13.0)
+      listen (~> 3.9)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
 
@@ -10,8 +10,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    ffi (1.15.5)
-    listen (3.8.0)
+    ffi (1.16.3)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.15.0)

data/README.md

@@ -119,7 +119,7 @@ $ retest 'bundle exec rails test <test>'
 
 ## Ruby Support
 
-Retest supports ruby 2.4 and above.
+Retest supports ruby 2.5 and above.
 
 ## Roadmap
 

data/bin/debug

@@ -3,4 +3,8 @@
 require "bundler/setup"
 require "byebug"
 
-eval(File.read("exe/retest"))
+begin
+  eval(File.read("exe/retest"))
+rescue LocalJumpError
+  # Silence early returns in the eval block
+end

data/exe/retest

@@ -13,13 +13,20 @@ if options.help?
   return
 end
 
-repository = Retest::Repository.new(files: Retest::VersionControl.files)
+if options.version?
+  $stdout.puts Retest::VERSION
+  return
+end
+
+prompt     = Retest::Prompt.new
+repository = Retest::Repository.new(files: Retest::VersionControl.files, prompt: prompt)
 command    = Retest::Command.for_options(options)
 runner     = Retest::Runners.runner_for(command.to_s)
 sounds     = Retest::Sounds.for(options)
 
 sounds.play(:start)
 runner.add_observer(sounds)
+prompt.add_observer(sounds)
 
 program = Retest::Program.new(
   repository: repository,

data/lib/retest/options.rb

@@ -85,6 +85,12 @@ module Retest
       desc "Print usage"
     end
 
+    flag :version do
+      short "-v"
+      long "--version"
+      desc "Print retest version"
+    end
+
     option :polling do
       long '--polling'
       desc <<~DESC.strip
@@ -133,6 +139,10 @@ module Retest
       params[:help]
     end
 
+    def version?
+      params[:version]
+    end
+
     def full_suite?
       params[:all]
     end

data/lib/retest/prompt.rb

@@ -1,5 +1,7 @@
 module Retest
   class Prompt
+    include Observable
+
     def self.ask_which_test_to_use(path, files)
       new.ask_which_test_to_use(path, files)
     end
@@ -15,16 +17,21 @@ module Retest
     end
 
     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)
@@ -37,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/sounds.rb

@@ -26,6 +26,8 @@ module Retest
           ['afplay', '/System/Library/Sounds/Funk.aiff']
         when :start
           ['afplay', '/System/Library/Sounds/Blow.aiff']
+        when :question
+          ['afplay', '/System/Library/Sounds/Glass.aiff']
         else
           raise ArgumentError.new("No sounds were found for type: #{sound}.")
         end
@@ -40,15 +42,18 @@ end
 # List of Mac Audio Files:
 # afplay /System/Library/Sounds/Basso.aiff
 # afplay /System/Library/Sounds/Bottle.aiff
-# afplay /System/Library/Sounds/Funk.aiff
 # afplay /System/Library/Sounds/Hero.aiff
 # afplay /System/Library/Sounds/Ping.aiff
 # afplay /System/Library/Sounds/Purr.aiff
 # afplay /System/Library/Sounds/Submarine.aiff
-# afplay /System/Library/Sounds/Blow.aiff
 # afplay /System/Library/Sounds/Frog.aiff
-# afplay /System/Library/Sounds/Glass.aiff
 # afplay /System/Library/Sounds/Morse.aiff
 # afplay /System/Library/Sounds/Pop.aiff
-# afplay /System/Library/Sounds/Sosumi.aiff
 # afplay /System/Library/Sounds/Tink.aiff
+
+# USED
+
+# fail:     afplay /System/Library/Sounds/Sosumi.aiff
+# pass:     afplay /System/Library/Sounds/Funk.aiff
+# start:    afplay /System/Library/Sounds/Blow.aiff
+# question: afplay /System/Library/Sounds/Glass.aiff

data/lib/retest/version.rb

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

data/lib/retest.rb

@@ -1,4 +1,5 @@
 require 'listen'
+
 require 'string/similarity'
 require 'observer'
 
@@ -15,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

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "A simple command line tool to watch file change and run its matching spec."
   spec.homepage      = "https://github.com/AlexB52/retest"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -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.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-04 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
@@ -121,14 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: A simple command line tool to watch file change and run its matching spec.