Merge branch 'master' into fix_testhelper_require

pvdb · web-flow · commit bf7db9066a75 · 2025-05-31T09:53:30.000+01:00
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.3.0
-    - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+    - uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
         ruby-version: '3.0'
     - name: Install dependencies
diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml
@@ -1,26 +1,32 @@
 # from https://github.com/gofiber/swagger/blob/main/.github/workflows/dependabot_automerge.yml
 name: Dependabot auto-merge
 on:
-  pull_request_target:
+  pull_request:
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   automerge:
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'ruby/rake'
     steps:
       - name: Dependabot metadata
         uses: dependabot/fetch-metadata@v2
         id: metadata
+
       - name: Wait for status checks
         uses: lewagon/wait-on-check-action@v1.3.4
         with:
           repo-token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           check-regexp: test*
           wait-interval: 30
+
       - name: Auto-merge for Dependabot PRs
         if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
         run: gh pr merge --auto --merge "$PR_URL"
         env:
-          PR_URL: ${{github.event.pull_request.html_url}}
+          PR_URL: ${{ github.event.pull_request.html_url }}
           GITHUB_TOKEN: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Setup Ruby
-        uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.139.0
+        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.139.0
         with:
           ruby-version: '3.2'
           bundler-cache: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     continue-on-error: true
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.3.0
-    - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+    - uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
         ruby-version: '3.0'
         bundler-cache: true
diff --git a/.github/workflows/push_gem.yml b/.github/workflows/push_gem.yml
@@ -0,0 +1,46 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'ruby/rake'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/rake
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
+        with:
+          bundler-cache: true
+          ruby-version: "ruby"
+
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
             ruby: jruby
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.3.0
-    - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+    - uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
diff --git a/Gemfile b/Gemfile
@@ -6,4 +6,5 @@ group :development do
   gem "test-unit"
   gem "coveralls"
   gem "rubocop"
+  gem "rdoc"
 end
diff --git a/README.rdoc b/README.rdoc
@@ -74,10 +74,10 @@ Type "rake --help" for all available options.
 
 === Rake Information
 
-* {Rake command-line}[link:doc/command_line_usage.rdoc]
-* {Writing Rakefiles}[link:doc/rakefile.rdoc]
-* The original {Rake announcement}[link:doc/rational.rdoc]
-* Rake {glossary}[link:doc/glossary.rdoc]
+* {Rake command-line}[rdoc-ref:doc/command_line_usage.rdoc]
+* {Writing Rakefiles}[rdoc-ref:doc/rakefile.rdoc]
+* The original {Rake announcement}[rdoc-ref:doc/rational.rdoc]
+* Rake {glossary}[rdoc-ref:doc/glossary.rdoc]
 
 === Presentations and Articles about Rake
 
diff --git a/lib/rake/application.rb b/lib/rake/application.rb
@@ -765,7 +765,7 @@ def standard_system_dir #:nodoc:
       end
     else
       def standard_system_dir #:nodoc:
-        File.join(File.expand_path("~"), ".rake")
+        File.join(Dir.home, ".rake")
       end
     end
     private :standard_system_dir
diff --git a/lib/rake/task_arguments.rb b/lib/rake/task_arguments.rb
@@ -94,6 +94,10 @@ def fetch(*args, &block)
       @hash.fetch(*args, &block)
     end
 
+    def deconstruct_keys(keys)
+      @hash.slice(*keys)
+    end
+
     protected
 
     def lookup(name) # :nodoc:
diff --git a/lib/rake/task_manager.rb b/lib/rake/task_manager.rb
@@ -35,7 +35,7 @@ def define_task(task_class, *args, &block) # :nodoc:
       task.set_arg_names(arg_names) unless arg_names.empty?
       if Rake::TaskManager.record_task_metadata
         add_location(task)
-        task.add_description(get_description(task))
+        task.add_description(get_description)
       end
       task.enhance(Task.format_deps(deps), &block)
       task | order_only unless order_only.nil?
@@ -316,7 +316,7 @@ def make_sources(task_name, task_pattern, extensions)
     end
 
     # Return the current description, clearing it in the process.
-    def get_description(task)
+    def get_description
       desc = @last_description
       @last_description = nil
       desc
diff --git a/lib/rake/version.rb b/lib/rake/version.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rake
-  VERSION = "13.2.1"
+  VERSION = "13.3.0"
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split "."
diff --git a/test/support/ruby_runner.rb b/test/support/ruby_runner.rb
@@ -1,4 +1,8 @@
 # frozen_string_literal: true
+
+require "open3"
+require "fileutils"
+
 module RubyRunner
   include FileUtils
 
diff --git a/test/test_rake_backtrace.rb b/test/test_rake_backtrace.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require File.expand_path("../helper", __FILE__)
-require "open3"
 
 class TestBacktraceSuppression < Rake::TestCase # :nodoc:
   def test_bin_rake_suppressed
diff --git a/test/test_rake_file_utils.rb b/test/test_rake_file_utils.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require File.expand_path("../helper", __FILE__)
 require "fileutils"
-require "stringio"
 
 class TestRakeFileUtils < Rake::TestCase # :nodoc:
   def setup
diff --git a/test/test_rake_functional.rb b/test/test_rake_functional.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 require File.expand_path("../helper", __FILE__)
-require "fileutils"
-require "open3"
 
 class TestRakeFunctional < Rake::TestCase # :nodoc:
   include RubyRunner
diff --git a/test/test_rake_reduce_compat.rb b/test/test_rake_reduce_compat.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require File.expand_path("../helper", __FILE__)
-require "open3"
 
 class TestRakeReduceCompat < Rake::TestCase # :nodoc:
   include RubyRunner
diff --git a/test/test_rake_task_arguments.rb b/test/test_rake_task_arguments.rb
@@ -54,6 +54,13 @@ def test_to_hash
     assert_equal 0,  h.fetch(:one)
   end
 
+  def test_deconstruct_keys
+    omit "No stable pattern matching until Ruby 3.1 (testing #{RUBY_VERSION})" if RUBY_VERSION < "3.1"
+
+    ta = Rake::TaskArguments.new([:a, :b, :c], [1, 2, 3])
+    assert_equal ta.deconstruct_keys([:a, :b]), { a: 1, b: 2 }
+  end
+
   def test_enumerable_behavior
     ta = Rake::TaskArguments.new([:a, :b, :c], [1, 2, 3])
     assert_equal [10, 20, 30], ta.map { |k, v| v * 10 }.sort
diff --git a/test/test_trace_output.rb b/test/test_trace_output.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require File.expand_path("../helper", __FILE__)
-require "stringio"
 
 class TestTraceOutput < Rake::TestCase # :nodoc:
   include Rake::TraceOutput
