From fba50a5ff2c70f4e44c9a7d69354df3345b971bb Mon Sep 17 00:00:00 2001 From: Julian Tabel Date: Mon, 4 Jan 2021 14:59:23 +0100 Subject: [PATCH 1/2] remove json dependency as it is covered by fpm --- fpm-fry.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fpm-fry.gemspec b/fpm-fry.gemspec index 68fbcb3..af0df70 100644 --- a/fpm-fry.gemspec +++ b/fpm-fry.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |gem| gem.name = 'fpm-fry' - gem.version = '0.4.5' + gem.version = '0.4.6' gem.date = Time.now.strftime("%Y-%m-%d") gem.summary = "FPM Fry" @@ -27,7 +27,6 @@ Gem::Specification.new do |gem| gem.add_dependency 'excon', '~> 0.71.0' gem.add_dependency 'fpm', '~> 1.0' - gem.add_dependency 'json', '>= 2.3.0' gem.add_development_dependency 'rake', '~> 12.0' gem.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0' From d6ba3384dcf360a9892f5c106a2c49397edfa999 Mon Sep 17 00:00:00 2001 From: Julian Tabel Date: Mon, 4 Jan 2021 15:51:36 +0100 Subject: [PATCH 2/2] fix test --- spec/plugin/script_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/plugin/script_helper_spec.rb b/spec/plugin/script_helper_spec.rb index ea7864a..7da9c3a 100644 --- a/spec/plugin/script_helper_spec.rb +++ b/spec/plugin/script_helper_spec.rb @@ -78,7 +78,7 @@ context 'on debian' do it 'renders an after_remove script' do - expect(package.scripts[:after_remove]).to match /remove[)]\s*do-foo/ + expect(package.scripts[:after_remove]).to match /remove|purge[)]\s*do-foo/ end end