fpm-cookery 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95014d3c9e85da55e6ba1e46ff1d8b6fddd05ff100afff7d3f26c1440c56845
-  data.tar.gz: e2c6c2e73c6816ba2f34e20fa9ad9d25c9a255caf0b2c6fe9b5ba37cc2cd6308
+  metadata.gz: 9dd8cf427fc81df78b55732516e91b8c98dcae6af6c465cd790042539098efaf
+  data.tar.gz: 67f996dc214f34ff79f35c670dfd082bb8cca472068207dc457025c911668240
 SHA512:
-  metadata.gz: 0c0eaf01306f288ac13a2c0766c1366a6dd79ec3eb5ada9928dbef287232d0f7b5108a0bdd1ff9005b53e1320100c9b70224126e3cebe1ae9dc7d3775de04324
-  data.tar.gz: ca59959ebd72f3b8eedbbba3b341a951f0ce816ccf5b383ab3b6013541befccf1da5e8d35f0cdda9bae5c86a8b1434cd4bd336fe8eec2692235ef37d69f0ee25
+  metadata.gz: d6df5723d6457029da89f9d5a64ccf73e46804171a94e474e48a9447442628c2141ccf63db3672b56d27b2c29308e95e70071744745f94d9c30f5773da8e123d
+  data.tar.gz: 31a87981c9f66d194a57595a71eaf1745ea4959a0cfdfd2789ce5c10613c5d7bdaafffb37b297799e05647f8065d5417f2bd81f6427994e14852d394d5b41c02

data/.github/workflows/ruby.yml

@@ -1,26 +1,38 @@
 name: Ruby
 
-on: [push]
+on:
+  pull_request:
+    types: [ opened, reopened, synchronize, edited ]
+  push:
+    branches: [ main ]
 
 jobs:
   build:
+    name: "Ruby ${{ matrix.ruby }}"
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
+
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
+
     - name: Build and test with Rake
       run: |
         sudo apt-get update -qq
         sudo apt-get install -yqq python3-sphinx
-        gem install bundler
+        if [ "${{ matrix.ruby }}" = "2.7" ]; then
+          # Last supported bundler version for Ruby 2.7
+          gem install bundler -v 2.4.22
+        else
+          gem install bundler
+        fi
         bundle install --jobs 4 --retry 3
         bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.38.0 (2025-07-07)
+* Fix compatibility with Ruby 3.2. (aalmenar / #221)
+* Fix compatibility with Ruby 3.4. (#222)
+
 # v0.37.0 (2023-04-04)
 * Add `osfamily` fact and choose package target based on it. (FooBarQuaxx / #216)
 * Install Sphinx toolchain for GitHub Action workflow. (FooBarQuaxx / #217)

data/Rakefile

@@ -6,6 +6,25 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
+namespace 'test:ruby' do |ns|
+  src = File.dirname(File.expand_path(__FILE__))
+
+  %w(3.4 3.3 3.2 3.1 3.0 2.7).each do |version|
+    task version do
+      sh %(
+        docker run -i --rm -v #{src}:/src ruby:#{version}
+        bash -c '
+        git config --global --add safe.directory /src/.git
+        && git clone -s /src /work
+        && cd /work
+        && bundle install -j 4
+        && bundle exec rake
+        '
+      ).gsub(/\s+/, ' ').strip
+    end
+  end
+end
+
 namespace :docs do |ns|
   require 'systemu'
 

data/fpm-cookery.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json_pure", "~> 2.6"
   s.add_runtime_dependency "safe_yaml", "~> 1.0.4"
   s.add_runtime_dependency "uri-ssh_git", "~> 2.0"
+  s.add_runtime_dependency "base64", "~> 0.3.0"
 end

data/lib/fpm/cookery/utils.rb

@@ -86,7 +86,7 @@ module FPM
       alias_method :inreplace, :inline_replace # homebrew compat
 
       def patch(src, level = 0)
-        raise "patch level must be integer" unless level.is_a?(Fixnum)
+        raise "patch level must be integer" unless level.is_a?(::Integer)
         raise "#{src} does not exist" unless File.exist? src
 
         if "#{src}".end_with?('.gz')

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.37.0'
+    VERSION = '0.38.0'
   end
 end

data/spec/utils_spec.rb

@@ -28,6 +28,14 @@ describe FPM::Cookery::Utils do
     def run_go_build_hash
       go :build, :mod => 'vendor', :v => true
     end
+
+    def run_patch_level
+      patch 'file.patch', 'one'
+    end
+
+    def run_patch_missing
+      patch 'missing.patch'
+    end
   end
 
   let(:test) { TestUtils.new }
@@ -81,4 +89,14 @@ describe FPM::Cookery::Utils do
       end
     end
   end
+  describe '#patch' do
+    it 'raises error if level is not an integer' do
+      expect { test.run_patch_level }.to raise_error("patch level must be integer")
+    end
+
+    it 'raises error if file does not exist' do
+      allow(File).to receive(:exist?).and_return(false)
+      expect { test.run_patch_missing }.to raise_error("missing.patch does not exist")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Bernd Ahlers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -198,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -347,7 +361,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -362,8 +376,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: A tool for building software packages with fpm.
 test_files: []