Bump version for 0.5.1

Not enough reuse possible

.gitignore

@@ -1,2 +1,4 @@
 .byebug_history
 *.gem
+coverage/*
+.DS_Store

Gemfile

@@ -4,4 +4,5 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 
 gem "debug"
+gem "mocha"
 gem "railties"

Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    mrsk (0.3.1)
+    mrsk (0.5.1)
       activesupport (>= 7.0)
+      dotenv (~> 2.8)
       sshkit (~> 1.21)
       thor (~> 1.2)
 
@@ -33,6 +34,7 @@ GEM
     debug (1.7.1)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
+    dotenv (2.8.1)
     erubi (1.12.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -44,6 +46,8 @@ GEM
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     minitest (5.17.0)
+    mocha (2.0.2)
+      ruby2_keywords (>= 0.0.5)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.0.1)
@@ -72,6 +76,7 @@ GEM
     rake (13.0.6)
     reline (0.3.2)
       io-console (~> 0.5)
+    ruby2_keywords (0.0.5)
     sshkit (1.21.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -90,6 +95,7 @@ PLATFORMS
 
 DEPENDENCIES
   debug
+  mocha
   mrsk!
   railties
 

README.md

@@ -46,6 +46,15 @@ Kubernetes is a beast. Running it yourself on your own hardware is not for the f
 
 ## Configuration
 
+### Using .env file to load required environment variables
+
+MRSK uses [dotenv](https://github.com/bkeepers/dotenv) to automatically load environment variables set in the `.env` file present in the application root. This file can be used to set variables like `MRSK_REGISTRY_PASSWORD` or database passwords. But for this reason you must ensure that .env files are not checked into Git or included in your Dockerfile! The format is just key-value like:
+
+```bash
+MRSK_REGISTRY_PASSWORD=pw
+DB_PASSWORD=secret123
+```
+
 ### Using another registry than Docker Hub
 
 The default registry is Docker Hub, but you can change it using `registry/server`:
@@ -226,6 +235,18 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
   bundle install
 ```
 
+### Using command arguments for Traefik
+
+You can customize the traefik command line:
+
+```yaml
+traefik:
+  accesslog: true
+  accesslog.format: json
+  metrics.prometheus: true
+  metrics.prometheus.buckets: 0.1,0.3,1.2,5.0
+```
+
 ### Configuring build args for new images
 
 Build arguments that aren't secret can also be configured:
@@ -281,9 +302,9 @@ Now run `mrsk accessory start mysql` to start the MySQL server on 1.1.1.3. See `
 
 ## Commands
 
-### Running remote execution and runners
+### Running commands on servers
 
-If you need to execute commands inside the Rails containers, you can use `mrsk app exec` and `mrsk app runner`. Examples:
+You can execute one-off commands on the servers:
 
 ```bash
 # Runs command on all servers
@@ -326,13 +347,25 @@ Database adapter          sqlite3
 Database schema version   20221231233303
 
 # Run Rails runner on primary server
-mrsk app runner -p 'puts Rails.application.config.time_zone'
+mrsk app exec -p 'bin/rails runner "puts Rails.application.config.time_zone"'
 UTC
 ```
 
-### Running a Rails console
+### Running interactive commands over SSH
+
+You can run interactive commands, like a Rails console or a bash session, on a server (default is primary, use `--hosts` to connect to another):
+
+```bash
+# Starts a bash session in a new container made from the most recent app image
+mrsk app exec -i bash
+
+# Starts a bash session in the currently running container for the app
+mrsk app exec -i --reuse bash
+
+# Starts a Rails console in a new container made from the most recent app image
+mrsk app exec -i 'bin/rails console'
+```
 
-If you need to interact with the production console for the app, you can use `mrsk app console`, which will start a Rails console session on the primary host. You can start the console on a different host using `mrsk app console --host 192.168.0.2`. Be mindful that this is a live wire! Any changes made to the production database will take effect immeditately.
 
 ### Running details to see state of containers
 

bin/mrsk

@@ -3,6 +3,7 @@
 # Prevent failures from being reported twice.
 Thread.report_on_exception = false
 
+require "dotenv/load"
 require "mrsk/cli"
 
 begin
@@ -10,4 +11,7 @@ begin
 rescue SSHKit::Runner::ExecuteError => e
   puts "  \e[31mERROR (#{e.cause.class}): #{e.cause.message}\e[0m"
   puts e.cause.backtrace if ENV["VERBOSE"]
+rescue => e
+  puts "  \e[31mERROR (#{e.class}): #{e.message}\e[0m"
+  puts e.backtrace if ENV["VERBOSE"]
 end

lib/mrsk/cli/accessory.rb

@@ -9,7 +9,10 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
       with_accessory(name) do |accessory|
         directories(name)
         upload(name)
-        on(accessory.host) { execute *accessory.run }
+        on(accessory.host) do
+          execute *MRSK.auditor.record("accessory #{name} boot"), verbosity: :debug
+          execute *accessory.run
+        end
       end
     end
   end
@@ -18,6 +21,8 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   def upload(name)
     with_accessory(name) do |accessory|
       on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} upload files"), verbosity: :debug
+
         accessory.files.each do |(local, remote)|
           accessory.ensure_local_file_present(local)
 
@@ -33,6 +38,8 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   def directories(name)
     with_accessory(name) do |accessory|
       on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} create directories"), verbosity: :debug
+
         accessory.directories.keys.each do |host_path|
           execute *accessory.make_directory(host_path)
         end
@@ -52,14 +59,20 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   desc "start [NAME]", "Start existing accessory on host"
   def start(name)
     with_accessory(name) do |accessory|
-      on(accessory.host) { execute *accessory.start }
+      on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} start"), verbosity: :debug
+        execute *accessory.start
+      end
     end
   end
 
   desc "stop [NAME]", "Stop accessory on host"
   def stop(name)
     with_accessory(name) do |accessory|
-      on(accessory.host) { execute *accessory.stop, raise_on_non_zero_exit: false }
+      on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} stop"), verbosity: :debug
+        execute *accessory.stop, raise_on_non_zero_exit: false
+      end
     end
   end
 
@@ -82,21 +95,33 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
     end
   end
 
-  desc "exec [NAME] [CMD]", "Execute a custom command on accessory host"
+  desc "exec [NAME] [CMD]", "Execute a custom command on servers"
-  option :run, type: :boolean, default: false, desc: "Start a new container to run the command rather than reusing existing"
+  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
+  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
   def exec(name, cmd)
     with_accessory(name) do |accessory|
-      runner = options[:run] ? :run_exec : :exec
+      case
-      on(accessory.host) { |host| puts_by_host host, capture_with_info(*accessory.send(runner, cmd)) }
+      when options[:interactive] && options[:reuse]
-    end
+        say "Launching interactive command with via SSH from existing container...", :magenta
+        run_locally { exec accessory.execute_in_existing_container_over_ssh(cmd) }
+
+      when options[:interactive]
+        say "Launching interactive command via SSH from new container...", :magenta
+        run_locally { exec accessory.execute_in_new_container_over_ssh(cmd) }
+
+      when options[:reuse]
+        say "Launching command from existing container...", :magenta
+        on(accessory.host) do
+          execute *MRSK.auditor.record("accessory #{name} cmd '#{cmd}'"), verbosity: :debug
+          capture_with_info(*accessory.execute_in_existing_container(cmd))
         end
 
-  desc "bash [NAME]", "Start a bash session on primary host (or specific host set by --hosts)"
+      else
-  def bash(name)
+        say "Launching command from new container...", :magenta
-    with_accessory(name) do |accessory|
+        on(accessory.host) do
-      run_locally do
+          execute *MRSK.auditor.record("accessory #{name} cmd '#{cmd}'"), verbosity: :debug
-        info "Launching bash session on #{accessory.host}"
+          capture_with_info(*accessory.execute_in_new_container(cmd))
-        exec accessory.bash(host: accessory.host)
+        end
       end
     end
   end
@@ -118,7 +143,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
         end
       else
         since = options[:since]
-        lines = options[:lines]
+        lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
 
         on(accessory.host) do
           puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep))
@@ -144,21 +169,30 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   desc "remove_container [NAME]", "Remove accessory container from host"
   def remove_container(name)
     with_accessory(name) do |accessory|
-      on(accessory.host) { execute *accessory.remove_container }
+      on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} remove container"), verbosity: :debug
+        execute *accessory.remove_container
+      end
     end
   end
 
-  desc "remove_container [NAME]", "Remove accessory image from host"
+  desc "remove_image [NAME]", "Remove accessory image from host"
   def remove_image(name)
     with_accessory(name) do |accessory|
-      on(accessory.host) { execute *accessory.remove_image }
+      on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} remove image"), verbosity: :debug
+        execute *accessory.remove_image
+      end
     end
   end
 
   desc "remove_service_directory [NAME]", "Remove accessory directory used for uploaded files and data directories from host"
   def remove_service_directory(name)
     with_accessory(name) do |accessory|
-      on(accessory.host) { execute *accessory.remove_service_directory }
+      on(accessory.host) do
+        execute *MRSK.auditor.record("accessory #{name} remove service directory"), verbosity: :debug
+        execute *accessory.remove_service_directory
+      end
     end
   end
 

lib/mrsk/cli/app.rb

@@ -1,16 +1,29 @@
 require "mrsk/cli/base"
 
 class Mrsk::Cli::App < Mrsk::Cli::Base
-  desc "boot", "Boot app on servers (or start them if they've already been booted)"
+  desc "boot", "Boot app on servers (or reboot app if already running)"
   def boot
+    cli = self
+
+    say "Ensure no other version of the app is running...", :magenta
+    stop
+
+    say "Get most recent version available as an image...", :magenta unless options[:version]
+    using_version(options[:version] || most_recent_version_available) do |version|
+      say "Start container with version #{version} (or reboot if already running)...", :magenta
+
       MRSK.config.roles.each do |role|
         on(role.hosts) do |host|
+          execute *MRSK.auditor.record("app boot version #{version}"), verbosity: :debug
+
           begin
             execute *MRSK.app.run(role: role.name)
           rescue SSHKit::Command::Failed => e
             if e.message =~ /already in use/
-            error "Container with same version already deployed on #{host}, starting that instead"
+              error "Rebooting container with same version already deployed on #{host}"
-            execute *MRSK.app.start, host: host
+
+              cli.remove_container version
+              execute *MRSK.app.run(role: role.name)
             else
               raise
             end
@@ -18,20 +31,22 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
         end
       end
     end
+  end
 
   desc "start", "Start existing app on servers (use --version=<git-hash> to designate specific version)"
-  option :version, desc: "Defaults to the most recent git-hash in local repository"
   def start
-    if (version = options[:version]).present?
+    on(MRSK.hosts) do
-      on(MRSK.hosts) { execute *MRSK.app.start(version: version) }
+      execute *MRSK.auditor.record("app start version #{MRSK.version}"), verbosity: :debug
-    else
+      execute *MRSK.app.start, raise_on_non_zero_exit: false
-      on(MRSK.hosts) { execute *MRSK.app.start, raise_on_non_zero_exit: false }
     end
   end
   
   desc "stop", "Stop app on servers"
   def stop
-    on(MRSK.hosts) { execute *MRSK.app.stop, raise_on_non_zero_exit: false }
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("app stop"), verbosity: :debug
+      execute *MRSK.app.stop, raise_on_non_zero_exit: false
+    end
   end
   
   desc "details", "Display details about app containers"
@@ -40,52 +55,57 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
   end
   
   desc "exec [CMD]", "Execute a custom command on servers"
-  option :method, aliases: "-m", default: "exec", desc: "Execution method: [exec] perform inside app container / [run] perform in new container / [ssh] perform over ssh"
+  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
+  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
   def exec(cmd)
-    runner = \
+    case
-      case options[:method]
+    when options[:interactive] && options[:reuse]
-      when "exec" then "exec"
+      say "Get current version of running container...", :magenta unless options[:version]
-      when "run"  then "run_exec"
+      using_version(options[:version] || current_running_version) do |version|
-      when "ssh"  then "exec_over_ssh"
+        say "Launching interactive command with version #{version} via SSH from existing container on #{MRSK.primary_host}...", :magenta
-      else raise "Unknown method: #{options[:method]}"
+        run_locally { exec MRSK.app.execute_in_existing_container_over_ssh(cmd, host: MRSK.primary_host) }
-      end.inquiry
-
-    if runner.exec_over_ssh?
-      run_locally do
-        info "Launching command on #{MRSK.primary_host}"
-        exec MRSK.app.exec_over_ssh(cmd, host: MRSK.primary_host)
       end
+
+    when options[:interactive]
+      say "Get most recent version available as an image...", :magenta unless options[:version]
+      using_version(options[:version] || most_recent_version_available) do |version|
+        say "Launching interactive command with version #{version} via SSH from new container on #{MRSK.primary_host}...", :magenta
+        run_locally { exec MRSK.app.execute_in_new_container_over_ssh(cmd, host: MRSK.primary_host) }
+      end
+
+    when options[:reuse]
+      say "Get current version of running container...", :magenta unless options[:version]
+      using_version(options[:version] || current_running_version) do |version|
+        say "Launching command with version #{version} from existing container...", :magenta
+
+        on(MRSK.hosts) do |host|
+          execute *MRSK.auditor.record("app cmd '#{cmd}' with version #{version}"), verbosity: :debug
+          puts_by_host host, capture_with_info(*MRSK.app.execute_in_existing_container(cmd))
+        end
+      end
+
     else
-      on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.send(runner, cmd)) }
+      say "Get most recent version available as an image...", :magenta unless options[:version]
+      using_version(options[:version] || most_recent_version_available) do |version|
+        say "Launching command with version #{version} from new container...", :magenta
+        on(MRSK.hosts) do |host|
+          execute *MRSK.auditor.record("app cmd '#{cmd}' with version #{version}"), verbosity: :debug
+          puts_by_host host, capture_with_info(*MRSK.app.execute_in_new_container(cmd))
         end
       end
-
-  desc "console", "Start Rails Console on primary host (or specific host set by --hosts)"
-  def console
-    run_locally do
-      info "Launching Rails console on #{MRSK.primary_host}"
-      exec MRSK.app.console(host: MRSK.primary_host)
     end
   end
 
-  desc "bash", "Start a bash session on primary host (or specific host set by --hosts)"
-  def bash
-    run_locally do
-      info "Launching bash session on #{MRSK.primary_host}"
-      exec MRSK.app.bash(host: MRSK.primary_host)
-    end
-  end
-
-  desc "runner [EXPRESSION]", "Execute Rails runner with given expression"
-  def runner(expression)
-    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.exec("bin/rails", "runner", "'#{expression}'")) }
-  end
-
   desc "containers", "List all the app containers currently on servers"
   def containers
     on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.list_containers) }
   end
 
+  desc "images", "List all the app images currently on servers"
+  def images
+    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.list_images) }
+  end
+
   desc "current", "Return the current running container ID"
   def current
     on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.current_container_id) }
@@ -109,7 +129,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
       end
     else
       since = options[:since]
-      lines = options[:lines]
+      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
 
       on(MRSK.hosts) do |host|
         begin
@@ -122,16 +142,64 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
   end
 
   desc "remove", "Remove app containers and images from servers"
-  option :only, default: "", desc: "Use 'containers' or 'images'"
   def remove
-    case options[:only]
+    remove_containers
-    when "containers"
+    remove_images
-      on(MRSK.hosts) { execute *MRSK.app.remove_containers }
+  end
-    when "images"
+
-      on(MRSK.hosts) { execute *MRSK.app.remove_images }
+  desc "remove_container [VERSION]", "Remove app container with given version from servers"
+  def remove_container(version)
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("app remove container #{version}"), verbosity: :debug
+      execute *MRSK.app.remove_container(version: version)
+    end
+  end
+
+  desc "remove_containers", "Remove all app containers from servers"
+  def remove_containers
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("app remove containers"), verbosity: :debug
+      execute *MRSK.app.remove_containers
+    end
+  end
+
+  desc "remove_images", "Remove all app images from servers"
+  def remove_images
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("app remove images"), verbosity: :debug
+      execute *MRSK.app.remove_images
+    end
+  end
+
+  desc "current_version", "Shows the version currently running"
+  def current_version
+    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.current_running_version).strip }
+  end
+
+  private
+    def using_version(new_version)
+      if new_version
+        begin
+          old_version = MRSK.config.version
+          MRSK.config.version = new_version
+          yield new_version
+        ensure
+          MRSK.config.version = old_version
+        end
       else
-      on(MRSK.hosts) { execute *MRSK.app.remove_containers }
+        yield MRSK.config.version
-      on(MRSK.hosts) { execute *MRSK.app.remove_images }
       end
     end
+
+    def most_recent_version_available(host: MRSK.primary_host)
+      version = nil
+      on(host) { version = capture_with_info(*MRSK.app.most_recent_version_from_available_images).strip }
+      version.presence
+    end
+
+    def current_running_version(host: MRSK.primary_host)
+      version = nil
+      on(host) { version = capture_with_info(*MRSK.app.current_running_version).strip }
+      version.presence
+    end
 end

lib/mrsk/cli/base.rb

@@ -8,6 +8,7 @@ module Mrsk::Cli
     def self.exit_on_failure?() true end
 
     class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging"
+    class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
 
     class_option :version, desc: "Run commands against a specific app version"
 
@@ -28,12 +29,20 @@ module Mrsk::Cli
         MRSK.tap do |commander|
           commander.config_file = Pathname.new(File.expand_path(options[:config_file]))
           commander.destination = options[:destination]
-          commander.verbose     = options[:verbose]
           commander.version     = options[:version]
 
           commander.specific_hosts    = options[:hosts]&.split(",")
           commander.specific_roles    = options[:roles]&.split(",")
           commander.specific_primary! if options[:primary]
+
+          if options[:verbose]
+            ENV["VERBOSE"] = "1" # For backtraces via cli/start
+            commander.verbosity = :debug
+          end
+
+          if options[:quiet]
+            commander.verbosity = :error
+          end
         end
       end
 

lib/mrsk/cli/build.rb

@@ -9,18 +9,17 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
 
   desc "push", "Build locally and push app image to registry"
   def push
-    verbose = options[:verbose]
     cli = self
 
     run_locally do 
       begin
-        MRSK.verbosity(:debug) { execute *MRSK.builder.push }
+        MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
       rescue SSHKit::Command::Failed => e
         if e.message =~ /(no builder)|(no such file or directory)/
           error "Missing compatible builder, so creating a new one first"
 
           if cli.create
-            MRSK.verbosity(:debug) { execute *MRSK.builder.push }
+            MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
           end
         else
           raise
@@ -31,7 +30,10 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
 
   desc "pull", "Pull app image from the registry onto servers"
   def pull
-    on(MRSK.hosts) { execute *MRSK.builder.pull }
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("build pull image #{MRSK.version}"), verbosity: :debug
+      execute *MRSK.builder.pull
+    end
   end
 
   desc "create", "Create a local build setup"

lib/mrsk/cli/main.rb

@@ -21,12 +21,21 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "deploy", "Deploy the app to servers"
   def deploy
     print_runtime do
+      say "Ensure Docker is installed...", :magenta
       invoke "mrsk:cli:server:bootstrap"
+
+      say "Log into image registry...", :magenta
       invoke "mrsk:cli:registry:login"
+
+      say "Build and push app image...", :magenta
       invoke "mrsk:cli:build:deliver"
+
+      say "Ensure Traefik is running...", :magenta
       invoke "mrsk:cli:traefik:boot"
-      invoke "mrsk:cli:app:stop"
+
       invoke "mrsk:cli:app:boot"
+
+      say "Prune old containers and images...", :magenta
       invoke "mrsk:cli:prune:all"
     end
   end
@@ -34,17 +43,23 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "redeploy", "Deploy new version of the app to servers (without bootstrapping servers, starting Traefik, pruning, and registry login)"
   def redeploy
     print_runtime do
+      say "Build and push app image...", :magenta
       invoke "mrsk:cli:build:deliver"
-      invoke "mrsk:cli:app:stop"
+
       invoke "mrsk:cli:app:boot"
     end
   end
 
-  desc "rollback [VERSION]", "Rollback the app to VERSION (that must already be on servers)"
+  desc "rollback [VERSION]", "Rollback the app to VERSION"
   def rollback(version)
+    MRSK.version = version
+
+    cli = self
+
+    cli.say "Stop current version, then start version #{version}...", :magenta
     on(MRSK.hosts) do
       execute *MRSK.app.stop, raise_on_non_zero_exit: false
-      execute *MRSK.app.start(version: version)
+      execute *MRSK.app.start
     end
   end
 
@@ -55,6 +70,13 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
     invoke "mrsk:cli:accessory:details", [ "all" ]
   end
 
+  desc "audit", "Show audit log from servers"
+  def audit
+    on(MRSK.hosts) do |host|
+      puts_by_host host, capture_with_info(*MRSK.auditor.reveal)
+    end
+  end
+
   desc "config", "Show combined config"
   def config
     run_locally do

lib/mrsk/cli/prune.rb

@@ -9,11 +9,17 @@ class Mrsk::Cli::Prune < Mrsk::Cli::Base
 
   desc "images", "Prune unused images older than 30 days"
   def images
-    on(MRSK.hosts) { execute *MRSK.prune.images }
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("prune images"), verbosity: :debug
+      execute *MRSK.prune.images
+    end
   end
 
   desc "containers", "Prune stopped containers for the service older than 3 days"
   def containers
-    on(MRSK.hosts) { execute *MRSK.prune.containers }
+    on(MRSK.hosts) do
+      execute *MRSK.auditor.record("prune containers"), verbosity: :debug
+      execute *MRSK.prune.containers
+    end
   end
 end

lib/mrsk/cli/traefik.rb

@@ -15,12 +15,18 @@ class Mrsk::Cli::Traefik < Mrsk::Cli::Base
 
   desc "start", "Start existing Traefik on servers"
   def start
-    on(MRSK.traefik_hosts) { execute *MRSK.traefik.start, raise_on_non_zero_exit: false }
+    on(MRSK.traefik_hosts) do
+      execute *MRSK.auditor.record("traefik start"), verbosity: :debug
+      execute *MRSK.traefik.start, raise_on_non_zero_exit: false
+    end
   end
 
   desc "stop", "Stop Traefik on servers"
   def stop
-    on(MRSK.traefik_hosts) { execute *MRSK.traefik.stop, raise_on_non_zero_exit: false }
+    on(MRSK.traefik_hosts) do
+      execute *MRSK.auditor.record("traefik stop"), verbosity: :debug
+      execute *MRSK.traefik.stop, raise_on_non_zero_exit: false
+    end
   end
 
   desc "restart", "Restart Traefik on servers"
@@ -50,7 +56,7 @@ class Mrsk::Cli::Traefik < Mrsk::Cli::Base
       end
     else
       since = options[:since]
-      lines = options[:lines]
+      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
 
       on(MRSK.traefik_hosts) do |host|
         puts_by_host host, capture(*MRSK.traefik.logs(since: since, lines: lines, grep: grep)), type: "Traefik"
@@ -67,11 +73,17 @@ class Mrsk::Cli::Traefik < Mrsk::Cli::Base
 
   desc "remove_container", "Remove Traefik container from servers"
   def remove_container
-    on(MRSK.traefik_hosts) { execute *MRSK.traefik.remove_container }
+    on(MRSK.traefik_hosts) do
+      execute *MRSK.auditor.record("traefik remove container"), verbosity: :debug
+      execute *MRSK.traefik.remove_container
+    end
   end
 
   desc "remove_container", "Remove Traefik image from servers"
   def remove_image
-    on(MRSK.traefik_hosts) { execute *MRSK.traefik.remove_image }
+    on(MRSK.traefik_hosts) do
+      execute *MRSK.auditor.record("traefik remove image"), verbosity: :debug
+      execute *MRSK.traefik.remove_image
+    end
   end
 end

lib/mrsk/commander.rb

@@ -3,16 +3,17 @@ require "active_support/core_ext/enumerable"
 require "mrsk/configuration"
 require "mrsk/commands/accessory"
 require "mrsk/commands/app"
+require "mrsk/commands/auditor"
 require "mrsk/commands/builder"
 require "mrsk/commands/prune"
 require "mrsk/commands/traefik"
 require "mrsk/commands/registry"
 
 class Mrsk::Commander
-  attr_accessor :config_file, :destination, :verbose, :version
+  attr_accessor :config_file, :destination, :verbosity, :version
 
-  def initialize(config_file: nil, destination: nil, verbose: false)
+  def initialize(config_file: nil, destination: nil, verbosity: :info)
-    @config_file, @destination, @verbose = config_file, destination, verbose
+    @config_file, @destination, @verbosity = config_file, destination, verbosity
   end
 
   def config
@@ -77,8 +78,12 @@ class Mrsk::Commander
     Mrsk::Commands::Accessory.new(config, name: name)
   end
 
+  def auditor
+    @auditor ||= Mrsk::Commands::Auditor.new(config)
+  end
 
-  def verbosity(level) 
+
+  def with_verbosity(level) 
     old_level = SSHKit.config.output_verbosity
     SSHKit.config.output_verbosity = level
     yield
@@ -86,6 +91,13 @@ 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"] || `git rev-parse HEAD`.strip
@@ -95,6 +107,6 @@ class Mrsk::Commander
     def configure_sshkit_with(config)
       SSHKit::Backend::Netssh.configure { |ssh| ssh.ssh_options = config.ssh_options }
       SSHKit.config.command_map[:docker] = "docker" # No need to use /usr/bin/env, just clogs up the logs
-      SSHKit.config.output_verbosity = :debug if verbose
+      SSHKit.config.output_verbosity = verbosity
     end
 end

lib/mrsk/commands/accessory.rb

@@ -33,6 +33,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
     docker :ps, *service_filter
   end
 
+
   def logs(since: nil, lines: nil, grep: nil)
     pipe \
       docker(:logs, service_name, (" --since #{since}" if since), (" -n #{lines}" if lines), "-t", "2>&1"),
@@ -42,20 +43,19 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
   def follow_logs(grep: nil)
     run_over_ssh pipe(
       docker(:logs, service_name, "-t", "-n", "10", "-f", "2>&1"),
-      ("grep '#{grep}'" if grep)
+      (%(grep "#{grep}") if grep)
-    ).join(" "), host: host
+    ).join(" ")
   end
 
-  def exec(*command, interactive: false)
+
+  def execute_in_existing_container(*command, interactive: false)
     docker :exec,
       ("-it" if interactive),
-      *env_args,
-      *volume_args,
       service_name,
       *command
   end
 
-  def run_exec(*command, interactive: false)
+  def execute_in_new_container(*command, interactive: false)
     docker :run,
       ("-it" if interactive),
       "--rm",
@@ -65,10 +65,19 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
       *command
   end
 
-  def bash(host:)
+  def execute_in_existing_container_over_ssh(*command)
-    exec_over_ssh "bash", host: host
+    run_over_ssh execute_in_existing_container(*command, interactive: true).join(" ")
   end
 
+  def execute_in_new_container_over_ssh(*command)
+    run_over_ssh execute_in_new_container(*command, interactive: true).join(" ")
+  end
+
+  def run_over_ssh(command)
+    super command, host: host
+  end
+
+
   def ensure_local_file_present(local_file)
     if !local_file.is_a?(StringIO) && !Pathname.new(local_file).exist?
       raise "Missing file: #{local_file}"
@@ -96,10 +105,6 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
   end
 
   private
-    def exec_over_ssh(*command, host:)
-      run_over_ssh run_exec(*command, interactive: true).join(" "), host: host
-    end
-
     def service_filter
       [ "--filter", "label=service=#{service_name}" ]
     end

lib/mrsk/commands/app.rb

@@ -7,7 +7,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
     docker :run,
       "-d",
       "--restart unless-stopped",
-      "--name", config.service_with_version,
+      "--name", service_with_version,
       *rails_master_key_arg,
       *role.env_args,
       *config.volume_args,
@@ -16,40 +16,43 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       role.cmd
   end
 
-  def start(version: config.version)
+  def start
-    docker :start, "#{config.service}-#{version}"
+    docker :start, service_with_version
-  end
-
-  def current_container_id
-    docker :ps, "-q", *service_filter
   end
 
   def stop
-    pipe current_container_id, "xargs docker stop"
+    pipe current_container_id, xargs(docker(:stop))
   end
 
   def info
     docker :ps, *service_filter
   end
 
+
   def logs(since: nil, lines: nil, grep: nil)
     pipe \
       current_container_id,
-      "xargs docker logs#{" --since #{since}" if since}#{" -n #{lines}" if lines} -t 2>&1",
+      "xargs docker logs#{" --since #{since}" if since}#{" -n #{lines}" if lines} 2>&1",
       ("grep '#{grep}'" if grep)
   end
 
-  def exec(*command, interactive: false)
+  def follow_logs(host:, grep: nil)
+    run_over_ssh pipe(
+      current_container_id,
+      "xargs docker logs -t -n 10 -f 2>&1",
+      (%(grep "#{grep}") if grep)
+    ).join(" "), host: host
+  end
+
+
+  def execute_in_existing_container(*command, interactive: false)
     docker :exec,
       ("-it" if interactive),
-      *rails_master_key_arg,
-      *config.env_args,
-      *config.volume_args,
       config.service_with_version,
       *command
   end
 
-  def run_exec(*command, interactive: false)
+  def execute_in_new_container(*command, interactive: false)
     docker :run,
       ("-it" if interactive),
       "--rm",
@@ -60,39 +63,70 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       *command
   end
 
-  def exec_over_ssh(*command, host:)
+  def execute_in_existing_container_over_ssh(*command, host:)
-    run_over_ssh run_exec(*command, interactive: true).join(" "), host: host
+    run_over_ssh execute_in_existing_container(*command, interactive: true).join(" "), host: host
   end
 
-  def follow_logs(host:, grep: nil)
+  def execute_in_new_container_over_ssh(*command, host:)
-    run_over_ssh pipe(
+    run_over_ssh execute_in_new_container(*command, interactive: true).join(" "), host: host
-      current_container_id,
-      "xargs docker logs -t -n 10 -f 2>&1",
-      ("grep '#{grep}'" if grep)
-    ).join(" "), host: host
   end
 
-  def console(host:)
+
-    exec_over_ssh "bin/rails", "c", host: host
+  def current_container_id
+    docker :ps, "-q", *service_filter
   end
 
-  def bash(host:)
+  def container_id_for(container_name:)
-    exec_over_ssh "bash", host: host
+    docker :container, :ls, "-a", "-f", "name=#{container_name}", "-q"
   end
 
+  def current_running_version
+    # FIXME: Find more graceful way to extract the version from "app-version" than using sed and tail!
+    pipe \
+      docker(:ps, "--filter", "label=service=#{config.service}", "--format", '"{{.Names}}"'),
+      %(sed 's/-/\\n/g'),
+      "tail -n 1"
+  end
+
+  def most_recent_version_from_available_images
+    pipe \
+      docker(:image, :ls, "--format", '"{{.Tag}}"', config.repository),
+      "head -n 1"
+  end
+
+
   def list_containers
     docker :container, :ls, "-a", *service_filter
   end
 
+  def remove_container(version:)
+    pipe \
+      container_id_for(container_name: service_with_version(version)),
+      xargs(docker(:container, :rm))
+  end
+
   def remove_containers
     docker :container, :prune, "-f", *service_filter
   end
 
+  def list_images
+    docker :image, :ls, config.repository
+  end
+
   def remove_images
     docker :image, :prune, "-a", "-f", *service_filter
   end
 
+
   private
+    def service_with_version(version = nil)
+      if version
+        "#{config.service}-#{version}"
+      else
+        config.service_with_version
+      end
+    end
+
     def service_filter
       [ "--filter", "label=service=#{config.service}" ]
     end

lib/mrsk/commands/auditor.rb

@@ -0,0 +1,31 @@
+require "active_support/core_ext/time/conversions"
+require "mrsk/commands/base"
+
+class Mrsk::Commands::Auditor < Mrsk::Commands::Base
+  def record(line)
+    append \
+      [ :echo, "'#{tags} #{line}'" ],
+      audit_log_file
+  end
+
+  def reveal
+    [ :tail, "-n", 50, audit_log_file ]
+  end
+
+  private
+    def audit_log_file
+      "mrsk-#{config.service}-audit.log"
+    end
+
+    def tags
+      "[#{timestamp}] [#{performer}]"
+    end
+
+    def performer
+      `whoami`.strip
+    end
+
+    def timestamp
+      Time.now.to_fs(:db)
+    end
+end

lib/mrsk/commands/base.rb

@@ -8,6 +8,10 @@ module Mrsk::Commands
       @config = config
     end
 
+    def run_over_ssh(command, host:)
+      "ssh -t #{config.ssh_user}@#{host} '#{command}'"
+    end
+
     private
       def combine(*commands, by: "&&")
         commands
@@ -24,12 +28,16 @@ module Mrsk::Commands
         combine *commands, by: "|"
       end
 
+      def append(*commands)
+        combine *commands, by: ">>"
+      end
+
+      def xargs(command)
+        [ :xargs, command ].flatten
+      end
+
       def docker(*args)
         args.compact.unshift :docker
       end
-
-      def run_over_ssh(command, host:)
-        "ssh -t #{config.ssh_user}@#{host} '#{command}'"
-      end
   end
 end

lib/mrsk/commands/traefik.rb

@@ -9,7 +9,8 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
       "-v /var/run/docker.sock:/var/run/docker.sock",
       "traefik",
       "--providers.docker",
-      "--log.level=DEBUG"
+      "--log.level=DEBUG",
+      *cmd_args
   end
 
   def start
@@ -33,7 +34,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
   def follow_logs(host:, grep: nil)
     run_over_ssh pipe(
       docker(:logs, "traefik", "-t", "-n", "10", "-f", "2>&1"),
-      ("grep '#{grep}'" if grep)
+      (%(grep "#{grep}") if grep)
     ).join(" "), host: host
   end
 
@@ -44,4 +45,9 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
   def remove_image
     docker :image, :prune, "-a", "-f", "--filter", "label=org.opencontainers.image.title=Traefik"
   end
+
+  private
+    def cmd_args
+      (config.raw_config.dig(:traefik, "args") || { }).collect { |(key, value)| [ "--#{key}", value ] }.flatten
+    end
 end

lib/mrsk/configuration.rb

@@ -9,6 +9,7 @@ class Mrsk::Configuration
   delegate :service, :image, :servers, :env, :labels, :registry, :builder, to: :raw_config, allow_nil: true
   delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
 
+  attr_accessor :version
   attr_accessor :raw_config
 
   class << self
@@ -39,7 +40,7 @@ class Mrsk::Configuration
   def initialize(raw_config, version: "missing", validate: true)
     @raw_config = ActiveSupport::InheritableOptions.new(raw_config)
     @version = version
-    ensure_required_keys_present if validate
+    valid? if validate
   end
 
 
@@ -52,7 +53,7 @@ class Mrsk::Configuration
   end
 
   def accessories
-    @accessories ||= raw_config.accessories&.keys&.collect { |name| Mrsk::Configuration::Assessory.new(name, config: self) } || []
+    @accessories ||= raw_config.accessories&.keys&.collect { |name| Mrsk::Configuration::Accessory.new(name, config: self) } || []
   end
 
   def accessory(name)
@@ -73,10 +74,6 @@ class Mrsk::Configuration
   end
 
 
-  def version
-    @version
-  end
-
   def repository
     [ raw_config.registry["server"], image ].compact.join("/")
   end
@@ -120,6 +117,12 @@ class Mrsk::Configuration
     end
   end
 
+
+  def valid?
+    ensure_required_keys_present && ensure_env_available
+  end
+
+
   def to_h
     {
       roles: role_names,
@@ -139,6 +142,7 @@ class Mrsk::Configuration
 
 
   private
+    # Will raise ArgumentError if any required config keys are missing
     def ensure_required_keys_present
       %i[ service image registry servers ].each do |key|
         raise ArgumentError, "Missing required configuration for #{key}" unless raw_config[key].present?
@@ -151,6 +155,16 @@ class Mrsk::Configuration
       if raw_config.registry["password"].blank?
         raise ArgumentError, "You must specify a password for the registry in config/deploy.yml (or set the ENV variable if that's used)"
       end
+
+      true
+    end
+
+    # Will raise KeyError if any secret ENVs are missing
+    def ensure_env_available
+      env_args
+      roles.each(&:env_args)
+
+      true
     end
 
     def role_names

lib/mrsk/configuration/accessory.rb

@@ -1,4 +1,4 @@
-class Mrsk::Configuration::Assessory
+class Mrsk::Configuration::Accessory
   delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
 
   attr_accessor :name, :specifics
@@ -74,12 +74,19 @@ class Mrsk::Configuration::Assessory
 
     def expand_local_file(local_file)
       if local_file.end_with?("erb")
-        read_dynamic_file(local_file)
+        with_clear_env_loaded { read_dynamic_file(local_file) }
       else
         Pathname.new(File.expand_path(local_file)).to_s
       end
     end
 
+    def with_clear_env_loaded
+      (env["clear"] || env).each { |k, v| ENV[k] = v }
+      yield
+    ensure
+      (env["clear"] || env).each { |k, v| ENV.delete(k) }
+    end
+
     def read_dynamic_file(local_file)
       StringIO.new(ERB.new(IO.read(local_file)).result)
     end

lib/mrsk/utils.rb

@@ -18,7 +18,7 @@ module Mrsk::Utils
     if (secrets = env["secret"]).present?
       argumentize("-e", secrets.to_h { |key| [ key, ENV.fetch(key) ] }, redacted: true) + argumentize("-e", env["clear"])
     else
-      argumentize "-e", env
+      argumentize "-e", env.fetch("clear", env)
     end
   end
 

lib/mrsk/version.rb

@@ -1,3 +1,3 @@
 module Mrsk
-  VERSION = "0.3.1"
+  VERSION = "0.5.1"
 end

mrsk.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 7.0"
   spec.add_dependency "sshkit", "~> 1.21"
   spec.add_dependency "thor", "~> 1.2"
+  spec.add_dependency "dotenv", "~> 2.8"
 end

test/cli/accessory_test.rb

@@ -1,34 +1,38 @@
-require "test_helper"
+require_relative "cli_test_case"
-require "active_support/testing/stream"
-require "mrsk/cli"
-
-class CliAccessoryTest < ActiveSupport::TestCase
-  include ActiveSupport::Testing::Stream
-
-  setup    { ENV["MYSQL_ROOT_PASSWORD"] = "secret123" }
-  teardown { ENV["MYSQL_ROOT_PASSWORD"] = nil }
 
+class CliAccessoryTest < CliTestCase
   test "upload" do
-    command = stdouted { Mrsk::Cli::Accessory.start(["upload", "mysql", "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+    assert_match "test/fixtures/files/my.cnf app-mysql/etc/mysql/my.cnf", run_command("upload", "mysql")
-    
-    assert_match "test/fixtures/files/my.cnf app-mysql/etc/mysql/my.cnf", command
   end
 
   test "directories" do
-    command = stdouted { Mrsk::Cli::Accessory.start(["directories", "mysql", "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+    assert_match "mkdir -p $PWD/app-mysql/data", run_command("directories", "mysql")
-    
-    assert_match "mkdir -p $PWD/app-mysql/data", command
   end
 
   test "remove service direcotry" do
-    command = stdouted { Mrsk::Cli::Accessory.start(["remove_service_directory", "mysql", "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+    assert_match "rm -rf app-mysql", run_command("remove_service_directory", "mysql")
-    
-    assert_match "rm -rf app-mysql", command
   end
 
   test "boot" do
-    command = stdouted { Mrsk::Cli::Accessory.start(["boot", "mysql", "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+    assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --volume $PWD/app-mysql/data:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", run_command("boot", "mysql")
+  end
 
-    assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --volume $PWD/app-mysql/data:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", command
+  test "exec" do
+    run_command("exec", "mysql", "mysql -v").tap do |output|
+      assert_match /Launching command from new container/, output
+      assert_match /mysql -v/, output
+    end
+  end
+
+  test "exec with reuse" do
+    run_command("exec", "mysql", "--reuse", "mysql -v").tap do |output|
+      assert_match /Launching command from existing container/, output
+      assert_match %r[docker exec app-mysql mysql -v], output
+    end
+  end
+
+  private
+    def run_command(*command)
+      stdouted { Mrsk::Cli::Accessory.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/app_test.rb

@@ -0,0 +1,67 @@
+require_relative "cli_test_case"
+
+class CliAppTest < CliTestCase
+  test "boot" do
+    assert_match /Running docker run -d --restart unless-stopped/, run_command("boot")
+  end
+
+  test "boot will reboot if same version is already running" do
+    run_command("details") # Preheat MRSK const
+
+    # Prevent expected failures from outputting to terminal
+    Thread.report_on_exception = false
+
+    MRSK.app.stubs(:run).raises(SSHKit::Command::Failed.new("already in use")).then.returns([ :docker, :run ])
+
+    run_command("boot").tap do |output|
+      assert_match /Rebooting container with same version already deployed/, output # Can't start what's already running
+      assert_match /docker ps -q --filter label=service=app \| xargs docker stop/, output # Stop what's running
+      assert_match /docker container ls -a -f name=app-999 -q \| xargs docker container rm/, output # Remove old container
+      assert_match /docker run/, output # Start new container
+    end
+  ensure
+    Thread.report_on_exception = true
+  end
+
+  test "start" do
+    run_command("start").tap do |output|
+      assert_match /docker start app-999/, output
+    end
+  end
+
+  test "stop" do
+    run_command("stop").tap do |output|
+      assert_match /docker ps -q --filter label=service=app \| xargs docker stop/, output
+    end
+  end
+
+  test "details" do
+    run_command("details").tap do |output|
+      assert_match /docker ps --filter label=service=app/, output
+    end
+  end
+
+  test "remove_container" do
+    run_command("remove_container", "1234567").tap do |output|
+      assert_match /docker container ls -a -f name=app-1234567 -q \| xargs docker container rm/, output
+    end
+  end
+
+  test "exec" do
+    run_command("exec", "ruby -v").tap do |output|
+      assert_match /ruby -v/, output
+    end
+  end
+
+  test "exec with reuse" do
+    run_command("exec", "--reuse", "ruby -v").tap do |output|
+      assert_match %r[docker ps --filter label=service=app --format \"{{.Names}}\" | sed 's/-/\\n/g' | tail -n 1], output # Get current version
+      assert_match %r[docker exec app-999 ruby -v], output
+    end
+  end
+
+  private
+    def run_command(*command)
+      stdouted { Mrsk::Cli::App.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+    end
+end

test/cli/cli_test_case.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+require "active_support/testing/stream"
+require "mrsk/cli"
+
+class CliTestCase < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Stream
+
+  setup do
+    ENV["VERSION"]             = "999"
+    ENV["RAILS_MASTER_KEY"]    = "123"
+    ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
+  end
+
+  teardown do
+    ENV.delete("RAILS_MASTER_KEY")
+    ENV.delete("MYSQL_ROOT_PASSWORD")
+    ENV.delete("VERSION")
+    MRSK.reset
+  end
+
+  private
+    def stdouted
+      capture(:stdout) { yield }.strip
+    end
+end

test/cli/main_test.rb

@@ -1,13 +1,6 @@
-require "test_helper"
+require_relative "cli_test_case"
-require "active_support/testing/stream"
-require "mrsk/cli"
-
-class CliMainTest < ActiveSupport::TestCase
-  include ActiveSupport::Testing::Stream
-
-  setup do
-  end
 
+class CliMainTest < CliTestCase
   test "version" do
     version = stdouted { Mrsk::Cli::Main.new.version }
     assert_equal Mrsk::VERSION, version

test/commands/accessory_test.rb

@@ -41,18 +41,20 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
     @config = Mrsk::Configuration.new(@config)
     @mysql  = Mrsk::Commands::Accessory.new(@config, name: :mysql)
     @redis  = Mrsk::Commands::Accessory.new(@config, name: :redis)
+
+    ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
+  end
+
+  teardown do
+    ENV.delete("MYSQL_ROOT_PASSWORD")
   end
 
   test "run" do
-    ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
-
     assert_equal \
       [:docker, :run, "--name", "app-mysql", "-d", "--restart", "unless-stopped", "-p", "3306:3306", "-e", "MYSQL_ROOT_PASSWORD=secret123", "-e", "MYSQL_ROOT_HOST=%", "--label", "service=app-mysql", "mysql:8.0"], @mysql.run
 
     assert_equal \
       [:docker, :run, "--name", "app-redis", "-d", "--restart", "unless-stopped", "-p", "6379:6379", "-e", "SOMETHING=else", "--volume", "/var/lib/redis:/data", "--label", "service=app-redis", "--label", "cache=true", "redis:latest"], @redis.run
-  ensure
-    ENV["MYSQL_ROOT_PASSWORD"] = nil
   end
 
   test "start" do
@@ -67,6 +69,35 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
     assert_equal [:docker, :ps, "--filter", "label=service=app-mysql"], @mysql.info
   end
 
+
+  test "execute in new container" do
+    assert_equal \
+      [ :docker, :run, "--rm", "-e", "MYSQL_ROOT_PASSWORD=secret123", "-e", "MYSQL_ROOT_HOST=%", "mysql:8.0", "mysql", "-u", "root" ],
+      @mysql.execute_in_new_container("mysql", "-u", "root")
+  end
+
+  test "execute in existing container" do
+    assert_equal \
+      [ :docker, :exec, "app-mysql", "mysql", "-u", "root" ],
+      @mysql.execute_in_existing_container("mysql", "-u", "root")
+  end
+
+  test "execute in new container over ssh" do
+    @mysql.stub(:run_over_ssh, ->(cmd) { cmd }) do
+      assert_match %r|docker run -it --rm -e MYSQL_ROOT_PASSWORD=secret123 -e MYSQL_ROOT_HOST=% mysql:8.0 mysql -u root|,
+        @mysql.execute_in_new_container_over_ssh("mysql", "-u", "root")
+    end
+  end
+
+  test "execute in existing container over ssh" do
+    @mysql.stub(:run_over_ssh, ->(cmd) { cmd }) do
+      assert_match %r|docker exec -it app-mysql mysql -u root|,
+        @mysql.execute_in_existing_container_over_ssh("mysql", "-u", "root")
+    end
+  end
+
+
+
   test "logs" do
     assert_equal [:docker, :logs, "app-mysql", "-t", "2>&1"], @mysql.logs
     assert_equal [:docker, :logs, "app-mysql", " --since 5m", " -n 100", "-t", "2>&1", "|", "grep 'thing'"], @mysql.logs(since: "5m", lines: 100, grep: "thing")

test/commands/app_test.rb

@@ -26,12 +26,34 @@ class CommandsAppTest < ActiveSupport::TestCase
       [:docker, :run, "-d", "--restart unless-stopped", "--name", "app-missing", "-e", "RAILS_MASTER_KEY=456", "--volume", "/local/path:/container/path", "--label", "service=app", "--label", "role=web", "--label", "traefik.http.routers.app.rule='PathPrefix(`/`)'", "--label", "traefik.http.services.app.loadbalancer.healthcheck.path=/up", "--label", "traefik.http.services.app.loadbalancer.healthcheck.interval=1s", "--label", "traefik.http.middlewares.app.retry.attempts=3", "--label", "traefik.http.middlewares.app.retry.initialinterval=500ms", "dhh/app:missing"], @app.run
   end
 
-  test "run with" do
+
+  test "execute in new container" do
     assert_equal \
       [ :docker, :run, "--rm", "-e", "RAILS_MASTER_KEY=456", "dhh/app:missing", "bin/rails", "db:setup" ],
-      @app.run_exec("bin/rails", "db:setup")
+      @app.execute_in_new_container("bin/rails", "db:setup")
   end
 
+  test "execute in existing container" do
+    assert_equal \
+      [ :docker, :exec, "app-missing", "bin/rails", "db:setup" ],
+      @app.execute_in_existing_container("bin/rails", "db:setup")
+  end
+
+  test "execute in new container over ssh" do
+    @app.stub(:run_over_ssh, ->(cmd, host:) { cmd }) do
+      assert_match %r|docker run -it --rm -e RAILS_MASTER_KEY=456 dhh/app:missing bin/rails c|,
+        @app.execute_in_new_container_over_ssh("bin/rails", "c", host: "app-1")
+    end
+  end
+
+  test "execute in existing container over ssh" do
+    @app.stub(:run_over_ssh, ->(cmd, host:) { cmd }) do
+      assert_match %r|docker exec -it app-missing bin/rails c|,
+        @app.execute_in_existing_container_over_ssh("bin/rails", "c", host: "app-1")
+    end
+  end
+
+
   test "run without master key" do
     ENV["RAILS_MASTER_KEY"] = nil
     @app = Mrsk::Commands::App.new Mrsk::Configuration.new(@config.tap { |c| c[:skip_master_key] = true })

test/commands/registry_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+require "mrsk/configuration"
+require "mrsk/commands/registry"
+
+class CommandsRegistryTest < ActiveSupport::TestCase
+  setup do
+    @config = { service: "app", 
+      image: "dhh/app",
+      registry: { "username" => "dhh",
+        "password" => "secret",
+        "server" => "hub.docker.com"
+      },
+      servers: [ "1.1.1.1" ]
+    }
+    @registry = Mrsk::Commands::Registry.new Mrsk::Configuration.new(@config)
+  end
+
+  test "registry login" do
+    assert_equal [ :docker, :login, "hub.docker.com", "-u", "dhh", "-p", "secret" ], @registry.login
+  end
+
+  test "registry logout" do
+    assert_equal [:docker, :logout, "hub.docker.com"], @registry.logout
+  end
+end

test/commands/traefik_test.rb

@@ -0,0 +1,78 @@
+require "test_helper"
+require "mrsk/configuration"
+require "mrsk/commands/traefik"
+
+class CommandsTraefikTest < ActiveSupport::TestCase
+  setup do
+    @config = {
+      service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" }, servers: [ "1.1.1.1" ],
+      traefik: { "args" => { "accesslog.format" => "json", "metrics.prometheus.buckets" => "0.1,0.3,1.2,5.0" } }
+    }
+  end
+
+  test "run" do
+    assert_equal \
+      [:docker, :run, "--name traefik", "-d", "--restart unless-stopped", "-p 80:80", "-v /var/run/docker.sock:/var/run/docker.sock", "traefik", "--providers.docker", "--log.level=DEBUG", "--accesslog.format", "json", "--metrics.prometheus.buckets", "0.1,0.3,1.2,5.0"],
+      new_command.run
+  end
+
+  test "traefik start" do
+    assert_equal \
+      [:docker, :container, :start, 'traefik'], new_command.start
+  end
+
+  test "traefik stop" do
+    assert_equal \
+      [:docker, :container, :stop, 'traefik'], new_command.stop
+  end
+
+  test "traefik info" do
+    assert_equal \
+      [:docker, :ps, '--filter', 'name=traefik'], new_command.info
+  end
+
+  test "traefik logs" do
+    assert_equal \
+      [:docker, :logs, 'traefik', '-t', '2>&1'], new_command.logs
+  end
+
+  test "traefik logs since 2h" do
+    assert_equal \
+      [:docker, :logs, 'traefik', ' --since 2h', '-t', '2>&1'], new_command.logs(since: '2h')
+  end
+
+  test "traefik logs last 10 lines" do
+    assert_equal \
+      [:docker, :logs, 'traefik', ' -n 10', '-t', '2>&1'], new_command.logs(lines: 10)
+  end
+
+  test "traefik logs with grep hello!" do
+    assert_equal \
+      [:docker, :logs, 'traefik', '-t', '2>&1', "|", "grep 'hello!'"], new_command.logs(grep: 'hello!')
+  end
+
+  test "traefik remove container" do
+    assert_equal \
+      [:docker, :container, :prune, "-f", "--filter", "label=org.opencontainers.image.title=Traefik"], new_command.remove_container
+  end
+
+  test "traefik remove image" do
+    assert_equal \
+    [:docker, :image, :prune, "-a", "-f", "--filter", "label=org.opencontainers.image.title=Traefik"], new_command.remove_image
+  end
+
+  test "traefik follow logs" do
+    assert_equal \
+    "ssh -t root@1.1.1.1 'docker logs traefik -t -n 10 -f 2>&1'", new_command.follow_logs(host: @config[:servers].first)
+  end
+
+  test "traefik follow logs with grep hello!" do
+    assert_equal \
+    "ssh -t root@1.1.1.1 'docker logs traefik -t -n 10 -f 2>&1 | grep \"hello!\"'", new_command.follow_logs(host: @config[:servers].first, grep: 'hello!')
+  end
+
+  private
+    def new_command
+      Mrsk::Commands::Traefik.new(Mrsk::Configuration.new(@config, version: "123"))
+    end
+end

test/configuration/accessory_test.rb

@@ -98,7 +98,8 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
     @deploy[:accessories]["mysql"]["files"] << "test/fixtures/files/structure.sql.erb:/docker-entrypoint-initdb.d/structure.sql"
     @config = Mrsk::Configuration.new(@deploy)
 
-    assert_equal "This was dynamically expanded", @config.accessory(:mysql).files.keys[2].read
+    assert_match "This was dynamically expanded", @config.accessory(:mysql).files.keys[2].read
+    assert_match "%", @config.accessory(:mysql).files.keys[2].read
   end
 
   test "directories" do

test/configuration_test.rb

@@ -105,6 +105,14 @@ class ConfigurationTest < ActiveSupport::TestCase
     ENV["PASSWORD"] = nil
   end
 
+  test "env args with only clear" do
+    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
+      env: { "clear" => { "PORT" => "3000" } }
+    }) })
+
+    assert_equal [ "-e", "PORT=3000" ], config.env_args
+  end
+
   test "env args with only secrets" do
     ENV["PASSWORD"] = "secret123"
     config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
@@ -118,15 +126,17 @@ class ConfigurationTest < ActiveSupport::TestCase
   end
 
   test "env args with missing secret" do
+    assert_raises(KeyError) do
       config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
         env: { "secret" => [ "PASSWORD" ] }
       }) })
-
-    assert_raises(KeyError) do
-      assert_equal [ "-e", "PASSWORD=secret123" ], config.env_args
     end
   end
 
+  test "valid config" do
+    assert @config.valid?
+  end
+
   test "ssh options" do
     assert_equal "root", @config.ssh_options[:user]
 

test/fixtures/files/structure.sql.erb

@@ -1 +1,2 @@
 <%= "This was dynamically expanded" %>
+<%= ENV["MYSQL_ROOT_HOST"] %>

test/test_helper.rb

@@ -2,6 +2,8 @@ require "bundler/setup"
 require "active_support/test_case"
 require "active_support/testing/autorun"
 require "debug"
+require "mocha/minitest" # using #stubs that can alter returns
+require "minitest/autorun" # using #stub that take args
 require "sshkit"
 
 ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
@@ -9,8 +11,4 @@ ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["
 SSHKit.config.backend = SSHKit::Backend::Printer
 
 class ActiveSupport::TestCase
-  private
-    def stdouted
-      capture(:stdout) { yield }.strip
-    end
 end