retest 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec0496e89c678c022c2e9f07edc70d9bb9f10e80ff9be3079ea1c00242e35920
-  data.tar.gz: a8b2c71b0be9ed265a1c04d1276c9a2ad84919a5349956fcaa5c5b497d241445
+  metadata.gz: 1e115f99996becceaa5a11f81f938afa18571c8bdcb3e3fe5e500bb4d2eaa647
+  data.tar.gz: 003bfb6679ddcfc531666fe397121170926248792503834f14e79566022da274
 SHA512:
-  metadata.gz: c1754d242669324f364419af2718449fb337435596079f3bce0b8ba54cce782af9480f1eb98635cf3e84901c0e478aaeeefa6e59d4c2953807dfb9ce54efbe14
-  data.tar.gz: 27771c70fada9ebcd67460982bf0d2a1d5b1440eee17b58328a674a5cba2e54fa3b2ab63a3e61c0a96634e4e5567a8ac3c8bd6b89b5e119a432dc0fecb7cdb48
+  metadata.gz: 7c71cb0291862bdd2cdda6ca37a7d199b6ad95c48812ff099e26ceef5505bb138cd01ea230fcbf7627c051de1760393850f129c59066f4ca45db21310114bf66
+  data.tar.gz: eac9a20b762eea7d8706d4754f2894659c8aafb4f3930d99d8d5b730fe1e47ae4341538bf1616569e3d01f9a8555b3b1ec5c33be60c4db699d13d639947de285

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (1.10.0)
+    retest (1.11.0)
       listen (~> 3.2)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
@@ -11,16 +11,16 @@ GEM
   specs:
     byebug (11.1.3)
     ffi (1.15.5)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.15.0)
-    rake (12.3.3)
+    rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     string-similarity (2.1.0)
-    tty-option (0.2.0)
+    tty-option (0.3.0)
 
 PLATFORMS
   ruby
@@ -28,8 +28,8 @@ PLATFORMS
 DEPENDENCIES
   byebug
   minitest (~> 5.0)
-  rake (~> 12.0)
+  rake (~> 13.0)
   retest!
 
 BUNDLED WITH
-   2.1.4
+   2.3.22

data/lib/retest/matching_options/path.rb

@@ -0,0 +1,60 @@
+require 'forwardable'
+
+module Retest
+  class MatchingOptions
+    class Path
+      extend Forwardable
+
+      def_delegators :pathname, :to_s, :basename, :extname, :dirname
+
+      attr_reader :pathname
+      def initialize(path)
+        @pathname = Pathname(path)
+      end
+
+      def reversed_dirnames
+        @reversed_dirnames ||= dirnames.reverse
+      end
+
+      def dirnames
+        @dirnames ||= dirname.each_filename.to_a
+      end
+
+      def test?(test_directories: nil)
+        if test_directories && (test_directories & dirnames).empty?
+          return false
+        end
+
+        test_regexs.any? { |regex| regex =~ to_s }
+      end
+
+      def possible_test?(file)
+        possible_test_regexs.any? { |regex| regex =~ file }
+      end
+
+      def similarity_score(file)
+        String::Similarity.levenshtein(to_s, file)
+      end
+
+      private
+
+      def test_regexs
+        [
+          Regexp.new("^(.*\/)?.*_(?:spec|test)#{extname}$"),
+          Regexp.new("^(.*\/)?(?:spec|test)_.*#{extname}$"),
+        ]
+      end
+
+      def possible_test_regexs
+        [
+          Regexp.new("^(.*\/)?.*#{filename}_(?:spec|test)#{extname}$"),
+          Regexp.new("^(.*\/)?.*(?:spec|test)_#{filename}#{extname}$"),
+        ]
+      end
+
+      def filename
+        basename(extname)
+      end
+    end
+  end
+end

data/lib/retest/matching_options.rb

@@ -0,0 +1,53 @@
+require_relative 'matching_options/path'
+
+module Retest
+  class MatchingOptions
+    def self.for(path, files: [], limit: nil)
+      new(path, files: files, limit: limit).filtered_results
+    end
+
+    attr_reader :path, :files, :test_directories
+
+    def initialize(path, files: [], limit: 5, test_directories: nil)
+      @path = Path.new(path)
+      @files = files
+      @limit = limit || 5
+      @test_directories = (test_directories || %w[spec test]) + %w[.] # add root file as a valid test directory
+    end
+
+    def filtered_results
+      if path.test?(test_directories: test_directories)
+        [path]
+      elsif (screened_tests = screen_namespaces(possible_tests)).any?
+        screened_tests
+      else
+        possible_tests
+      end.map(&:to_s)
+    end
+
+    private
+
+    def possible_tests
+      @possible_tests ||= files
+        .select  { |file| path.possible_test?(file) }
+        .sort_by { |file| [-path.similarity_score(file), file] }
+        .first(@limit)
+    end
+
+    def screen_namespaces(files)
+      test_files = files
+        .map { |file| Path.new(file) }
+        .select { |path| (path.reversed_dirnames & test_directories).any? }
+
+      path
+        .reversed_dirnames
+        .each
+        .with_index
+        .with_object(test_files) do |(dirname, index), tests|
+          break tests if tests.count <= 1
+
+          tests.keep_if { |test| test.reversed_dirnames[index] == dirname }
+        end
+    end
+  end
+end

data/lib/retest/prompt.rb

@@ -0,0 +1,47 @@
+module Retest
+  class Prompt
+    def self.ask_which_test_to_use(path, files)
+      new.ask_which_test_to_use(path, files)
+    end
+
+    def self.puts(*args)
+      new.puts(*args)
+    end
+
+    attr_accessor :input, :output
+    def initialize(input: nil, output: nil)
+      @input  = input || $stdin
+      @output = output || $stdout
+    end
+
+    def ask_which_test_to_use(path, files)
+      output.puts(<<~QUESTION)
+        We found few tests matching: #{path}
+
+        #{list_options(files)}
+
+        Which file do you want to use?
+        Enter the file number now:
+      QUESTION
+
+      files[input.gets.chomp.to_i]
+    end
+
+    def puts(*args)
+      output.puts(*args)
+    end
+
+    def read_output
+      output.tap(&:rewind).read
+    end
+
+    private
+
+    def list_options(files)
+      files
+        .map
+        .with_index { |file, index| "[#{index}] - #{file}" }
+        .join("\n")
+    end
+  end
+end

data/lib/retest/repository.rb

@@ -1,12 +1,11 @@
 module Retest
   class Repository
-    attr_accessor :files, :cache, :stdin, :stdout
+    attr_accessor :files, :cache, :prompt
 
-    def initialize(files: [], cache: {}, stdin: $stdin, stdout: $stdout)
+    def initialize(files: [], cache: {}, prompt: nil)
       @cache  = cache
       @files  = files
-      @stdin  = stdin
-      @stdout = stdout
+      @prompt = prompt || Prompt.new
     end
 
     def find_test(path)
@@ -14,7 +13,7 @@ module Retest
       return if path.empty?
 
       @path = path
-      cache[@path] ||= select_from TestOptions.for(@path, files: files)
+      cache[@path] ||= select_from MatchingOptions.for(@path, files: files)
     end
 
     def find_tests(paths)
@@ -55,29 +54,8 @@ module Retest
       when 0, 1
         tests.first
       else
-        ask_question tests
-        tests[get_input]
+        prompt.ask_which_test_to_use(@path, tests)
       end
     end
-
-    def ask_question(tests)
-      stdout.puts(<<~QUESTION)
-        We found few tests matching: #{@path}
-        #{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
-      stdin.gets.chomp.to_i
-    end
   end
 end

data/lib/retest/runners/cached_test_file.rb

@@ -0,0 +1,23 @@
+module Retest
+  module Runners
+    module CachedTestFile
+      def cached_test_file
+        @cached_test_file
+      end
+
+      def cached_test_file=(value)
+        @cached_test_file = value || @cached_test_file
+      end
+
+      def purge_test_file(purged)
+        return if purged.empty?
+
+        if purged.is_a?(Array) && purged.include?(cached_test_file)
+          @cached_test_file = nil
+        elsif purged.is_a?(String) && purged == cached_test_file
+          @cached_test_file = nil
+        end
+      end
+    end
+  end
+end

data/lib/retest/runners/change_runner.rb

@@ -2,15 +2,19 @@ module Retest
   module Runners
     class ChangeRunner < Runner
       def run(changed_file = nil, repository: nil)
-        if changed_file
-          log("Changed File Selected: #{changed_file}")
-          system_run command.gsub('<changed>', changed_file)
-        else
-          log(<<~ERROR)
-            404 - Test File Not Found
-            Retest could not find a changed file to run.
-          ERROR
-        end
+        return print_file_not_found unless changed_file
+
+        log("Changed File Selected: #{changed_file}")
+        system_run command.gsub('<changed>', changed_file)
+      end
+
+      private
+
+      def print_file_not_found
+        log(<<~ERROR)
+          404 - File Not Found
+          Retest could not find a changed file to run.
+        ERROR
       end
     end
   end

data/lib/retest/runners/test_runner.rb

@@ -1,46 +1,30 @@
+require_relative "cached_test_file"
+
 module Retest
   module Runners
     class TestRunner < Runner
-      def cached_test_file
-        @cached_test_file
-      end
-
-      def cached_test_file=(value)
-        @cached_test_file = value || @cached_test_file
-      end
+      include CachedTestFile
 
       def run(changed_file, repository:)
         self.cached_test_file = repository.find_test(changed_file)
 
-        if cached_test_file
-          log("Test File Selected: #{cached_test_file}")
-          system_run command.gsub('<test>', cached_test_file)
-        else
-          log(<<~ERROR)
-            404 - Test File Not Found
-            Retest could not find a matching test file to run.
-          ERROR
-        end
+        return print_file_not_found unless cached_test_file
+
+        log("Test File Selected: #{cached_test_file}")
+        system_run command.gsub('<test>', cached_test_file)
       end
 
       def sync(added:, removed:)
-        remove(removed)
+        purge_test_file(removed)
       end
 
       private
 
-      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
-
-      def purge_cache
-        @cached_test_file = nil
+      def print_file_not_found
+        log(<<~ERROR)
+          404 - Test File Not Found
+          Retest could not find a matching test file to run.
+        ERROR
       end
     end
   end

data/lib/retest/runners/variable_runner.rb

@@ -1,18 +1,14 @@
+require_relative "cached_test_file"
+
 module Retest
   module Runners
     class VariableRunner < Runner
-      def cached_test_file
-        @cached_test_file
-      end
-
-      def cached_test_file=(value)
-        @cached_test_file = value || @cached_test_file
-      end
+      include CachedTestFile
 
       def run(changed_file, repository:)
         self.cached_test_file = repository.find_test(changed_file)
 
-        return print_test_file_not_found unless cached_test_file
+        return print_file_not_found unless cached_test_file
 
         log(<<~FILES)
           Files Selected:
@@ -27,31 +23,17 @@ module Retest
       end
 
       def sync(added:, removed:)
-        remove(removed)
+        purge_test_file(removed)
       end
 
       private
 
-      def print_test_file_not_found
+      def print_file_not_found
         log(<<~ERROR)
           404 - Test File Not Found
           Retest could not find a matching test file to run.
         ERROR
       end
-
-      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
-
-      def purge_cache
-        @cached_test_file = nil
-      end
     end
   end
 end

data/lib/retest/runners.rb

@@ -8,14 +8,13 @@ module Retest
     module_function
 
     def runner_for(command)
-      if command.include?('<test>') && command.include?('<changed>')
-        VariableRunner
-      elsif command.include?('<test>')
-        TestRunner
-      elsif command.include?('<changed>')
-        ChangeRunner
-      else
-        Runner
+      for_test   = command.include?('<test>')
+      for_change = command.include?('<changed>')
+
+      if for_test && for_change then VariableRunner
+      elsif for_test            then TestRunner
+      elsif for_change          then ChangeRunner
+      else                           Runner
       end.new command
     end
   end

data/lib/retest/setup.rb

@@ -1,21 +1,13 @@
 module Retest
   class Setup
-    def self.type
-      new.type
-    end
-
     def type
       @type ||= begin
         return :ruby unless has_lock_file?
 
-        if rspec?
-          :rspec
-        elsif rails?
-          :rails
-        elsif rake?
-          :rake
-        else
-          :ruby
+        if rspec?    then :rspec
+        elsif rails? then :rails
+        elsif rake?  then :rake
+        else              :ruby
         end
       end
     end

data/lib/retest/version.rb

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

data/lib/retest/version_control/git.rb

@@ -1,33 +1,32 @@
-class Retest::VersionControl
-  class Git
-    def self.installed?
-      system "git -C . rev-parse 2>/dev/null"
-    end
+module Retest
+  module VersionControl
+    module Git
 
-    def self.diff_files(branch)
-      new.diff_files(branch)
-    end
+      module_function
 
-    def name
-      'git'
-    end
+      def installed?
+        system "git -C . rev-parse 2>/dev/null"
+      end
 
-    def files
-      (untracked_files + tracked_files).sort
-    end
+      def name
+        'git'
+      end
 
-    def diff_files(branch)
-      `git diff #{branch} --name-only --diff-filter=ACMRT -z`.split("\x0")
-    end
+      def files
+        (untracked_files + tracked_files).sort
+      end
 
-    private
+      def diff_files(branch)
+        `git diff #{branch} --name-only --diff-filter=ACMRT -z`.split("\x0")
+      end
 
-    def untracked_files
-      `git ls-files --other --exclude-standard -z`.split("\x0")
-    end
+      def untracked_files
+        `git ls-files --other --exclude-standard -z`.split("\x0")
+      end
 
-    def tracked_files
-      `git ls-files -z`.split("\x0")
+      def tracked_files
+        `git ls-files -z`.split("\x0")
+      end
     end
   end
-end
+end

data/lib/retest/version_control/no_version_control.rb

@@ -1,15 +1,20 @@
-class Retest::VersionControl
-  class NoVersionControl
-    def self.installed?
-      true
-    end
+module Retest
+  module VersionControl
+    module NoVersionControl
 
-    def name
-      'default'
-    end
+      module_function
+
+      def installed?
+        true
+      end
+
+      def name
+        'default'
+      end
 
-    def files
-      Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
+      def files
+        Dir.glob('**/*') - Dir.glob('{tmp,node_modules}/**/*')
+      end
     end
   end
-end
+end

data/lib/retest/version_control.rb

@@ -2,12 +2,12 @@ require_relative 'version_control/git'
 require_relative 'version_control/no_version_control'
 
 module Retest
-  class VersionControl
-    def self.files
-      [Git, NoVersionControl].select(&:installed?).first.new.files
-    end
+  module VersionControl
+
+    module_function
 
-    def name; end
-    alias :to_s :name
+    def files
+      [Git, NoVersionControl].find(&:installed?).files
+    end
   end
 end

data/lib/retest.rb

@@ -5,13 +5,14 @@ require 'observer'
 require "retest/version"
 require "retest/runners"
 require "retest/repository"
-require "retest/test_options"
+require "retest/matching_options"
 require "retest/options"
 require "retest/version_control"
 require "retest/setup"
 require "retest/command"
 require "retest/file_system"
 require "retest/program"
+require "retest/prompt"
 require "retest/sounds"
 
 module Retest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -60,6 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
@@ -87,17 +88,20 @@ files:
 - lib/retest/command/rspec.rb
 - lib/retest/command/ruby.rb
 - lib/retest/file_system.rb
+- lib/retest/matching_options.rb
+- lib/retest/matching_options/path.rb
 - lib/retest/options.rb
 - lib/retest/program.rb
+- lib/retest/prompt.rb
 - lib/retest/repository.rb
 - lib/retest/runners.rb
+- lib/retest/runners/cached_test_file.rb
 - lib/retest/runners/change_runner.rb
 - lib/retest/runners/runner.rb
 - lib/retest/runners/test_runner.rb
 - lib/retest/runners/variable_runner.rb
 - lib/retest/setup.rb
 - lib/retest/sounds.rb
-- lib/retest/test_options.rb
 - lib/retest/version.rb
 - lib/retest/version_control.rb
 - lib/retest/version_control/git.rb
@@ -124,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A simple command line tool to watch file change and run its matching spec.

data/lib/retest/test_options.rb

@@ -1,98 +0,0 @@
-require 'forwardable'
-
-module Retest
-  class TestOptions
-    def self.for(path, files: [], limit: nil)
-      new(path, files: files, limit: limit).filtered_results
-    end
-
-    attr_reader :path, :files
-
-    def initialize(path, files: [], limit: 5)
-      @path = Path.new(path)
-      @files = files
-      @limit = limit || 5
-    end
-
-    def filtered_results
-      if path.test?
-        [path]
-      elsif namespace_screens.any?
-        namespace_screens
-      else
-        possible_tests
-      end.map(&:to_s)
-    end
-
-    private
-
-    def possible_tests
-      @possible_tests ||= filter_by_string_similarities(path, files)
-        .last(@limit)
-        .reverse
-    end
-
-    def filter_by_string_similarities(path, files)
-      files.select  { |file| path.possible_test?(file) }
-           .sort_by { |file| [path.similarity_score(file), file] }
-    end
-
-    def namespace_screens
-      @namespace_screens ||= path
-        .reversed_dirnames
-        .each_with_index
-        .with_object(possible_tests.map { |file| Path.new(file) }) do |(reference, index), result|
-          unless [1, 0].include? result.count
-            result.keep_if { |path| path.reversed_dirnames[index] == reference }
-          end
-        end
-    end
-
-    class Path
-      extend Forwardable
-
-      def_delegators :pathname, :to_s, :basename, :extname, :dirname
-
-      attr_reader :pathname
-      def initialize(path)
-        @pathname = Pathname(path)
-      end
-
-      def reversed_dirnames
-        @reversed_dirnames ||= dirname.each_filename.to_a.reverse
-      end
-
-      def test?
-        test_regexs.any? { |regex| regex =~ to_s }
-      end
-
-      def possible_test?(file)
-        possible_test_regexs.any? { |regex| regex =~ file }
-      end
-
-      def similarity_score(file)
-        String::Similarity.levenshtein(to_s, file)
-      end
-
-      private
-
-      def test_regexs
-        [
-          Regexp.new("^(.*\/)?.*_(?:spec|test)#{extname}$"),
-          Regexp.new("^(.*\/)?(?:spec|test)_.*#{extname}$"),
-        ]
-      end
-
-      def possible_test_regexs
-        [
-          Regexp.new("^(.*\/)?.*#{filename}_(?:spec|test)#{extname}$"),
-          Regexp.new("^(.*\/)?.*(?:spec|test)_#{filename}#{extname}$"),
-        ]
-      end
-
-      def filename
-        basename(extname)
-      end
-    end
-  end
-end