rmagick 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f2e11d828e48371aa5ff6b599cebff2e793b3751892cc864cd22015781c324
-  data.tar.gz: 65fa64db84769aa12a954bdd57ea7e03b8fcb61c1cebab89b2f9d833e8aab0aa
+  metadata.gz: a7ed79c680b9ea528ef33ba989c37e33c62dc2bd69766a96478826d1f02ad42b
+  data.tar.gz: 80315df8a5f0ae2de433e0929e165ed2636b9a451fb93ed3b301888418313685
 SHA512:
-  metadata.gz: 1238aaf7239bf0ae5041682b6941fb52341283d6e8fe73c37d4c914e21c40a565d0f244fb923289647dc44d0f43bfbf2e0cd59e4a8ee99595ea32524b35bbd26
-  data.tar.gz: ba83bde0c15f3061ad9e0d656cc79a65985fc55b49ae340f7fa3fd2ef510127610d95d2d8692c2111a97b3f4673badd1a03f18d6b78abbbb169f30020bcbdd4b
+  metadata.gz: fcea3eb1d2d92e3d0a0b658e95be0e6579f37a204823eb7dca6f60f2f867ea888bcc4a70f99163415620d48bb0b585bd74778bc881bef5f3f81089e1490f6bb3
+  data.tar.gz: 8e610ec1b43e3758002329a1ab2ffa013c3ce6e2ca233349572c54dd36c0875c09f63e6d9fb529030694f750dfa996f244d56a881a55d80077b149e77c7b894d

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "../Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "6.9.13-33"
+      "IMAGEMAGICK_VERSION": "6.9.13-43"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "7.1.2-8"
+      "IMAGEMAGICK_VERSION": "7.1.2-18"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'monthly'

data/.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
     timeout-minutes: 20
     steps:
     - uses: actions/checkout@v6
-    - name: Set up Ruby 3.3
-      uses: ruby/setup-ruby@master
+    - name: Set up Ruby 4.0
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
+        ruby-version: '4.0'
         bundler-cache: true
     - name: Build and test with Rake
       run: |
@@ -31,10 +31,10 @@ jobs:
     timeout-minutes: 20
     steps:
     - uses: actions/checkout@v6
-    - name: Set up Ruby 3.0
-      uses: ruby/setup-ruby@master
+    - name: Set up Ruby 4.0
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '4.0'
         bundler-cache: true
     - name: Validate RBS signatures
       run: |
@@ -57,7 +57,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ./build-ImageMagick
         key: v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
@@ -65,10 +65,9 @@ jobs:
           v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Update/Install packages
       run: |
-        export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
-        ./before_install_linux.sh
+        IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }} ./before_install_linux.sh
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
@@ -76,66 +75,40 @@ jobs:
       run: |
         bundle exec rake
 
-  test-linux:
-    runs-on: ubuntu-latest
+  test:
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
         imagemagick-version:
-          - { full: 6.9.13-33, major-minor: '6.9' }
-          - { full: 7.1.2-8, major-minor: '7.1' }
+          - { full: 6.9.13-43, major-minor: '6.9' }
+          - { full: 7.1.2-18, major-minor: '7.1' }
 
-    name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
+    name: ${{ matrix.os }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ./build-ImageMagick
         key: v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
         restore-keys: |
           v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
-    - name: Update/Install packages
+    - name: Update/Install packages (Linux)
+      if: runner.os == 'Linux'
       run: |
-        export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
-        ./before_install_linux.sh
-    - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
-    - name: Build and test with Rake
-      run: |
-        bundle exec rake
-
-  test-macos:
-    runs-on: macos-latest
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
-        imagemagick-version:
-          - { full: 6.9.13-33, major-minor: '6.9' }
-          - { full: 7.1.2-8, major-minor: '7.1' }
-
-    name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
-    steps:
-    - uses: actions/checkout@v6
-    - name: Cache ImageMagick built objects
-      uses: actions/cache@v4
-      with:
-        path: ./build-ImageMagick
-        key: v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
-        restore-keys: |
-          v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
-    - name: Update/Install packages
+        IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }} ./before_install_linux.sh
+    - name: Update/Install packages (macOS)
+      if: runner.os == 'macOS'
       run: |
         IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }} ./before_install_osx.sh
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
@@ -151,14 +124,14 @@ jobs:
       matrix:
         ruby-version: ['4.0']
         imagemagick-version:
-          - { full: 6.9.13-33, major-minor: '6.9' }
-          - { full: 7.1.2-8, major-minor: '7.1' }
+          - { full: 6.9.13-43, major-minor: '6.9' }
+          - { full: 7.1.2-18, major-minor: '7.1' }
         os:
           - { target: windows-latest, arch: 'x64' }
           - { target: windows-11-arm, arch: 'arm64' }
         exclude:
           # ImageMagick 6 has not provided ARM binary. Ref. https://legacy.imagemagick.org/archive/binaries/
-          - imagemagick-version: { full: 6.9.13-33, major-minor: '6.9' }
+          - imagemagick-version: { full: 6.9.13-43, major-minor: '6.9' }
             os: { target: windows-11-arm, arch: 'arm64' }
 
     env:
@@ -222,7 +195,7 @@ jobs:
         Invoke-WebRequest -Uri $url -OutFile $installer_name
         Start-Process -FilePath $installer_name -ArgumentList "/DIR=${{ env.install_im_dir }} /VERYSILENT /NORESTART /TASKS=install_Devel"
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
@@ -247,7 +220,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
@@ -259,6 +232,6 @@ jobs:
           $pkg = "mingw-w64-ucrt-x86_64-imagemagick"
         }
         ridk exec pacman -S $pkg --noconfirm
-    - name: Build and test with Rake
+    - name: Build test
       run: |
-        cmd.exe /D /S /C "bundle exec rake"
+        cmd.exe /D /S /C "bundle exec rake compile"

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-01-31 06:59:04 UTC using RuboCop version 1.84.0.
+# on 2026-03-06 16:48:22 UTC using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -117,7 +117,7 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 5527
+# Offense count: 5528
 # Configuration parameters: Only, Ignore.
 Lint/ConstantResolution:
   Enabled: false
@@ -270,7 +270,7 @@ Naming/MethodParameterName:
 # Offense count: 2
 # Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
 # AllowedMethods: call
-# WaywardPredicates: nonzero?
+# WaywardPredicates: infinite?, nonzero?
 Naming/PredicateMethod:
   Exclude:
     - 'lib/rvg/deep_equal.rb'
@@ -351,15 +351,6 @@ Style/CaseEquality:
     - 'spec/rmagick/pixel/dup_spec.rb'
     - 'spec/rmagick/pixel/threequals_spec.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-# AllowedMethods: ==, equal?, eql?
-Style/ClassEqualityComparison:
-  Exclude:
-    - 'spec/rmagick/image_list/all_predicate_spec.rb'
-    - 'spec/rmagick/image_list/any_predicate_spec.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -396,7 +387,7 @@ Style/DocumentDynamicEvalDefinition:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 164
+# Offense count: 165
 # Configuration parameters: AllowedMethods, RequireForNonPublicMethods.
 Style/DocumentationMethod:
   Enabled: false
@@ -415,7 +406,7 @@ Style/FetchEnvVar:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
-# Offense count: 41
+# Offense count: 43
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
@@ -440,7 +431,7 @@ Style/HashEachMethods:
     - 'spec/rmagick/image/info/orientation_spec.rb'
     - 'spec/rmagick/image/info/units_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
@@ -461,7 +452,7 @@ Style/InvertibleUnlessCondition:
     - 'lib/rvg/embellishable.rb'
     - 'lib/rvg/stretchable.rb'
 
-# Offense count: 4515
+# Offense count: 4516
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: IgnoreMacros, AllowedMethods, AllowedPatterns, IncludedMacros, IncludedMacroPatterns, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
@@ -512,6 +503,13 @@ Style/NumericPredicate:
     - 'lib/rvg/embellishable.rb'
     - 'spec/rmagick/image/destroy_spec.rb'
 
+# Offense count: 3
+# Configuration parameters: AllowedClasses.
+Style/OneClassPerFile:
+  Exclude:
+    - 'examples/histogram.rb'
+    - 'lib/rvg/misc.rb'
+
 # Offense count: 4
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
@@ -588,7 +586,7 @@ Style/YodaCondition:
 Style/YodaExpression:
   Enabled: false
 
-# Offense count: 128
+# Offense count: 129
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.3.0
+
+> [!IMPORTANT]
+> This release is the final minor update for the RMagick 6 series.
+>
+> The upcoming RMagick 7.0 will require:
+>  * Ruby 3.2 or later
+>  * ImageMagick 6.9 or later (for ImageMagick 6 users)
+>  * ImageMagick 7.1 or later (for ImageMagick 7 users)
+
+Enhancements
+
+- Add deprecation warnings for upcoming RMagick 7.0 (#1740)
+
 ## RMagick 6.2.0
 
 Improvements

data/Gemfile

@@ -16,9 +16,11 @@ gem 'rubocop', '~> 1.63'
 gem 'rubocop-performance', '~> 1.21'
 gem 'rubocop-rspec', '~> 3.5'
 
-gem 'rubocop-on-rbs', '~> 1.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2')
-
-gem 'rbs', '~> 3.4'
-gem 'steep', '~> 1.6'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2')
+  # TODO: Bump rubocop-on-rbs to >= 2.0 when steep supports rbs 4.0
+  gem 'rbs', '~> 3.9'
+  gem 'rubocop-on-rbs', '< 2.0'
+  gem 'steep', '~> 1.10'
+end
 
 gem 'ruby_memcheck', '~> 3.0' if RUBY_PLATFORM.include?('linux')

data/ext/RMagick/extconf.rb

@@ -363,6 +363,38 @@ at_exit do
   msg = "Configured compile options: #{extconf.configured_compile_options}"
   Logging.message msg
   message msg + "\n"
+
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2.0')
+    message <<~"WARNING"
+      =======================================================================
+      DEPRECATION WARNING
+
+      RMagick 7.0 will drop support for Ruby #{RUBY_VERSION}.
+      Please upgrade to Ruby 3.2 or later.
+      =======================================================================
+    WARNING
+  end
+
+  if Gem::Version.new($magick_version) < Gem::Version.new('6.9.0')
+    message <<~"WARNING"
+      =======================================================================
+      DEPRECATION WARNING
+
+      RMagick 7.0 will drop support for ImageMagick #{$magick_version}.
+      Please upgrade to ImageMagick 6.9.0 or later.
+      =======================================================================
+    WARNING
+  end
+  if Gem::Version.new($magick_version) >= Gem::Version.new('7.0.0') && Gem::Version.new($magick_version) < Gem::Version.new('7.1.0')
+    message <<~"WARNING"
+      =======================================================================
+      DEPRECATION WARNING
+
+      RMagick 7.0 will drop support for ImageMagick #{$magick_version}.
+      Please upgrade to ImageMagick 7.1.0 or later.
+      =======================================================================
+    WARNING
+  end
 end
 extconf.create_makefile_file
 extconf.create_compile_flags_txt

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.2.0'
+  VERSION = '6.3.0'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -53,8 +53,8 @@ files:
 - ".devcontainer/setup-repo.sh"
 - ".devcontainer/setup-user.sh"
 - ".editorconfig"
-- ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/report.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.8.9 or later
-rubygems_version: 4.0.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []

data/.github/ISSUE_TEMPLATE.md

@@ -1,17 +0,0 @@
-### Description
-<!-- A description of the bug or feature -->
-
-### Steps to Reproduce
-<!-- List of steps, sample code, failing test or link to a project that reproduces the behavior.
-     Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues -->
-
-### System Configuration
-<!-- Tell us about the environment where you are experiencing the bug -->
-
-- ImageMagick version:
-- RMagick version:
-- Ruby version:
-- Environment (Operating system, version and so on):
-- Additional information:
-
-<!-- Thanks for reporting the issue to RMagick! -->