Merge pull request #111 from calmyournerves/deploy-without-build-push

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"
+      invoke "mrsk:cli:registry:login", [], invoke_options
 
+      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 "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
+      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 "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]

test/cli/main_test.rb

@@ -6,6 +6,74 @@ class CliMainTest < CliTestCase
     assert_equal Mrsk::VERSION, version
   end
 
+  test "deploy" do
+    invoke_options = { "config_file" => "test/fixtures/deploy_with_accessories.yml", "skip_broadcast" => false, "skip_push" => false}
+
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:server:bootstrap", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:registry:login", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:deliver", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:traefik:boot", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:prune:all", [], invoke_options)
+
+    run_command("deploy").tap do |output|
+      assert_match /Ensure curl and Docker are installed/, output
+      assert_match /Log into image registry/, output
+      assert_match /Build and push app image/, output
+      assert_match /Ensure Traefik is running/, output
+      assert_match /Ensure app can pass healthcheck/, output
+      assert_match /Prune old containers and images/, output
+    end
+  end
+
+  test "deploy with skip_push" do
+    invoke_options = { "config_file" => "test/fixtures/deploy_with_accessories.yml", "skip_broadcast" => false, "skip_push" => true }
+
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:server:bootstrap", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:registry:login", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:pull", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:traefik:boot", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:prune:all", [], invoke_options)
+
+    run_command("deploy", "--skip_push").tap do |output|
+      assert_match /Ensure curl and Docker are installed/, output
+      assert_match /Log into image registry/, output
+      assert_match /Pull app image/, output
+      assert_match /Ensure Traefik is running/, output
+      assert_match /Ensure app can pass healthcheck/, output
+      assert_match /Prune old containers and images/, output
+    end
+  end
+
+  test "redeploy" do
+    invoke_options = { "config_file" => "test/fixtures/deploy_with_accessories.yml", "skip_broadcast" => false, "skip_push" => false}
+
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:deliver", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
+
+    run_command("redeploy").tap do |output|
+      assert_match /Build and push app image/, output
+      assert_match /Ensure app can pass healthcheck/, output
+    end
+  end
+
+  test "redeploy with skip_push" do
+    invoke_options = { "config_file" => "test/fixtures/deploy_with_accessories.yml", "skip_broadcast" => false, "skip_push" => true }
+
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:pull", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
+    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
+
+    run_command("redeploy", "--skip_push").tap do |output|
+      assert_match /Pull app image/, output
+      assert_match /Ensure app can pass healthcheck/, output
+    end
+  end
+
   test "rollback bad version" do
     run_command("details") # Preheat MRSK const