retest 2.2.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c873cec57f9fc325d7b69a04910bc00014af31c4e065c9aa978751a4828f20
-  data.tar.gz: 2bbbb2031a9f0833ae37b954349d7134b8e2b4d3b6aa50b7b2edcfdd0b08e357
+  metadata.gz: ddcd17a0606fa3fd4fc58ea7b6ac625f6eb441b05e7f6ee5e219d4e5c4772ada
+  data.tar.gz: 1230ff83093919562a6a15a49889ebc26711d23e8270341b9032e8d8772ea929
 SHA512:
-  metadata.gz: 1c389288c74f66002ff5862d081dc116687748360cfd4e8df04cd5a2e3e462b58ba253a39923a6d625775ba9fd123a2866901517ee58bd12f07769a1d8799e52
-  data.tar.gz: d6a80bca3f44cbe7ecd46d6bbcc72d237060b5e9eca7253f5b0579b72de0e20c59cacd083440597c90e72606ec36bd2c61b4bda6b4b6c6192a8a2d7b586f423a
+  metadata.gz: 6b647c571bc496405e43719a26820f58d12220724e2d772daee4ceeeb4dfdafdeecb116d9e156907ed1a8870804ee076480fcc757cfec01073bec8e60d180edf
+  data.tar.gz: f5e52d42d5dd8f23f4a29a8eddebfb421d8398bf31fb991ab3f9ab07e420ec828df7173677552765c4b6da734cbe1a45ee5e5593c8277ccd5e5970e56e824be3

data/.github/workflows/ci.yml

@@ -28,7 +28,6 @@ jobs:
           - version: '3.2'
           - version: '3.3'
           - version: '3.4'
-            gemfile: Gemfile-3.4
     name: Ruby ${{ matrix.ruby.version }} test (${{ matrix.os }})
     env:
       BUNDLE_GEMFILE: ${{ matrix.ruby.gemfile || 'Gemfile' }}
@@ -39,6 +38,9 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby.version }}
         bundler-cache: true
+    - run: rm -f Gemfile.lock
+    - run: bundle config set deployment false
+    - run: bundle config
     - run: bundle install
     - run: bundle exec rake
 

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 .ruby-version
-*.DS_Store
+*.DS_Store
+Gemfile.lock

data/Gemfile

@@ -3,6 +3,3 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in retest.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-gem "minitest", "~> 5.0"
-gem "byebug", require: false

data/README.md

@@ -58,17 +58,18 @@ Ready to refactor! You can make file changes now
 Type interactive command and press enter. Enter 'h' for help.
 > h
 
-* 'h', 'help'              # Prints help.
-* 'p', 'pause'             # Pauses Retest. Tests aren't run on file change events until unpaused.
-* 'u', 'unpause'           # Unpauses Retest.
-* <ENTER>                  # Runs last changed triggered command.
-* 'ra, 'run all'           # Runs all tests.
-* 'f', 'force'             # Forces a selection of test to run on every file change.
-* 'r', 'reset'             # Disables forced selection.
-* 'd', 'diff' [GIT BRANCH] # Runs matching specs that changed from a target branch.
-* 'c'                      # Clears window.
-* 'e', 'exit'              # Exits Retest.
-
+Commands:
+  <ENTER>                Run last changed triggered command
+  h, help                Show help
+  p, pause               Pause Retest (tests won't run on file changes)
+  u, unpause             Unpause Retest
+  ra, run all            Run all tests
+  f, force               Force a selection of tests to run on every file change
+  fb, force batch        Force a selection of tests based on raw data list
+  r, reset               Reset forced selection
+  d, diff [BRANCH]       Run specs changed relative to a Git branch
+  c, clear               Clear the window
+  e, exit                Exit Retest
 ```
 ### **Supports Multiple Watchers**  
 Retest ships with [Listen](https://github.com/guard/listen) for file monitoring but can use the more performant [Watchexec](https://github.com/watchexec/watchexec) if installed.  
@@ -90,19 +91,29 @@ retest 'bundle exec rails test <test>'
 
 ## ❤️ **Contributing**
 
-Got feedback or ideas? Join the discussion for Retest 2.0 and share your thoughts:  
-[Discussion - Retest V2.0 - Interactive Panel](https://github.com/AlexB52/retest/discussions/216)
+Got feedback or ideas? [Start a new discussion](https://github.com/AlexB52/retest/discussions).
 
-Bug reports and pull requests are welcome at [GitHub](https://github.com/alexb52/retest).  
+Bug reports and pull requests are welcome.
 
 ## 🛠️ **Development**
 
 Want to contribute to Retest? Follow these steps to set up your environment
 
 1. Clone the repo and install dependencies: `bin/setup`
-2. Run tests to ensure everything is working: `rake test`
-3. Experiment with an interactive console: `bin/console`
-4. To run integration tests (e.g., for a Hanami app): `bin/test/hanami-app`
+2. Experiment with an interactive console: `bin/console`
+3. Run retest with local changes applied: `bin/debug`
+4. Run tests to ensure everything is working: `rake test`
+5. To run integration tests:
+	* bundler-app: `bin/test/bundler-app`
+	* git-ruby: `bin/test/git-ruby`
+	* hanami-app: `bin/test/hanami-app`
+	* rails-app: `bin/test/rails-app`
+	* rspec-rails: `bin/test/rspec-rails`
+	* rspec-ruby: `bin/test/rspec-ruby`
+	* ruby-app: `bin/test/ruby-app`
+	* ruby-bare: `bin/test/ruby-bare`
+
+Note, we squash all PRs and may edit commit messages for clarity or consistency.
 
 ## 📜 **License**  
 

data/exe/retest

@@ -112,6 +112,10 @@ def run_command(input:, program:)
       filter: true, min: 1
     )
     program.run(nil, force_run: true)
+  when 'fb', 'force batch'
+    require 'tty-prompt'
+    prompt = TTY::Prompt.new
+    program.force_batch prompt.multiline("Enter list of test files to run").join
   when ''
     puts "Running last command: '#{program.last_command}'\n"
     program.run_last_command
@@ -120,21 +124,23 @@ def run_command(input:, program:)
     program.run_all
   when /^di?f?f?\s(.*)$/
     program.diff($1)
-  when 'c'
+  when 'c', 'clear'
     program.clear_terminal
   when 'h', 'help'
     puts <<~HELP
 
-      * 'h', 'help'              # Prints help.
-      * 'p', 'pause'             # Pauses Retest. Tests aren't run on file change events until unpaused.
-      * 'u', 'unpause'           # Unpauses Retest.
-      * <ENTER>                  # Runs last changed triggered command.
-      * 'ra, 'run all'           # Runs all tests.
-      * 'f', 'force'             # Forces a selection of test to run on every file change.
-      * 'r', 'reset'             # Disables forced selection.
-      * 'd', 'diff' [GIT BRANCH] # Runs matching specs that changed from a target branch.
-      * 'c'                      # Clears window.
-      * 'e', 'exit'              # Exits Retest.
+      Commands:
+        <ENTER>                Run last changed triggered command
+        h, help                Show help
+        p, pause               Pause Retest (tests won't run on file changes)
+        u, unpause             Unpause Retest
+        ra, run all            Run all tests
+        f, force               Force a selection of tests to run on every file change
+        fb, force batch        Force a selection of tests based on raw data list
+        r, reset               Reset forced selection
+        d, diff [BRANCH]       Run specs changed relative to a Git branch
+        c, clear               Clear the window
+        e, exit                Exit Retest
     HELP
   else
     puts "Unknown interactive command #{input}\n"

data/lib/retest/matching_options/path.rb

@@ -12,6 +12,10 @@ module Retest
         @pathname = Pathname(path)
       end
 
+      def ==(other)
+        pathname == other.pathname
+      end
+
       def reversed_dirnames
         @reversed_dirnames ||= dirnames.reverse
       end
@@ -28,14 +32,23 @@ module Retest
         test_regexs.any? { |regex| regex =~ to_s }
       end
 
-      def possible_test?(file)
-        possible_test_regexs.any? { |regex| regex =~ file }
+      def possible_test?(file, test_directories: nil)
+        if test?(test_directories: test_directories)
+          other = Path.new(file)
+          self == other || test_subset?(other)
+        else
+          possible_test_regexs.any? { |regex| regex =~ file }
+        end
       end
 
       def similarity_score(file)
         String::Similarity.levenshtein(to_s, file)
       end
 
+      def filename
+        basename(extname)
+      end
+
       private
 
       def test_regexs
@@ -52,8 +65,15 @@ module Retest
         ]
       end
 
-      def filename
-        basename(extname)
+      # This method checks whether the test file is included in the path of
+      # another test file
+      # Example: fixture_test.rb is included in test/valuation/fixture_test.rb
+      def test_subset?(other)
+        if dirnames == ['.']
+          filename == other.filename
+        else
+          filename == other.filename && Set.new(dirnames).subset?(Set.new(other.dirnames))
+        end
       end
     end
   end

data/lib/retest/matching_options.rb

@@ -16,8 +16,8 @@ module Retest
     end
 
     def filtered_results
-      if path.test?(test_directories: test_directories)
-        [path]
+      if (test_file = possible_tests.find { |file| file == path.to_s })
+        [test_file]
       elsif (screened_tests = screen_namespaces(possible_tests)).any?
         screened_tests
       else
@@ -29,7 +29,7 @@ module Retest
 
     def possible_tests
       @possible_tests ||= files
-        .select  { |file| path.possible_test?(file) }
+        .select  { |file| path.possible_test?(file, test_directories: test_directories) }
         .sort_by { |file| [-path.similarity_score(file), file] }
         .first(@limit)
     end

data/lib/retest/output.rb

@@ -0,0 +1,25 @@
+module Retest
+  # This library formats output messages displayed to the user
+  module Output
+    module_function
+
+    # This method formats the force batch search failures and prints it to IO if
+    # passed in or returns the message otherwise.
+    def force_batch_failures(paths, out: nil)
+      return unless paths&.any?
+
+      output = "\n"
+      output += "Retest could not find matching tests for these inputs:\n"
+      paths.each do |invalid_path|
+        output += "  - #{invalid_path}\n"
+      end
+      output += "\n"
+
+      if out
+        out.puts output
+      else
+        output
+      end
+    end
+  end
+end

data/lib/retest/program.rb

@@ -54,6 +54,21 @@ module Retest
       runner.run_all
     end
 
+    def force_batch(multiline_input)
+      failures, successes = repository
+        .search_tests(multiline_input.split(/\s+/))
+        .partition { |k,v| v.nil? }
+
+      Output.force_batch_failures(failures.map(&:first), out: @stdout)
+
+      if (successes = successes.to_h).empty?
+        @stdout.puts "No test files found"
+      else
+        force_selection(successes.values.uniq.compact.sort)
+        run(nil, force_run: true)
+      end
+    end
+
     def clear_terminal
       system('clear 2>/dev/null') || system('cls 2>/dev/null')
     end

data/lib/retest/prompt.rb

@@ -37,9 +37,8 @@ module Retest
     private
 
     def options(files, blank_option: 'none')
-      result = {}
+      result = { blank_option => nil } # blank option first
       files.each { |file| result[file] = file }
-      result[blank_option] = nil # blank option last
       result
     end
 

data/lib/retest/repository.rb

@@ -23,14 +23,25 @@ module Retest
     end
 
     def find_tests(paths)
-      paths
-        .select { |path| Regexp.new("\.rb$") =~ path }
-        .map    { |path| find_test(path) }
+      search_tests(paths)
+        .values
         .compact
         .uniq
         .sort
     end
 
+    def search_tests(paths)
+      result = {}
+      ruby_files = paths.select { |path| path.end_with?('.rb') }
+
+      ruby_files.each do |path|
+        result[path] ||= find_test(path)
+      end
+
+      result
+    end
+
+
     def test_files
       files.select { |file| MatchingOptions::Path.new(file).test? }
     end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "2.2.2"
+  VERSION = "2.4.0"
 end

data/lib/retest.rb

@@ -14,6 +14,7 @@ require "retest/program"
 require "retest/prompt"
 require "retest/sounds"
 require "retest/watcher"
+require "retest/output"
 
 module Retest
   class Error < StandardError; end

data/retest.gemspec

@@ -30,4 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tty-option", ["~> 0.1"]
   spec.add_runtime_dependency "tty-prompt", ["~> 0.1"]
   spec.add_runtime_dependency "observer", ["~> 0.1"]
+  spec.add_development_dependency "minitest", ["~> 5.0"]
+  spec.add_development_dependency "rake", ["~> 13.0"]
+  spec.add_development_dependency "byebug", ["~> 11.1"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-12 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 description:
 email:
 - alex@abletech.nz
@@ -92,9 +134,6 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
-- Gemfile-3.4
-- Gemfile-3.4.lock
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - README/demo.gif
@@ -128,6 +167,7 @@ files:
 - lib/retest/matching_options.rb
 - lib/retest/matching_options/path.rb
 - lib/retest/options.rb
+- lib/retest/output.rb
 - lib/retest/program.rb
 - lib/retest/program/forced_selection.rb
 - lib/retest/program/pausable.rb
@@ -165,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A simple command line tool to watch file change and run its matching spec.

data/Gemfile-3.4

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in retest.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-gem "minitest", "~> 5.0"
-gem "byebug", require: false

data/Gemfile-3.4.lock

@@ -1,71 +0,0 @@
-PATH
-  remote: .
-  specs:
-    retest (2.2.1)
-      listen (~> 3.9)
-      observer (~> 0.1)
-      string-similarity (~> 2.1)
-      tty-option (~> 0.1)
-      tty-prompt (~> 0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (11.1.3)
-    ffi (1.17.1)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-aarch64-linux-musl)
-    ffi (1.17.1-arm-linux-gnu)
-    ffi (1.17.1-arm-linux-musl)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86-linux-gnu)
-    ffi (1.17.1-x86-linux-musl)
-    ffi (1.17.1-x86_64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.25.5)
-    observer (0.1.2)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    string-similarity (2.1.0)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-option (0.3.0)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.2)
-    wisper (2.0.1)
-
-PLATFORMS
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  arm-linux-gnu
-  arm-linux-musl
-  arm64-darwin
-  ruby
-  x86-linux-gnu
-  x86-linux-musl
-  x86_64-darwin
-  x86_64-linux-gnu
-  x86_64-linux-musl
-
-DEPENDENCIES
-  byebug
-  minitest (~> 5.0)
-  rake (~> 13.0)
-  retest!
-
-BUNDLED WITH
-   2.6.6

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    retest (2.2.2)
-      listen (~> 3.9)
-      observer (~> 0.1)
-      string-similarity (~> 2.1)
-      tty-option (~> 0.1)
-      tty-prompt (~> 0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (11.1.3)
-    ffi (1.17.1)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.15.0)
-    observer (0.1.2)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    rake (13.0.6)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    string-similarity (2.1.0)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-option (0.3.0)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.2)
-    wisper (2.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  byebug
-  minitest (~> 5.0)
-  rake (~> 13.0)
-  retest!
-
-BUNDLED WITH
-   2.3.27