Various code style improvements

lib/mrsk/commands/builder.rb

@@ -7,9 +7,9 @@ class Mrsk::Commands::Builder < Mrsk::Commands::Base
 
   def target
     case
-    when !config.builder.multiarch? && !config.builder.cache?
+    when !config.builder.multiarch? && !config.builder.cached?
       native
-    when !config.builder.multiarch? && config.builder.cache?
+    when !config.builder.multiarch? && config.builder.cached?
       native_cached
     when config.builder.local? && config.builder.remote?
       multiarch_remote

lib/mrsk/commands/builder/base.rb

@@ -3,6 +3,7 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
   class BuilderError < StandardError; end
 
   delegate :argumentize, to: Mrsk::Utils
+  delegate :args, :secrets, :dockerfile, :local_arch, :local_host, :remote_arch, :remote_host, :cache_from, :cache_to, to: :builder_config
 
   def clean
     docker :image, :rm, "--force", config.absolute_image
@@ -27,9 +28,9 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
     end
 
     def build_cache
-      if config.builder.cache?
-        ["--cache-to", config.builder.cache_to,
-          "--cache-from", config.builder.cache_from]
+      if cache_to && cache_from
+        ["--cache-to", cache_to,
+          "--cache-from", cache_from]
       end
     end
 
@@ -38,18 +39,22 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
     end
 
     def build_args
-      argumentize "--build-arg", config.builder.args, sensitive: true
+      argumentize "--build-arg", args, sensitive: true
     end
 
     def build_secrets
-      argumentize "--secret", config.builder.secrets.collect { |secret| [ "id", secret ] }
+      argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
     end
 
     def build_dockerfile
-      if Pathname.new(File.expand_path(config.builder.dockerfile)).exist?
-        argumentize "--file", config.builder.dockerfile
+      if Pathname.new(File.expand_path(dockerfile)).exist?
+        argumentize "--file", dockerfile
       else
-        raise BuilderError, "Missing #{config.builder.dockerfile}"
+        raise BuilderError, "Missing #{dockerfile}"
       end
     end
+
+    def builder_config
+      config.builder
+    end
 end

lib/mrsk/commands/builder/multiarch/remote.rb

@@ -22,17 +22,17 @@ class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Mult
     end
 
     def create_local_buildx
-      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(config.builder.local_arch), "--platform", "linux/#{config.builder.local_arch}"
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local_arch), "--platform", "linux/#{local_arch}"
     end
 
     def append_remote_buildx
-      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(config.builder.remote_arch), "--platform", "linux/#{config.builder.remote_arch}"
+      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote_arch), "--platform", "linux/#{remote_arch}"
     end
 
     def create_contexts
       combine \
-        create_context(config.builder.local_arch, config.builder.local_host),
-        create_context(config.builder.remote_arch, config.builder.remote_host)
+        create_context(local_arch, local_host),
+        create_context(remote_arch, remote_host)
     end
 
     def create_context(arch, host)
@@ -41,8 +41,8 @@ class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Mult
 
     def remove_contexts
       combine \
-        remove_context(config.builder.local_arch),
-        remove_context(config.builder.remote_arch)
+        remove_context(local_arch),
+        remove_context(remote_arch)
     end
 
     def remove_context(arch)

lib/mrsk/commands/builder/native/remote.rb

@@ -33,16 +33,16 @@ class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
     end
 
     def builder_name_with_arch
-      "#{builder_name}-#{config.builder.remote_arch}"
+      "#{builder_name}-#{remote_arch}"
     end
 
     def platform
-      "linux/#{config.builder.remote_arch}"
+      "linux/#{remote_arch}"
     end
 
     def create_context
       docker :context, :create,
-        builder_name_with_arch, "--description", "'#{builder_name} #{config.builder.remote_arch} native host'", "--docker", "'host=#{config.builder.remote_host}'"
+        builder_name_with_arch, "--description", "'#{builder_name} #{remote_arch} native host'", "--docker", "'host=#{remote_host}'"
     end
 
     def remove_context