From 826308aabd52971711bd26fc2a48304d7da0af4f Mon Sep 17 00:00:00 2001 From: Nick Hammond Date: Tue, 27 Aug 2024 22:52:06 -0700 Subject: [PATCH] Clean things up via Rubocop --- lib/kamal/commands/builder/native/pack.rb | 4 ++-- test/commands/builder_test.rb | 2 +- test/configuration/builder_test.rb | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/kamal/commands/builder/native/pack.rb b/lib/kamal/commands/builder/native/pack.rb index d4ca1931..d64b091a 100644 --- a/lib/kamal/commands/builder/native/pack.rb +++ b/lib/kamal/commands/builder/native/pack.rb @@ -9,7 +9,7 @@ class Kamal::Commands::Builder::Native::Pack < Kamal::Commands::Builder::Native "-t", config.absolute_image, "-t", config.latest_image, "--env", "BP_IMAGE_LABELS=service=#{config.service}", - secrets.map { |secret| ["--env", Kamal::Utils.sensitive(ENV[secret])] }, + secrets.map { |secret| [ "--env", Kamal::Utils.sensitive(ENV[secret]) ] }, "--path", build_context), docker(:push, config.absolute_image), docker(:push, config.latest_image) @@ -21,6 +21,6 @@ class Kamal::Commands::Builder::Native::Pack < Kamal::Commands::Builder::Native end def buildpacks - (pack_buildpacks << "paketo-buildpacks/image-labels").map { |buildpack| ["--buildpack", buildpack] } + (pack_buildpacks << "paketo-buildpacks/image-labels").map { |buildpack| [ "--buildpack", buildpack ] } end end diff --git a/test/commands/builder_test.rb b/test/commands/builder_test.rb index 29c65703..aae88919 100644 --- a/test/commands/builder_test.rb +++ b/test/commands/builder_test.rb @@ -54,7 +54,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase end test "target pack when pack is set" do - builder = new_builder_command(builder: { "pack" => { "arch" => "amd64" , "builder" => "heroku/builder:24", "buildpacks" => [ "heroku/ruby", "heroku/procfile" ] }}) + builder = new_builder_command(builder: { "pack" => { "arch" => "amd64", "builder" => "heroku/builder:24", "buildpacks" => [ "heroku/ruby", "heroku/procfile" ] } }) assert_equal "native/pack", builder.name assert_equal \ "pack build dhh/app:123 --platform linux/amd64 --builder heroku/builder:24 --buildpack heroku/ruby --buildpack heroku/procfile --buildpack paketo-buildpacks/image-labels -t dhh/app:123 -t dhh/app:latest --env BP_IMAGE_LABELS=service=app --path . && docker push dhh/app:123 && docker push dhh/app:latest", diff --git a/test/configuration/builder_test.rb b/test/configuration/builder_test.rb index 8576e06a..092edd4f 100644 --- a/test/configuration/builder_test.rb +++ b/test/configuration/builder_test.rb @@ -33,21 +33,21 @@ class ConfigurationBuilderTest < ActiveSupport::TestCase end test "pack?" do - refute config.builder.pack? + assert_not config.builder.pack? end test "pack? with pack builder" do - @deploy[:builder] = { "pack" => {"builder" => "heroku/builder:24"} } + @deploy[:builder] = { "pack" => { "builder" => "heroku/builder:24" } } assert config.builder.pack? end test "pack details" do - @deploy[:builder] = { "pack" => {"arch" => "amd64", "builder" => "heroku/builder:24", "buildpacks" => ["heroku/ruby", "heroku/procfile"]} } + @deploy[:builder] = { "pack" => { "arch" => "amd64", "builder" => "heroku/builder:24", "buildpacks" => [ "heroku/ruby", "heroku/procfile" ] } } assert_equal "amd64", config.builder.pack_arch assert_equal "heroku/builder:24", config.builder.pack_builder - assert_equal ["heroku/ruby", "heroku/procfile"], config.builder.pack_buildpacks + assert_equal [ "heroku/ruby", "heroku/procfile" ], config.builder.pack_buildpacks end test "remote_arch" do