Skip to content

Commit

Permalink
Support fpm 1.16.0 (#34)
Browse files Browse the repository at this point in the history
fpm 1.16.0 relaxed clamp dependency and clamp >= 1.1.0 removed parent_attribute_values param for Command#initialize
  • Loading branch information
Aqualon authored Dec 12, 2024
1 parent 835024f commit fbf7f37
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion fpm-fry.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
gem.files = Dir['lib/**/*'] & `git ls-files -z`.split("\0")

gem.add_dependency 'excon', '~> 0.71'
gem.add_dependency 'fpm', '~> 1.13'
gem.add_dependency 'fpm', '~> 1.16'
gem.add_dependency 'clamp', '> 1.1.0'
end
2 changes: 1 addition & 1 deletion lib/fpm/fry/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Command < Clamp::Command
extend Forwardable
def_delegators :ui, :out, :err, :logger, :tmpdir

def initialize(invocation_path, ctx = {}, parent_attribute_values = {})
def initialize(invocation_path, ctx = {})
super
@ui = ctx.fetch(:ui){ UI.new(tmpdir: dir) }
@client = ctx[:client]
Expand Down
2 changes: 1 addition & 1 deletion lib/fpm/fry/command/cook.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class BuildFailed < StandardError
parameter 'image', 'Docker image to build from'
parameter '[recipe]', 'Recipe file to cook', default: 'recipe.rb'

def initialize(invocation_path, ctx = {}, parent_attribute_values = {})
def initialize(invocation_path, ctx = {})
@tls = nil
require 'digest'
require 'fileutils'
Expand Down

1 comment on commit fbf7f37

@skaes
Copy link
Contributor

@skaes skaes commented on fbf7f37 Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx for fixing this Bruno! I was just about to start working on it. :-)

Please sign in to comment.