fpm-cookery 0.36.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d635234a7161b1b47ba35bf07f4a3c58209482d57ead1d2e7d42e59ead4090f
-  data.tar.gz: 15c95843c18e2b098236b68fa4249fad32387dfae68b92ae734087379179d337
+  metadata.gz: 9dd8cf427fc81df78b55732516e91b8c98dcae6af6c465cd790042539098efaf
+  data.tar.gz: 67f996dc214f34ff79f35c670dfd082bb8cca472068207dc457025c911668240
 SHA512:
-  metadata.gz: b9c9ef894547aa17415134b1de01ba2cf4b594429f4d7a93fe24166bf0a1eed82961d1cdf155f16edb96907f4a9f36bc3517bae12e384c60fbd126daad953753
-  data.tar.gz: 79b01c1bb917e0ae2ab6e90c64a521d930d8e3d80512345b6df98ca82ce1ece074229eaff0044c39a8a451c79954b2b84966a9d440b827bbd978f771ae548c70
+  metadata.gz: d6df5723d6457029da89f9d5a64ccf73e46804171a94e474e48a9447442628c2141ccf63db3672b56d27b2c29308e95e70071744745f94d9c30f5773da8e123d
+  data.tar.gz: 31a87981c9f66d194a57595a71eaf1745ea4959a0cfdfd2789ce5c10613c5d7bdaafffb37b297799e05647f8065d5417f2bd81f6427994e14852d394d5b41c02

data/.github/workflows/ruby.yml

@@ -1,24 +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.4", "2.5", "2.6", "2.7", "3.0", "3.1"]
+        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: |
-        gem install bundler
+        sudo apt-get update -qq
+        sudo apt-get install -yqq python3-sphinx
+        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,12 @@
+# 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)
+* Add support for Ruby 3.2. (FooBarQuaxx / #218, bernd / #219)
+
 # v0.36.0 (2022-07-13)
 * Add Dockerfile for Ubuntu 18.04.
 * Allow newer versions of Puppet (gmathes / #211)

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/chain_packager.rb

@@ -20,7 +20,7 @@ module FPM
         DependencyInspector.verify!([], recipe.build_depends)
         recipe.chain_recipes.each do |name|
           recipe_file = build_recipe_file_path(name)
-          unless File.exists?(recipe_file)
+          unless File.exist?(recipe_file)
             error_message = "Cannot find a recipe for #{name} at #{recipe_file}"
             Log.fatal error_message
             raise Error::ExecutionFailure, error_message
@@ -49,7 +49,7 @@ module FPM
         recipe.chain_recipes.each do |name|
           recipe_file = build_recipe_file_path(name)
 
-          unless File.exists?(recipe_file)
+          unless File.exist?(recipe_file)
             Log.fatal "Cannot find a recipe for #{name} at #{recipe_file}"
             exit 1
           end

data/lib/fpm/cookery/cli.rb

@@ -60,7 +60,7 @@ module FPM
           file = File.expand_path(recipe)
 
           # Allow giving the directory containing a recipe.rb
-          if File.directory?(file) && File.exists?(File.join(file, 'recipe.rb'))
+          if File.directory?(file) && File.exist?(File.join(file, 'recipe.rb'))
             file = File.join(file, 'recipe.rb')
           end
 
@@ -68,7 +68,7 @@ module FPM
         end
 
         def validate
-          unless File.exists?(recipe_file)
+          unless File.exist?(recipe_file)
             Log.error 'No recipe.rb found in the current directory, abort.'
             exit 1
           end

data/lib/fpm/cookery/facts.rb

@@ -28,13 +28,20 @@ module FPM
           @osmajorrelease ||= value(:operatingsystemmajrelease, false)
         end
 
+        def osfamily
+          @osfamily ||= value(:osfamily)
+        end
+
+        def osfamily=(value)
+          @osfamily = value.downcase.to_sym
+        end
+
         def target
-          @target ||= case platform
-                      when :centos, :redhat, :fedora, :amazon,
-                           :scientific, :oraclelinux, :sles    then :rpm
-                      when :debian, :ubuntu                    then :deb
-                      when :darwin                             then :osxpkg
-                      when :alpine                             then :apk
+          @target ||= case osfamily
+                      when :redhat, :suse then :rpm
+                      when :debian        then :deb
+                      when :darwin        then :osxpkg
+                      when :alpine        then :apk
                       end
         end
 

data/lib/fpm/cookery/hiera.rb

@@ -27,9 +27,6 @@ module FPM
         # Provides a default scope, and attempts to look up the key both as a
         # string and as a symbol.
         def lookup(key, default = nil, scope = self.scope, *rest)
-          
-          (Gem::Version.new(::Hiera.version) < Gem::Version.new('2.0.0') &&
-               super(key.to_sym, default, scope, *rest)) ||
             super(key.to_s, default, scope, *rest)
         end
         alias_method :[], :lookup

data/lib/fpm/cookery/omnibus_packager.rb

@@ -21,7 +21,7 @@ module FPM
         _recipe.omnibus_recipes.each do |name|
           recipe_file = build_recipe_file_path(name)
           Log.info "Loading dependency recipe #{name} from #{recipe_file}"
-          unless File.exists?(recipe_file)
+          unless File.exist?(recipe_file)
             error_message = "Cannot find a recipe for #{name} at #{recipe_file}"
             Log.fatal error_message
             raise Error::ExecutionFailure, error_message

data/lib/fpm/cookery/packager.rb

@@ -119,7 +119,7 @@ module FPM
 
             # Do not extract source again because it might destroy changes
             # that have been made to the source. (like patches)
-            if File.exists?(extract_cookie)
+            if File.exist?(extract_cookie)
               extracted_source = File.read(extract_cookie).chomp
               Log.debug "Extract cookie exists, using existing source directory: #{extracted_source}"
             else
@@ -149,7 +149,7 @@ module FPM
 
               build_cookie = build_cookie_name(package_name)
 
-              if File.exists?(build_cookie)
+              if File.exist?(build_cookie)
                 Log.warn "Skipping build of #{recipe.name} because build cookie found (#{build_cookie})," \
                          " use \"fpm-cook clean\" to rebuild!"
               else
@@ -161,7 +161,7 @@ module FPM
               end
 
               FileUtils.rm_rf(recipe.destdir) unless keep_destdir?
-              recipe.destdir.mkdir unless File.exists?(recipe.destdir)
+              recipe.destdir.mkdir unless File.exist?(recipe.destdir)
 
               begin
                 recipe.installing = true
@@ -243,7 +243,7 @@ module FPM
               script_file = File.expand_path("../#{script_file.to_s}", recipe.filename)
             end
 
-            if File.exists?(script_file)
+            if File.exist?(script_file)
               input.add_script(script, File.read(script_file.to_s))
             else
               Log.error "#{script} script '#{script_file}' is missing"

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.36.0'
+    VERSION = '0.38.0'
   end
 end

data/spec/facts_spec.rb

@@ -69,81 +69,59 @@ describe "Facts" do
     end
   end
 
-  describe "target" do
-
-    describe "with platform Scientific" do
-      it "returns rpm" do
-        FPM::Cookery::Facts.platform = 'Scientific'
-        expect(FPM::Cookery::Facts.target).to eq(:rpm)
-      end
-    end
+  describe "osfamily" do
+    include_context "mock facts", { :osfamily => 'RedHat' }
 
-    describe "with platform CentOS" do
-      it "returns rpm" do
-        FPM::Cookery::Facts.platform = 'CentOS'
-        expect(FPM::Cookery::Facts.target).to eq(:rpm)
-      end
+    it "is using Facter to autodetect the osfamily" do
+      expect(FPM::Cookery::Facts.osfamily).to eq(:redhat)
     end
 
-    describe "with platform RedHat" do
-      it "returns rpm" do
-        FPM::Cookery::Facts.platform = 'RedHat'
-        expect(FPM::Cookery::Facts.target).to eq(:rpm)
-      end
+    it "can be set" do
+      FPM::Cookery::Facts.platform = 'RedHat'
+      expect(FPM::Cookery::Facts.osfamily).to eq(:redhat)
     end
+  end
 
-    describe "with platform Fedora" do
-      it "returns rpm" do
-        FPM::Cookery::Facts.platform = 'Fedora'
-        expect(FPM::Cookery::Facts.target).to eq(:rpm)
-      end
-    end
+  describe "target" do
 
-    describe "with platform Amazon" do
+    describe "with os family RedHat" do
       it "returns rpm" do
-        FPM::Cookery::Facts.platform = 'Amazon'
+        FPM::Cookery::Facts.osfamily = 'RedHat'
         expect(FPM::Cookery::Facts.target).to eq(:rpm)
       end
     end
 
-    describe "with platform OracleLinux" do
+    describe "with os family Suse" do
       it "returns rpm" do
-        FPM::Cookery::Facts.platform = 'OracleLinux'
+        FPM::Cookery::Facts.osfamily = 'Suse'
         expect(FPM::Cookery::Facts.target).to eq(:rpm)
       end
     end
 
-    describe "with platform Debian" do
-      it "returns deb" do
-        FPM::Cookery::Facts.platform = 'Debian'
-        expect(FPM::Cookery::Facts.target).to eq(:deb)
-      end
-    end
-
-    describe "with platform Ubuntu" do
+    describe "with os family Debian" do
       it "returns deb" do
-        FPM::Cookery::Facts.platform = 'Ubuntu'
+        FPM::Cookery::Facts.osfamily = 'Debian'
         expect(FPM::Cookery::Facts.target).to eq(:deb)
       end
     end
 
-    describe "with platform Darwin" do
+    describe "with os family Darwin" do
       it "returns osxpkg" do
-        FPM::Cookery::Facts.platform = 'Darwin'
+        FPM::Cookery::Facts.osfamily = 'Darwin'
         expect(FPM::Cookery::Facts.target).to eq(:osxpkg)
       end
     end
 
-    describe "with platform Alpine" do
+    describe "with os family Alpine" do
       it "returns apk" do
-        FPM::Cookery::Facts.platform = 'Alpine'
+        FPM::Cookery::Facts.osfamily = 'Alpine'
         expect(FPM::Cookery::Facts.target).to eq(:apk)
       end
     end
 
-    describe "with an unknown platform" do
+    describe "with an unknown os family" do
       it "returns nil" do
-        FPM::Cookery::Facts.platform = '___X___'
+        FPM::Cookery::Facts.osfamily = '___X___'
         expect(FPM::Cookery::Facts.target).to eq(nil)
       end
     end

data/spec/path_spec.rb

@@ -91,10 +91,10 @@ describe "Path" do
     it "creates the directory" do
       dir = Dir.mktmpdir
       FileUtils.rm_rf(dir)
-      expect(File.exists?(dir)).to eq(false)
+      expect(File.exist?(dir)).to eq(false)
 
       FPM::Cookery::Path.new(dir).mkdir
-      expect(File.exists?(dir)).to eq(true)
+      expect(File.exist?(dir)).to eq(true)
 
       FileUtils.rm_rf(dir)
     end
@@ -102,7 +102,7 @@ describe "Path" do
     describe "directory exists" do
       it "does not throw an error" do
         dir = Dir.mktmpdir
-        expect(File.exists?(dir)).to eq(true)
+        expect(File.exist?(dir)).to eq(true)
 
         expect(FPM::Cookery::Path.new(dir).mkdir).to eq([dir])
 

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.36.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Bernd Ahlers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 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: []