diff --git a/fpm-fry.gemspec b/fpm-fry.gemspec index fbdfe59..2c20d75 100644 --- a/fpm-fry.gemspec +++ b/fpm-fry.gemspec @@ -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 diff --git a/lib/fpm/fry/command.rb b/lib/fpm/fry/command.rb index c412bb7..ab16147 100644 --- a/lib/fpm/fry/command.rb +++ b/lib/fpm/fry/command.rb @@ -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] diff --git a/lib/fpm/fry/command/cook.rb b/lib/fpm/fry/command/cook.rb index 13bc755..ad20e25 100644 --- a/lib/fpm/fry/command/cook.rb +++ b/lib/fpm/fry/command/cook.rb @@ -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'