mrsk 0.0.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f5260e6f41ed0ae04931d800b7c2da3b0bc32f0042d2e140fcb2860b1a9e12a
-  data.tar.gz: 0c94b286b4a9ce9339678a4a4662c65dcefd6947795227c2464db50e7bf727e0
+  metadata.gz: 04a17f68f19cfaf130747feded6450c389fdcb01bb83c4d44b1acb0c33d6fb60
+  data.tar.gz: 4d60e6c22acd3bf07fa22b0e488138166cf2265cedcd102ebb3245bb6318f5e0
 SHA512:
-  metadata.gz: 0f980ac1468ac3581f1b8bd8206c2471b5e79d7bc84c274f1bef2a761ceccc25905308774770a04156e68e5b1fd73d8d83926d235d287a11118fb9ea8f7fb619
-  data.tar.gz: 720ac72cfd88a494049a237140e774b37288f3a142cb70e3a672a91aa7094a019c0eb938c3ca9a146cd64b1d33d811b2c4b8d0373d7b9457bfaf8499bfd86943
+  metadata.gz: 379a355dafd696bbe470367c712e318e6ff9b215143059bde147dc1fdca2870bc7e46a1f47057976c2c6a5ec2601ca7cef722d928c33d3b0f1ee0700a1ee934c
+  data.tar.gz: b0a6a7e0efa5824e116c3728726a3be1d6c9310903eefa992411a2d91731dddd8db6903d6a8697c5d5643b831b39adad9ec088ff28262d5b79e4f4aad3a90c46

data/README.md

@@ -1,10 +1,10 @@
 # MRSK
 
-MRSK ships zero-downtime deploys of Rails apps packed as containers to any host. It uses the dynamic reverse-proxy Traefik to hold requests while the new application container is started and the old one is wound down. It works seamlessly across multiple hosts, using SSHKit to execute commands.
+MRSK deploys Rails apps in containers to servers running Docker with zero downtime. It uses the dynamic reverse-proxy Traefik to hold requests while the new application container is started and the old one is stopped. It works seamlessly across multiple hosts, using SSHKit to execute commands.
 
 ## Installation
 
-Add the gem with `bundle add mrsk`, then run `rake mrsk:init`, and then edit the new file in `config/deploy.yml`. It could look as simple as this:
+Install MRSK globally with `gem install mrsk`. Then, inside your app directory, run `mrsk install`. Now edit the new file `config/deploy.yml`. It could look as simple as this:
 
 ```yaml
 service: hey
@@ -13,48 +13,48 @@ servers:
   - 192.168.0.1
   - 192.168.0.2
 registry:
-  username: <%= Rails.application.credentials.registry["username"] %>
-  password: <%= Rails.application.credentials.registry["password"] %>
-```
-
-Then ensure your encrypted credentials have the registry username + password by editing them with `rails credentials:edit`:
-
-```
-registry:
-  username: real-user-name
-  password: real-registry-password-or-token
+  username: registry-user-name
+  password: <%= ENV.fetch("MRSK_REGISTRY_PASSWORD") %>
 ```
 
 Now you're ready to deploy a multi-arch image to the servers:
 
 ```
-./bin/mrsk deploy
+MRSK_REGISTRY_PASSWORD=pw mrsk deploy
 ```
 
 This will:
 
-1. Log into the registry both locally and remotely
-2. Build the image using the standard Dockerfile in the root of the application.
-3. Push the image to the registry.
-4. Pull the image from the registry on the servers.
-5. Ensure Traefik is running and accepting traffic on port 80.
-6. Stop any containers running a previous versions of the app.
-7. Start a new container with the version of the app that matches the current git version hash.
-8. Prune unused images and stopped containers to ensure servers don't fill up.
+1. Connect to the servers over SSH (using root by default, authenticated by your loaded ssh key)
+2. Install Docker on any server that might be missing it (using apt-get)
+3. Log into the registry both locally and remotely
+4. Build the image using the standard Dockerfile in the root of the application.
+5. Push the image to the registry.
+6. Pull the image from the registry on the servers.
+7. Ensure Traefik is running and accepting traffic on port 80.
+8. Stop any containers running a previous versions of the app.
+9. Start a new container with the version of the app that matches the current git version hash.
+10. Prune unused images and stopped containers to ensure servers don't fill up.
 
 Voila! All the servers are now serving the app on port 80. If you're just running a single server, you're ready to go. If you're running multiple servers, you need to put a load balancer in front of them.
 
+## Why not just run Capistrano or Kubernetes?
+
+MRSK basically is Capistrano for Containers, which allow us to use vanilla servers as the hosts. No need to ensure that the servers have just the right version of Ruby or other dependencies you need. That all lives in the Docker image now. You can boot a brand new Ubuntu (or whatever) server, add it to the deploy servers of MRSK, and it'll be auto-provisioned with Docker, and run right away. Docker's layer caching also allows for quicker deployments with less mucking about on the server. And the images built for MRSK can be used for CI or later introspection.
+
+Kubernetes is a beast. Running it yourself on your own hardware is not for the faint of heart. It's a fine option if you want to run on someone else's platform, like Render or Fly, but if you'd like the freedom to move between cloud and your own hardware, or even mix the two, MRSK is much simpler. You can see everything that's going on, it's just basic Docker commands being called.
+
 ## Configuration
 
 ### Using another registry than Docker Hub
 
-The default registry for Docker is Docker Hub. If you'd like to use a different one, just configure the server, like so:
+The default registry is Docker Hub, but you can change it using `registry/server`:
 
 ```yaml
 registry:
   server: registry.digitalocean.com
-  username: <%= Rails.application.credentials.registry["username"] %>
-  password: <%= Rails.application.credentials.registry["password"] %>
+  username: registry-user-name
+  password: <%= ENV.fetch("MRSK_REGISTRY_PASSWORD") %>
 ```
 
 ### Using a different SSH user than root
@@ -65,9 +65,9 @@ The default SSH user is root, but you can change it using `ssh_user`:
 ssh_user: app
 ```
 
-### Adding custom env variables
+### Using env variables
 
-You can inject custom env variables into the app containers using `env`:
+You can inject env variables into the app containers using `env`:
 
 ```yaml
 env:
@@ -75,9 +75,38 @@ env:
   REDIS_URL: redis://redis1:6379/1
 ```
 
-### Splitting servers into different roles
+### Using secret env variables
+
+If you have env variables that are secret, you can divide the `env` block into `clear` and `secret`:
+
+```yaml
+env:
+  clear:
+    DATABASE_URL: mysql2://db1/hey_production/
+    REDIS_URL: redis://redis1:6379/1
+  secret:
+    - DATABASE_PASSWORD
+    - REDIS_PASSWORD
+```
+
+The list of secret env variables will be expanded at run time from your local machine. So a reference to a secret `DATABASE_PASSWORD` will look for `ENV["DATABASE_PASSWORD"]` on the machine running MRSK. Just like with build secrets.
 
-If your application uses separate hosts for running jobs or other roles beyond the default web running, you can specify these hosts and their custom entrypoint command like so:
+If the referenced secret ENVs are missing, the configuration will be halted with a `KeyError` exception.
+
+Note: Marking an ENV as secret currently only redacts its value in the output for MRSK. The ENV is still injected in the clear into the container at runtime.
+
+### Using volumes
+
+You can add custom volumes into the app containers using `volumes`:
+
+```yaml
+volumes:
+  - "/local/path:/container/path"
+```
+
+### Using different roles for servers
+
+If your application uses separate hosts for running jobs or other roles beyond the default web running, you can specify these hosts in a dedicated role with a new entrypoint command like so:
 
 ```yaml
 servers:
@@ -91,23 +120,35 @@ servers:
     cmd: bin/jobs
 ```
 
-Traefik will only be installed and run on the servers in the `web` role (and on all servers if no roles are defined).
+Note: Traefik will only by default be installed and run on the servers in the `web` role (and on all servers if no roles are defined). If you need Traefik on hosts in other roles than `web`, add `traefik: true`:
 
-### Adding custom container labels
+```yaml
+servers:
+  web:
+    - 192.168.0.1
+    - 192.168.0.2
+  web2:
+    traefik: true
+    hosts:
+      - 192.168.0.3
+      - 192.168.0.4
+```
 
-You can specialize the default Traefik rules by setting custom labels on the containers that are being started:
+### Using container labels
+
+You can specialize the default Traefik rules by setting labels on the containers that are being started:
 
 ```
 labels:
   traefik.http.routers.hey.rule: '''Host(`app.hey.com`)'''
 ```
 
-(Note: The extra quotes are needed to ensure the rule is passed in correctly!)
+Note: The extra quotes are needed to ensure the rule is passed in correctly!
 
 This allows you to run multiple applications on the same server sharing the same Traefik instance and port.
 See https://doc.traefik.io/traefik/routing/routers/#rule for a full list of available routing rules.
 
-The labels can even be applied on a per-role basis:
+The labels can also be applied on a per-role basis:
 
 ```yaml
 servers:
@@ -120,60 +161,139 @@ servers:
       - 192.168.0.4
     cmd: bin/jobs
     labels:
-      my-custom-label: "50"
+      my-label: "50"
 ```
 
-### Configuring remote builder for native multi-arch
+### Using remote builder for native multi-arch
 
-If you're developing on ARM64 (like Apple Silicon), but you want to deploy on AMD64 (x86 64-bit), you have to use multi-archecture images. By default, MRSK will setup a local buildx configuration that allows for this through QEMU emulation. This can be slow, especially on the first build.
+If you're developing on ARM64 (like Apple Silicon), but you want to deploy on AMD64 (x86 64-bit), you can use multi-archecture images. By default, MRSK will setup a local buildx configuration that does this through QEMU emulation. But this can be quite slow, especially on the first build.
 
-If you want to speed up this process by using a remote AMD64 host to natively build the AMD64 part of the image, while natively building the ARM64 part locally, you can do so using builder options like follows:
+If you want to speed up this process by using a remote AMD64 host to natively build the AMD64 part of the image, while natively building the ARM64 part locally, you can do so using builder options:
 
 ```yaml
 builder:
   local:
     arch: arm64
-    host: unix:///Users/dhh/.docker/run/docker.sock
+    host: unix:///Users/<%= `whoami`.strip %>/.docker/run/docker.sock
   remote:
     arch: amd64
     host: ssh://root@192.168.0.1
 ```
 
-Note: You must have Docker running on the remote host being used as a builder.
+Note: You must have Docker running on the remote host being used as a builder. This instance should only be shared for builds using the same registry and credentials.
 
-With that configuration in place, you can setup the local/remote configuration using `./bin/mrsk build:remote:create`. If you wish to remove the contexts and buildx instances again, you can run `./bin/mrsk build:remote:remove`. If you had already built using the standard emulation setup, run `./bin/mrsk build:remove` before doing `./bin/mrsk build:remote:create`.
+### Using remote builder for single-arch
 
-### Configuring native builder when multi-arch isn't needed
+If you're developing on ARM64 (like Apple Silicon), want to deploy on AMD64 (x86 64-bit), but don't need to run the image locally (or on other ARM64 hosts), you can configure a remote builder that just targets AMD64. This is a bit faster than building with multi-arch, as there's nothing to build locally.
 
-If you're developing on the same architecture as the one you're deploying on, you can speed up the build a lot by forgoing a multi-arch image. This can be done by configuring the builder like so:
+```yaml
+builder:
+  remote:
+    arch: amd64
+    host: ssh://root@192.168.0.1
+```
+
+### Using native builder when multi-arch isn't needed
+
+If you're developing on the same architecture as the one you're deploying on, you can speed up the build by forgoing both multi-arch and remote building:
 
 ```yaml
 builder:
   multiarch: false
 ```
 
+This is also a good option if you're running MRSK from a CI server that shares architecture with the deployment servers.
+
+### Using build secrets for new images
+
+Some images need a secret passed in during build time, like a GITHUB_TOKEN to give access to private gem repositories. This can be done by having the secret in ENV, then referencing it in the builder configuration:
+
+```yaml
+builder:
+  secrets:
+    - GITHUB_TOKEN
+```
+
+This build secret can then be referenced in the Dockerfile:
+
+```
+# Copy Gemfiles
+COPY Gemfile Gemfile.lock ./
+
+# Install dependencies, including private repositories via access token
+RUN --mount=type=secret,id=GITHUB_TOKEN \
+  BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
+  bundle install
+```
+
+### Configuring build args for new images
+
+Build arguments that aren't secret can also be configured:
+
+```yaml
+builder:
+  args:
+    RUBY_VERSION: 3.2.0
+```
+
+This build argument can then be used in the Dockerfile:
+
+```
+# Private repositories need an access token during the build
+ARG RUBY_VERSION
+FROM ruby:$RUBY_VERSION-slim as base
+```
+
+### Using accessories for database, cache, search services
+
+You can manage your accessory services via MRSK as well. The services will build off public images, and will not be automatically updated when you deploy:
+
+```yaml
+accessories:
+  mysql:
+    image: mysql:5.7
+    host: 1.1.1.3
+    port: 3306
+    env:
+      clear:
+        MYSQL_ROOT_HOST: '%'
+      secret:
+        - MYSQL_ROOT_PASSWORD
+    volumes:
+      - /var/lib/mysql:/var/lib/mysql
+  redis:
+    image: redis:latest
+    host: 1.1.1.4
+    port: "36379:6379"
+    volumes:
+      - /var/lib/redis:/data
+```
+
+Now run `mrsk accessory start mysql` to start the MySQL server on 1.1.1.3. See `mrsk accessory` for all the commands possible.
+
 ## Commands
 
-### Remote execution
+### Running remote execution and runners
 
-If you need to execute commands inside the Rails containers, you can use `./bin/mrsk app:exec`, `./bin/mrsk app:exec:once`, `./bin/mrsk app:exec:rails`, and `./bin/mrsk app:exec:once:rails`. Examples:
+If you need to execute commands inside the Rails containers, you can use `mrsk app exec` and `mrsk app runner`. Examples:
 
 ```bash
 # Runs command on all servers
-./bin/mrsk app:exec CMD='ruby -v'
-App Host: xxx.xxx.xxx.xxx
+mrsk app exec 'ruby -v'
+App Host: 192.168.0.1
 ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
 
-App Host: xxx.xxx.xxx.xxx
+App Host: 192.168.0.2
 ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
 
-# Runs command on first server
-./bin/mrsk app:exec:once CMD='cat .ruby-version'
+# Runs command on primary server
+mrsk app exec --primary 'cat .ruby-version'
+App Host: 192.168.0.1
 3.1.3
 
 # Runs Rails command on all servers
-./bin/mrsk app:exec:rails CMD=about
-App Host: xxx.xxx.xxx.xxx
+mrsk app exec 'bin/rails about'
+App Host: 192.168.0.1
 About your application's environment
 Rails version             7.1.0.alpha
 Ruby version              ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
@@ -185,7 +305,7 @@ Environment               production
 Database adapter          sqlite3
 Database schema version   20221231233303
 
-App Host: xxx.xxx.xxx.xxx
+App Host: 192.168.0.2
 About your application's environment
 Rails version             7.1.0.alpha
 Ruby version              ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
@@ -197,70 +317,66 @@ Environment               production
 Database adapter          sqlite3
 Database schema version   20221231233303
 
-# Runs Rails command on first server
-./bin/mrsk app:exec:once:rails CMD='db:version'
-database: storage/production.sqlite3
-Current version: 20221231233303
+# Run Rails runner on primary server
+mrsk app runner -p 'puts Rails.application.config.time_zone'
+UTC
 ```
 
-### Running a Rails console on the primary host
+### Running a Rails console
 
-If you need to interact with the production console for the app, you can use `./bin/mrsk app:console`, which will start a Rails console session on the primary host. Be mindful that this is a live wire! Any changes made to the production database will take effect immeditately.
+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.
 
-### Inspecting
+### Running details to see state of containers
 
-You can see the state of your servers by running `./bin/mrsk info`. It'll show something like this:
+You can see the state of your servers by running `mrsk details`:
 
 ```
-Traefik Host: xxx.xxx.xxx.xxx
+Traefik Host: 192.168.0.1
 CONTAINER ID   IMAGE     COMMAND                  CREATED          STATUS          PORTS                               NAMES
 6195b2a28c81   traefik   "/entrypoint.sh --pr…"   30 minutes ago   Up 19 minutes   0.0.0.0:80->80/tcp, :::80->80/tcp   traefik
 
-Traefik Host: 164.92.105.119
+Traefik Host: 192.168.0.2
 CONTAINER ID   IMAGE     COMMAND                  CREATED          STATUS          PORTS                               NAMES
 de14a335d152   traefik   "/entrypoint.sh --pr…"   30 minutes ago   Up 19 minutes   0.0.0.0:80->80/tcp, :::80->80/tcp   traefik
 
-App Host: 164.90.145.60
+App Host: 192.168.0.1
 CONTAINER ID   IMAGE                                                                         COMMAND                  CREATED          STATUS          PORTS      NAMES
 badb1aa51db3   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483f86d05a123   "/rails/bin/docker-e…"   13 minutes ago   Up 13 minutes   3000/tcp   chat-6ef8a6a84c525b123c5245345a8483f86d05a123
 
-App Host: 164.92.105.119
+App Host: 192.168.0.2
 CONTAINER ID   IMAGE                                                                         COMMAND                  CREATED          STATUS          PORTS      NAMES
 1d3c91ed1f55   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483f86d05a123   "/rails/bin/docker-e…"   13 minutes ago   Up 13 minutes   3000/tcp   chat-6ef8a6a84c525b123c5245345a8483f86d05a123
 ```
 
-You can also see just info for app containers with `./bin/mrsk app:info` or just for Traefik with `./bin/mrsk traefik:info`.
+You can also see just info for app containers with `mrsk app details` or just for Traefik with `mrsk traefik details`.
 
-### Rollback
+### Running rollback to fix a bad deploy
 
-If you've discovered a bad deploy, you can quickly rollback by reactivating the old, paused container image. You can see what old containers are available for rollback by running `./bin/mrsk app:containers`. It'll give you a presentation similar to `./bin/mrsk app:info`, but include all the old containers as well. Showing something like this:
+If you've discovered a bad deploy, you can quickly rollback by reactivating the old, paused container image. You can see what old containers are available for rollback by running `mrsk app containers`. It'll give you a presentation similar to `mrsk app details`, but include all the old containers as well. Showing something like this:
 
 ```
-App Host: 164.92.105.119
+App Host: 192.168.0.1
 CONTAINER ID   IMAGE                                                                         COMMAND                  CREATED          STATUS                      PORTS      NAMES
 1d3c91ed1f51   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483f86d05a123   "/rails/bin/docker-e…"   19 minutes ago   Up 19 minutes               3000/tcp   chat-6ef8a6a84c525b123c5245345a8483f86d05a123
 539f26b28369   registry.digitalocean.com/user/app:e5d9d7c2b898289dfbc5f7f1334140d984eedae4   "/rails/bin/docker-e…"   31 minutes ago   Exited (1) 27 minutes ago              chat-e5d9d7c2b898289dfbc5f7f1334140d984eedae4
 
-App Host: 164.90.145.60
+App Host: 192.168.0.2
 CONTAINER ID   IMAGE                                                                         COMMAND                  CREATED          STATUS                      PORTS      NAMES
 badb1aa51db4   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483f86d05a123   "/rails/bin/docker-e…"   19 minutes ago   Up 19 minutes               3000/tcp   chat-6ef8a6a84c525b123c5245345a8483f86d05a123
 6f170d1172ae   registry.digitalocean.com/user/app:e5d9d7c2b898289dfbc5f7f1334140d984eedae4   "/rails/bin/docker-e…"   31 minutes ago   Exited (1) 27 minutes ago              chat-e5d9d7c2b898289dfbc5f7f1334140d984eedae4
 ```
 
-From the example above, we can see that `e5d9d7c2b898289dfbc5f7f1334140d984eedae4` was the last version, so it's available as a rollback target. We can perform this rollback by running `./bin/mrsk rollback VERSION=e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. That'll stop `6ef8a6a84c525b123c5245345a8483f86d05a123` and then start `e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. Because the old container is still available, this is very quick. Nothing to download from the registry.
+From the example above, we can see that `e5d9d7c2b898289dfbc5f7f1334140d984eedae4` was the last version, so it's available as a rollback target. We can perform this rollback by running `mrsk rollback e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. That'll stop `6ef8a6a84c525b123c5245345a8483f86d05a123` and then start `e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. Because the old container is still available, this is very quick. Nothing to download from the registry.
 
-Note that by default old containers are pruned after 3 days when you run `./bin/mrsk deploy`.
+Note that by default old containers are pruned after 3 days when you run `mrsk deploy`.
 
-### Removing
+### Running removal to clean up servers
 
-If you wish to remove the entire application, including Traefik, containers, images, and registry session, you can run `./bin/mrsk remove`. This will leave the servers clean.
+If you wish to remove the entire application, including Traefik, containers, images, and registry session, you can run `mrsk remove`. This will leave the servers clean.
 
 ## Stage of development
 
-This is alpha software. Lots of stuff is missing. Here are some of the areas we seek to improve:
-
-- Adapterize commands to work with Podman and other container runners
-- Integrate with cloud CI pipelines
+This is alpha software. Lots of stuff is missing. Lots of stuff will keep moving around for a while.
 
 ## License
 

data/bin/mrsk

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "mrsk/cli"
+
+Mrsk::Cli::Main.start(ARGV)

data/lib/mrsk/cli/accessory.rb

@@ -0,0 +1,85 @@
+require "mrsk/cli/base"
+
+class Mrsk::Cli::Accessory < Mrsk::Cli::Base
+  desc "boot [NAME]", "Boot accessory service on host"
+  def boot(name)
+    accessory = MRSK.accessory(name)
+    on(accessory.host) { execute *accessory.run }
+  end
+
+  desc "reboot [NAME]", "Reboot accessory on host (stop container, remove container, start new container)"
+  def reboot(name)
+    invoke :stop, [ name ]
+    invoke :remove_container, [ name ]
+    invoke :boot, [ name ]
+  end
+
+  desc "start [NAME]", "Start existing accessory on host"
+  def start(name)
+    accessory = MRSK.accessory(name)
+    on(accessory.host) { execute *accessory.start }
+  end
+
+  desc "stop [NAME]", "Stop accessory on host"
+  def stop(name)
+    accessory = MRSK.accessory(name)
+    on(accessory.host) { execute *accessory.stop }
+  end
+
+  desc "restart [NAME]", "Restart accessory on host"
+  def restart(name)
+    invoke :stop, [ name ]
+    invoke :start, [ name ]
+  end
+
+  desc "details [NAME]", "Display details about accessory on host"
+  def details(name)
+    accessory = MRSK.accessory(name)
+    on(accessory.host) { puts capture_with_info(*accessory.info) }
+  end
+
+  desc "logs [NAME]", "Show log lines from accessory on host"
+  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
+  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
+  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
+  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
+  def logs(name)
+    accessory = MRSK.accessory(name)
+
+    grep = options[:grep]
+
+    if options[:follow]
+      run_locally do
+        info "Following logs on #{accessory.host}..."
+        info accessory.follow_logs(grep: grep)
+        exec accessory.follow_logs(grep: grep)
+      end
+    else
+      since = options[:since]
+      lines = options[:lines]
+
+      on(accessory.host) do
+        puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep))
+      end
+    end
+  end
+
+  desc "remove [NAME]", "Remove accessory container and image from host"
+  def remove(name)
+    invoke :stop, [ name ]
+    invoke :remove_container, [ name ]
+    invoke :remove_image, [ name ]
+  end
+
+  desc "remove_container [NAME]", "Remove accessory container from host"
+  def remove_container(name)
+    accessory = MRSK.accessory(name)
+    on(accessory.host) { execute *accessory.remove_container }
+  end
+
+  desc "remove_container [NAME]", "Remove accessory image from servers"
+  def remove_image(name)
+    accessory = MRSK.accessory(name)
+    on(accessory.host) { execute *accessory.remove_image }
+  end
+end

data/lib/mrsk/cli/app.rb

@@ -0,0 +1,123 @@
+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)"
+  def boot
+    MRSK.config.roles.each do |role|
+      on(role.hosts) do |host|
+        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"
+            execute *MRSK.app.start, host: host
+          else
+            raise
+          end
+        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) { execute *MRSK.app.start(version: version) }
+    else
+      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 }
+  end
+  
+  desc "details", "Display details about app containers"
+  def details
+    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.info) }
+  end
+  
+  desc "exec [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"
+  def exec(cmd)
+    runner = options[:run] ? :run_exec : :exec
+    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.send(runner, cmd)) }
+  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 "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) }
+  end
+  
+  desc "logs", "Show lines from app on servers"
+  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
+  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
+  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
+  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
+  def logs
+    # FIXME: Catch when app containers aren't running
+
+    grep = options[:grep]
+
+    if options[:follow]
+      run_locally do
+        info "Following logs on #{MRSK.primary_host}..."
+        info MRSK.app.follow_logs(host: MRSK.primary_host, grep: grep)
+        exec MRSK.app.follow_logs(host: MRSK.primary_host, grep: grep)
+      end
+    else
+      since = options[:since]
+      lines = options[:lines]
+
+      on(MRSK.hosts) do |host|
+        begin
+          puts_by_host host, capture_with_info(*MRSK.app.logs(since: since, lines: lines, grep: grep))
+        rescue SSHKit::Command::Failed
+          puts_by_host host, "Nothing found"
+        end
+      end
+    end
+  end
+
+  desc "remove", "Remove app containers and images from servers"
+  option :only, default: "", desc: "Use 'containers' or 'images'"
+  def remove
+    case options[:only]
+    when "containers"
+      on(MRSK.hosts) { execute *MRSK.app.remove_containers }
+    when "images"
+      on(MRSK.hosts) { execute *MRSK.app.remove_images }
+    else
+      on(MRSK.hosts) { execute *MRSK.app.remove_containers }
+      on(MRSK.hosts) { execute *MRSK.app.remove_images }
+    end
+  end
+end