From cb15800d2529cd0cb29ab916bbac029a7edbc39c Mon Sep 17 00:00:00 2001
From: Samuel Sieg <samuel.sieg@crafted.ch>
Date: Mon, 13 Mar 2023 16:02:24 +0100
Subject: [PATCH] Move option to `deploy`/`redeploy`, rename to `skip-push`

---
 lib/mrsk/cli/base.rb  |  8 +++-----
 lib/mrsk/cli/build.rb |  2 +-
 lib/mrsk/cli/main.rb  | 38 +++++++++++++++++++++++++++-----------
 lib/mrsk/commander.rb |  2 +-
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/lib/mrsk/cli/base.rb b/lib/mrsk/cli/base.rb
index 8fa3fc6b..c7a87964 100644
--- a/lib/mrsk/cli/base.rb
+++ b/lib/mrsk/cli/base.rb
@@ -12,7 +12,6 @@ module Mrsk::Cli
     class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
 
     class_option :version, desc: "Run commands against a specific app version"
-    class_option :use_prebuilt_image, type: :boolean, default: false, desc: "Use prebuilt image, skip building"
 
     class_option :primary, type: :boolean, aliases: "-p", desc: "Run commands only on primary host instead of all"
     class_option :hosts, aliases: "-h", desc: "Run commands on these hosts instead of all (separate by comma)"
@@ -40,10 +39,9 @@ module Mrsk::Cli
 
       def initialize_commander(options)
         MRSK.tap do |commander|
-          commander.config_file        = Pathname.new(File.expand_path(options[:config_file]))
-          commander.destination        = options[:destination]
-          commander.version            = options[:version]
-          commander.use_prebuilt_image = options[:use_prebuilt_image]
+          commander.config_file = Pathname.new(File.expand_path(options[:config_file]))
+          commander.destination = options[:destination]
+          commander.version     = options[:version]
 
           commander.specific_hosts    = options[:hosts]&.split(",")
           commander.specific_roles    = options[:roles]&.split(",")
diff --git a/lib/mrsk/cli/build.rb b/lib/mrsk/cli/build.rb
index dd721d6f..3e8912d7 100644
--- a/lib/mrsk/cli/build.rb
+++ b/lib/mrsk/cli/build.rb
@@ -1,7 +1,7 @@
 class Mrsk::Cli::Build < Mrsk::Cli::Base
   desc "deliver", "Build app and push app image to registry then pull image on servers"
   def deliver
-    push unless MRSK.use_prebuilt_image
+    push
     pull
   end
 
diff --git a/lib/mrsk/cli/main.rb b/lib/mrsk/cli/main.rb
index 73268f50..e34cdaf3 100644
--- a/lib/mrsk/cli/main.rb
+++ b/lib/mrsk/cli/main.rb
@@ -9,42 +9,58 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   end
 
   desc "deploy", "Deploy app to servers"
+  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   def deploy
+    invoke_options = options.without(:skip_push)
+
     runtime = print_runtime do
       say "Ensure curl and Docker are installed...", :magenta
-      invoke "mrsk:cli:server:bootstrap"
+      invoke "mrsk:cli:server:bootstrap", [], invoke_options
 
       say "Log into image registry...", :magenta
       invoke "mrsk:cli:registry:login"
 
-      say "Build and push app image...", :magenta
-      invoke "mrsk:cli:build:deliver"
+      if options[:skip_push]
+        say "Pull app image...", :magenta
+        invoke "mrsk:cli:build:pull", [], invoke_options
+      else
+        say "Build and push app image...", :magenta
+        invoke "mrsk:cli:build:deliver", [], invoke_options
+      end
 
       say "Ensure Traefik is running...", :magenta
-      invoke "mrsk:cli:traefik:boot"
+      invoke "mrsk:cli:traefik:boot", [], invoke_options
 
       say "Ensure app can pass healthcheck...", :magenta
-      invoke "mrsk:cli:healthcheck:perform"
+      invoke "mrsk:cli:healthcheck:perform", [], invoke_options
 
-      invoke "mrsk:cli:app:boot"
+      invoke "mrsk:cli:app:boot", [], invoke_options
 
       say "Prune old containers and images...", :magenta
-      invoke "mrsk:cli:prune:all"
+      invoke "mrsk:cli:prune:all", [], invoke_options
     end
 
     audit_broadcast "Deployed app in #{runtime.to_i} seconds" unless options[:skip_broadcast]
   end
 
   desc "redeploy", "Deploy app to servers without bootstrapping servers, starting Traefik, pruning, and registry login"
+  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   def redeploy
+    invoke_options = options.without(:skip_push)
+
     runtime = print_runtime do
-      say "Build and push app image...", :magenta
-      invoke "mrsk:cli:build:deliver"
+      if options[:skip_push]
+        say "Pull app image...", :magenta
+        invoke "mrsk:cli:build:pull", [], invoke_options
+      else
+        say "Build and push app image...", :magenta
+        invoke "mrsk:cli:build:deliver", [], invoke_options
+      end
 
       say "Ensure app can pass healthcheck...", :magenta
-      invoke "mrsk:cli:healthcheck:perform"
+      invoke "mrsk:cli:healthcheck:perform", [], invoke_options
 
-      invoke "mrsk:cli:app:boot"
+      invoke "mrsk:cli:app:boot", [], invoke_options
     end
 
     audit_broadcast "Redeployed app in #{runtime.to_i} seconds" unless options[:skip_broadcast]
diff --git a/lib/mrsk/commander.rb b/lib/mrsk/commander.rb
index d9fb5347..be2fd2e3 100644
--- a/lib/mrsk/commander.rb
+++ b/lib/mrsk/commander.rb
@@ -1,7 +1,7 @@
 require "active_support/core_ext/enumerable"
 
 class Mrsk::Commander
-  attr_accessor :config_file, :destination, :verbosity, :version, :use_prebuilt_image
+  attr_accessor :config_file, :destination, :verbosity, :version
 
   def initialize(config_file: nil, destination: nil, verbosity: :info)
     @config_file, @destination, @verbosity = config_file, destination, verbosity