fpm-cookery 0.35.1 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7f311c220910c26ded28d35577a469f17940542
-  data.tar.gz: ef041b28f7b56ddfe19ce483e276cb7a3a88e7c4
+SHA256:
+  metadata.gz: 9d635234a7161b1b47ba35bf07f4a3c58209482d57ead1d2e7d42e59ead4090f
+  data.tar.gz: 15c95843c18e2b098236b68fa4249fad32387dfae68b92ae734087379179d337
 SHA512:
-  metadata.gz: 40be51fb1f5a8fe25e69443ec138a227ce8f015aed97e93b38265d9601d3f5547710475d09a674ac8541b8433c707ac674cbce047ecd0e6d6ea540389251c311
-  data.tar.gz: d1e9d2422cb4bc45f5d72ef90e8df360165bdf3183f1c88b6046ff51963959f5eccfc15b3fb73980c88e215a98bfe0f7f5b5e7231cf32759efd72218dc702a34
+  metadata.gz: b9c9ef894547aa17415134b1de01ba2cf4b594429f4d7a93fe24166bf0a1eed82961d1cdf155f16edb96907f4a9f36bc3517bae12e384c60fbd126daad953753
+  data.tar.gz: 79b01c1bb917e0ae2ab6e90c64a521d930d8e3d80512345b6df98ca82ce1ece074229eaff0044c39a8a451c79954b2b84966a9d440b827bbd978f771ae548c70

data/.github/workflows/ruby.yml

@@ -8,14 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.4, 2.5, 2.6]
+        ruby: ["2.4", "2.5", "2.6", "2.7", "3.0", "3.1"]
 
     steps:
     - uses: actions/checkout@v1
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}.x
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - name: Build and test with Rake
       run: |
         gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.36.0 (2022-07-13)
+* Add Dockerfile for Ubuntu 18.04.
+* Allow newer versions of Puppet (gmathes / #211)
+* Fix compatibility issues with newer Ruby and newer dependencies. (#214)
+* Add Ruby versions up to 3.1 to GitHub Action workflow.
+* Switch default branch to `main`.
+
 # v0.35.1 (2019-12-18)
 * Fix default Docker image name
 

data/README.md

@@ -1,6 +1,6 @@
 # fpm-cookery - For building software
 
-[![Build Status](https://travis-ci.org/bernd/fpm-cookery.svg)](https://travis-ci.org/bernd/fpm-cookery)
+![Build Status](https://github.com/bernd/fpm-cookery/actions/workflows/ruby.yml/badge.svg)
 
 A tool for building software packages with
 [fpm](https://github.com/jordansissel/fpm).

data/docker/Dockerfile.ubuntu-16.04

@@ -1,14 +1,14 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
-RUN \
-    apt-get install --no-install-recommends -y \
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
       curl \
       wget \
       git \
       ruby2.3-dev \
       build-essential \
       man-db \
+      unzip \
     && gem install --no-ri --no-rdoc fpm-cookery \
     && apt-get clean \
     && rm -rf \

data/docker/Dockerfile.ubuntu-18.04

@@ -0,0 +1,27 @@
+FROM ubuntu:18.04
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+      curl \
+      wget \
+      git \
+      ruby2.5-dev \
+      build-essential \
+      man-db \
+      unzip \
+    && gem install --no-ri --no-rdoc fpm-cookery \
+    && apt-get clean \
+    && rm -rf \
+      /tmp/* \
+      /root/.gem \
+      /var/cache/debconf/* \
+      /var/lib/gems/*/cache/* \
+      /var/lib/apt/lists/* \
+      /var/log/* \
+      /usr/share/X11 \
+      /usr/share/doc/*
+
+COPY docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["fpm-cook"]

data/docs/index.rst

@@ -1,4 +1,4 @@
-.. fpm-cookery documentation master file, created by
+.. fpm-cookery documentation main file, created by
    sphinx-quickstart on Sat Jul 25 11:02:45 2015.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.

data/docs/pages/using-hiera.rst

@@ -281,5 +281,5 @@ Examples
 --------
 
 See the `Redis recipe
-<https://github.com/bernd/fpm-cookery/tree/master/recipes/redis>`_ for an
+<https://github.com/bernd/fpm-cookery/tree/main/recipes/redis>`_ for an
 example of fpm-cookery and Hiera in action.

data/fpm-cookery.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.11"
   s.add_runtime_dependency "fpm", "~> 1.1"
   s.add_runtime_dependency "facter"
-  s.add_runtime_dependency "puppet", ">= 3.4", "< 6.0"
-  s.add_runtime_dependency "addressable", "~> 2.3.8"
+  s.add_runtime_dependency "puppet", ">= 3.4", "< 8.0"
+  s.add_runtime_dependency "addressable", "~> 2.8"
   s.add_runtime_dependency "systemu"
-  s.add_runtime_dependency "json", ">= 1.7.7", "< 2.0"
-  s.add_runtime_dependency "json_pure", ">= 1.7.7", "< 2.0"
+  s.add_runtime_dependency "json", "~> 2.6"
+  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"
 end

data/lib/fpm/cookery/docker_packager.rb

@@ -68,7 +68,7 @@ module FPM
         ].compact.flatten.join(' ')
 
 
-        Log.info "Running: #{cmd}"
+        Log.debug "Running: #{cmd}"
         begin
           sh cmd
         rescue => e

data/lib/fpm/cookery/environment.rb

@@ -24,11 +24,11 @@ module FPM
         end
       end
 
-      def merge(other)
+      def merge(other = {})
         super(self.class[other])
       end
 
-      def merge!(other)
+      def merge!(other = {})
         super(self.class[other])
       end
 

data/lib/fpm/cookery/recipe.rb

@@ -237,14 +237,14 @@ module FPM
           }
         end
 
-        def applicator(method)
+        def applicator(method, &block)
           if (result = lookup(method)).nil?
             Log.debug("No result for `#{method}'")
             return
           end
 
           Log.debug("Setting `#{method}' to `#{result}'")
-          Proc.new.call(result)
+          block.call(result)
         end
       end
 

data/lib/fpm/cookery/source.rb

@@ -1,4 +1,5 @@
 require 'addressable/uri'
+require 'uri/ssh_git'
 
 module FPM
   module Cookery
@@ -7,7 +8,11 @@ module FPM
 
       def initialize(url, options = nil)
         options ||= {}
-        @url = Addressable::URI.parse(url.to_s)
+        begin
+          @url = Addressable::URI.parse(url.to_s)
+        rescue Addressable::URI::InvalidURIError
+          @url = URI::SshGit.parse(url.to_s)
+        end
         @provider = options[:with]
         @options = options
       end
@@ -22,7 +27,7 @@ module FPM
 
       # If the Addressable::URI is empty, there's nothing to fetch
       def fetchable?
-        !@url.empty?
+        !@url.to_s.empty?
       end
 
       def url

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.35.1'
+    VERSION = '0.36.0'
   end
 end

data/spec/fixtures/hiera_config/common.yaml

@@ -3,7 +3,7 @@ description: >
     For testing purposes on %{scope("platform")} only - you've been warned ;)
 version: 1.0.2
 source:
-    - http://www.dummy-url.com/archive/%{hiera("name")}-%{hiera("version")}.tar.gz
+    - http://www.example.com/archive/%{hiera("name")}-%{hiera("version")}.tar.gz
     - :with: :git
 
 environment:

data/spec/inheritable_attr_spec.rb

@@ -15,12 +15,12 @@ shared_examples 'attribute registration' do |attr_method, registry_method|
         extend FPM::Cookery::InheritableAttr
 
         instance_eval %Q{
-          #{attr_method} :dummy_attr
+          #{attr_method} :example_attr
         }
       end
 
       expect(klass).to respond_to(registry_method)
-      expect(klass.send(registry_method)).to include(:dummy_attr)
+      expect(klass.send(registry_method)).to include(:example_attr)
     end
   end
 end
@@ -30,7 +30,7 @@ shared_context 'class inheritance' do
   let(:subklass) { Class.new(superklass) }
 end
 
-shared_examples 'attribute inheritance' do |attr_method, default_value, attr_name = :dummy_attr|
+shared_examples 'attribute inheritance' do |attr_method, default_value, attr_name = :example_attr|
   # A default implementation.  Useful for +.attr_rw+, but should probably be
   # overridden for the other DSL methods.
   let(:attr_setter) {
@@ -74,7 +74,7 @@ shared_examples 'attribute inheritance' do |attr_method, default_value, attr_nam
   end
 end
 
-shared_context 'inheritable attributes' do |attr_method, default_value, attr_name = :dummy_attr|
+shared_context 'inheritable attributes' do |attr_method, default_value, attr_name = :example_attr|
   include_context 'class inheritance'
   include_examples 'attribute inheritance', attr_method, default_value
 

data/spec/source_spec.rb

@@ -52,6 +52,8 @@ describe "Source" do
 
       expect(source.url).to eq('git@github.com:foo/bar.git')
       expect(source.path).to eq('foo/bar.git')
+      expect(source.local?).to eq(false)
+      expect(source.fetchable?).to eq(true)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -103,7 +103,7 @@ dependencies:
         version: '3.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,21 +113,21 @@ dependencies:
         version: '3.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -146,42 +146,30 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: uri-ssh_git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -206,7 +208,6 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -214,6 +215,7 @@ files:
 - Rakefile
 - bin/fpm-cook
 - docker/Dockerfile.ubuntu-16.04
+- docker/Dockerfile.ubuntu-18.04
 - docker/docker-entrypoint.sh
 - docs/.gitignore
 - docs/Makefile
@@ -360,8 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: fpm-cookery
-rubygems_version: 2.5.2.1
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: A tool for building software packages with fpm.

data/.travis.yml

@@ -1,15 +0,0 @@
-sudo: false
-cache: bundler
-script: bundle exec rake spec
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.1
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head