minitest-keyword 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b569537ff4f2eacfd9b0e3dfdbb4ba8d0864eed8e3c3c0fab016ab865c308c2
-  data.tar.gz: e77fefde1103684177cbcd645cde4eb74d1002ecbf7ec6cd3cb9752ff4af90ac
+  metadata.gz: 1b364876ff4ff76e2547510f40c1ff01b133222e53aee1e3580316c27a3e17de
+  data.tar.gz: 3b13150d418ab6e0684c463e3fb5586127112d675f9a2229e56ee70c69effa05
 SHA512:
-  metadata.gz: 8cee286ebf8de7e7c68695604998ce3bd93a9451d7eb1a52eb69489a000b3a5220ba46b404e81a59ac65877eb46e62ec9343f8e8bd0339b1cde92c4480b43678
-  data.tar.gz: 35ad6969492e0bb920897e0b2e85d0e415be703c98f0d5f30fbdda8100877f4a402880aac9958e93ef6ca0532d8be2780f8eb23f3b970d0da8939b878338e7ce
+  metadata.gz: 37025f541764496e4dd279f137a34677aa3169847d8ad095fb2c4dc98c89cd13dcc88b112260948b7c5d4f263479d94579f4806c825e92df8b87b26503c1a002
+  data.tar.gz: 3ae02edd1590ae4c01d22140b2d2c3fa78e8f4f45bfa30120cff3d313cd6141691cf7e56d44664a01c10e251be07625839fe8153dff22ca133ab8834b0210f37

data/.github/workflows/auto-merge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.4.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

data/.rubocop.yml

@@ -6,7 +6,7 @@ AllCops:
   DisplayStyleGuide: true
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
   - '{tmp,vendor,yard}/**/*'
 

data/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [2.1.0] - 2025-12-18
+
+### Added
+
+- Explicit support for Minitest 6.
+
 ## [2.0.0] - 2024-01-23
 
 ### Changed
@@ -32,7 +38,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - The name of the underlying parameter changed for `assert_in_epsilon` from `a` and `b` to `exp` and `act`. As such, in order to normalize, those were aliased to `expected` and `actual` as well.
 
-[unreleased]: https://github.com/kddnewton/minitest-keyword/compare/v2.0.0...HEAD
+[unreleased]: https://github.com/kddnewton/minitest-keyword/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/kddnewton/minitest-keyword/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/kddnewton/minitest-keyword/compare/v1.0.2...v2.0.0
 [1.0.2]: https://github.com/kddnewton/minitest-keyword/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/kddnewton/minitest-keyword/compare/v1.0.0...v1.0.1

data/Gemfile.lock

@@ -1,50 +1,55 @@
 PATH
   remote: .
   specs:
-    minitest-keyword (2.0.0)
-      minitest (~> 5.0)
+    minitest-keyword (2.1.0)
+      minitest (>= 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    docile (1.4.0)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    minitest (5.21.2)
-    parallel (1.24.0)
-    parser (3.3.0.4)
+    ast (2.4.3)
+    docile (1.4.1)
+    json (2.18.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    minitest (6.0.0)
+      prism (~> 1.5)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    racc (1.7.3)
+    prism (1.7.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rubocop (1.60.1)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rubocop (1.82.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.48.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (6.2.0)
+    syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -52,7 +52,7 @@ assert_instance_of class:, object:, message: nil
 assert_kind_of     class:, object:, message: nil
 assert_match       matcher:, object:, message: nil
 assert_nil         object:, message: nil
-assert_operator    receiver:, operator:, argument: UNDEFINED, message: nil
+assert_operator    receiver:, operator:, argument: Minitest::Assertions::UNDEFINED, message: nil
 assert_output      stdout: nil, stderr: nil
 assert_path_exists path:, message: nil
 assert_predicate   receiver:, operator:, message: nil
@@ -75,7 +75,7 @@ refute_instance_of class:, object:, message: nil
 refute_kind_of     class:, object:, message: nil
 refute_match       matcher:, object:, message: nil
 refute_nil         object:, message: nil
-refute_operator    receiver:, operator:, argument: UNDEFINED, message: nil
+refute_operator    receiver:, operator:, argument: Minitest::Assertions::UNDEFINED, message: nil
 refute_path_exists path:, message: nil
 refute_predicate   receiver:, operator:, message: nil
 refute_respond_to  object:, method:, message: nil, include_all: false

data/bin/readme

@@ -11,15 +11,19 @@ source = Minitest::Assertions
 source.instance_methods.grep(/^(assert|refute)/).sort.each do |method_name|
   method = source.instance_method(method_name)
   parameters = method.parameters
-
   next if parameters.empty? || method_name == :assert_send
 
+  parameter_aliases = aliases
+  if Minitest::VERSION >= "6.0.0" && method_name == :refute_includes
+    parameter_aliases = { **aliases, obj: :collection, sub: :object }
+  end
+
   iseq = RubyVM::InstructionSequence.of(method).to_a
   opt_index = 0
 
   values =
     parameters.map do |(parameter_type, parameter_name)|
-      name = aliases[parameter_name]
+      name = parameter_aliases[parameter_name]
 
       case parameter_type
       in :req
@@ -31,7 +35,7 @@ source.instance_methods.grep(/^(assert|refute)/).sort.each do |method_name|
           in Symbol | Integer
             next
           in [:opt_getconstant_path, path]
-            stack << path.join("::")
+            stack << [source.name, *path].join("::")
           in [:putobject, object]
             stack << object.inspect
           in [:putnil]

data/lib/minitest/keyword/version.rb

@@ -2,6 +2,6 @@
 
 module Minitest
   module Keyword
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/minitest/keyword.rb

@@ -52,18 +52,23 @@ module Minitest
         parameters = Assertions.instance_method(method_name).parameters
         next if parameters.empty? || method_name == :assert_send
 
+        aliases = ALIASES
+        if Minitest::VERSION >= "6.0.0" && method_name == :refute_includes
+          aliases = { **ALIASES, obj: :collection, sub: :object }
+        end
+
         define_method(method_name) do |*args, **kwargs, &block|
           passed_args = []
           passed_kwargs = {}
 
           parameters.each.with_index do |(type, arg_name), index|
             if args.length > index &&
-                 (kwargs.key?(arg_name) || kwargs.key?(ALIASES[arg_name]))
+                 (kwargs.key?(arg_name) || kwargs.key?(aliases[arg_name]))
               raise OverloadedArgumentError.new(method_name, arg_name)
             end
 
             if type == :req && args.length <= index && !kwargs.key?(arg_name) &&
-                 !kwargs.key?(ALIASES[arg_name])
+                 !kwargs.key?(aliases[arg_name])
               raise MissingRequiredArgumentError.new(method_name, arg_name)
             end
 
@@ -73,15 +78,15 @@ module Minitest
                 if args.any?
                   args[index..-1]
                 else
-                  kwargs[arg_name] || kwargs[ALIASES[arg_name]]
+                  kwargs[arg_name] || kwargs[aliases[arg_name]]
                 end
             when :key
               passed_kwargs[arg_name] = (
-                kwargs[arg_name] || kwargs[ALIASES[arg_name]]
+                kwargs[arg_name] || kwargs[aliases[arg_name]]
               )
             when :req, :opt
               passed_args << (
-                args[index] || kwargs[arg_name] || kwargs[ALIASES[arg_name]]
+                args[index] || kwargs[arg_name] || kwargs[aliases[arg_name]]
               )
             else
               raise "Unknown parameter type #{type}"

data/minitest-keyword.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "minitest", "~> 5.0"
+  spec.add_dependency "minitest", ">= 5"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: minitest-keyword
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2025-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/kddnewton/minitest-keyword/issues
-  changelog_uri: https://github.com/kddnewton/minitest-keyword/blob/v2.0.0/CHANGELOG.md
+  changelog_uri: https://github.com/kddnewton/minitest-keyword/blob/v2.1.0/CHANGELOG.md
   source_code_uri: https://github.com/kddnewton/minitest-keyword
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Use Minitest assertions with keyword arguments