mrsk 0.9.1 → 0.10.1

data/lib/mrsk/cli/main.rb

@@ -1,77 +1,104 @@
 class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "setup", "Setup all accessories and deploy app to servers"
   def setup
-    print_runtime do
-      invoke "mrsk:cli:server:bootstrap"
-      invoke "mrsk:cli:accessory:boot", [ "all" ]
-      deploy
+    with_lock do
+      print_runtime do
+        invoke "mrsk:cli:server:bootstrap"
+        invoke "mrsk:cli:accessory:boot", [ "all" ]
+        deploy
+      end
     end
   end
 
   desc "deploy", "Deploy app to servers"
+  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   def deploy
-    runtime = print_runtime do
-      say "Ensure curl and Docker are installed...", :magenta
-      invoke "mrsk:cli:server:bootstrap"
+    with_lock do
+      invoke_options = deploy_options
 
-      say "Log into image registry...", :magenta
-      invoke "mrsk:cli:registry:login"
+      runtime = print_runtime do
+        say "Ensure curl and Docker are installed...", :magenta
+        invoke "mrsk:cli:server:bootstrap", [], invoke_options
 
-      say "Build and push app image...", :magenta
-      invoke "mrsk:cli:build:deliver"
+        say "Log into image registry...", :magenta
+        invoke "mrsk:cli:registry:login", [], invoke_options
 
-      say "Ensure Traefik is running...", :magenta
-      invoke "mrsk:cli:traefik:boot"
+        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"
+        say "Ensure Traefik is running...", :magenta
+        invoke "mrsk:cli:traefik:boot", [], invoke_options
 
-      invoke "mrsk:cli:app:boot"
+        say "Ensure app can pass healthcheck...", :magenta
+        invoke "mrsk:cli:healthcheck:perform", [], invoke_options
 
-      say "Prune old containers and images...", :magenta
-      invoke "mrsk:cli:prune:all"
-    end
+        invoke "mrsk:cli:app:boot", [], invoke_options
 
-    audit_broadcast "Deployed app in #{runtime.to_i} seconds" unless options[:skip_broadcast]
+        say "Prune old containers and images...", :magenta
+        invoke "mrsk:cli:prune:all", [], invoke_options
+      end
+
+      audit_broadcast "Deployed #{service_version} in #{runtime.round} seconds" unless options[:skip_broadcast]
+    end
   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
-    runtime = print_runtime do
-      say "Build and push app image...", :magenta
-      invoke "mrsk:cli:build:deliver"
-
-      say "Ensure app can pass healthcheck...", :magenta
-      invoke "mrsk:cli:healthcheck:perform"
+    with_lock do
+      invoke_options = deploy_options
+
+      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_options
+        end
+
+        say "Ensure app can pass healthcheck...", :magenta
+        invoke "mrsk:cli:healthcheck:perform", [], invoke_options
+
+        invoke "mrsk:cli:app:boot", [], invoke_options
+      end
 
-      invoke "mrsk:cli:app:boot"
+      audit_broadcast "Redeployed #{service_version} in #{runtime.round} seconds" unless options[:skip_broadcast]
     end
-
-    audit_broadcast "Redeployed app in #{runtime.to_i} seconds" unless options[:skip_broadcast]
   end
 
   desc "rollback [VERSION]", "Rollback app to VERSION"
   def rollback(version)
-    MRSK.version = version
+    with_lock do
+      MRSK.config.version = version
 
-    if container_name_available?(MRSK.config.service_with_version)
-      say "Start version #{version}, then wait #{MRSK.config.readiness_delay}s for app to boot before stopping the old version...", :magenta
+      if container_name_available?(MRSK.config.service_with_version)
+        say "Start version #{version}, then wait #{MRSK.config.readiness_delay}s for app to boot before stopping the old version...", :magenta
 
-      cli = self
+        cli = self
+        old_version = nil
 
-      on(MRSK.hosts) do |host|
-        old_version = capture_with_info(*MRSK.app.current_running_version).strip.presence
+        on(MRSK.hosts) do |host|
+          old_version = capture_with_info(*MRSK.app.current_running_version).strip.presence
 
-        execute *MRSK.app.start
+          execute *MRSK.app.start
 
-        sleep MRSK.config.readiness_delay
+          if old_version
+            sleep MRSK.config.readiness_delay
 
-        execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false
-      end
+            execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false
+          end
+        end
 
-      audit_broadcast "Rolled back app to version #{version}" unless options[:skip_broadcast]
-    else
-      say "The app version '#{version}' is not available as a container (use 'mrsk app containers' for available versions)", :red
+        audit_broadcast "Rolled back #{service_version(Mrsk::Utils.abbreviate_version(old_version))} to #{service_version}" unless options[:skip_broadcast]
+      else
+        say "The app version '#{version}' is not available as a container (use 'mrsk app containers' for available versions)", :red
+      end
     end
   end
 
@@ -119,8 +146,10 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
         puts "Binstub already exists in bin/mrsk (remove first to create a new one)"
       else
         puts "Adding MRSK to Gemfile and bundle..."
-        `bundle add mrsk`
-        `bundle binstubs mrsk`
+        run_locally do
+          execute :bundle, :add, :mrsk
+          execute :bundle, :binstubs, :mrsk
+        end
         puts "Created binstub file in bin/mrsk"
       end
     end
@@ -142,11 +171,13 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "remove", "Remove Traefik, app, accessories, and registry session from servers"
   option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
   def remove
-    if options[:confirmed] || ask("This will remove all containers and images. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
-      invoke "mrsk:cli:traefik:remove", [], options.without(:confirmed)
-      invoke "mrsk:cli:app:remove", [], options.without(:confirmed)
-      invoke "mrsk:cli:accessory:remove", [ "all" ], options
-      invoke "mrsk:cli:registry:logout", [], options.without(:confirmed)
+    with_lock do
+      if options[:confirmed] || ask("This will remove all containers and images. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
+        invoke "mrsk:cli:traefik:remove", [], options.without(:confirmed)
+        invoke "mrsk:cli:app:remove", [], options.without(:confirmed)
+        invoke "mrsk:cli:accessory:remove", [ "all" ], options
+        invoke "mrsk:cli:registry:logout", [], options.without(:confirmed)
+      end
     end
   end
 
@@ -179,10 +210,21 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "traefik", "Manage Traefik load balancer"
   subcommand "traefik", Mrsk::Cli::Traefik
 
+  desc "lock", "Manage the deploy lock"
+  subcommand "lock", Mrsk::Cli::Lock
+
   private
     def container_name_available?(container_name, host: MRSK.primary_host)
       container_names = nil
       on(host) { container_names = capture_with_info(*MRSK.app.list_container_names).split("\n") }
       Array(container_names).include?(container_name)
     end
+
+    def deploy_options
+      { "version" => MRSK.config.version }.merge(options.without("skip_push"))
+    end
+
+    def service_version(version = MRSK.config.abbreviated_version)
+      [ MRSK.config.service, version ].compact.join("@")
+    end
 end

data/lib/mrsk/cli/prune.rb

@@ -1,23 +1,29 @@
 class Mrsk::Cli::Prune < Mrsk::Cli::Base
   desc "all", "Prune unused images and stopped containers"
   def all
-    containers
-    images
+    with_lock do
+      containers
+      images
+    end
   end
 
   desc "images", "Prune unused images older than 7 days"
   def images
-    on(MRSK.hosts) do
-      execute *MRSK.auditor.record("Pruned images"), verbosity: :debug
-      execute *MRSK.prune.images
+    with_lock do
+      on(MRSK.hosts) do
+        execute *MRSK.auditor.record("Pruned images"), verbosity: :debug
+        execute *MRSK.prune.images
+      end
     end
   end
 
   desc "containers", "Prune stopped containers older than 3 days"
   def containers
-    on(MRSK.hosts) do
-      execute *MRSK.auditor.record("Pruned containers"), verbosity: :debug
-      execute *MRSK.prune.containers
+    with_lock do
+      on(MRSK.hosts) do
+        execute *MRSK.auditor.record("Pruned containers"), verbosity: :debug
+        execute *MRSK.prune.containers
+      end
     end
   end
 end

data/lib/mrsk/cli/server.rb

@@ -1,14 +1,16 @@
 class Mrsk::Cli::Server < Mrsk::Cli::Base
   desc "bootstrap", "Ensure curl and Docker are installed on servers"
   def bootstrap
-    on(MRSK.hosts + MRSK.accessory_hosts) do
-      dependencies_to_install = Array.new.tap do |dependencies|
-        dependencies << "curl" unless execute "which curl", raise_on_non_zero_exit: false
-        dependencies << "docker.io" unless execute "which docker", raise_on_non_zero_exit: false
-      end
+    with_lock do
+      on(MRSK.hosts + MRSK.accessory_hosts) do
+        dependencies_to_install = Array.new.tap do |dependencies|
+          dependencies << "curl" unless execute "which curl", raise_on_non_zero_exit: false
+          dependencies << "docker.io" unless execute "which docker", raise_on_non_zero_exit: false
+        end
 
-      if dependencies_to_install.any?
-        execute "apt-get update -y && apt-get install #{dependencies_to_install.join(" ")} -y"
+        if dependencies_to_install.any?
+          execute "apt-get update -y && apt-get install #{dependencies_to_install.join(" ")} -y"
+        end
       end
     end
   end

data/lib/mrsk/cli/templates/deploy.yml

@@ -13,6 +13,8 @@ registry:
   # Specify the registry server, if you're not using Docker Hub
   # server: registry.digitalocean.com / ghcr.io / ...
   username: my-user
+
+  # Always use an access token rather than real password when possible.
   password:
     - MRSK_REGISTRY_PASSWORD
 

data/lib/mrsk/cli/traefik.rb

@@ -1,36 +1,46 @@
 class Mrsk::Cli::Traefik < Mrsk::Cli::Base
   desc "boot", "Boot Traefik on servers"
   def boot
-    on(MRSK.traefik_hosts) { execute *MRSK.traefik.run, raise_on_non_zero_exit: false }
+    with_lock do
+      on(MRSK.traefik_hosts) { execute *MRSK.traefik.run, raise_on_non_zero_exit: false }
+    end
   end
 
   desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
   def reboot
-    stop
-    remove_container
-    boot
+    with_lock do
+      stop
+      remove_container
+      boot
+    end
   end
 
   desc "start", "Start existing Traefik container on servers"
   def start
-    on(MRSK.traefik_hosts) do
-      execute *MRSK.auditor.record("Started traefik"), verbosity: :debug
-      execute *MRSK.traefik.start, raise_on_non_zero_exit: false
+    with_lock do
+      on(MRSK.traefik_hosts) do
+        execute *MRSK.auditor.record("Started traefik"), verbosity: :debug
+        execute *MRSK.traefik.start, raise_on_non_zero_exit: false
+      end
     end
   end
 
   desc "stop", "Stop existing Traefik container on servers"
   def stop
-    on(MRSK.traefik_hosts) do
-      execute *MRSK.auditor.record("Stopped traefik"), verbosity: :debug
-      execute *MRSK.traefik.stop, raise_on_non_zero_exit: false
+    with_lock do
+      on(MRSK.traefik_hosts) do
+        execute *MRSK.auditor.record("Stopped traefik"), verbosity: :debug
+        execute *MRSK.traefik.stop, raise_on_non_zero_exit: false
+      end
     end
   end
 
   desc "restart", "Restart existing Traefik container on servers"
   def restart
-    stop
-    start
+    with_lock do
+      stop
+      start
+    end
   end
 
   desc "details", "Show details about Traefik container from servers"
@@ -64,24 +74,30 @@ class Mrsk::Cli::Traefik < Mrsk::Cli::Base
 
   desc "remove", "Remove Traefik container and image from servers"
   def remove
-    stop
-    remove_container
-    remove_image
+    with_lock do
+      stop
+      remove_container
+      remove_image
+    end
   end
 
   desc "remove_container", "Remove Traefik container from servers", hide: true
   def remove_container
-    on(MRSK.traefik_hosts) do
-      execute *MRSK.auditor.record("Removed traefik container"), verbosity: :debug
-      execute *MRSK.traefik.remove_container
+    with_lock do
+      on(MRSK.traefik_hosts) do
+        execute *MRSK.auditor.record("Removed traefik container"), verbosity: :debug
+        execute *MRSK.traefik.remove_container
+      end
     end
   end
 
   desc "remove_container", "Remove Traefik image from servers", hide: true
   def remove_image
-    on(MRSK.traefik_hosts) do
-      execute *MRSK.auditor.record("Removed traefik image"), verbosity: :debug
-      execute *MRSK.traefik.remove_image
+    with_lock do
+      on(MRSK.traefik_hosts) do
+        execute *MRSK.auditor.record("Removed traefik image"), verbosity: :debug
+        execute *MRSK.traefik.remove_image
+      end
     end
   end
 end

data/lib/mrsk/commander.rb

@@ -1,35 +1,57 @@
 require "active_support/core_ext/enumerable"
+require "active_support/core_ext/module/delegation"
 
 class Mrsk::Commander
-  attr_accessor :config_file, :destination, :verbosity, :version
+  attr_accessor :verbosity, :lock_count
 
-  def initialize(config_file: nil, destination: nil, verbosity: :info)
-    @config_file, @destination, @verbosity = config_file, destination, verbosity
+  def initialize
+    self.verbosity = :info
+    self.lock_count = 0
   end
 
   def config
-    @config ||= \
-      Mrsk::Configuration
-        .create_from(config_file, destination: destination, version: cascading_version)
-        .tap { |config| configure_sshkit_with(config) }
+    @config ||= Mrsk::Configuration.create_from(**@config_kwargs).tap do |config|
+      @config_kwargs = nil
+      configure_sshkit_with(config)
+    end
+  end
+
+  def configure(**kwargs)
+    @config, @config_kwargs = nil, kwargs
   end
 
-  attr_accessor :specific_hosts
+  attr_reader :specific_roles, :specific_hosts
 
   def specific_primary!
     self.specific_hosts = [ config.primary_web_host ]
   end
 
   def specific_roles=(role_names)
-    self.specific_hosts = config.roles.select { |r| role_names.include?(r.name) }.flat_map(&:hosts) if role_names.present?
+    @specific_roles = config.roles.select { |r| role_names.include?(r.name) } if role_names.present?
+  end
+
+  def specific_hosts=(hosts)
+    @specific_hosts = config.all_hosts & hosts if hosts.present?
   end
 
   def primary_host
     specific_hosts&.first || config.primary_web_host
   end
 
+  def roles
+    (specific_roles || config.roles).select do |role|
+      ((specific_hosts || config.all_hosts) & role.hosts).any?
+    end
+  end
+
   def hosts
-    specific_hosts || config.all_hosts
+    (specific_hosts || config.all_hosts).select do |host|
+      (specific_roles || config.roles).flat_map(&:hosts).include?(host)
+    end
+  end
+
+  def roles_on(host)
+    roles.select { |role| role.hosts.include?(host.to_s) }.map(&:name)
   end
 
   def traefik_hosts
@@ -37,7 +59,7 @@ class Mrsk::Commander
   end
 
   def accessory_hosts
-    specific_hosts || config.accessories.collect(&:host)
+    specific_hosts || config.accessories.flat_map(&:hosts)
   end
 
   def accessory_names
@@ -45,16 +67,16 @@ class Mrsk::Commander
   end
 
 
-  def app
-    @app ||= Mrsk::Commands::App.new(config)
+  def app(role: nil)
+    Mrsk::Commands::App.new(config, role: role)
   end
 
   def accessory(name)
     Mrsk::Commands::Accessory.new(config, name: name)
   end
 
-  def auditor
-    @auditor ||= Mrsk::Commands::Auditor.new(config)
+  def auditor(role: nil)
+    Mrsk::Commands::Auditor.new(config, role: role)
   end
 
   def builder
@@ -77,6 +99,9 @@ class Mrsk::Commander
     @traefik ||= Mrsk::Commands::Traefik.new(config)
   end
 
+  def lock
+    @lock ||= Mrsk::Commands::Lock.new(config)
+  end
 
   def with_verbosity(level)
     old_level = self.verbosity
@@ -90,26 +115,7 @@ class Mrsk::Commander
     SSHKit.config.output_verbosity = old_level
   end
 
-  # Test-induced damage!
-  def reset
-    @config = @config_file = @destination = @version = nil
-    @app = @builder = @traefik = @registry = @prune = @auditor = nil
-    @verbosity = :info
-  end
-
   private
-    def cascading_version
-      version.presence || ENV["VERSION"] || current_commit_hash
-    end
-
-    def current_commit_hash
-      if system("git rev-parse")
-        `git rev-parse HEAD`.strip
-      else
-        raise "Can't use commit hash as version, no git repository found in #{Dir.pwd}"
-      end
-    end
-
     # Lazy setup of SSHKit
     def configure_sshkit_with(config)
       SSHKit::Backend::Netssh.configure { |ssh| ssh.ssh_options = config.ssh_options }

data/lib/mrsk/commands/accessory.rb

@@ -1,6 +1,7 @@
 class Mrsk::Commands::Accessory < Mrsk::Commands::Base
   attr_reader :accessory_config
-  delegate :service_name, :image, :host, :port, :files, :directories, :env_args, :volume_args, :label_args, to: :accessory_config
+  delegate :service_name, :image, :hosts, :port, :files, :directories, :cmd,
+           :publish_args, :env_args, :volume_args, :label_args, :option_args, to: :accessory_config
 
   def initialize(config, name:)
     super(config)
@@ -12,12 +13,14 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
       "--name", service_name,
       "--detach",
       "--restart", "unless-stopped",
-      "--log-opt", "max-size=#{MAX_LOG_SIZE}",
-      "--publish", port,
+      *config.logging_args,
+      *publish_args,
       *env_args,
       *volume_args,
       *label_args,
-      image
+      *option_args,
+      image,
+      cmd
   end
 
   def start
@@ -73,7 +76,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
   end
 
   def run_over_ssh(command)
-    super command, host: host
+    super command, host: hosts.first
   end
 
 
@@ -100,7 +103,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
   end
 
   def remove_image
-    docker :image, :prune, "--all", "--force", *service_filter
+    docker :image, :rm, "--force", image
   end
 
   private