nicetest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8b1e58e35c866d01e21b5b8e397e05c3506002d3af25681a8178e6c26d4f2e3
-  data.tar.gz: 8f032d23008336df8010de48bb4a4cf872e4416d52a092ce76e231a7a09cb934
+  metadata.gz: 61441e7efe86d553594ec78afb04d59b8f6d33581624dc4854feef7958fe1793
+  data.tar.gz: 1efcd585b516002dcdea5c8aa6f20adbb559dcb4bab7d03c53ee530132d6bfd3
 SHA512:
-  metadata.gz: 1cc1cd63f09d3d3c5a2abca7fcd6bf9b914eb61391efb146cb0c01c0c77139b32ee8a32d493f1cef49b69bcf8df9ebda39bda69607f84f94b39535f30ef7b0fd
-  data.tar.gz: a19a0494f63b94dd40cfa2a493d31eb0ee1eea53ab33b08fc05e775d715dfc9c3f8e0eda533e1923cbdbe984da52d6fd6c9325da67b13ed968955dbf86e5c217
+  metadata.gz: b10a7f41792d304f1d5ab721353b324b1afa0bc586cfbedaf461959da2c7bce8c0ac11e45e95baba219de92c368fc3aacdc7cf57c207111efeb0f4440b02f7e8
+  data.tar.gz: 97caebe046160f28cc37ccfe3e8db7778641cf5812af8b161675825016ac82c44f6ad49866a9b85a87533830d9ed72dfefef2c4f2c53e43adb1d11f065241573

data/lib/minitest/nicetest_plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # opts.banner = "Usage: example.rb [options]"
-require "nicetest/cli"
+require "nicetest"
 
 module Minitest
   class << self

data/lib/nicetest/cli.rb

@@ -20,11 +20,11 @@ module Nicetest
       elsif File.exist?("Gemfile") && !File.read("Gemfile").include?("nicetest")
         run_in_directory(".")
       else
-        run_tests
+        run_tests(cli_options)
       end
     end
 
-    def run_tests
+    def run_tests(cli_options = Opts.parse!(@argv))
       disable_autorun!
       adjust_load_path!
 
@@ -32,12 +32,24 @@ module Nicetest
       argv_test_files = select_file_args(args)
       argv_test_files = glob_test_files("test") if argv_test_files.empty?
       args -= argv_test_files
+      finder = TestFinder.new
+      filters = Set.new
+
+      if cli_options.name
+        name = cli_options.name
+        name = name[1..-1] if name.start_with?("/")
+        name = name[0..-2] if name.end_with?("/")
+        filters << name
+      end
 
-      required_files = argv_test_files.flat_map do |file_or_dir|
+      required_files = argv_test_files.map do |pattern|
+        file_or_dir, filter = finder.filter_for(pattern)
+        filters << filter if filter && !cli_options.name
         require_path_or_dir(file_or_dir)
       end
 
       @logger.fatal!("no test files found") if required_files.compact.empty?
+      args << "--name=/#{filters.to_a.join("|")}/" if filters.any?
 
       Minitest.run(args)
     end
@@ -164,7 +176,7 @@ module Nicetest
       end
     end
 
-    Opts = Struct.new(:cd) do
+    Opts = Struct.new(:cd, :name) do
       class << self
         def parse!(argv)
           old_officious = OptionParser::Officious.dup
@@ -177,6 +189,10 @@ module Nicetest
             opts.on("--cd=DIR", "Change directory before running tests") do |dir|
               options[:cd] = dir
             end
+
+            opts.on("-n", "--name=PATTERN", "Filter test names on pattern") do |pattern|
+              options[:name] = pattern
+            end
           end
 
           parser.parse!(argv)

data/lib/nicetest/test_finder.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require "prism"
+require "set"
+
+module Nicetest
+  class TestFinder
+    def initialize
+      @parse_cache = {}
+    end
+
+    def filter_for(target)
+      filename, lineno = target.split(":", 2)
+      filepath = File.expand_path(filename)
+      lineno = lineno&.to_i
+
+      return [filepath, nil] unless lineno
+
+      [filepath, find_test(filepath, lineno)]
+    end
+
+    private
+
+    def find_test(filename, lineno)
+      range_finder = @parse_cache[filename] ||= RangeFinder.parse_file(filename)
+      range_finder.nearest_test_for_line(lineno)
+    rescue => e
+      Nicetest.logger.warn("Failed to parse #{filename} (#{e.class}: #{e.message})")
+      nil
+    end
+
+    class RangeFinder < Prism::Compiler
+      class << self
+        def parse_file(filename)
+          node = Prism.parse_file(filename)
+          new(filename).populate(node.value)
+        end
+      end
+
+      attr_reader :scopes
+
+      def initialize(filename)
+        super()
+        @namespace_stack = []
+        @class_scopes = []
+        @tests = []
+        @program_nodes = []
+        @scopes = []
+      end
+
+      def populate(node)
+        visit(node)
+        @scopes += @tests
+        @scopes += @class_scopes
+        self
+      end
+
+      def nearest_test_for_line(lineno)
+        found = @scopes.find do |range, _test_name|
+          range.cover?(lineno)
+        end
+        found&.last
+      end
+
+      def visit_program_node(node)
+        @program_nodes << node
+        ret = super
+
+        if (last_scope = @class_scopes.last)
+          @class_scopes << [last_scope[0].end..node.location.end_line, last_scope[1]]
+        end
+
+        ret
+      end
+
+      def visit_module_node(node)
+        @namespace_stack.push(node)
+        super
+        @namespace_stack.pop
+      end
+
+      def visit_class_node(node)
+        @namespace_stack.push(node)
+        super
+        @namespace_stack.pop
+      end
+
+      def visit_def_node(node)
+        node_name = node.name.to_s
+        return super unless node_name.start_with?("test_")
+
+        @tests << [test_range_for(node.location), test_id_for(node_name)]
+      end
+
+      def visit_call_node(node)
+        return super unless node.name == :test
+
+        test_name = "test_#{node.arguments.arguments.first.unescaped}"
+        test_name.gsub!(/\s+/, "_")
+        @tests << [test_range_for(node.location), test_id_for(test_name)]
+      end
+
+      def test_id_for(test_name)
+        "#{@namespace_stack.map(&:name).join("::")}##{test_name}"
+      end
+
+      def test_range_for(location)
+        if @tests.empty?
+          current_nesting = @namespace_stack.map(&:name).join("::")
+          @class_scopes << [0..(location.start_line - 1), current_nesting]
+        end
+
+        last_scope = @tests.last || @class_scopes.last
+        last_scope_start = last_scope[0].begin
+        last_scope[0] = last_scope_start..(location.start_line - 1)
+
+        location.start_line..location.end_line
+      end
+    end
+  end
+end

data/lib/nicetest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nicetest
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/nicetest.rb

@@ -7,6 +7,7 @@ require_relative "nicetest/version"
 require_relative "nicetest/logger"
 require_relative "nicetest/cli"
 require_relative "nicetest/backtrace_filter"
+require_relative "nicetest/test_finder"
 
 module Nicetest
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nicetest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -29,7 +29,7 @@ cert_chain:
   Lvd35BNvZkhFzs9xfykhurpkT2TiP2F3ZFn9dwLXMFe41pwrtEYLIWhYi8mUG4Ek
   6aR8M/tqIpChVV39
   -----END CERTIFICATE-----
-date: 2024-07-21 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -101,6 +101,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.30'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: super_diff
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +148,7 @@ files:
 - lib/nicetest/backtrace_filter.rb
 - lib/nicetest/cli.rb
 - lib/nicetest/logger.rb
+- lib/nicetest/test_finder.rb
 - lib/nicetest/version.rb
 homepage: https://github.com/ianks/nicetest
 licenses: