Bump version for 0.16.0

Rename project to Kamal

CODE_OF_CONDUCT.md

@@ -1,10 +1,10 @@
 # Contributor Code of Conduct
 
-As contributors and maintainers of the MRSK project, we pledge to create a welcoming and inclusive environment for everyone. We value the participation of each member of our community and want all contributors to feel respected and valued.
+As contributors and maintainers of the Kamal project, we pledge to create a welcoming and inclusive environment for everyone. We value the participation of each member of our community and want all contributors to feel respected and valued.
 
 We are committed to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age, or religion (or lack thereof). We do not tolerate harassment of participants in any form.
 
-This code of conduct applies to all MRSK project spaces, including but not limited to project code, issue trackers, chat rooms, and mailing lists. Violations of this code of conduct may result in removal from the project community.
+This code of conduct applies to all Kamal project spaces, including but not limited to project code, issue trackers, chat rooms, and mailing lists. Violations of this code of conduct may result in removal from the project community.
 
 ## Our standards
 

CONTRIBUTING.md

@@ -1,18 +1,18 @@
-# Contributing to MRSK development
+# Contributing to Kamal development
 
-Thank you for considering contributing to MRSK! This document outlines some guidelines for contributing to this open source project.
+Thank you for considering contributing to Kamal! This document outlines some guidelines for contributing to this open source project.
 
-Please make sure to review our [Code of Conduct](CODE_OF_CONDUCT.md) before contributing to MRSK.
+Please make sure to review our [Code of Conduct](CODE_OF_CONDUCT.md) before contributing to Kamal.
 
 There are several ways you can contribute to the betterment of the project:
 
-- **Report an issue?** - If the issue isn’t reported, we can’t fix it. Please report any bugs, feature, and/or improvement requests on the [MRSK GitHub Issues tracker](https://github.com/mrsked/mrsk/issues).
-- **Submit patches** - Do you have a new feature or a fix you'd like to share? [Submit a pull request](https://github.com/mrsked/mrsk/pulls)!
-- **Write blog articles** - Are you using MRSK? We'd love to hear how you're using it with your projects. Write a tutorial and post it on your blog!
+- **Report an issue?** - If the issue isn’t reported, we can’t fix it. Please report any bugs, feature, and/or improvement requests on the [Kamal GitHub Issues tracker](https://github.com/basecamp/kamal/issues).
+- **Submit patches** - Do you have a new feature or a fix you'd like to share? [Submit a pull request](https://github.com/basecamp/kamal/pulls)!
+- **Write blog articles** - Are you using Kamal? We'd love to hear how you're using it with your projects. Write a tutorial and post it on your blog!
 
 ## Issues
 
-If you encounter any issues with the project, please check the [existing issues](https://github.com/mrsked/mrsk/issues) first to see if the issue has already been reported. If the issue hasn't been reported, please open a new issue with a clear description of the problem and steps to reproduce it.
+If you encounter any issues with the project, please check the [existing issues](https://github.com/basecamp/kamal/issues) first to see if the issue has already been reported. If the issue hasn't been reported, please open a new issue with a clear description of the problem and steps to reproduce it.
 
 ## Pull Requests
 
@@ -33,17 +33,17 @@ A good commit message should describe what changed and why.
 
 ## Development
 
-The `main` branch is regularly built and tested, but it is not guaranteed to be completely stable. Tags are created regularly from release branches to indicate new official, stable release versions of MRSK.
+The `main` branch is regularly built and tested, but it is not guaranteed to be completely stable. Tags are created regularly from release branches to indicate new official, stable release versions of Kamal.
 
-MRSK is written in Ruby. You should have Ruby 3.2+ installed on your machine in order to work on MRSK. If that's already setup, run `bundle` in the root directory to install all dependencies. Then you can run `bin/test` to run all tests.
+Kamal is written in Ruby. You should have Ruby 3.2+ installed on your machine in order to work on Kamal. If that's already setup, run `bundle` in the root directory to install all dependencies. Then you can run `bin/test` to run all tests.
 
 1. Fork the project repository.
 2. Create a new branch for your contribution.
 3. Write your code or make the desired changes.
 4. **Ensure that your code passes the project's minitests by running ./bin/test.**
 5. Commit your changes and push them to your forked repository.
-6. [Open a pull request](https://github.com/mrsked/mrsk/pulls) to the main project repository with a detailed description of your changes.
+6. [Open a pull request](https://github.com/basecamp/kamal/pulls) to the main project repository with a detailed description of your changes.
 
 ## License
 
-MRSK is released under the MIT License. By contributing to this project, you agree to license your contributions under the same license.
+Kamal is released under the MIT License. By contributing to this project, you agree to license your contributions under the same license.

Dockerfile

@@ -4,14 +4,14 @@ FROM ruby:3.2.0-alpine
 # Install  docker/buildx-bin
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 
-# Set the working directory to /mrsk
-WORKDIR /mrsk
+# Set the working directory to /kamal
+WORKDIR /kamal
 
 # Copy the Gemfile, Gemfile.lock into the container
-COPY Gemfile Gemfile.lock mrsk.gemspec ./
+COPY Gemfile Gemfile.lock kamal.gemspec ./
 
-# Required in mrsk.gemspec
-COPY lib/mrsk/version.rb /mrsk/lib/mrsk/version.rb
+# Required in kamal.gemspec
+COPY lib/kamal/version.rb /kamal/lib/kamal/version.rb
 
 # Install system dependencies
 RUN apk add --no-cache --update build-base git docker openrc openssh-client-default \
@@ -25,8 +25,8 @@ RUN apk add --no-cache --update build-base git docker openrc openssh-client-defa
 COPY . .
 
 # Install the gem locally from the project folder
-RUN gem build mrsk.gemspec && \
-    gem install ./mrsk-*.gem --no-document
+RUN gem build kamal.gemspec && \
+    gem install ./kamal-*.gem --no-document
 
 # Set the working directory to /workdir
 WORKDIR /workdir
@@ -36,5 +36,5 @@ WORKDIR /workdir
 RUN git config --global --add safe.directory /workdir
 
 # Set the entrypoint to run the installed binary in /workdir
-# Example:  docker run -it -v "$PWD:/workdir" mrsk init
-ENTRYPOINT ["mrsk"]
+# Example:  docker run -it -v "$PWD:/workdir" kamal init
+ENTRYPOINT ["kamal"]

Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    mrsk (0.13.2)
+    kamal (0.16.0)
       activesupport (>= 7.0)
       bcrypt_pbkdf (~> 1.0)
+      concurrent-ruby (~> 1.2)
       dotenv (~> 2.8)
       ed25519 (~> 1.2)
       net-ssh (~> 7.0)
@@ -98,8 +99,8 @@ PLATFORMS
 
 DEPENDENCIES
   debug
+  kamal!
   mocha
-  mrsk!
   railties
 
 BUNDLED WITH

README.md

@@ -1,28 +1,28 @@
-# MRSK
+# Kamal
 
-MRSK deploys web apps anywhere from bare metal to cloud VMs using 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. It was built for Rails applications, but works with any type of web app that can be containerized with Docker.
+Kamal deploys web apps anywhere from bare metal to cloud VMs using 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. It was built for Rails applications, but works with any type of web app that can be containerized with Docker.
 
 Watch the screencast: https://www.youtube.com/watch?v=LL1cV2FXZ5I
 
 Join us on Discord: https://discord.gg/YgHVT7GCXS
 
-Ask questions: https://github.com/mrsked/mrsk/discussions
+Ask questions: https://github.com/basecamp/kamal/discussions
 
 ## Installation
 
-If you have a Ruby environment available, you can install MRSK globally with:
+If you have a Ruby environment available, you can install Kamal globally with:
 
 ```sh
-gem install mrsk
+gem install kamal
 ```
 
 ...otherwise, you can run a dockerized version via an alias (add this to your .bashrc or similar to simplify re-use):
 
 ```sh
-alias mrsk='docker run --rm -it -v $HOME/.ssh:/root/.ssh -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workdir  ghcr.io/mrsked/mrsk'
+alias kamal='docker run --rm -it -v $HOME/.ssh:/root/.ssh -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workdir  ghcr.io/basecamp/kamal'
 ```
 
-Then, inside your app directory, run `mrsk init` (or `mrsk init --bundle` within Rails 7+ apps where you want a bin/mrsk binstub). Now edit the new file `config/deploy.yml`. It could look as simple as this:
+Then, inside your app directory, run `kamal init` (or `kamal init --bundle` within Rails 7+ apps where you want a bin/kamal binstub). Now edit the new file `config/deploy.yml`. It could look as simple as this:
 
 ```yaml
 service: hey
@@ -33,18 +33,18 @@ servers:
 registry:
   username: registry-user-name
   password:
-    - MRSK_REGISTRY_PASSWORD
+    - KAMAL_REGISTRY_PASSWORD
 env:
   secret:
     - RAILS_MASTER_KEY
 ```
 
-Then edit your `.env` file to add your registry password as `MRSK_REGISTRY_PASSWORD` (and your `RAILS_MASTER_KEY` for production with a Rails app).
+Then edit your `.env` file to add your registry password as `KAMAL_REGISTRY_PASSWORD` (and your `RAILS_MASTER_KEY` for production with a Rails app).
 
 Now you're ready to deploy to the servers:
 
 ```
-mrsk setup
+kamal setup
 ```
 
 This will:
@@ -61,46 +61,64 @@ This will:
 10. Stop the old container running the previous version of the app.
 11. 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. For subsequent deploys, or if your servers already have Docker and curl installed, you can just run `mrsk deploy`.
+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. For subsequent deploys, or if your servers already have Docker and curl installed, you can just run `kamal deploy`.
+
+### Rails <7 usage
+
+Kamal is not needed to be in your application Gemfile to be used. However, if you want to guarantee specific Kamal version in your CI/CD workflows, you can create a separate Gemfile for Kamal, for example, `gemfile/kamal.gemfile`:
+
+```ruby
+source 'https://rubygems.org'
+
+gem 'kamal', '~> 0.14'
+```
+
+Bundle with `BUNDLE_GEMFILE=gemfiles/kamal.gemfile bundle`.
+
+After this Kamal can be used for deployment:
+
+```sh
+BUNDLE_GEMFILE=gemfiles/kamal.gemfile bundle exec kamal deploy
+```
 
 ## Vision
 
 In the past decade+, there's been an explosion in commercial offerings that make deploying web apps easier. Heroku kicked it off with an incredible offering that stayed ahead of the competition seemingly forever. These days we have excellent alternatives like Fly.io and Render. And hosted Kubernetes is making things easier too on AWS, GCP, Digital Ocean, and elsewhere. But these are all offerings that have you renting computers in the cloud at a premium. If you want to run on your own hardware, or even just have a clear migration path to do so in the future, you need to carefully consider how locked in you get to these commercial platforms. Preferably before the bills swallow your business whole!
 
-MRSK seeks to bring the advance in ergonomics pioneered by these commercial offerings to deploying web apps anywhere. Whether that's low-cost cloud options without the managed-service markup from the likes of Digital Ocean, Hetzner, OVH, etc., or it's your own colocated bare metal. To MRSK, it's all the same. Feed the config file a list of IP addresses with vanilla Ubuntu servers that have seen no prep beyond an added SSH key, and you'll be running in literally minutes.
+Kamal seeks to bring the advance in ergonomics pioneered by these commercial offerings to deploying web apps anywhere. Whether that's low-cost cloud options without the managed-service markup from the likes of Digital Ocean, Hetzner, OVH, etc., or it's your own colocated bare metal. To Kamal, it's all the same. Feed the config file a list of IP addresses with vanilla Ubuntu servers that have seen no prep beyond an added SSH key, and you'll be running in literally minutes.
 
 This approach gives you enormous portability. You can have your web app deployed on several clouds at ease like this. Or you can buy the baseline with your own hardware, then deploy to a cloud before a big seasonal spike to get more capacity. When you're not locked into a single provider from a tooling perspective, there are a lot of compelling options available.
 
-Ultimately, MRSK is meant to compress the complexity of going to production using open source tooling that isn't tied to any commercial offering. Not to zero, mind you. You're probably still better off with a fully managed service if basic Linux or Docker is still difficult, but as soon as those concepts are familiar, you'll be ready to go with MRSK.
+Ultimately, Kamal is meant to compress the complexity of going to production using open source tooling that isn't tied to any commercial offering. Not to zero, mind you. You're probably still better off with a fully managed service if basic Linux or Docker is still difficult, but as soon as those concepts are familiar, you'll be ready to go with Kamal.
 
 ## Why not just run Capistrano, Kubernetes or Docker Swarm?
 
-MRSK basically is Capistrano for Containers, without the need to carefully prepare servers in advance. 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 list of servers in MRSK, and it'll be auto-provisioned with Docker, and run right away. Docker's layer caching also speeds up deployments with less mucking about on the server. And the images built for MRSK can be used for CI or later introspection.
+Kamal basically is Capistrano for Containers, without the need to carefully prepare servers in advance. 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 list of servers in Kamal, and it'll be auto-provisioned with Docker, and run right away. Docker's layer caching also speeds up deployments with less mucking about on the server. And the images built for Kamal 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, either transparently [like Render](https://thenewstack.io/render-cloud-deployment-with-less-engineering/) or explicitly on AWS/GCP, 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.
+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, either transparently [like Render](https://thenewstack.io/render-cloud-deployment-with-less-engineering/) or explicitly on AWS/GCP, but if you'd like the freedom to move between cloud and your own hardware, or even mix the two, Kamal is much simpler. You can see everything that's going on, it's just basic Docker commands being called.
 
-Docker Swarm is much simpler than Kubernetes, but it's still built on the same declarative model that uses state reconciliation. MRSK is intentionally designed around imperative commands, like Capistrano.
+Docker Swarm is much simpler than Kubernetes, but it's still built on the same declarative model that uses state reconciliation. Kamal is intentionally designed around imperative commands, like Capistrano.
 
 Ultimately, there are a myriad of ways to deploy web apps, but this is the toolkit we're using at [37signals](https://37signals.com) to bring [HEY](https://www.hey.com) [home from the cloud](https://world.hey.com/dhh/why-we-re-leaving-the-cloud-654b47e0) without losing the advantages of modern containerization tooling.
 
-## Running MRSK from Docker
+## Running Kamal from Docker
 
-MRSK is packaged up in a Docker container similarly to [rails/docked](https://github.com/rails/docked). This will allow you to run MRSK (from your application directory) without having to install any dependencies other than Docker. Add the following alias to your profile configuration to make working with the container more convenient:
+Kamal is packaged up in a Docker container similarly to [rails/docked](https://github.com/rails/docked). This will allow you to run Kamal (from your application directory) without having to install any dependencies other than Docker. Add the following alias to your profile configuration to make working with the container more convenient:
 
 ```bash
-alias mrsk="docker run -it --rm -v '${PWD}:/workdir' -v '${SSH_AUTH_SOCK}:/ssh-agent' -v /var/run/docker.sock:/var/run/docker.sock -e 'SSH_AUTH_SOCK=/ssh-agent' ghcr.io/mrsked/mrsk:latest"
+alias kamal="docker run -it --rm -v '${PWD}:/workdir' -v '${SSH_AUTH_SOCK}:/ssh-agent' -v /var/run/docker.sock:/var/run/docker.sock -e 'SSH_AUTH_SOCK=/ssh-agent' ghcr.io/basecamp/kamal:latest"
 ```
 
-Since MRSK uses SSH to establish a remote connection, it will need access to your SSH agent. The above command uses a volume mount to make it available inside the container and configures the SSH agent inside the container to make use of it.
+Since Kamal uses SSH to establish a remote connection, it will need access to your SSH agent. The above command uses a volume mount to make it available inside the container and configures the SSH agent inside the container to make use of it.
 
 ## 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:
+Kamal 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 `KAMAL_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
+KAMAL_REGISTRY_PASSWORD=pw
 DB_PASSWORD=secret123
 ```
 
@@ -111,17 +129,19 @@ DB_PASSWORD=secret123
 If you're using a centralized secret store, like 1Password, you can create `.env.erb` as a template which looks up the secrets. Example of a .env.erb file:
 
 ```erb
-<% if (session_token = `op signin --account my-one-password-account --raw`.strip) != "" %># Generated by mrsk envify
+<% if (session_token = `op signin --account my-one-password-account --raw`.strip) != "" %># Generated by kamal envify
 GITHUB_TOKEN=<%= `gh config get -h github.com oauth_token`.strip %>
-MRSK_REGISTRY_PASSWORD=<%= `op read "op://Vault/Docker Hub/password" -n --session  #{session_token}` %>
+KAMAL_REGISTRY_PASSWORD=<%= `op read "op://Vault/Docker Hub/password" -n --session  #{session_token}` %>
 RAILS_MASTER_KEY=<%= `op read "op://Vault/My App/RAILS_MASTER_SECRET" -n --session #{session_token}` %>
 MYSQL_ROOT_PASSWORD=<%= `op read "op://Vault/My App/MYSQL_ROOT_PASSWORD" -n --session #{session_token}` %>
 <% else raise ArgumentError, "Session token missing" end %>
 ```
 
-This template can safely be checked into git. Then everyone deploying the app can run `mrsk envify` when they setup the app for the first time or passwords change to get the correct `.env` file.
+This template can safely be checked into git. Then everyone deploying the app can run `kamal envify` when they setup the app for the first time or passwords change to get the correct `.env` file.
 
-If you need separate env variables for different destinations, you can set them with `.env.destination.erb` for the template, which will generate `.env.staging` when run with `mrsk envify -d staging`.
+If you need separate env variables for different destinations, you can set them with `.env.destination.erb` for the template, which will generate `.env.staging` when run with `kamal envify -d staging`.
+
+Note: If you utilize biometrics with 1Password you can remove the `session_token` related parts in the example and just call `op read op://Vault/Docker Hub/password -n`.
 
 #### Bitwarden as a secret store
 
@@ -161,12 +181,12 @@ and extract the `id` of `SOME_SECRET` from the `json` above and use in the `erb`
 Example `.env.erb` file:
 
 ```erb
-<% if (session_token=`bw unlock --raw`.strip) != "" %># Generated by mrsk envify
+<% if (session_token=`bw unlock --raw`.strip) != "" %># Generated by kamal envify
 SOME_SECRET=<%= `bw get notes 123123123-1232-4224-222f-234234234234 --session #{session_token}` %>
 <% else raise ArgumentError, "session_token token missing" end %>
 ```
 
-Then everyone deploying the app can run `mrsk envify` and mrsk will generate `.env`
+Then everyone deploying the app can run `kamal envify` and kamal will generate `.env`
 
 
 ### Using another registry than Docker Hub
@@ -182,7 +202,7 @@ registry:
     - DOCKER_REGISTRY_TOKEN
 ```
 
-A reference to secret `DOCKER_REGISTRY_TOKEN` will look for `ENV["DOCKER_REGISTRY_TOKEN"]` on the machine running MRSK.
+A reference to secret `DOCKER_REGISTRY_TOKEN` will look for `ENV["DOCKER_REGISTRY_TOKEN"]` on the machine running Kamal.
 
 #### Using AWS ECR as the container registry
 
@@ -206,13 +226,13 @@ ssh:
   user: app
 ```
 
-If you are using non-root user, you need to bootstrap your servers manually, before using them with MRSK. On Ubuntu, you'd do:
+If you are using non-root user (`app` as above example), you need to bootstrap your servers manually, before using them with Kamal. On Ubuntu, you'd do:
 
 ```bash
 sudo apt update
 sudo apt upgrade -y
 sudo apt install -y docker.io curl git
-sudo usermod -a -G docker ubuntu
+sudo usermod -a -G docker app
 ```
 
 ### Using a proxy SSH host
@@ -238,6 +258,14 @@ ssh:
   proxy_command: aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p' --region=us-east-1 ## ssh via aws ssm
 ```
 
+### Configuring the SSH log level
+
+```yaml
+ssh:
+  log_level: debug
+```
+
+Valid levels are `debug`, `info`, `warn`, `error` and `fatal` (default).
 ### Using env variables
 
 You can inject env variables into the app containers using `env`:
@@ -262,11 +290,11 @@ env:
     - 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.
+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 Kamal. Just like with build secrets.
 
 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.
+Note: Marking an ENV as secret currently only redacts its value in the output for Kamal. The ENV is still injected in the clear into the container at runtime.
 
 ### Using volumes
 
@@ -277,11 +305,11 @@ volumes:
   - "/local/path:/container/path"
 ```
 
-### MRSK env variables
+### Kamal env variables
 
 The following env variables are set when your container runs:
 
-`MRSK_CONTAINER_NAME` : this contains the current container name and version
+`KAMAL_CONTAINER_NAME` : this contains the current container name and version
 
 ### Using different roles for servers
 
@@ -380,6 +408,16 @@ servers:
 
 That'll start the job containers with `docker run ... --cap-add --cpu-count 4 ...`.
 
+### Setting a minimum version
+
+You can set the minimum Kamal version with:
+
+```yaml
+minimum_version: 0.13.3
+```
+
+Note: versions <= 0.13.2 will ignore this setting.
+
 ### Configuring logging
 
 You can configure the logging driver and options passed to Docker using `logging`:
@@ -405,7 +443,7 @@ stop_wait_time: 30
 
 ### 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 can use multi-architecture 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're developing on ARM64 (like Apple Silicon), but you want to deploy on AMD64 (x86 64-bit), you can use multi-architecture images. By default, Kamal 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:
 
@@ -441,7 +479,7 @@ 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.
+This is also a good option if you're running Kamal from a CI server that shares architecture with the deployment servers.
 
 ### Using a different Dockerfile or context when building
 
@@ -463,6 +501,37 @@ builder:
   context: ".."
 ```
 
+### Using multistage builder cache
+
+Docker multistage build cache can singlehandedly speed up your builds by a lot. Currently Kamal only supports using the GHA cache or the Registry cache:
+
+```yaml
+# Using GHA cache
+builder:
+  cache:
+    type: gha
+
+# Using Registry cache
+builder:
+  cache:
+    type: registry
+
+# Using Registry cache with different cache image
+builder:
+  cache:
+    type: registry
+    # default image name is <image>-build-cache
+    image: application-cache-image
+
+# Using Registry cache with additinonal cache-to options
+builder:
+  cache:
+    type: registry
+    options: mode=max,image-manifest=true,oci-mediatypes=true
+```
+
+For further insights into build cache optimization, check out documentation on Docker's official website: https://docs.docker.com/build/cache/.
+
 ### 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:
@@ -510,7 +579,7 @@ traefik:
 
 ### Traefik version, upgrades, and custom images
 
-MRSK runs the traefik:v2.9 image to track Traefik 2.9.x releases.
+Kamal runs the traefik:v2.9 image to track Traefik 2.9.x releases.
 
 To pin Traefik to a specific version or an image published to your registry,
 specify `image`:
@@ -524,7 +593,7 @@ This is useful for downgrading Traefik if there's an unexpected breaking
 change in a minor version release, upgrading Traefik to test forthcoming
 releases, or running your own Traefik-derived image.
 
-MRSK has not been tested for compatibility with Traefik 3 betas. Please do!
+Kamal has not been tested for compatibility with Traefik 3 betas. Please do!
 
 ### Traefik container configuration
 
@@ -581,6 +650,16 @@ traefik:
     entrypoints.otherentrypoint.address: ':9000'
 ```
 
+### Rebooting Traefik
+
+If you make changes to Traefik args or labels, you'll need to reboot with:
+
+`kamal traefik reboot`
+
+In production, reboot the Traefik containers one by one with a slower but safer approach, using a rolling reboot:
+
+`kamal traefik reboot --rolling`
+
 ### Configuring build args for new images
 
 Build arguments that aren't secret can also be configured:
@@ -600,7 +679,7 @@ FROM ruby:$RUBY_VERSION-slim as base
 
 ### Using accessories for database, cache, search services
 
-You can manage your accessory services via MRSK as well. Accessories are long-lived services that your app depends on. They are not updated when you deploy.
+You can manage your accessory services via Kamal as well. Accessories are long-lived services that your app depends on. They are not updated when you deploy.
 
 ```yaml
 accessories:
@@ -649,7 +728,7 @@ The hosts that the accessories will run on can be specified by hosts or roles:
       - jobs
 ```
 
-Now run `mrsk accessory start mysql` to start the MySQL server on 1.1.1.3. See `mrsk accessory` for all the commands possible.
+Now run `kamal accessory start mysql` to start the MySQL server on 1.1.1.3. See `kamal accessory` for all the commands possible.
 
 Accessory images must be public or tagged in your private registry.
 
@@ -670,7 +749,7 @@ This assumes the Cron settings are stored in `config/crontab`.
 
 ### Healthcheck
 
-MRSK uses Docker healthchecks to check the health of your application during deployment. Traefik uses this same healthcheck status to determine when a container is ready to receive traffic.
+Kamal uses Docker healthchecks to check the health of your application during deployment. Traefik uses this same healthcheck status to determine when a container is ready to receive traffic.
 
 The healthcheck defaults to testing the HTTP response to the path `/up` on port 3000, up to 7 times. You can tailor this behaviour with the `healthcheck` setting:
 
@@ -682,7 +761,7 @@ healthcheck:
   interval: 20s
 ```
 
-This will ensure your application is configured with a traefik label for the healthcheck against `/healthz` and that the pre-deploy healthcheck that MRSK performs is done against the same path on port 4000.
+This will ensure your application is configured with a traefik label for the healthcheck against `/healthz` and that the pre-deploy healthcheck that Kamal performs is done against the same path on port 4000.
 
 You can also specify a custom healthcheck command, which is useful for non-HTTP services:
 
@@ -716,7 +795,7 @@ You can execute one-off commands on the servers:
 
 ```bash
 # Runs command on all servers
-mrsk app exec 'ruby -v'
+kamal app exec 'ruby -v'
 App Host: 192.168.0.1
 ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
 
@@ -724,12 +803,12 @@ App Host: 192.168.0.2
 ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
 
 # Runs command on primary server
-mrsk app exec --primary 'cat .ruby-version'
+kamal app exec --primary 'cat .ruby-version'
 App Host: 192.168.0.1
 3.1.3
 
 # Runs Rails command on all servers
-mrsk app exec 'bin/rails about'
+kamal app exec 'bin/rails about'
 App Host: 192.168.0.1
 About your application's environment
 Rails version             7.1.0.alpha
@@ -755,7 +834,7 @@ Database adapter          sqlite3
 Database schema version   20221231233303
 
 # Run Rails runner on primary server
-mrsk app exec -p 'bin/rails runner "puts Rails.application.config.time_zone"'
+kamal app exec -p 'bin/rails runner "puts Rails.application.config.time_zone"'
 UTC
 ```
 
@@ -765,19 +844,19 @@ You can run interactive commands, like a Rails console or a bash session, on a s
 
 ```bash
 # Starts a bash session in a new container made from the most recent app image
-mrsk app exec -i bash
+kamal app exec -i bash
 
 # Starts a bash session in the currently running container for the app
-mrsk app exec -i --reuse bash
+kamal 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'
+kamal app exec -i 'bin/rails console'
 ```
 
 
 ### Running details to show state of containers
 
-You can see the state of your servers by running `mrsk details`:
+You can see the state of your servers by running `kamal details`:
 
 ```
 Traefik Host: 192.168.0.1
@@ -797,11 +876,11 @@ CONTAINER ID   IMAGE
 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 `mrsk app details` or just for Traefik with `mrsk traefik details`.
+You can also see just info for app containers with `kamal app details` or just for Traefik with `kamal traefik details`.
 
 ### 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 `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:
+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 `kamal app containers`. It'll give you a presentation similar to `kamal app details`, but include all the old containers as well. Showing something like this:
 
 ```
 App Host: 192.168.0.1
@@ -815,22 +894,22 @@ badb1aa51db4   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483
 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 `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.
+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 `kamal 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 `mrsk deploy`.
+Note that by default old containers are pruned after 3 days when you run `kamal deploy`.
 
 ### Running removal to clean up servers
 
-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.
+If you wish to remove the entire application, including Traefik, containers, images, and registry session, you can run `kamal remove`. This will leave the servers clean.
 
 ## Locking
 
-Commands that are unsafe to run concurrently will take a deploy lock while they run. The lock is the `mrsk_lock` directory on the primary server.
+Commands that are unsafe to run concurrently will take a deploy lock while they run. The lock is the `kamal_lock-<service>` directory on the primary server.
 
 You can check the lock status with:
 
 ```
-mrsk lock status
+kamal lock status
 
 Locked by: AN Other at 2023-03-24 09:49:03 UTC
 Version: 77f45c0686811c68989d6576748475a60bf53fc2
@@ -840,18 +919,18 @@ Message: Automatic deploy lock
 You can also manually acquire and release the lock
 
 ```
-mrsk lock acquire -m "Doing maintenance"
+kamal lock acquire -m "Doing maintenance"
 ```
 
 ```
-mrsk lock release
+kamal lock release
 ```
 
 ## Rolling deployments
 
 When deploying to large numbers of hosts, you might prefer not to restart your services on every host at the same time.
 
-MRSK's default is to boot new containers on all hosts in parallel. But you can control this by configuring `boot/limit` and `boot/wait` as options:
+Kamal's default is to boot new containers on all hosts in parallel. But you can control this by configuring `boot/limit` and `boot/wait` as options:
 
 ```yaml
 service: myservice
@@ -861,32 +940,32 @@ boot:
   wait: 2
 ```
 
-When `limit` is specified, containers will be booted on, at most, `limit` hosts at once. MRSK will pause for `wait` seconds between batches.
+When `limit` is specified, containers will be booted on, at most, `limit` hosts at once. Kamal will pause for `wait` seconds between batches.
 
-These settings only apply when booting containers (using `mrsk deploy`, or `mrsk app boot`). For other commands, MRSK continues to run commands in parallel across all hosts.
+These settings only apply when booting containers (using `kamal deploy`, or `kamal app boot`). For other commands, Kamal continues to run commands in parallel across all hosts.
 
 ## Hooks
 
 You can run custom scripts at specific points with hooks.
 
-Hooks should be stored in the .mrsk/hooks folder. Running mrsk init will build that folder and add some sample scripts.
+Hooks should be stored in the .kamal/hooks folder. Running kamal init will build that folder and add some sample scripts.
 
 You can change their location by setting `hooks_path` in the configuration file.
 
 If the script returns a non-zero exit code the command will be aborted.
 
-`MRSK_*` environment variables are available to the hooks command for
+`KAMAL_*` environment variables are available to the hooks command for
 fine-grained audit reporting, e.g. for triggering deployment reports or
 firing a JSON webhook. These variables include:
-- `MRSK_RECORDED_AT` - UTC timestamp in ISO 8601 format, e.g. `2023-04-14T17:07:31Z`
-- `MRSK_PERFORMER` - the local user performing the command (from `whoami`)
-- `MRSK_SERVICE_VERSION` - an abbreviated service and version for use in messages, e.g. app@150b24f
-- `MRSK_VERSION` - an full version being deployed
-- `MRSK_HOSTS` - a comma separated list of the hosts targeted by the command
-- `MRSK_COMMAND` - The command we are running
-- `MRSK_SUBCOMMAND` - optional: The subcommand we are running
-- `MRSK_DESTINATION` - optional: destination, e.g. "staging"
-- `MRSK_ROLE` - optional: role targeted, e.g. "web"
+- `KAMAL_RECORDED_AT` - UTC timestamp in ISO 8601 format, e.g. `2023-04-14T17:07:31Z`
+- `KAMAL_PERFORMER` - the local user performing the command (from `whoami`)
+- `KAMAL_SERVICE_VERSION` - an abbreviated service and version for use in messages, e.g. app@150b24f
+- `KAMAL_VERSION` - the full version being deployed
+- `KAMAL_HOSTS` - a comma-separated list of the hosts targeted by the command
+- `KAMAL_COMMAND` - The command we are running
+- `KAMAL_SUBCOMMAND` - optional: The subcommand we are running
+- `KAMAL_DESTINATION` - optional: destination, e.g. "staging"
+- `KAMAL_ROLE` - optional: role targeted, e.g. "web"
 
 There are four hooks:
 
@@ -899,9 +978,8 @@ Used for pre-build checks - e.g. there are no uncommitted changes or that CI has
 3. pre-deploy
 For final checks before deploying, e.g. checking CI completed
 
-3. post-deploy - run after a deploy, redeploy or rollback
-
-This hook is also passed a `MRSK_RUNTIME` env variable.
+3. post-deploy - run after a deploy, redeploy or rollback.
+This hook is also passed a `KAMAL_RUNTIME` env variable set to the total seconds the deploy took.
 
 This could be used to broadcast a deployment message, or register the new version with an APM.
 
@@ -909,10 +987,10 @@ The command could look something like:
 
 ```bash
 #!/usr/bin/env bash
-curl -q -d content="[My App] ${MRSK_PERFORMER} Rolled back to version ${MRSK_VERSION}" https://3.basecamp.com/XXXXX/integrations/XXXXX/buckets/XXXXX/chats/XXXXX/lines
+curl -q -d content="[My App] ${KAMAL_PERFORMER} Rolled back to version ${KAMAL_VERSION}" https://3.basecamp.com/XXXXX/integrations/XXXXX/buckets/XXXXX/chats/XXXXX/lines
 ```
 
-That'll post a line like follows to a preconfigured chatbot in Basecamp:
+That'll post a line like the following to a preconfigured chatbot in Basecamp:
 
 ```
 [My App] [dhh] Rolled back to version d264c4e92470ad1bd18590f04466787262f605de
@@ -920,10 +998,24 @@ That'll post a line like follows to a preconfigured chatbot in Basecamp:
 
 Set `--skip_hooks` to avoid running the hooks.
 
+## SSH connection management
+
+Creating SSH connections concurrently can be an issue when deploying to many servers. By default Kamal will limit concurrent connection starts to 30 at a time.
+
+It also sets a long idle timeout of 900 seconds on connections to prevent re-connection storms after a long idle period, like building an image or waiting for CI.
+
+You can configure both of these settings:
+
+```yaml
+sshkit:
+  max_concurrent_starts: 10
+  pool_idle_timeout: 300
+```
+
 ## Stage of development
 
 This is beta software. Commands may still move around. But we're live in production at [37signals](https://37signals.com).
 
 ## License
 
-MRSK is released under the [MIT License](https://opensource.org/licenses/MIT).
+Kamal is released under the [MIT License](https://opensource.org/licenses/MIT).

bin/kamal

@@ -3,10 +3,10 @@
 # Prevent failures from being reported twice.
 Thread.report_on_exception = false
 
-require "mrsk"
+require "kamal"
 
 begin
-  Mrsk::Cli::Main.start(ARGV)
+  Kamal::Cli::Main.start(ARGV)
 rescue SSHKit::Runner::ExecuteError => e
   puts "  \e[31mERROR (#{e.cause.class}): #{e.message}\e[0m"
   puts e.cause.backtrace if ENV["VERBOSE"]

bin/release

@@ -2,13 +2,13 @@
 
 VERSION=$1
 
-printf "module Mrsk\n  VERSION = \"$VERSION\"\nend\n" > ./lib/mrsk/version.rb
+printf "module Kamal\n  VERSION = \"$VERSION\"\nend\n" > ./lib/kamal/version.rb
 bundle
-git add Gemfile.lock lib/mrsk/version.rb
+git add Gemfile.lock lib/kamal/version.rb
 git commit -m "Bump version for $VERSION"
 git push
 git tag v$VERSION
 git push --tags
-gem build mrsk.gemspec
-gem push "mrsk-$VERSION.gem" --host https://rubygems.org
-rm "mrsk-$VERSION.gem"
+gem build kamal.gemspec
+gem push "kamal-$VERSION.gem" --host https://rubygems.org
+rm "kamal-$VERSION.gem"

kamal.gemspec

@@ -1,16 +1,16 @@
-require_relative "lib/mrsk/version"
+require_relative "lib/kamal/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = "mrsk"
-  spec.version     = Mrsk::VERSION
+  spec.name        = "kamal"
+  spec.version     = Kamal::VERSION
   spec.authors     = [ "David Heinemeier Hansson" ]
   spec.email       = "dhh@hey.com"
-  spec.homepage    = "https://github.com/rails/mrsk"
+  spec.homepage    = "https://github.com/rails/kamal"
   spec.summary     = "Deploy web apps in containers to servers running Docker with zero downtime."
   spec.license     = "MIT"
 
   spec.files = Dir["lib/**/*", "MIT-LICENSE", "README.md"]
-  spec.executables = %w[ mrsk ]
+  spec.executables = %w[ kamal ]
 
   spec.add_dependency "activesupport", ">= 7.0"
   spec.add_dependency "sshkit", "~> 1.21"
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk", "~> 2.5"
   spec.add_dependency "ed25519", "~> 1.2"
   spec.add_dependency "bcrypt_pbkdf", "~> 1.0"
+  spec.add_dependency "concurrent-ruby", "~> 1.2"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "mocha"

lib/kamal.rb

@@ -1,10 +1,10 @@
-module Mrsk
+module Kamal
 end
 
 require "active_support"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/mrsk/sshkit_with_ext.rb")
+loader.ignore("#{__dir__}/kamal/sshkit_with_ext.rb")
 loader.setup
 loader.eager_load # We need all commands loaded.

lib/kamal/cli.rb

@@ -1,7 +1,7 @@
-module Mrsk::Cli
+module Kamal::Cli
   class LockError < StandardError; end
   class HookError < StandardError; end
 end
 
 # SSHKit uses instance eval, so we need a global const for ergonomics
-MRSK = Mrsk::Commander.new
+KAMAL = Kamal::Commander.new

lib/kamal/cli/accessory.rb

@@ -1,17 +1,17 @@
-class Mrsk::Cli::Accessory < Mrsk::Cli::Base
+class Kamal::Cli::Accessory < Kamal::Cli::Base
   desc "boot [NAME]", "Boot new accessory service on host (use NAME=all to boot all accessories)"
-  def boot(name)
-    with_lock do
+  def boot(name, login: true)
+    mutating do
       if name == "all"
-        MRSK.accessory_names.each { |accessory_name| boot(accessory_name) }
+        KAMAL.accessory_names.each { |accessory_name| boot(accessory_name) }
       else
         with_accessory(name) do |accessory|
           directories(name)
           upload(name)
 
           on(accessory.hosts) do
-            execute *MRSK.registry.login
-            execute *MRSK.auditor.record("Booted #{name} accessory"), verbosity: :debug
+            execute *KAMAL.registry.login if login
+            execute *KAMAL.auditor.record("Booted #{name} accessory"), verbosity: :debug
             execute *accessory.run
           end
         end
@@ -21,7 +21,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "upload [NAME]", "Upload accessory files to host", hide: true
   def upload(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
           accessory.files.each do |(local, remote)|
@@ -38,7 +38,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "directories [NAME]", "Create accessory directories on host", hide: true
   def directories(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
           accessory.directories.keys.each do |host_path|
@@ -51,21 +51,25 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "reboot [NAME]", "Reboot existing accessory on host (stop container, remove container, start new container)"
   def reboot(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
+        on(accessory.hosts) do
+          execute *KAMAL.registry.login
+        end
+
         stop(name)
         remove_container(name)
-        boot(name)
+        boot(name, login: false)
       end
     end
   end
 
   desc "start [NAME]", "Start existing accessory container on host"
   def start(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
-          execute *MRSK.auditor.record("Started #{name} accessory"), verbosity: :debug
+          execute *KAMAL.auditor.record("Started #{name} accessory"), verbosity: :debug
           execute *accessory.start
         end
       end
@@ -74,10 +78,10 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "stop [NAME]", "Stop existing accessory container on host"
   def stop(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
-          execute *MRSK.auditor.record("Stopped #{name} accessory"), verbosity: :debug
+          execute *KAMAL.auditor.record("Stopped #{name} accessory"), verbosity: :debug
           execute *accessory.stop, raise_on_non_zero_exit: false
         end
       end
@@ -86,7 +90,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "restart [NAME]", "Restart existing accessory container on host"
   def restart(name)
-    with_lock do
+    mutating do
       with_accessory(name) do
         stop(name)
         start(name)
@@ -97,7 +101,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   desc "details [NAME]", "Show details about accessory on host (use NAME=all to show all accessories)"
   def details(name)
     if name == "all"
-      MRSK.accessory_names.each { |accessory_name| details(accessory_name) }
+      KAMAL.accessory_names.each { |accessory_name| details(accessory_name) }
     else
       with_accessory(name) do |accessory|
         on(accessory.hosts) { puts capture_with_info(*accessory.info) }
@@ -122,14 +126,14 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
       when options[:reuse]
         say "Launching command from existing container...", :magenta
         on(accessory.hosts) do
-          execute *MRSK.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
+          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
           capture_with_info(*accessory.execute_in_existing_container(cmd))
         end
 
       else
         say "Launching command from new container...", :magenta
         on(accessory.hosts) do
-          execute *MRSK.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
+          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
           capture_with_info(*accessory.execute_in_new_container(cmd))
         end
       end
@@ -165,9 +169,9 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   desc "remove [NAME]", "Remove accessory container, image and data directory from host (use NAME=all to remove all accessories)"
   option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
   def remove(name)
-    with_lock do
+    mutating do
       if name == "all"
-        MRSK.accessory_names.each { |accessory_name| remove(accessory_name) }
+        KAMAL.accessory_names.each { |accessory_name| remove(accessory_name) }
       else
         if options[:confirmed] || ask("This will remove all containers, images and data directories for #{name}. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
           with_accessory(name) do
@@ -183,10 +187,10 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "remove_container [NAME]", "Remove accessory container from host", hide: true
   def remove_container(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
-          execute *MRSK.auditor.record("Remove #{name} accessory container"), verbosity: :debug
+          execute *KAMAL.auditor.record("Remove #{name} accessory container"), verbosity: :debug
           execute *accessory.remove_container
         end
       end
@@ -195,10 +199,10 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "remove_image [NAME]", "Remove accessory image from host", hide: true
   def remove_image(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
-          execute *MRSK.auditor.record("Removed #{name} accessory image"), verbosity: :debug
+          execute *KAMAL.auditor.record("Removed #{name} accessory image"), verbosity: :debug
           execute *accessory.remove_image
         end
       end
@@ -207,7 +211,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   desc "remove_service_directory [NAME]", "Remove accessory directory used for uploaded files and data directories from host", hide: true
   def remove_service_directory(name)
-    with_lock do
+    mutating do
       with_accessory(name) do |accessory|
         on(accessory.hosts) do
           execute *accessory.remove_service_directory
@@ -218,7 +222,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
 
   private
     def with_accessory(name)
-      if accessory = MRSK.accessory(name)
+      if accessory = KAMAL.accessory(name)
         yield accessory
       else
         error_on_missing_accessory(name)
@@ -226,7 +230,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
     end
 
     def error_on_missing_accessory(name)
-      options = MRSK.accessory_names.presence
+      options = KAMAL.accessory_names.presence
 
       error \
         "No accessory by the name of '#{name}'" +

lib/kamal/cli/app.rb

@@ -1,23 +1,23 @@
-class Mrsk::Cli::App < Mrsk::Cli::Base
+class Kamal::Cli::App < Kamal::Cli::Base
   desc "boot", "Boot app on servers (or reboot app if already running)"
   def boot
-    with_lock do
+    mutating do
       hold_lock_on_error do
         say "Get most recent version available as an image...", :magenta unless options[:version]
         using_version(version_or_latest) do |version|
-          say "Start container with version #{version} using a #{MRSK.config.readiness_delay}s readiness delay (or reboot if already running)...", :magenta
+          say "Start container with version #{version} using a #{KAMAL.config.readiness_delay}s readiness delay (or reboot if already running)...", :magenta
 
-          on(MRSK.hosts) do
-            execute *MRSK.auditor.record("Tagging #{MRSK.config.absolute_image} as the latest image"), verbosity: :debug
-            execute *MRSK.app.tag_current_as_latest
+          on(KAMAL.hosts) do
+            execute *KAMAL.auditor.record("Tagging #{KAMAL.config.absolute_image} as the latest image"), verbosity: :debug
+            execute *KAMAL.app.tag_current_as_latest
           end
 
-          on(MRSK.hosts, **MRSK.boot_strategy) do |host|
-            roles = MRSK.roles_on(host)
+          on(KAMAL.hosts, **KAMAL.boot_strategy) do |host|
+            roles = KAMAL.roles_on(host)
 
             roles.each do |role|
-              app = MRSK.app(role: role)
-              auditor = MRSK.auditor(role: role)
+              app = KAMAL.app(role: role)
+              auditor = KAMAL.auditor(role: role)
 
               if capture_with_info(*app.container_id_for_version(version, only_running: true), raise_on_non_zero_exit: false).present?
                 tmp_version = "#{version}_replaced_#{SecureRandom.hex(8)}"
@@ -31,7 +31,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
               old_version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
               execute *app.start_or_run(hostname: "#{host}-#{SecureRandom.hex(6)}")
 
-              Mrsk::Utils::HealthcheckPoller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
+              Kamal::Utils::HealthcheckPoller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
 
               execute *app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present?
             end
@@ -43,13 +43,13 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "start", "Start existing app container on servers"
   def start
-    with_lock do
-      on(MRSK.hosts) do |host|
-        roles = MRSK.roles_on(host)
+    mutating do
+      on(KAMAL.hosts) do |host|
+        roles = KAMAL.roles_on(host)
 
         roles.each do |role|
-          execute *MRSK.auditor.record("Started app version #{MRSK.config.version}"), verbosity: :debug
-          execute *MRSK.app(role: role).start, raise_on_non_zero_exit: false
+          execute *KAMAL.auditor.record("Started app version #{KAMAL.config.version}"), verbosity: :debug
+          execute *KAMAL.app(role: role).start, raise_on_non_zero_exit: false
         end
       end
     end
@@ -57,13 +57,13 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "stop", "Stop app container on servers"
   def stop
-    with_lock do
-      on(MRSK.hosts) do |host|
-        roles = MRSK.roles_on(host)
+    mutating do
+      on(KAMAL.hosts) do |host|
+        roles = KAMAL.roles_on(host)
 
         roles.each do |role|
-          execute *MRSK.auditor.record("Stopped app", role: role), verbosity: :debug
-          execute *MRSK.app(role: role).stop, raise_on_non_zero_exit: false
+          execute *KAMAL.auditor.record("Stopped app", role: role), verbosity: :debug
+          execute *KAMAL.app(role: role).stop, raise_on_non_zero_exit: false
         end
       end
     end
@@ -72,11 +72,11 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
   # FIXME: Drop in favor of just containers?
   desc "details", "Show details about app containers"
   def details
-    on(MRSK.hosts) do |host|
-      roles = MRSK.roles_on(host)
+    on(KAMAL.hosts) do |host|
+      roles = KAMAL.roles_on(host)
 
       roles.each do |role|
-        puts_by_host host, capture_with_info(*MRSK.app(role: role).info)
+        puts_by_host host, capture_with_info(*KAMAL.app(role: role).info)
       end
     end
   end
@@ -89,15 +89,15 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
     when options[:interactive] && options[:reuse]
       say "Get current version of running container...", :magenta unless options[:version]
       using_version(options[:version] || current_running_version) do |version|
-        say "Launching interactive command with version #{version} via SSH from existing container on #{MRSK.primary_host}...", :magenta
-        run_locally { exec MRSK.app(role: "web").execute_in_existing_container_over_ssh(cmd, host: MRSK.primary_host) }
+        say "Launching interactive command with version #{version} via SSH from existing container on #{KAMAL.primary_host}...", :magenta
+        run_locally { exec KAMAL.app(role: "web").execute_in_existing_container_over_ssh(cmd, host: KAMAL.primary_host) }
       end
 
     when options[:interactive]
       say "Get most recent version available as an image...", :magenta unless options[:version]
       using_version(version_or_latest) 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) }
+        say "Launching interactive command with version #{version} via SSH from new container on #{KAMAL.primary_host}...", :magenta
+        run_locally { exec KAMAL.app(role: KAMAL.primary_host.roles.first).execute_in_new_container_over_ssh(cmd, host: KAMAL.primary_host) }
       end
 
     when options[:reuse]
@@ -105,12 +105,12 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
       using_version(options[:version] || current_running_version) do |version|
         say "Launching command with version #{version} from existing container...", :magenta
 
-        on(MRSK.hosts) do |host|
-          roles = MRSK.roles_on(host)
+        on(KAMAL.hosts) do |host|
+          roles = KAMAL.roles_on(host)
 
           roles.each do |role|
-            execute *MRSK.auditor.record("Executed cmd '#{cmd}' on app version #{version}", role: role), verbosity: :debug
-            puts_by_host host, capture_with_info(*MRSK.app(role: role).execute_in_existing_container(cmd))
+            execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}", role: role), verbosity: :debug
+            puts_by_host host, capture_with_info(*KAMAL.app(role: role).execute_in_existing_container(cmd))
           end
         end
       end
@@ -119,9 +119,9 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
       say "Get most recent version available as an image...", :magenta unless options[:version]
       using_version(version_or_latest) do |version|
         say "Launching command with version #{version} from new container...", :magenta
-        on(MRSK.hosts) do |host|
-          execute *MRSK.auditor.record("Executed cmd '#{cmd}' on app version #{version}"), verbosity: :debug
-          puts_by_host host, capture_with_info(*MRSK.app.execute_in_new_container(cmd))
+        on(KAMAL.hosts) do |host|
+          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}"), verbosity: :debug
+          puts_by_host host, capture_with_info(*KAMAL.app.execute_in_new_container(cmd))
         end
       end
     end
@@ -129,27 +129,27 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "containers", "Show app containers on servers"
   def containers
-    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.list_containers) }
+    on(KAMAL.hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_containers) }
   end
 
   desc "stale_containers", "Detect app stale containers"
   option :stop, aliases: "-s", type: :boolean, default: false, desc: "Stop the stale containers found"
   def stale_containers
-    with_lock do
+    mutating do
       stop = options[:stop]
 
       cli = self
 
-      on(MRSK.hosts) do |host|
-        roles = MRSK.roles_on(host)
+      on(KAMAL.hosts) do |host|
+        roles = KAMAL.roles_on(host)
 
         roles.each do |role|
           cli.send(:stale_versions, host: host, role: role).each do |version|
             if stop
               puts_by_host host, "Stopping stale container for role #{role} with version #{version}"
-              execute *MRSK.app(role: role).stop(version: version), raise_on_non_zero_exit: false
+              execute *KAMAL.app(role: role).stop(version: version), raise_on_non_zero_exit: false
             else
-              puts_by_host host,  "Detected stale container for role #{role} with version #{version} (use `mrsk app stale_containers --stop` to stop)"
+              puts_by_host host,  "Detected stale container for role #{role} with version #{version} (use `kamal app stale_containers --stop` to stop)"
             end
           end
         end
@@ -159,7 +159,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "images", "Show app images on servers"
   def images
-    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.list_images) }
+    on(KAMAL.hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_images) }
   end
 
   desc "logs", "Show log lines from app on servers (use --help to show options)"
@@ -174,24 +174,24 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
     if options[:follow]
       run_locally do
-        info "Following logs on #{MRSK.primary_host}..."
+        info "Following logs on #{KAMAL.primary_host}..."
 
-        MRSK.specific_roles ||= ["web"]
-        role = MRSK.roles_on(MRSK.primary_host).first
+        KAMAL.specific_roles ||= ["web"]
+        role = KAMAL.roles_on(KAMAL.primary_host).first
 
-        info MRSK.app(role: role).follow_logs(host: MRSK.primary_host, grep: grep)
-        exec MRSK.app(role: role).follow_logs(host: MRSK.primary_host, grep: grep)
+        info KAMAL.app(role: role).follow_logs(host: KAMAL.primary_host, grep: grep)
+        exec KAMAL.app(role: role).follow_logs(host: KAMAL.primary_host, grep: grep)
       end
     else
       since = options[:since]
       lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
 
-      on(MRSK.hosts) do |host|
-        roles = MRSK.roles_on(host)
+      on(KAMAL.hosts) do |host|
+        roles = KAMAL.roles_on(host)
 
         roles.each do |role|
           begin
-            puts_by_host host, capture_with_info(*MRSK.app(role: role).logs(since: since, lines: lines, grep: grep))
+            puts_by_host host, capture_with_info(*KAMAL.app(role: role).logs(since: since, lines: lines, grep: grep))
           rescue SSHKit::Command::Failed
             puts_by_host host, "Nothing found"
           end
@@ -202,7 +202,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "remove", "Remove app containers and images from servers"
   def remove
-    with_lock do
+    mutating do
       stop
       remove_containers
       remove_images
@@ -211,13 +211,13 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "remove_container [VERSION]", "Remove app container with given version from servers", hide: true
   def remove_container(version)
-    with_lock do
-      on(MRSK.hosts) do |host|
-        roles = MRSK.roles_on(host)
+    mutating do
+      on(KAMAL.hosts) do |host|
+        roles = KAMAL.roles_on(host)
 
         roles.each do |role|
-          execute *MRSK.auditor.record("Removed app container with version #{version}", role: role), verbosity: :debug
-          execute *MRSK.app(role: role).remove_container(version: version)
+          execute *KAMAL.auditor.record("Removed app container with version #{version}", role: role), verbosity: :debug
+          execute *KAMAL.app(role: role).remove_container(version: version)
         end
       end
     end
@@ -225,13 +225,13 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "remove_containers", "Remove all app containers from servers", hide: true
   def remove_containers
-    with_lock do
-      on(MRSK.hosts) do |host|
-        roles = MRSK.roles_on(host)
+    mutating do
+      on(KAMAL.hosts) do |host|
+        roles = KAMAL.roles_on(host)
 
         roles.each do |role|
-          execute *MRSK.auditor.record("Removed all app containers", role: role), verbosity: :debug
-          execute *MRSK.app(role: role).remove_containers
+          execute *KAMAL.auditor.record("Removed all app containers", role: role), verbosity: :debug
+          execute *KAMAL.app(role: role).remove_containers
         end
       end
     end
@@ -239,37 +239,43 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
 
   desc "remove_images", "Remove all app images from servers", hide: true
   def remove_images
-    with_lock do
-      on(MRSK.hosts) do
-        execute *MRSK.auditor.record("Removed all app images"), verbosity: :debug
-        execute *MRSK.app.remove_images
+    mutating do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Removed all app images"), verbosity: :debug
+        execute *KAMAL.app.remove_images
       end
     end
   end
 
   desc "version", "Show app version currently running on servers"
   def version
-    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.current_running_version).strip }
+    on(KAMAL.hosts) do |host|
+      role = KAMAL.roles_on(host).first
+      puts_by_host host, capture_with_info(*KAMAL.app(role: role).current_running_version).strip
+    end
   end
 
   private
     def using_version(new_version)
       if new_version
         begin
-          old_version = MRSK.config.version
-          MRSK.config.version = new_version
+          old_version = KAMAL.config.version
+          KAMAL.config.version = new_version
           yield new_version
         ensure
-          MRSK.config.version = old_version
+          KAMAL.config.version = old_version
         end
       else
-        yield MRSK.config.version
+        yield KAMAL.config.version
       end
     end
 
-    def current_running_version(host: MRSK.primary_host)
+    def current_running_version(host: KAMAL.primary_host)
       version = nil
-      on(host) { version = capture_with_info(*MRSK.app.current_running_version).strip }
+      on(host) do
+        role = KAMAL.roles_on(host).first
+        version = capture_with_info(*KAMAL.app(role: role).current_running_version).strip
+      end
       version.presence
     end
 
@@ -277,7 +283,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
       versions = nil
       on(host) do
         versions = \
-          capture_with_info(*MRSK.app(role: role).list_versions, raise_on_non_zero_exit: false)
+          capture_with_info(*KAMAL.app(role: role).list_versions, raise_on_non_zero_exit: false)
           .split("\n")
           .drop(1)
       end

lib/kamal/cli/base.rb

@@ -1,8 +1,8 @@
 require "thor"
 require "dotenv"
-require "mrsk/sshkit_with_ext"
+require "kamal/sshkit_with_ext"
 
-module Mrsk::Cli
+module Kamal::Cli
   class Base < Thor
     include SSHKit::DSL
 
@@ -42,7 +42,7 @@ module Mrsk::Cli
       end
 
       def initialize_commander(options)
-        MRSK.tap do |commander|
+        KAMAL.tap do |commander|
           if options[:verbose]
             ENV["VERBOSE"] = "1" # For backtraces via cli/start
             commander.verbosity = :debug
@@ -72,51 +72,51 @@ module Mrsk::Cli
         puts "  Finished all in #{sprintf("%.1f seconds", runtime)}"
       end
 
-      def with_lock
-        if MRSK.holding_lock?
+      def mutating
+        return yield if KAMAL.holding_lock?
+
+        KAMAL.config.ensure_env_available
+
+        run_hook "pre-connect"
+
+        acquire_lock
+
+        begin
           yield
-        else
-          run_hook "pre-connect"
-
-          acquire_lock
-
-          begin
-            yield
-          rescue
-            if MRSK.hold_lock_on_error?
-              error "  \e[31mDeploy lock was not released\e[0m"
-            else
-              release_lock
-            end
-
-            raise
+        rescue
+          if KAMAL.hold_lock_on_error?
+            error "  \e[31mDeploy lock was not released\e[0m"
+          else
+            release_lock
           end
 
-          release_lock
+          raise
         end
+
+        release_lock
       end
 
       def acquire_lock
         raise_if_locked do
           say "Acquiring the deploy lock...", :magenta
-          on(MRSK.primary_host) { execute *MRSK.lock.acquire("Automatic deploy lock", MRSK.config.version), verbosity: :debug }
+          on(KAMAL.primary_host) { execute *KAMAL.lock.acquire("Automatic deploy lock", KAMAL.config.version), verbosity: :debug }
         end
 
-        MRSK.holding_lock = true
+        KAMAL.holding_lock = true
       end
 
       def release_lock
         say "Releasing the deploy lock...", :magenta
-        on(MRSK.primary_host) { execute *MRSK.lock.release, verbosity: :debug }
+        on(KAMAL.primary_host) { execute *KAMAL.lock.release, verbosity: :debug }
 
-        MRSK.holding_lock = false
+        KAMAL.holding_lock = false
       end
 
       def raise_if_locked
         yield
       rescue SSHKit::Runner::ExecuteError => e
         if e.message =~ /cannot create directory/
-          on(MRSK.primary_host) { puts capture_with_debug(*MRSK.lock.status) }
+          on(KAMAL.primary_host) { puts capture_with_debug(*KAMAL.lock.status) }
           raise LockError, "Deploy lock found"
         else
           raise e
@@ -124,22 +124,22 @@ module Mrsk::Cli
       end
 
       def hold_lock_on_error
-        if MRSK.hold_lock_on_error?
+        if KAMAL.hold_lock_on_error?
           yield
         else
-          MRSK.hold_lock_on_error = true
+          KAMAL.hold_lock_on_error = true
           yield
-          MRSK.hold_lock_on_error = false
+          KAMAL.hold_lock_on_error = false
         end
       end
 
       def run_hook(hook, **extra_details)
-        if !options[:skip_hooks] && MRSK.hook.hook_exists?(hook)
-          details = { hosts: MRSK.hosts.join(","), command: command, subcommand: subcommand }
+        if !options[:skip_hooks] && KAMAL.hook.hook_exists?(hook)
+          details = { hosts: KAMAL.hosts.join(","), command: command, subcommand: subcommand }
 
           say "Running the #{hook} hook...", :magenta
           run_locally do
-            MRSK.with_verbosity(:debug) { execute *MRSK.hook.run(hook, **details, **extra_details) }
+            KAMAL.with_verbosity(:debug) { execute *KAMAL.hook.run(hook, **details, **extra_details) }
           rescue SSHKit::Command::Failed
             raise HookError.new("Hook `#{hook}` failed")
           end
@@ -147,20 +147,20 @@ module Mrsk::Cli
       end
 
       def command
-        @mrsk_command ||= begin
+        @kamal_command ||= begin
           invocation_class, invocation_commands = *first_invocation
-          if invocation_class == Mrsk::Cli::Main
+          if invocation_class == Kamal::Cli::Main
             invocation_commands[0]
           else
-            Mrsk::Cli::Main.subcommand_classes.find { |command, clazz| clazz == invocation_class }[0]
+            Kamal::Cli::Main.subcommand_classes.find { |command, clazz| clazz == invocation_class }[0]
           end
         end
       end
 
       def subcommand
-        @mrsk_subcommand ||= begin
+        @kamal_subcommand ||= begin
           invocation_class, invocation_commands = *first_invocation
-          invocation_commands[0] if invocation_class != Mrsk::Cli::Main
+          invocation_commands[0] if invocation_class != Kamal::Cli::Main
         end
       end
 

lib/kamal/cli/build.rb

@@ -1,9 +1,9 @@
-class Mrsk::Cli::Build < Mrsk::Cli::Base
+class Kamal::Cli::Build < Kamal::Cli::Base
   class BuildError < StandardError; end
 
   desc "deliver", "Build app and push app image to registry then pull image on servers"
   def deliver
-    with_lock do
+    mutating do
       push
       pull
     end
@@ -11,21 +11,27 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
 
   desc "push", "Build and push app image to registry"
   def push
-    with_lock do
+    mutating do
       cli = self
 
       verify_local_dependencies
       run_hook "pre-build"
 
+      if (uncommitted_changes = Kamal::Utils.uncommitted_changes).present?
+        say "The following paths have uncommitted changes:\n #{uncommitted_changes}", :yellow
+      end
+
       run_locally do
         begin
-          MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
+          KAMAL.with_verbosity(:debug) do
+            execute *KAMAL.builder.push
+          end
         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.with_verbosity(:debug) { execute *MRSK.builder.push }
+              KAMAL.with_verbosity(:debug) { execute *KAMAL.builder.push }
             end
           else
             raise
@@ -37,22 +43,22 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
 
   desc "pull", "Pull app image from registry onto servers"
   def pull
-    with_lock do
-      on(MRSK.hosts) do
-        execute *MRSK.auditor.record("Pulled image with version #{MRSK.config.version}"), verbosity: :debug
-        execute *MRSK.builder.clean, raise_on_non_zero_exit: false
-        execute *MRSK.builder.pull
+    mutating do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Pulled image with version #{KAMAL.config.version}"), verbosity: :debug
+        execute *KAMAL.builder.clean, raise_on_non_zero_exit: false
+        execute *KAMAL.builder.pull
       end
     end
   end
 
   desc "create", "Create a build setup"
   def create
-    with_lock do
+    mutating do
       run_locally do
         begin
-          debug "Using builder: #{MRSK.builder.name}"
-          execute *MRSK.builder.create
+          debug "Using builder: #{KAMAL.builder.name}"
+          execute *KAMAL.builder.create
         rescue SSHKit::Command::Failed => e
           if e.message =~ /stderr=(.*)/
             error "Couldn't create remote builder: #{$1}"
@@ -67,10 +73,10 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
 
   desc "remove", "Remove build setup"
   def remove
-    with_lock do
+    mutating do
       run_locally do
-        debug "Using builder: #{MRSK.builder.name}"
-        execute *MRSK.builder.remove
+        debug "Using builder: #{KAMAL.builder.name}"
+        execute *KAMAL.builder.remove
       end
     end
   end
@@ -78,8 +84,8 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
   desc "details", "Show build setup"
   def details
     run_locally do
-      puts "Builder: #{MRSK.builder.name}"
-      puts capture(*MRSK.builder.info)
+      puts "Builder: #{KAMAL.builder.name}"
+      puts capture(*KAMAL.builder.info)
     end
   end
 
@@ -87,7 +93,7 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
     def verify_local_dependencies
       run_locally do
         begin
-          execute *MRSK.builder.ensure_local_dependencies_installed
+          execute *KAMAL.builder.ensure_local_dependencies_installed
         rescue SSHKit::Command::Failed => e
           build_error = e.message =~ /command not found/ ?
             "Docker is not installed locally" :

lib/kamal/cli/healthcheck.rb

@@ -0,0 +1,20 @@
+class Kamal::Cli::Healthcheck < Kamal::Cli::Base
+  default_command :perform
+
+  desc "perform", "Health check current app version"
+  def perform
+    on(KAMAL.primary_host) do
+      begin
+        execute *KAMAL.healthcheck.run
+        Kamal::Utils::HealthcheckPoller.wait_for_healthy { capture_with_info(*KAMAL.healthcheck.status) }
+      rescue Kamal::Utils::HealthcheckPoller::HealthcheckError => e
+        error capture_with_info(*KAMAL.healthcheck.logs)
+        error capture_with_pretty_json(*KAMAL.healthcheck.container_health_log)
+        raise
+      ensure
+        execute *KAMAL.healthcheck.stop, raise_on_non_zero_exit: false
+        execute *KAMAL.healthcheck.remove, raise_on_non_zero_exit: false
+      end
+    end
+  end
+end

lib/kamal/cli/lock.rb

@@ -1,8 +1,8 @@
-class Mrsk::Cli::Lock < Mrsk::Cli::Base
+class Kamal::Cli::Lock < Kamal::Cli::Base
   desc "status", "Report lock status"
   def status
     handle_missing_lock do
-      on(MRSK.primary_host) { puts capture_with_debug(*MRSK.lock.status) }
+      on(KAMAL.primary_host) { puts capture_with_debug(*KAMAL.lock.status) }
     end
   end
 
@@ -11,7 +11,7 @@ class Mrsk::Cli::Lock < Mrsk::Cli::Base
   def acquire
     message = options[:message]
     raise_if_locked do
-      on(MRSK.primary_host) { execute *MRSK.lock.acquire(message, MRSK.config.version), verbosity: :debug }
+      on(KAMAL.primary_host) { execute *KAMAL.lock.acquire(message, KAMAL.config.version), verbosity: :debug }
       say "Acquired the deploy lock"
     end
   end
@@ -19,7 +19,7 @@ class Mrsk::Cli::Lock < Mrsk::Cli::Base
   desc "release", "Release the deploy lock"
   def release
     handle_missing_lock do
-      on(MRSK.primary_host) { execute *MRSK.lock.release, verbosity: :debug }
+      on(KAMAL.primary_host) { execute *KAMAL.lock.release, verbosity: :debug }
       say "Released the deploy lock"
     end
   end

lib/kamal/cli/main.rb

@@ -1,10 +1,10 @@
-class Mrsk::Cli::Main < Mrsk::Cli::Base
+class Kamal::Cli::Main < Kamal::Cli::Base
   desc "setup", "Setup all accessories and deploy app to servers"
   def setup
     print_runtime do
-      with_lock do
-        invoke "mrsk:cli:server:bootstrap"
-        invoke "mrsk:cli:accessory:boot", [ "all" ]
+      mutating do
+        invoke "kamal:cli:server:bootstrap"
+        invoke "kamal:cli:accessory:boot", [ "all" ]
         deploy
       end
     end
@@ -14,35 +14,35 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   def deploy
     runtime = print_runtime do
-      with_lock do
+      mutating do
         invoke_options = deploy_options
 
         say "Log into image registry...", :magenta
-        invoke "mrsk:cli:registry:login", [], invoke_options
+        invoke "kamal:cli:registry:login", [], invoke_options
 
         if options[:skip_push]
           say "Pull app image...", :magenta
-          invoke "mrsk:cli:build:pull", [], invoke_options
+          invoke "kamal:cli:build:pull", [], invoke_options
         else
           say "Build and push app image...", :magenta
-          invoke "mrsk:cli:build:deliver", [], invoke_options
+          invoke "kamal:cli:build:deliver", [], invoke_options
         end
 
         run_hook "pre-deploy"
 
         say "Ensure Traefik is running...", :magenta
-        invoke "mrsk:cli:traefik:boot", [], invoke_options
+        invoke "kamal:cli:traefik:boot", [], invoke_options
 
         say "Ensure app can pass healthcheck...", :magenta
-        invoke "mrsk:cli:healthcheck:perform", [], invoke_options
+        invoke "kamal:cli:healthcheck:perform", [], invoke_options
 
         say "Detect stale containers...", :magenta
-        invoke "mrsk:cli:app:stale_containers", [], invoke_options
+        invoke "kamal:cli:app:stale_containers", [], invoke_options
 
-        invoke "mrsk:cli:app:boot", [], invoke_options
+        invoke "kamal:cli:app:boot", [], invoke_options
 
         say "Prune old containers and images...", :magenta
-        invoke "mrsk:cli:prune:all", [], invoke_options
+        invoke "kamal:cli:prune:all", [], invoke_options
       end
     end
 
@@ -53,26 +53,26 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   def redeploy
     runtime = print_runtime do
-      with_lock do
+      mutating do
         invoke_options = deploy_options
 
         if options[:skip_push]
           say "Pull app image...", :magenta
-          invoke "mrsk:cli:build:pull", [], invoke_options
+          invoke "kamal:cli:build:pull", [], invoke_options
         else
           say "Build and push app image...", :magenta
-          invoke "mrsk:cli:build:deliver", [], invoke_options
+          invoke "kamal:cli:build:deliver", [], invoke_options
         end
 
         run_hook "pre-deploy"
 
         say "Ensure app can pass healthcheck...", :magenta
-        invoke "mrsk:cli:healthcheck:perform", [], invoke_options
+        invoke "kamal:cli:healthcheck:perform", [], invoke_options
 
         say "Detect stale containers...", :magenta
-        invoke "mrsk:cli:app:stale_containers", [], invoke_options
+        invoke "kamal:cli:app:stale_containers", [], invoke_options
 
-        invoke "mrsk:cli:app:boot", [], invoke_options
+        invoke "kamal:cli:app:boot", [], invoke_options
       end
     end
 
@@ -83,19 +83,19 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   def rollback(version)
     rolled_back = false
     runtime = print_runtime do
-      with_lock do
+      mutating do
         invoke_options = deploy_options
 
-        MRSK.config.version = version
+        KAMAL.config.version = version
         old_version = nil
 
         if container_available?(version)
           run_hook "pre-deploy"
 
-          invoke "mrsk:cli:app:boot", [], invoke_options.merge(version: version)
+          invoke "kamal:cli:app:boot", [], invoke_options.merge(version: version)
           rolled_back = true
         else
-          say "The app version '#{version}' is not available as a container (use 'mrsk app containers' for available versions)", :red
+          say "The app version '#{version}' is not available as a container (use 'kamal app containers' for available versions)", :red
         end
       end
     end
@@ -105,27 +105,27 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
 
   desc "details", "Show details about all containers"
   def details
-    invoke "mrsk:cli:traefik:details"
-    invoke "mrsk:cli:app:details"
-    invoke "mrsk:cli:accessory:details", [ "all" ]
+    invoke "kamal:cli:traefik:details"
+    invoke "kamal:cli:app:details"
+    invoke "kamal: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)
+    on(KAMAL.hosts) do |host|
+      puts_by_host host, capture_with_info(*KAMAL.auditor.reveal)
     end
   end
 
   desc "config", "Show combined config (including secrets!)"
   def config
     run_locally do
-      puts Mrsk::Utils.redacted(MRSK.config.to_h).to_yaml
+      puts Kamal::Utils.redacted(KAMAL.config.to_h).to_yaml
     end
   end
 
   desc "init", "Create config stub in config/deploy.yml and env stub in .env"
-  option :bundle, type: :boolean, default: false, desc: "Add MRSK to the Gemfile and create a bin/mrsk binstub"
+  option :bundle, type: :boolean, default: false, desc: "Add Kamal to the Gemfile and create a bin/kamal binstub"
   def init
     require "fileutils"
 
@@ -142,24 +142,24 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
       puts "Created .env file"
     end
 
-    unless (hooks_dir = Pathname.new(File.expand_path(".mrsk/hooks"))).exist?
+    unless (hooks_dir = Pathname.new(File.expand_path(".kamal/hooks"))).exist?
       hooks_dir.mkpath
       Pathname.new(File.expand_path("templates/sample_hooks", __dir__)).each_child do |sample_hook|
         FileUtils.cp sample_hook, hooks_dir, preserve: true
       end
-      puts "Created sample hooks in .mrsk/hooks"
+      puts "Created sample hooks in .kamal/hooks"
     end
 
     if options[:bundle]
-      if (binstub = Pathname.new(File.expand_path("bin/mrsk"))).exist?
-        puts "Binstub already exists in bin/mrsk (remove first to create a new one)"
+      if (binstub = Pathname.new(File.expand_path("bin/kamal"))).exist?
+        puts "Binstub already exists in bin/kamal (remove first to create a new one)"
       else
-        puts "Adding MRSK to Gemfile and bundle..."
+        puts "Adding Kamal to Gemfile and bundle..."
         run_locally do
-          execute :bundle, :add, :mrsk
-          execute :bundle, :binstubs, :mrsk
+          execute :bundle, :add, :kamal
+          execute :bundle, :binstubs, :kamal
         end
-        puts "Created binstub file in bin/mrsk"
+        puts "Created binstub file in bin/kamal"
       end
     end
   end
@@ -180,54 +180,54 @@ 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
-    with_lock do
+    mutating 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)
+        invoke "kamal:cli:traefik:remove", [], options.without(:confirmed)
+        invoke "kamal:cli:app:remove", [], options.without(:confirmed)
+        invoke "kamal:cli:accessory:remove", [ "all" ], options
+        invoke "kamal:cli:registry:logout", [], options.without(:confirmed)
       end
     end
   end
 
-  desc "version", "Show MRSK version"
+  desc "version", "Show Kamal version"
   def version
-    puts Mrsk::VERSION
+    puts Kamal::VERSION
   end
 
   desc "accessory", "Manage accessories (db/redis/search)"
-  subcommand "accessory", Mrsk::Cli::Accessory
+  subcommand "accessory", Kamal::Cli::Accessory
 
   desc "app", "Manage application"
-  subcommand "app", Mrsk::Cli::App
+  subcommand "app", Kamal::Cli::App
 
   desc "build", "Build application image"
-  subcommand "build", Mrsk::Cli::Build
+  subcommand "build", Kamal::Cli::Build
 
   desc "healthcheck", "Healthcheck application"
-  subcommand "healthcheck", Mrsk::Cli::Healthcheck
+  subcommand "healthcheck", Kamal::Cli::Healthcheck
 
   desc "lock", "Manage the deploy lock"
-  subcommand "lock", Mrsk::Cli::Lock
+  subcommand "lock", Kamal::Cli::Lock
 
   desc "prune", "Prune old application images and containers"
-  subcommand "prune", Mrsk::Cli::Prune
+  subcommand "prune", Kamal::Cli::Prune
 
   desc "registry", "Login and -out of the image registry"
-  subcommand "registry", Mrsk::Cli::Registry
+  subcommand "registry", Kamal::Cli::Registry
 
   desc "server", "Bootstrap servers with curl and Docker"
-  subcommand "server", Mrsk::Cli::Server
+  subcommand "server", Kamal::Cli::Server
 
   desc "traefik", "Manage Traefik load balancer"
-  subcommand "traefik", Mrsk::Cli::Traefik
+  subcommand "traefik", Kamal::Cli::Traefik
 
   private
     def container_available?(version)
       begin
-        on(MRSK.hosts) do
-          MRSK.roles_on(host).each do |role|
-            container_id = capture_with_info(*MRSK.app(role: role).container_id_for_version(version))
+        on(KAMAL.hosts) do
+          KAMAL.roles_on(host).each do |role|
+            container_id = capture_with_info(*KAMAL.app(role: role).container_id_for_version(version))
             raise "Container not found" unless container_id.present?
           end
         end
@@ -244,6 +244,6 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
     end
 
     def deploy_options
-      { "version" => MRSK.config.version }.merge(options.without("skip_push"))
+      { "version" => KAMAL.config.version }.merge(options.without("skip_push"))
     end
 end

lib/kamal/cli/prune.rb

@@ -0,0 +1,30 @@
+class Kamal::Cli::Prune < Kamal::Cli::Base
+  desc "all", "Prune unused images and stopped containers"
+  def all
+    mutating do
+      containers
+      images
+    end
+  end
+
+  desc "images", "Prune dangling images"
+  def images
+    mutating do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Pruned images"), verbosity: :debug
+        execute *KAMAL.prune.dangling_images
+        execute *KAMAL.prune.tagged_images
+      end
+    end
+  end
+
+  desc "containers", "Prune all stopped containers, except the last 5"
+  def containers
+    mutating do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Pruned containers"), verbosity: :debug
+        execute *KAMAL.prune.containers
+      end
+    end
+  end
+end

lib/kamal/cli/registry.rb

@@ -1,8 +1,8 @@
-class Mrsk::Cli::Registry < Mrsk::Cli::Base
+class Kamal::Cli::Registry < Kamal::Cli::Base
   desc "login", "Log in to registry locally and remotely"
   def login
-    run_locally    { execute *MRSK.registry.login }
-    on(MRSK.hosts) { execute *MRSK.registry.login }
+    run_locally    { execute *KAMAL.registry.login }
+    on(KAMAL.hosts) { execute *KAMAL.registry.login }
   # FIXME: This rescue needed?
   rescue ArgumentError => e
     puts e.message
@@ -10,7 +10,7 @@ class Mrsk::Cli::Registry < Mrsk::Cli::Base
 
   desc "logout", "Log out of registry remotely"
   def logout
-    on(MRSK.hosts) { execute *MRSK.registry.logout }
+    on(KAMAL.hosts) { execute *KAMAL.registry.logout }
   # FIXME: This rescue needed?
   rescue ArgumentError => e
     puts e.message

lib/kamal/cli/server.rb

@@ -1,13 +1,13 @@
-class Mrsk::Cli::Server < Mrsk::Cli::Base
-  desc "bootstrap", "Set up Docker to run MRSK apps"
+class Kamal::Cli::Server < Kamal::Cli::Base
+  desc "bootstrap", "Set up Docker to run Kamal apps"
   def bootstrap
     missing = []
 
-    on(MRSK.hosts | MRSK.accessory_hosts) do |host|
-      unless execute(*MRSK.docker.installed?, raise_on_non_zero_exit: false)
-        if execute(*MRSK.docker.superuser?, raise_on_non_zero_exit: false)
+    on(KAMAL.hosts | KAMAL.accessory_hosts) do |host|
+      unless execute(*KAMAL.docker.installed?, raise_on_non_zero_exit: false)
+        if execute(*KAMAL.docker.superuser?, raise_on_non_zero_exit: false)
           info "Missing Docker on #{host}. Installing…"
-          execute *MRSK.docker.install
+          execute *KAMAL.docker.install
         else
           missing << host
         end

lib/kamal/cli/templates/deploy.yml

@@ -16,7 +16,7 @@ registry:
 
   # Always use an access token rather than real password when possible.
   password:
-    - MRSK_REGISTRY_PASSWORD
+    - KAMAL_REGISTRY_PASSWORD
 
 # Inject ENV variables into containers (secrets come from .env).
 # env:

lib/kamal/cli/templates/sample_hooks/post-deploy.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# A sample post-deploy hook
+#
+# These environment variables are available:
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+# KAMAL_RUNTIME
+
+echo "$KAMAL_PERFORMER deployed $KAMAL_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds"

lib/kamal/cli/templates/sample_hooks/pre-build.sample

@@ -9,12 +9,12 @@
 # 4. The version we are deploying matches the remote
 #
 # These environment variables are available:
-# MRSK_RECORDED_AT
-# MRSK_PERFORMER
-# MRSK_VERSION
-# MRSK_HOSTS
-# MRSK_ROLE (if set)
-# MRSK_DESTINATION (if set)
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
 
 if [ -n "$(git status --porcelain)" ]; then
   echo "Git checkout is not clean, aborting..." >&2
@@ -43,8 +43,8 @@ if [ -z "$remote_head" ]; then
   exit 1
 fi
 
-if [ "$MRSK_VERSION" != "$remote_head" ]; then
-  echo "Version ($MRSK_VERSION) does not match remote HEAD ($remote_head), aborting..." >&2
+if [ "$KAMAL_VERSION" != "$remote_head" ]; then
+  echo "Version ($KAMAL_VERSION) does not match remote HEAD ($remote_head), aborting..." >&2
   exit 1
 fi
 

lib/kamal/cli/templates/sample_hooks/pre-connect.sample

@@ -5,15 +5,15 @@
 # Warms DNS before connecting to hosts in parallel
 #
 # These environment variables are available:
-# MRSK_RECORDED_AT
-# MRSK_PERFORMER
-# MRSK_VERSION
-# MRSK_HOSTS
-# MRSK_ROLE (if set)
-# MRSK_DESTINATION (if set)
-# MRSK_RUNTIME
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+# KAMAL_RUNTIME
 
-hosts = ENV["MRSK_HOSTS"].split(",")
+hosts = ENV["KAMAL_HOSTS"].split(",")
 results = nil
 max = 3
 

lib/kamal/cli/templates/sample_hooks/pre-deploy.sample

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby
+
+# A sample pre-deploy hook
+#
+# Checks the Github status of the build, waiting for a pending build to complete for up to 720 seconds.
+#
+# Fails unless the combined status is "success"
+#
+# These environment variables are available:
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_COMMAND
+# KAMAL_SUBCOMMAND
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+
+# Only check the build status for production deployments
+if ENV["KAMAL_COMMAND"] == "rollback" || ENV["KAMAL_DESTINATION"] != "production"
+  exit 0
+end
+
+require "bundler/inline"
+
+# true = install gems so this is fast on repeat invocations
+gemfile(true, quiet: true) do
+  source "https://rubygems.org"
+
+  gem "octokit"
+  gem "faraday-retry"
+end
+
+MAX_ATTEMPTS = 72
+ATTEMPTS_GAP = 10
+
+def exit_with_error(message)
+  $stderr.puts message
+  exit 1
+end
+
+class GithubStatusChecks
+  attr_reader :remote_url, :git_sha, :github_client, :combined_status
+
+  def initialize
+    @remote_url = `git config --get remote.origin.url`.strip.delete_prefix("https://github.com/")
+    @git_sha = `git rev-parse HEAD`.strip
+    @github_client = Octokit::Client.new(access_token: ENV["GITHUB_TOKEN"])
+    refresh!
+  end
+
+  def refresh!
+    @combined_status = github_client.combined_status(remote_url, git_sha)
+  end
+
+  def state
+    combined_status[:state]
+  end
+
+  def first_status_url
+    first_status = combined_status[:statuses].find { |status| status[:state] == state }
+    first_status && first_status[:target_url]
+  end
+
+  def complete_count
+    combined_status[:statuses].count { |status| status[:state] != "pending"}
+  end
+
+  def total_count
+    combined_status[:statuses].count
+  end
+
+  def current_status
+    if total_count > 0
+      "Completed #{complete_count}/#{total_count} checks, see #{first_status_url} ..."
+    else
+      "Build not started..."
+    end
+  end
+end
+
+
+$stdout.sync = true
+
+puts "Checking build status..."
+attempts = 0
+checks = GithubStatusChecks.new
+
+begin
+  loop do
+    case checks.state
+    when "success"
+      puts "Checks passed, see #{checks.first_status_url}"
+      exit 0
+    when "failure"
+      exit_with_error "Checks failed, see #{checks.first_status_url}"
+    when "pending"
+      attempts += 1
+    end
+
+    exit_with_error "Checks are still pending, gave up after #{MAX_ATTEMPTS * ATTEMPTS_GAP} seconds" if attempts == MAX_ATTEMPTS
+
+    puts checks.current_status
+    sleep(ATTEMPTS_GAP)
+    checks.refresh!
+  end
+rescue Octokit::NotFound
+  exit_with_error "Build status could not be found"
+end

lib/kamal/cli/templates/template.env

@@ -0,0 +1,2 @@
+KAMAL_REGISTRY_PASSWORD=change-this
+RAILS_MASTER_KEY=another-env

lib/kamal/cli/traefik.rb

@@ -0,0 +1,111 @@
+class Kamal::Cli::Traefik < Kamal::Cli::Base
+  desc "boot", "Boot Traefik on servers"
+  def boot
+    mutating do
+      on(KAMAL.traefik_hosts) do
+        execute *KAMAL.registry.login
+        execute *KAMAL.traefik.start_or_run
+      end
+    end
+  end
+
+  desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
+  option :rolling, type: :boolean, default: false, desc: "Reboot traefik on hosts in sequence, rather than in parallel"
+  def reboot
+    mutating do
+      on(KAMAL.traefik_hosts, in: options[:rolling] ? :sequence : :parallel) do
+        execute *KAMAL.auditor.record("Rebooted traefik"), verbosity: :debug
+        execute *KAMAL.registry.login
+        execute *KAMAL.traefik.stop
+        execute *KAMAL.traefik.remove_container
+        execute *KAMAL.traefik.run
+      end
+    end
+  end
+
+  desc "start", "Start existing Traefik container on servers"
+  def start
+    mutating do
+      on(KAMAL.traefik_hosts) do
+        execute *KAMAL.auditor.record("Started traefik"), verbosity: :debug
+        execute *KAMAL.traefik.start
+      end
+    end
+  end
+
+  desc "stop", "Stop existing Traefik container on servers"
+  def stop
+    mutating do
+      on(KAMAL.traefik_hosts) do
+        execute *KAMAL.auditor.record("Stopped traefik"), verbosity: :debug
+        execute *KAMAL.traefik.stop
+      end
+    end
+  end
+
+  desc "restart", "Restart existing Traefik container on servers"
+  def restart
+    mutating do
+      stop
+      start
+    end
+  end
+
+  desc "details", "Show details about Traefik container from servers"
+  def details
+    on(KAMAL.traefik_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.traefik.info), type: "Traefik" }
+  end
+
+  desc "logs", "Show log lines from Traefik 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
+    grep = options[:grep]
+
+    if options[:follow]
+      run_locally do
+        info "Following logs on #{KAMAL.primary_host}..."
+        info KAMAL.traefik.follow_logs(host: KAMAL.primary_host, grep: grep)
+        exec KAMAL.traefik.follow_logs(host: KAMAL.primary_host, grep: grep)
+      end
+    else
+      since = options[:since]
+      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
+
+      on(KAMAL.traefik_hosts) do |host|
+        puts_by_host host, capture(*KAMAL.traefik.logs(since: since, lines: lines, grep: grep)), type: "Traefik"
+      end
+    end
+  end
+
+  desc "remove", "Remove Traefik container and image from servers"
+  def remove
+    mutating do
+      stop
+      remove_container
+      remove_image
+    end
+  end
+
+  desc "remove_container", "Remove Traefik container from servers", hide: true
+  def remove_container
+    mutating do
+      on(KAMAL.traefik_hosts) do
+        execute *KAMAL.auditor.record("Removed traefik container"), verbosity: :debug
+        execute *KAMAL.traefik.remove_container
+      end
+    end
+  end
+
+  desc "remove_image", "Remove Traefik image from servers", hide: true
+  def remove_image
+    mutating do
+      on(KAMAL.traefik_hosts) do
+        execute *KAMAL.auditor.record("Removed traefik image"), verbosity: :debug
+        execute *KAMAL.traefik.remove_image
+      end
+    end
+  end
+end

lib/kamal/commander.rb

@@ -1,7 +1,7 @@
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/module/delegation"
 
-class Mrsk::Commander
+class Kamal::Commander
   attr_accessor :verbosity, :holding_lock, :hold_lock_on_error
 
   def initialize
@@ -11,7 +11,7 @@ class Mrsk::Commander
   end
 
   def config
-    @config ||= Mrsk::Configuration.create_from(**@config_kwargs).tap do |config|
+    @config ||= Kamal::Configuration.create_from(**@config_kwargs).tap do |config|
       @config_kwargs = nil
       configure_sshkit_with(config)
     end
@@ -77,47 +77,47 @@ class Mrsk::Commander
 
 
   def app(role: nil)
-    Mrsk::Commands::App.new(config, role: role)
+    Kamal::Commands::App.new(config, role: role)
   end
 
   def accessory(name)
-    Mrsk::Commands::Accessory.new(config, name: name)
+    Kamal::Commands::Accessory.new(config, name: name)
   end
 
   def auditor(**details)
-    Mrsk::Commands::Auditor.new(config, **details)
+    Kamal::Commands::Auditor.new(config, **details)
   end
 
   def builder
-    @builder ||= Mrsk::Commands::Builder.new(config)
+    @builder ||= Kamal::Commands::Builder.new(config)
   end
 
   def docker
-    @docker ||= Mrsk::Commands::Docker.new(config)
+    @docker ||= Kamal::Commands::Docker.new(config)
   end
 
   def healthcheck
-    @healthcheck ||= Mrsk::Commands::Healthcheck.new(config)
+    @healthcheck ||= Kamal::Commands::Healthcheck.new(config)
   end
 
   def hook
-    @hook ||= Mrsk::Commands::Hook.new(config)
+    @hook ||= Kamal::Commands::Hook.new(config)
   end
 
   def lock
-    @lock ||= Mrsk::Commands::Lock.new(config)
+    @lock ||= Kamal::Commands::Lock.new(config)
   end
 
   def prune
-    @prune ||= Mrsk::Commands::Prune.new(config)
+    @prune ||= Kamal::Commands::Prune.new(config)
   end
 
   def registry
-    @registry ||= Mrsk::Commands::Registry.new(config)
+    @registry ||= Kamal::Commands::Registry.new(config)
   end
 
   def traefik
-    @traefik ||= Mrsk::Commands::Traefik.new(config)
+    @traefik ||= Kamal::Commands::Traefik.new(config)
   end
 
   def with_verbosity(level)
@@ -143,7 +143,11 @@ class Mrsk::Commander
   private
     # Lazy setup of SSHKit
     def configure_sshkit_with(config)
-      SSHKit::Backend::Netssh.configure { |ssh| ssh.ssh_options = config.ssh_options }
+      SSHKit::Backend::Netssh.pool.idle_timeout = config.sshkit.pool_idle_timeout
+      SSHKit::Backend::Netssh.configure do |sshkit|
+        sshkit.max_concurrent_starts = config.sshkit.max_concurrent_starts
+        sshkit.ssh_options = config.ssh.options
+      end
       SSHKit.config.command_map[:docker] = "docker" # No need to use /usr/bin/env, just clogs up the logs
       SSHKit.config.output_verbosity = verbosity
     end

lib/kamal/commands.rb

@@ -0,0 +1,2 @@
+module Kamal::Commands
+end

lib/kamal/commands/accessory.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Accessory < Mrsk::Commands::Base
+class Kamal::Commands::Accessory < Kamal::Commands::Base
   attr_reader :accessory_config
   delegate :service_name, :image, :hosts, :port, :files, :directories, :cmd,
            :publish_args, :env_args, :volume_args, :label_args, :option_args, to: :accessory_config

lib/kamal/commands/app.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::App < Mrsk::Commands::Base
+class Kamal::Commands::App < Kamal::Commands::Base
   ACTIVE_DOCKER_STATUSES = [ :running, :restarting ]
 
   attr_reader :role
@@ -20,7 +20,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       "--restart unless-stopped",
       "--name", container_name,
       *(["--hostname", hostname] if hostname),
-      "-e", "MRSK_CONTAINER_NAME=\"#{container_name}\"",
+      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
       *role.env_args,
       *role.health_check_args,
       *config.logging_args,
@@ -76,11 +76,14 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
   end
 
   def execute_in_new_container(*command, interactive: false)
+    role = config.role(self.role)
+
     docker :run,
       ("-it" if interactive),
       "--rm",
       *config.env_args,
       *config.volume_args,
+      *role&.option_args,
       config.absolute_image,
       *command
   end
@@ -109,8 +112,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
   def list_versions(*docker_args, statuses: nil)
     pipe \
       docker(:ps, *filter_args(statuses: statuses), *docker_args, "--format", '"{{.Names}}"'),
-      %(grep -oE "\\-[^-]+$"), # Extract SHA from "service-role-dest-SHA"
-      %(cut -c 2-)
+      %(while read line; do echo ${line##{service_role_dest}-}; done) # Extract SHA from "service-role-dest-SHA"
   end
 
   def list_containers
@@ -157,6 +159,10 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       argumentize "--filter", filters(statuses: statuses)
     end
 
+    def service_role_dest
+      [config.service, role, config.destination].compact.join("-")
+    end
+
     def filters(statuses: nil)
       [ "label=service=#{config.service}" ].tap do |filters|
         filters << "label=destination=#{config.destination}" if config.destination

lib/kamal/commands/auditor.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Auditor < Mrsk::Commands::Base
+class Kamal::Commands::Auditor < Kamal::Commands::Base
   attr_reader :details
 
   def initialize(config, **details)
@@ -19,7 +19,7 @@ class Mrsk::Commands::Auditor < Mrsk::Commands::Base
 
   private
     def audit_log_file
-      [ "mrsk", config.service, config.destination, "audit.log" ].compact.join("-")
+      [ "kamal", config.service, config.destination, "audit.log" ].compact.join("-")
     end
 
     def audit_tags(**details)

lib/kamal/commands/base.rb

@@ -1,6 +1,6 @@
-module Mrsk::Commands
+module Kamal::Commands
   class Base
-    delegate :sensitive, :argumentize, to: Mrsk::Utils
+    delegate :sensitive, :argumentize, to: Kamal::Utils
 
     DOCKER_HEALTH_STATUS_FORMAT = "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'"
     DOCKER_HEALTH_LOG_FORMAT    = "'{{json .State.Health}}'"
@@ -13,8 +13,12 @@ module Mrsk::Commands
 
     def run_over_ssh(*command, host:)
       "ssh".tap do |cmd|
-        cmd << " -J #{config.ssh_proxy.jump_proxies}" if config.ssh_proxy
-        cmd << " -t #{config.ssh_user}@#{host} '#{command.join(" ")}'"
+        if config.ssh.proxy && config.ssh.proxy.is_a?(Net::SSH::Proxy::Jump)
+          cmd << " -J #{config.ssh.proxy.jump_proxies}"
+        elsif config.ssh.proxy && config.ssh.proxy.is_a?(Net::SSH::Proxy::Command)
+          cmd << " -o ProxyCommand='#{config.ssh.proxy.command_line_template}'"
+        end
+        cmd << " -t #{config.ssh.user}@#{host} '#{command.join(" ")}'"
       end
     end
 
@@ -55,7 +59,7 @@ module Mrsk::Commands
       end
 
       def tags(**details)
-        Mrsk::Tags.from_config(config, **details)
+        Kamal::Tags.from_config(config, **details)
       end
   end
 end

lib/kamal/commands/builder.rb

@@ -0,0 +1,62 @@
+class Kamal::Commands::Builder < Kamal::Commands::Base
+  delegate :create, :remove, :push, :clean, :pull, :info, to: :target
+
+  def name
+    target.class.to_s.remove("Kamal::Commands::Builder::").underscore.inquiry
+  end
+
+  def target
+    case
+    when !config.builder.multiarch? && !config.builder.cached?
+      native
+    when !config.builder.multiarch? && config.builder.cached?
+      native_cached
+    when config.builder.local? && config.builder.remote?
+      multiarch_remote
+    when config.builder.remote?
+      native_remote
+    else
+      multiarch
+    end
+  end
+
+  def native
+    @native ||= Kamal::Commands::Builder::Native.new(config)
+  end
+
+  def native_cached
+    @native ||= Kamal::Commands::Builder::Native::Cached.new(config)
+  end
+
+  def native_remote
+    @native ||= Kamal::Commands::Builder::Native::Remote.new(config)
+  end
+
+  def multiarch
+    @multiarch ||= Kamal::Commands::Builder::Multiarch.new(config)
+  end
+
+  def multiarch_remote
+    @multiarch_remote ||= Kamal::Commands::Builder::Multiarch::Remote.new(config)
+  end
+
+
+  def ensure_local_dependencies_installed
+    if name.native?
+      ensure_local_docker_installed
+    else
+      combine \
+        ensure_local_docker_installed,
+        ensure_local_buildx_installed
+    end
+  end
+
+  private
+    def ensure_local_docker_installed
+      docker "--version"
+    end
+
+    def ensure_local_buildx_installed
+      docker :buildx, "version"
+    end
+end

lib/kamal/commands/builder/base.rb

@@ -1,8 +1,9 @@
 
-class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
+class Kamal::Commands::Builder::Base < Kamal::Commands::Base
   class BuilderError < StandardError; end
 
-  delegate :argumentize, to: Mrsk::Utils
+  delegate :argumentize, to: Kamal::Utils
+  delegate :args, :secrets, :dockerfile, :local_arch, :local_host, :remote_arch, :remote_host, :cache_from, :cache_to, to: :builder_config
 
   def clean
     docker :image, :rm, "--force", config.absolute_image
@@ -13,11 +14,11 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
   end
 
   def build_options
-    [ *build_tags, *build_labels, *build_args, *build_secrets, *build_dockerfile ]
+    [ *build_tags, *build_cache, *build_labels, *build_args, *build_secrets, *build_dockerfile ]
   end
 
   def build_context
-    context
+    config.builder.context
   end
 
 
@@ -26,6 +27,13 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
       [ "-t", config.absolute_image, "-t", config.latest_image ]
     end
 
+    def build_cache
+      if cache_to && cache_from
+        ["--cache-to", cache_to,
+          "--cache-from", cache_from]
+      end
+    end
+
     def build_labels
       argumentize "--label", { service: config.service }
     end
@@ -46,19 +54,7 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
       end
     end
 
-    def args
-      (config.builder && config.builder["args"]) || {}
-    end
-
-    def secrets
-      (config.builder && config.builder["secrets"]) || []
-    end
-
-    def dockerfile
-      (config.builder && config.builder["dockerfile"]) || "Dockerfile"
-    end
-
-    def context
-      (config.builder && config.builder["context"]) || "."
+    def builder_config
+      config.builder
     end
 end

lib/kamal/commands/builder/multiarch.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
+class Kamal::Commands::Builder::Multiarch < Kamal::Commands::Builder::Base
   def create
     docker :buildx, :create, "--use", "--name", builder_name
   end
@@ -24,6 +24,6 @@ class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
 
   private
     def builder_name
-      "mrsk-#{config.service}-multiarch"
+      "kamal-#{config.service}-multiarch"
     end
 end

lib/kamal/commands/builder/multiarch/remote.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Multiarch
+class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Multiarch
   def create
     combine \
       create_contexts,
@@ -22,17 +22,17 @@ class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Mult
     end
 
     def create_local_buildx
-      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local["arch"]), "--platform", "linux/#{local["arch"]}"
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local_arch), "--platform", "linux/#{local_arch}"
     end
 
     def append_remote_buildx
-      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote["arch"]), "--platform", "linux/#{remote["arch"]}"
+      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote_arch), "--platform", "linux/#{remote_arch}"
     end
 
     def create_contexts
       combine \
-        create_context(local["arch"], local["host"]),
-        create_context(remote["arch"], remote["host"])
+        create_context(local_arch, local_host),
+        create_context(remote_arch, remote_host)
     end
 
     def create_context(arch, host)
@@ -41,19 +41,11 @@ class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Mult
 
     def remove_contexts
       combine \
-        remove_context(local["arch"]),
-        remove_context(remote["arch"])
+        remove_context(local_arch),
+        remove_context(remote_arch)
     end
 
     def remove_context(arch)
       docker :context, :rm, builder_name_with_arch(arch)
     end
-
-    def local
-      config.builder["local"]
-    end
-
-    def remote
-      config.builder["remote"]
-    end
 end

lib/kamal/commands/builder/native.rb

@@ -1,10 +1,10 @@
-class Mrsk::Commands::Builder::Native < Mrsk::Commands::Builder::Base
+class Kamal::Commands::Builder::Native < Kamal::Commands::Builder::Base
   def create
-    # No-op on native
+    # No-op on native without cache
   end
 
   def remove
-    # No-op on native
+    # No-op on native without cache
   end
 
   def push

lib/kamal/commands/builder/native/cached.rb

@@ -0,0 +1,16 @@
+class Kamal::Commands::Builder::Native::Cached < Kamal::Commands::Builder::Native
+  def create
+    docker :buildx, :create, "--use", "--driver=docker-container"
+  end
+
+  def remove
+    docker :buildx, :rm, builder_name
+  end
+
+  def push
+    docker :buildx, :build,
+      "--push",
+      *build_options,
+      build_context
+  end
+end

lib/kamal/commands/builder/native/remote.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
+class Kamal::Commands::Builder::Native::Remote < Kamal::Commands::Builder::Native
   def create
     chain \
       create_context,
@@ -28,29 +28,21 @@ class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
 
 
   private
-    def arch
-      config.builder["remote"]["arch"]
-    end
-
-    def host
-      config.builder["remote"]["host"]
-    end
-
     def builder_name
-      "mrsk-#{config.service}-native-remote"
+      "kamal-#{config.service}-native-remote"
     end
 
     def builder_name_with_arch
-      "#{builder_name}-#{arch}"
+      "#{builder_name}-#{remote_arch}"
     end
 
     def platform
-      "linux/#{arch}"
+      "linux/#{remote_arch}"
     end
 
     def create_context
       docker :context, :create,
-        builder_name_with_arch, "--description", "'#{builder_name} #{arch} native host'", "--docker", "'host=#{host}'"
+        builder_name_with_arch, "--description", "'#{builder_name} #{remote_arch} native host'", "--docker", "'host=#{remote_host}'"
     end
 
     def remove_context

lib/kamal/commands/docker.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Docker < Mrsk::Commands::Base
+class Kamal::Commands::Docker < Kamal::Commands::Base
   # Install Docker using the https://github.com/docker/docker-install convenience script.
   def install
     pipe [ :curl, "-fsSL", "https://get.docker.com" ], :sh

lib/kamal/commands/healthcheck.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Healthcheck < Mrsk::Commands::Base
+class Kamal::Commands::Healthcheck < Kamal::Commands::Base
   EXPOSED_PORT = 3999
 
   def run
@@ -9,7 +9,7 @@ class Mrsk::Commands::Healthcheck < Mrsk::Commands::Base
       "--name", container_name_with_version,
       "--publish", "#{EXPOSED_PORT}:#{config.healthcheck["port"]}",
       "--label", "service=#{container_name}",
-      "-e", "MRSK_CONTAINER_NAME=\"#{container_name}\"",
+      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
       *web.env_args,
       *web.health_check_args,
       *config.volume_args,

lib/kamal/commands/hook.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Hook < Mrsk::Commands::Base
+class Kamal::Commands::Hook < Kamal::Commands::Base
   def run(hook, **details)
     [ hook_file(hook), env: tags(**details).env ]
   end

lib/kamal/commands/lock.rb

@@ -1,7 +1,7 @@
 require "active_support/duration"
 require "time"
 
-class Mrsk::Commands::Lock < Mrsk::Commands::Base
+class Kamal::Commands::Lock < Kamal::Commands::Base
   def acquire(message, version)
     combine \
       [:mkdir, lock_dir],
@@ -40,7 +40,7 @@ class Mrsk::Commands::Lock < Mrsk::Commands::Base
     end
 
     def lock_dir
-      :mrsk_lock
+      "kamal_lock-#{config.service}"
     end
 
     def lock_details_file

lib/kamal/commands/prune.rb

@@ -1,7 +1,7 @@
 require "active_support/duration"
 require "active_support/core_ext/numeric/time"
 
-class Mrsk::Commands::Prune < Mrsk::Commands::Base
+class Kamal::Commands::Prune < Kamal::Commands::Base
   def dangling_images
     docker :image, :prune, "--force", "--filter", "label=service=#{config.service}", "--filter", "dangling=true"
   end

lib/kamal/commands/registry.rb

@@ -1,4 +1,4 @@
-class Mrsk::Commands::Registry < Mrsk::Commands::Base
+class Kamal::Commands::Registry < Kamal::Commands::Base
   delegate :registry, to: :config
 
   def login

lib/kamal/commands/traefik.rb

@@ -1,8 +1,11 @@
-class Mrsk::Commands::Traefik < Mrsk::Commands::Base
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Mrsk::Utils
+class Kamal::Commands::Traefik < Kamal::Commands::Base
+  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
 
   DEFAULT_IMAGE = "traefik:v2.9"
   CONTAINER_PORT = 80
+  DEFAULT_ARGS = {
+    'log.level' => 'DEBUG'
+  }
 
   def run
     docker :run, "--name traefik",
@@ -16,7 +19,6 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
       *docker_options_args,
       image,
       "--providers.docker",
-      "--log.level=DEBUG",
       *cmd_option_args
   end
 
@@ -28,6 +30,10 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
     docker :container, :stop, "traefik"
   end
 
+  def start_or_run
+    combine start, run, by: "||"
+  end
+
   def info
     docker :ps, "--filter", "name=^traefik$"
   end
@@ -86,9 +92,9 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
 
     def cmd_option_args
       if args = config.traefik["args"]
-        optionize args, with: "="
+        optionize DEFAULT_ARGS.merge(args), with: "="
       else
-        []
+        optionize DEFAULT_ARGS, with: "="
       end
     end
 

lib/kamal/configuration.rb

@@ -5,9 +5,9 @@ require "pathname"
 require "erb"
 require "net/ssh/proxy/jump"
 
-class Mrsk::Configuration
-  delegate :service, :image, :servers, :env, :labels, :registry, :builder, :stop_wait_time, :hooks_path, to: :raw_config, allow_nil: true
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Mrsk::Utils
+class Kamal::Configuration
+  delegate :service, :image, :servers, :env, :labels, :registry, :stop_wait_time, :hooks_path, to: :raw_config, allow_nil: true
+  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
 
   attr_accessor :destination
   attr_accessor :raw_config
@@ -54,7 +54,7 @@ class Mrsk::Configuration
   end
 
   def abbreviated_version
-    Mrsk::Utils.abbreviate_version(version)
+    Kamal::Utils.abbreviate_version(version)
   end
 
 
@@ -67,7 +67,7 @@ class Mrsk::Configuration
   end
 
   def accessories
-    @accessories ||= raw_config.accessories&.keys&.collect { |name| Mrsk::Configuration::Accessory.new(name, config: self) } || []
+    @accessories ||= raw_config.accessories&.keys&.collect { |name| Kamal::Configuration::Accessory.new(name, config: self) } || []
   end
 
   def accessory(name)
@@ -88,7 +88,7 @@ class Mrsk::Configuration
   end
 
   def boot
-    Mrsk::Configuration::Boot.new(config: self)
+    Kamal::Configuration::Boot.new(config: self)
   end
 
 
@@ -135,25 +135,12 @@ class Mrsk::Configuration
   end
 
 
-  def ssh_user
-    if raw_config.ssh.present?
-      raw_config.ssh["user"] || "root"
-    else
-      "root"
-    end
+  def ssh
+    Kamal::Configuration::Ssh.new(config: self)
   end
 
-  def ssh_proxy
-    if raw_config.ssh.present? && raw_config.ssh["proxy"]
-      Net::SSH::Proxy::Jump.new \
-        raw_config.ssh["proxy"].include?("@") ? raw_config.ssh["proxy"] : "root@#{raw_config.ssh["proxy"]}"
-    elsif raw_config.ssh.present? && raw_config.ssh["proxy_command"]
-      Net::SSH::Proxy::Command.new(raw_config.ssh["proxy_command"])
-    end
-  end
-
-  def ssh_options
-    { user: ssh_user, proxy: ssh_proxy, auth_methods: [ "publickey" ] }.compact
+  def sshkit
+    Kamal::Configuration::Sshkit.new(config: self)
   end
 
 
@@ -165,8 +152,12 @@ class Mrsk::Configuration
     raw_config.readiness_delay || 7
   end
 
+  def minimum_version
+    raw_config.minimum_version
+  end
+
   def valid?
-    ensure_required_keys_present && ensure_env_available
+    ensure_required_keys_present && ensure_valid_kamal_version
   end
 
 
@@ -181,8 +172,9 @@ class Mrsk::Configuration
       service_with_version: service_with_version,
       env_args: env_args,
       volume_args: volume_args,
-      ssh_options: ssh_options,
-      builder: raw_config.builder,
+      ssh_options: ssh.to_h,
+      sshkit: sshkit.to_h,
+      builder: builder.to_h,
       accessories: raw_config.accessories,
       logging: logging_args,
       healthcheck: healthcheck
@@ -194,7 +186,19 @@ class Mrsk::Configuration
   end
 
   def hooks_path
-    raw_config.hooks_path || ".mrsk/hooks"
+    raw_config.hooks_path || ".kamal/hooks"
+  end
+
+  def builder
+    Kamal::Configuration::Builder.new(config: self)
+  end
+
+  # Will raise KeyError if any secret ENVs are missing
+  def ensure_env_available
+    env_args
+    roles.each(&:env_args)
+
+    true
   end
 
   private
@@ -221,14 +225,15 @@ class Mrsk::Configuration
       true
     end
 
-    # Will raise KeyError if any secret ENVs are missing
-    def ensure_env_available
-      env_args
-      roles.each(&:env_args)
+    def ensure_valid_kamal_version
+      if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Kamal::VERSION)
+        raise ArgumentError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
+      end
 
       true
     end
 
+
     def role_names
       raw_config.servers.is_a?(Array) ? [ "web" ] : raw_config.servers.keys.sort
     end
@@ -236,7 +241,7 @@ class Mrsk::Configuration
     def git_version
       @git_version ||=
         if system("git rev-parse")
-          uncommitted_suffix = `git status --porcelain`.strip.present? ? "_uncommitted_#{SecureRandom.hex(8)}" : ""
+          uncommitted_suffix = Kamal::Utils.uncommitted_changes.present? ? "_uncommitted_#{SecureRandom.hex(8)}" : ""
 
           "#{`git rev-parse HEAD`.strip}#{uncommitted_suffix}"
         else

lib/kamal/configuration/accessory.rb

@@ -1,5 +1,5 @@
-class Mrsk::Configuration::Accessory
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Mrsk::Utils
+class Kamal::Configuration::Accessory
+  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
 
   attr_accessor :name, :specifics
 

lib/kamal/configuration/boot.rb

@@ -1,4 +1,4 @@
-class Mrsk::Configuration::Boot
+class Kamal::Configuration::Boot
   def initialize(config:)
     @options = config.raw_config.boot || {}
     @host_count = config.all_hosts.count

lib/kamal/configuration/builder.rb

@@ -0,0 +1,114 @@
+class Kamal::Configuration::Builder
+  def initialize(config:)
+    @options = config.raw_config.builder || {}
+    @image = config.image
+    @server = config.registry["server"]
+
+    valid?
+  end
+
+  def to_h
+    @options
+  end
+
+  def multiarch?
+    @options["multiarch"] != false
+  end
+
+  def local?
+    !!@options["local"]
+  end
+
+  def remote?
+    !!@options["remote"]
+  end
+
+  def cached?
+    !!@options["cache"]
+  end
+
+  def args
+    @options["args"] || {}
+  end
+
+  def secrets
+    @options["secrets"] || []
+  end
+
+  def dockerfile
+    @options["dockerfile"] || "Dockerfile"
+  end
+
+  def context
+    @options["context"] || "."
+  end
+
+  def local_arch
+    @options["local"]["arch"] if local?
+  end
+
+  def local_host
+    @options["local"]["host"] if local?
+  end
+
+  def remote_arch
+    @options["remote"]["arch"] if remote?
+  end
+
+  def remote_host
+    @options["remote"]["host"] if remote?
+  end
+
+  def cache_from
+    if cached?
+      case @options["cache"]["type"]
+      when "gha"
+        cache_from_config_for_gha
+      when "registry"
+        cache_from_config_for_registry
+      end
+    end
+  end
+
+  def cache_to
+    if cached?
+      case @options["cache"]["type"]
+      when "gha"
+        cache_to_config_for_gha
+      when "registry"
+        cache_to_config_for_registry
+      end
+    end
+  end
+
+  private
+    def valid?
+      if @options["cache"] && @options["cache"]["type"]
+        raise ArgumentError, "Invalid cache type: #{@options["cache"]["type"]}" unless ["gha", "registry"].include?(@options["cache"]["type"])
+      end
+    end
+
+    def cache_image
+      @options["cache"]&.fetch("image", nil) || "#{@image}-build-cache"
+    end
+
+    def cache_image_ref
+      [ @server, cache_image ].compact.join("/")
+    end
+
+    def cache_from_config_for_gha
+      "type=gha"
+    end
+
+    def cache_from_config_for_registry
+      [ "type=registry", "ref=#{cache_image_ref}" ].compact.join(",")
+    end
+
+    def cache_to_config_for_gha
+      [ "type=gha", @options["cache"]&.fetch("options", nil)].compact.join(",")
+    end
+
+    def cache_to_config_for_registry
+      [ "type=registry", @options["cache"]&.fetch("options", nil), "ref=#{cache_image_ref}" ].compact.join(",")
+    end
+end

lib/kamal/configuration/role.rb

@@ -1,5 +1,5 @@
-class Mrsk::Configuration::Role
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Mrsk::Utils
+class Kamal::Configuration::Role
+  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
 
   attr_accessor :name
 

lib/kamal/configuration/ssh.rb

@@ -0,0 +1,38 @@
+class Kamal::Configuration::Ssh
+  LOGGER = ::Logger.new(STDERR)
+
+  def initialize(config:)
+    @config = config.raw_config.ssh || {}
+  end
+
+  def user
+    config.fetch("user", "root")
+  end
+
+  def proxy
+    if (proxy = config["proxy"])
+      Net::SSH::Proxy::Jump.new(proxy.include?("@") ? proxy : "root@#{proxy}")
+    elsif (proxy_command = config["proxy_command"])
+      Net::SSH::Proxy::Command.new(proxy_command)
+    end
+  end
+
+  def options
+    { user: user, proxy: proxy, auth_methods: [ "publickey" ], logger: logger, keepalive: true, keepalive_interval: 30 }.compact
+  end
+
+  def to_h
+    options.except(:logger).merge(log_level: log_level)
+  end
+
+  private
+    attr_accessor :config
+
+    def logger
+      LOGGER.tap { |logger| logger.level = log_level }
+    end
+
+    def log_level
+      config.fetch("log_level", :fatal)
+    end
+end

lib/kamal/configuration/sshkit.rb

@@ -0,0 +1,20 @@
+class Kamal::Configuration::Sshkit
+  def initialize(config:)
+    @options = config.raw_config.sshkit || {}
+  end
+
+  def max_concurrent_starts
+    options.fetch("max_concurrent_starts", 30)
+  end
+
+  def pool_idle_timeout
+    options.fetch("pool_idle_timeout", 900)
+  end
+
+  def to_h
+    options
+  end
+
+  private
+    attr_accessor :options
+end

lib/kamal/sshkit_with_ext.rb

@@ -54,3 +54,51 @@ class SSHKit::Backend::Abstract
   end
   prepend CommandEnvMerge
 end
+
+class SSHKit::Backend::Netssh::Configuration
+  attr_accessor :max_concurrent_starts
+end
+
+class SSHKit::Backend::Netssh
+  module LimitConcurrentStartsClass
+    attr_reader :start_semaphore
+
+    def configure(&block)
+      super &block
+      # Create this here to avoid lazy creation by multiple threads
+      if config.max_concurrent_starts
+        @start_semaphore = Concurrent::Semaphore.new(config.max_concurrent_starts)
+      end
+    end
+  end
+
+  class << self
+    prepend LimitConcurrentStartsClass
+  end
+
+  module LimitConcurrentStartsInstance
+    private
+      def with_ssh(&block)
+        host.ssh_options = self.class.config.ssh_options.merge(host.ssh_options || {})
+        self.class.pool.with(
+          method(:start_with_concurrency_limit),
+          String(host.hostname),
+          host.username,
+          host.netssh_options,
+          &block
+        )
+      end
+
+      def start_with_concurrency_limit(*args)
+        if self.class.start_semaphore
+          self.class.start_semaphore.acquire do
+            Net::SSH.start(*args)
+          end
+        else
+          Net::SSH.start(*args)
+        end
+      end
+  end
+
+  prepend LimitConcurrentStartsInstance
+end

lib/kamal/tags.rb

@@ -1,6 +1,6 @@
 require "time"
 
-class Mrsk::Tags
+class Kamal::Tags
   attr_reader :config, :tags
 
   class << self
@@ -26,7 +26,7 @@ class Mrsk::Tags
   end
 
   def env
-    tags.transform_keys { |detail| "MRSK_#{detail.upcase}" }
+    tags.transform_keys { |detail| "KAMAL_#{detail.upcase}" }
   end
 
   def to_s

lib/kamal/utils.rb

@@ -1,4 +1,4 @@
-module Mrsk::Utils
+module Kamal::Utils
   extend self
 
   DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX = /\$(?!{[^\}]*\})/
@@ -46,7 +46,7 @@ module Mrsk::Utils
   # Pass `redaction:` to change the default `"[REDACTED]"` redaction, e.g.
   # `sensitive "#{arg}=#{secret}", redaction: "#{arg}=xxxx"
   def sensitive(...)
-    Mrsk::Utils::Sensitive.new(...)
+    Kamal::Utils::Sensitive.new(...)
   end
 
   def redacted(value)
@@ -93,4 +93,8 @@ module Mrsk::Utils
       end
     end
   end
+
+  def uncommitted_changes
+    `git status --porcelain`.strip
+  end
 end

lib/kamal/utils/healthcheck_poller.rb

@@ -1,4 +1,4 @@
-class Mrsk::Utils::HealthcheckPoller
+class Kamal::Utils::HealthcheckPoller
   TRAEFIK_HEALTHY_DELAY = 2
 
   class HealthcheckError < StandardError; end
@@ -6,14 +6,14 @@ class Mrsk::Utils::HealthcheckPoller
   class << self
     def wait_for_healthy(pause_after_ready: false, &block)
       attempt = 1
-      max_attempts = MRSK.config.healthcheck["max_attempts"]
+      max_attempts = KAMAL.config.healthcheck["max_attempts"]
 
       begin
         case status = block.call
         when "healthy"
           sleep TRAEFIK_HEALTHY_DELAY if pause_after_ready
         when "running" # No health check configured
-          sleep MRSK.config.readiness_delay if pause_after_ready
+          sleep KAMAL.config.readiness_delay if pause_after_ready
         else
           raise HealthcheckError, "container not ready (#{status})"
         end

lib/kamal/utils/sensitive.rb

@@ -1,6 +1,6 @@
 require "active_support/core_ext/module/delegation"
 
-class Mrsk::Utils::Sensitive
+class Kamal::Utils::Sensitive
   # So SSHKit knows to redact these values.
   include SSHKit::Redaction
 

lib/kamal/version.rb

@@ -0,0 +1,3 @@
+module Kamal
+  VERSION = "0.16.0"
+end

lib/mrsk/cli/healthcheck.rb

@@ -1,20 +0,0 @@
-class Mrsk::Cli::Healthcheck < Mrsk::Cli::Base
-  default_command :perform
-
-  desc "perform", "Health check current app version"
-  def perform
-    on(MRSK.primary_host) do
-      begin
-        execute *MRSK.healthcheck.run
-        Mrsk::Utils::HealthcheckPoller.wait_for_healthy { capture_with_info(*MRSK.healthcheck.status) }
-      rescue Mrsk::Utils::HealthcheckPoller::HealthcheckError => e
-        error capture_with_info(*MRSK.healthcheck.logs)
-        error capture_with_pretty_json(*MRSK.healthcheck.container_health_log)
-        raise
-      ensure
-        execute *MRSK.healthcheck.stop, raise_on_non_zero_exit: false
-        execute *MRSK.healthcheck.remove, raise_on_non_zero_exit: false
-      end
-    end
-  end
-end

lib/mrsk/cli/prune.rb

@@ -1,30 +0,0 @@
-class Mrsk::Cli::Prune < Mrsk::Cli::Base
-  desc "all", "Prune unused images and stopped containers"
-  def all
-    with_lock do
-      containers
-      images
-    end
-  end
-
-  desc "images", "Prune dangling images"
-  def images
-    with_lock do
-      on(MRSK.hosts) do
-        execute *MRSK.auditor.record("Pruned images"), verbosity: :debug
-        execute *MRSK.prune.dangling_images
-        execute *MRSK.prune.tagged_images
-      end
-    end
-  end
-
-  desc "containers", "Prune all stopped containers, except the last 5"
-  def containers
-    with_lock do
-      on(MRSK.hosts) do
-        execute *MRSK.auditor.record("Pruned containers"), verbosity: :debug
-        execute *MRSK.prune.containers
-      end
-    end
-  end
-end

lib/mrsk/cli/templates/sample_hooks/post-deploy.sample

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# A sample post-deploy hook
-#
-# These environment variables are available:
-# MRSK_RECORDED_AT
-# MRSK_PERFORMER
-# MRSK_VERSION
-# MRSK_HOSTS
-# MRSK_ROLE (if set)
-# MRSK_DESTINATION (if set)
-# MRSK_RUNTIME
-
-echo "$MRSK_PERFORMER deployed $MRSK_VERSION to $MRSK_DESTINATION in $MRSK_RUNTIME seconds"

lib/mrsk/cli/templates/sample_hooks/pre-deploy.sample

@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# A sample pre-deploy hook
-#
-# Checks the Github status of the build, waiting for a pending build to complete for up to 720 seconds.
-#
-# Fails unless the combined status is "success"
-#
-# These environment variables are available:
-# MRSK_RECORDED_AT
-# MRSK_PERFORMER
-# MRSK_VERSION
-# MRSK_HOSTS
-# MRSK_COMMAND
-# MRSK_SUBCOMMAND
-# MRSK_ROLE (if set)
-# MRSK_DESTINATION (if set)
-
-#!/usr/bin/env ruby
-
-# Only check the build status for production deployments
-if ENV["MRSK_COMMAND"] == "rollback" || ENV["MRSK_DESTINATION"] != "production"
-  exit 0
-end
-
-require "bundler/inline"
-
-# true = install gems so this is fast on repeat invocations
-gemfile(true, quiet: true) do
-  source "https://rubygems.org"
-
-  gem "octokit"
-  gem "faraday-retry"
-end
-
-MAX_ATTEMPTS = 72
-ATTEMPTS_GAP = 10
-
-def exit_with_error(message)
-  $stderr.puts message
-  exit 1
-end
-
-def first_status_url(combined_status, state)
-  first_status = combined_status[:statuses].find { |status| status[:state] == state }
-  first_status && first_status[:target_url]
-end
-
-remote_url = `git config --get remote.origin.url`.strip.delete_prefix("https://github.com/")
-git_sha = `git rev-parse HEAD`.strip
-
-repository = Octokit::Repository.from_url(remote_url)
-github_client = Octokit::Client.new(access_token: ENV["GITHUB_TOKEN"])
-attempts = 0
-
-begin
-  loop do
-    combined_status = github_client.combined_status(remote_url, git_sha)
-    state = combined_status[:state]
-    first_status_url = first_status_url(combined_status, state)
-
-    case state
-    when "success"
-      puts "Build passed, see #{first_status_url}"
-      exit 0
-    when "failure"
-      exit_with_error "Build failed, see #{first_status_url}"
-    when "pending"
-      attempts += 1
-    end
-
-    puts "Waiting #{ATTEMPTS_GAP} more seconds for build to complete#{", see #{first_status_url}" if first_status_url}..."
-
-    if attempts == MAX_ATTEMPTS
-      exit_with_error "Build status is still pending, gave up after #{MAX_ATTEMPTS * ATTEMPTS_GAP} seconds"
-    end
-
-    sleep(ATTEMPTS_GAP)
-  end
-rescue Octokit::NotFound
-  exit_with_error "Build status could not be found"
-end

lib/mrsk/cli/templates/template.env

@@ -1,2 +0,0 @@
-MRSK_REGISTRY_PASSWORD=change-this
-RAILS_MASTER_KEY=another-env

lib/mrsk/cli/traefik.rb

@@ -1,106 +0,0 @@
-class Mrsk::Cli::Traefik < Mrsk::Cli::Base
-  desc "boot", "Boot Traefik on servers"
-  def boot
-    with_lock do
-      on(MRSK.traefik_hosts) do
-        execute *MRSK.registry.login
-        execute *MRSK.traefik.run, raise_on_non_zero_exit: false
-      end
-    end
-  end
-
-  desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
-  def reboot
-    with_lock do
-      stop
-      remove_container
-      boot
-    end
-  end
-
-  desc "start", "Start existing Traefik container on servers"
-  def start
-    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
-    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
-    with_lock do
-      stop
-      start
-    end
-  end
-
-  desc "details", "Show details about Traefik container from servers"
-  def details
-    on(MRSK.traefik_hosts) { |host| puts_by_host host, capture_with_info(*MRSK.traefik.info), type: "Traefik" }
-  end
-
-  desc "logs", "Show log lines from Traefik 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
-    grep = options[:grep]
-
-    if options[:follow]
-      run_locally do
-        info "Following logs on #{MRSK.primary_host}..."
-        info MRSK.traefik.follow_logs(host: MRSK.primary_host, grep: grep)
-        exec MRSK.traefik.follow_logs(host: MRSK.primary_host, grep: grep)
-      end
-    else
-      since = options[:since]
-      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"
-      end
-    end
-  end
-
-  desc "remove", "Remove Traefik container and image from servers"
-  def remove
-    with_lock do
-      stop
-      remove_container
-      remove_image
-    end
-  end
-
-  desc "remove_container", "Remove Traefik container from servers", hide: true
-  def 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_image", "Remove Traefik image from servers", hide: true
-  def 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

lib/mrsk/commands.rb

@@ -1,2 +0,0 @@
-module Mrsk::Commands
-end

lib/mrsk/commands/builder.rb

@@ -1,56 +0,0 @@
-class Mrsk::Commands::Builder < Mrsk::Commands::Base
-  delegate :create, :remove, :push, :clean, :pull, :info, to: :target
-
-  def name
-    target.class.to_s.remove("Mrsk::Commands::Builder::").underscore.inquiry
-  end
-
-  def target
-    case
-    when config.builder && config.builder["multiarch"] == false
-      native
-    when config.builder && config.builder["local"] && config.builder["remote"]
-      multiarch_remote
-    when config.builder && config.builder["remote"]
-      native_remote
-    else
-      multiarch
-    end
-  end
-
-  def native
-    @native ||= Mrsk::Commands::Builder::Native.new(config)
-  end
-
-  def native_remote
-    @native ||= Mrsk::Commands::Builder::Native::Remote.new(config)
-  end
-
-  def multiarch
-    @multiarch ||= Mrsk::Commands::Builder::Multiarch.new(config)
-  end
-
-  def multiarch_remote
-    @multiarch_remote ||= Mrsk::Commands::Builder::Multiarch::Remote.new(config)
-  end
-
-
-  def ensure_local_dependencies_installed
-    if name.native?
-      ensure_local_docker_installed
-    else
-      combine \
-        ensure_local_docker_installed,
-        ensure_local_buildx_installed
-    end
-  end
-
-  private
-    def ensure_local_docker_installed
-      docker "--version"
-    end
-
-    def ensure_local_buildx_installed
-      docker :buildx, "version"
-    end
-end

lib/mrsk/version.rb

@@ -1,3 +0,0 @@
-module Mrsk
-  VERSION = "0.13.2"
-end

test/cli/accessory_test.rb

@@ -2,8 +2,8 @@ require_relative "cli_test_case"
 
 class CliAccessoryTest < CliTestCase
   test "boot" do
-    Mrsk::Cli::Accessory.any_instance.expects(:directories).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:upload).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:directories).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:upload).with("mysql")
 
     run_command("boot", "mysql").tap do |output|
       assert_match /docker login.*on 1.1.1.3/, output
@@ -12,10 +12,10 @@ class CliAccessoryTest < CliTestCase
   end
 
   test "boot all" do
-    Mrsk::Cli::Accessory.any_instance.expects(:directories).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:upload).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:directories).with("redis")
-    Mrsk::Cli::Accessory.any_instance.expects(:upload).with("redis")
+    Kamal::Cli::Accessory.any_instance.expects(:directories).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:upload).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:directories).with("redis")
+    Kamal::Cli::Accessory.any_instance.expects(:upload).with("redis")
 
     run_command("boot", "all").tap do |output|
       assert_match /docker login.*on 1.1.1.3/, output
@@ -40,9 +40,10 @@ class CliAccessoryTest < CliTestCase
   end
 
   test "reboot" do
-    Mrsk::Cli::Accessory.any_instance.expects(:stop).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:boot).with("mysql")
+    Kamal::Commands::Registry.any_instance.expects(:login)
+    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:boot).with("mysql", login: false)
 
     run_command("reboot", "mysql")
   end
@@ -56,8 +57,8 @@ class CliAccessoryTest < CliTestCase
   end
 
   test "restart" do
-    Mrsk::Cli::Accessory.any_instance.expects(:stop).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:start).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:start).with("mysql")
 
     run_command("restart", "mysql")
   end
@@ -102,23 +103,23 @@ class CliAccessoryTest < CliTestCase
   end
 
   test "remove with confirmation" do
-    Mrsk::Cli::Accessory.any_instance.expects(:stop).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_image).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_service_directory).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_image).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_service_directory).with("mysql")
 
     run_command("remove", "mysql", "-y")
   end
 
   test "remove all with confirmation" do
-    Mrsk::Cli::Accessory.any_instance.expects(:stop).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_image).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_service_directory).with("mysql")
-    Mrsk::Cli::Accessory.any_instance.expects(:stop).with("redis")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_container).with("redis")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_image).with("redis")
-    Mrsk::Cli::Accessory.any_instance.expects(:remove_service_directory).with("redis")
+    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_image).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_service_directory).with("mysql")
+    Kamal::Cli::Accessory.any_instance.expects(:stop).with("redis")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("redis")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_image).with("redis")
+    Kamal::Cli::Accessory.any_instance.expects(:remove_service_directory).with("redis")
 
     run_command("remove", "all", "-y")
   end
@@ -137,6 +138,6 @@ class CliAccessoryTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Accessory.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Accessory.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/app_test.rb

@@ -11,7 +11,7 @@ class CliAppTest < CliTestCase
   end
 
   test "boot will rename if same version is already running" do
-    run_command("details") # Preheat MRSK const
+    run_command("details") # Preheat Kamal const
 
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
       .with(:docker, :container, :ls, "--filter", "name=^app-web-latest$", "--quiet", raise_on_non_zero_exit: false)
@@ -22,7 +22,7 @@ class CliAppTest < CliTestCase
       .returns("running") # health check
 
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "grep -oE \"\\-[^-]+$\"", "|", "cut -c 2-", raise_on_non_zero_exit: false)
+      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
       .returns("123") # old version
 
     run_command("boot").tap do |output|
@@ -36,11 +36,11 @@ class CliAppTest < CliTestCase
   end
 
   test "boot uses group strategy when specified" do
-    Mrsk::Cli::App.any_instance.stubs(:on).with("1.1.1.1").twice # acquire & release lock
-    Mrsk::Cli::App.any_instance.stubs(:on).with([ "1.1.1.1" ]) # tag container
+    Kamal::Cli::App.any_instance.stubs(:on).with("1.1.1.1").twice # acquire & release lock
+    Kamal::Cli::App.any_instance.stubs(:on).with([ "1.1.1.1" ]) # tag container
 
     # Strategy is used when booting the containers
-    Mrsk::Cli::App.any_instance.expects(:on).with([ "1.1.1.1" ], in: :groups, limit: 3, wait: 2).with_block_given
+    Kamal::Cli::App.any_instance.expects(:on).with([ "1.1.1.1" ], in: :groups, limit: 3, wait: 2).with_block_given
 
     run_command("boot", config: :with_boot_strategy)
   end
@@ -48,13 +48,13 @@ class CliAppTest < CliTestCase
   test "boot errors leave lock in place" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999" }
 
-    Mrsk::Cli::App.any_instance.expects(:using_version).raises(RuntimeError)
+    Kamal::Cli::App.any_instance.expects(:using_version).raises(RuntimeError)
 
-    assert !MRSK.holding_lock?
+    assert !KAMAL.holding_lock?
     assert_raises(RuntimeError) do
       stderred { run_command("boot") }
     end
-    assert MRSK.holding_lock?
+    assert KAMAL.holding_lock?
   end
 
   test "start" do
@@ -71,7 +71,7 @@ class CliAppTest < CliTestCase
 
   test "stale_containers" do
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--format", "\"{{.Names}}\"", "|", "grep -oE \"\\-[^-]+$\"", "|", "cut -c 2-", raise_on_non_zero_exit: false)
+      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
       .returns("12345678\n87654321")
 
     run_command("stale_containers").tap do |output|
@@ -81,7 +81,7 @@ class CliAppTest < CliTestCase
 
   test "stop stale_containers" do
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--format", "\"{{.Names}}\"", "|", "grep -oE \"\\-[^-]+$\"", "|", "cut -c 2-", raise_on_non_zero_exit: false)
+      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
       .returns("12345678\n87654321")
 
     run_command("stale_containers", "--stop").tap do |output|
@@ -130,7 +130,7 @@ class CliAppTest < CliTestCase
 
   test "exec with reuse" do
     run_command("exec", "--reuse", "ruby -v").tap do |output|
-      assert_match "docker ps --filter label=service=app --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | grep -oE \"\\-[^-]+$\" | cut -c 2-", output # Get current version
+      assert_match "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done", output # Get current version
       assert_match "docker exec app-web-999 ruby -v", output
     end
   end
@@ -163,20 +163,20 @@ class CliAppTest < CliTestCase
 
   test "version" do
     run_command("version").tap do |output|
-      assert_match "docker ps --filter label=service=app --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | grep -oE \"\\-[^-]+$\" | cut -c 2-", output
+      assert_match "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done", output
     end
   end
 
 
   test "version through main" do
-    stdouted { Mrsk::Cli::Main.start(["app", "version", "-c", "test/fixtures/deploy_with_accessories.yml", "--hosts", "1.1.1.1"]) }.tap do |output|
-      assert_match "docker ps --filter label=service=app --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | grep -oE \"\\-[^-]+$\" | cut -c 2-", output
+    stdouted { Kamal::Cli::Main.start(["app", "version", "-c", "test/fixtures/deploy_with_accessories.yml", "--hosts", "1.1.1.1"]) }.tap do |output|
+      assert_match "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done", output
     end
   end
 
   private
     def run_command(*command, config: :with_accessories)
-      stdouted { Mrsk::Cli::App.start([*command, "-c", "test/fixtures/deploy_#{config}.yml", "--hosts", "1.1.1.1"]) }
+      stdouted { Kamal::Cli::App.start([*command, "-c", "test/fixtures/deploy_#{config}.yml", "--hosts", "1.1.1.1"]) }
     end
 
     def stub_running

test/cli/build_test.rb

@@ -2,20 +2,20 @@ require_relative "cli_test_case"
 
 class CliBuildTest < CliTestCase
   test "deliver" do
-    Mrsk::Cli::Build.any_instance.expects(:push)
-    Mrsk::Cli::Build.any_instance.expects(:pull)
+    Kamal::Cli::Build.any_instance.expects(:push)
+    Kamal::Cli::Build.any_instance.expects(:pull)
 
     run_command("deliver")
   end
 
   test "push" do
-    Mrsk::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
+    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
     hook_variables = { version: 999, service_version: "app@999", hosts: "1.1.1.1,1.1.1.2,1.1.1.3,1.1.1.4", command: "build", subcommand: "push" }
 
     run_command("push").tap do |output|
       assert_hook_ran "pre-build", output, **hook_variables
       assert_match /docker --version && docker buildx version/, output
-      assert_match /docker buildx build --push --platform linux\/amd64,linux\/arm64 --builder mrsk-app-multiarch -t dhh\/app:999 -t dhh\/app:latest --label service="app" --file Dockerfile \. as .*@localhost/, output
+      assert_match /docker buildx build --push --platform linux\/amd64,linux\/arm64 --builder kamal-app-multiarch -t dhh\/app:999 -t dhh\/app:latest --label service="app" --file Dockerfile \. as .*@localhost/, output
     end
   end
 
@@ -41,14 +41,14 @@ class CliBuildTest < CliTestCase
       .with(:docker, "--version", "&&", :docker, :buildx, "version")
       .raises(SSHKit::Command::Failed.new("no buildx"))
 
-    Mrsk::Commands::Builder.any_instance.stubs(:native_and_local?).returns(false)
-    assert_raises(Mrsk::Cli::Build::BuildError) { run_command("push") }
+    Kamal::Commands::Builder.any_instance.stubs(:native_and_local?).returns(false)
+    assert_raises(Kamal::Cli::Build::BuildError) { run_command("push") }
   end
 
   test "push pre-build hook failure" do
     fail_hook("pre-build")
 
-    assert_raises(Mrsk::Cli::HookError) { run_command("push") }
+    assert_raises(Kamal::Cli::HookError) { run_command("push") }
 
     assert @executions.none? { |args| args[0..2] == [:docker, :buildx, :build] }
   end
@@ -62,7 +62,7 @@ class CliBuildTest < CliTestCase
 
   test "create" do
     run_command("create").tap do |output|
-      assert_match /docker buildx create --use --name mrsk-app-multiarch/, output
+      assert_match /docker buildx create --use --name kamal-app-multiarch/, output
     end
   end
 
@@ -79,7 +79,7 @@ class CliBuildTest < CliTestCase
 
   test "remove" do
     run_command("remove").tap do |output|
-      assert_match /docker buildx rm mrsk-app-multiarch/, output
+      assert_match /docker buildx rm kamal-app-multiarch/, output
     end
   end
 
@@ -96,7 +96,7 @@ class CliBuildTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Build.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Build.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 
     def stub_dependency_checks

test/cli/cli_test_case.rb

@@ -5,8 +5,8 @@ class CliTestCase < ActiveSupport::TestCase
     ENV["VERSION"]             = "999"
     ENV["RAILS_MASTER_KEY"]    = "123"
     ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
-    Object.send(:remove_const, :MRSK)
-    Object.const_set(:MRSK, Mrsk::Commander.new)
+    Object.send(:remove_const, :KAMAL)
+    Object.const_set(:KAMAL, Kamal::Commander.new)
   end
 
   teardown do
@@ -18,20 +18,20 @@ class CliTestCase < ActiveSupport::TestCase
   private
     def fail_hook(hook)
       @executions = []
-      Mrsk::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
+      Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
 
       SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-        .with { |*args| @executions << args; args != [".mrsk/hooks/#{hook}"] }
+        .with { |*args| @executions << args; args != [".kamal/hooks/#{hook}"] }
       SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-        .with { |*args| args.first == ".mrsk/hooks/#{hook}" }
+        .with { |*args| args.first == ".kamal/hooks/#{hook}" }
         .raises(SSHKit::Command::Failed.new("failed"))
     end
 
     def stub_locking
       SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-        .with { |arg1, arg2| arg1 == :mkdir && arg2 == :mrsk_lock }
+        .with { |arg1, arg2| arg1 == :mkdir && arg2 == "kamal_lock-app" }
       SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-        .with { |arg1, arg2| arg1 == :rm && arg2 == "mrsk_lock/details" }
+        .with { |arg1, arg2| arg1 == :rm && arg2 == "kamal_lock-app/details" }
     end
 
     def assert_hook_ran(hook, output, version:, service_version:, hosts:, command:, subcommand: nil, runtime: nil)
@@ -39,17 +39,17 @@ class CliTestCase < ActiveSupport::TestCase
 
       assert_match "Running the #{hook} hook...\n", output
 
-      expected = %r{Running\s/usr/bin/env\s\.mrsk/hooks/#{hook}\sas\s#{performer}@localhost\n\s
+      expected = %r{Running\s/usr/bin/env\s\.kamal/hooks/#{hook}\sas\s#{performer}@localhost\n\s
         DEBUG\s\[[0-9a-f]*\]\sCommand:\s\(\sexport\s
-        MRSK_RECORDED_AT=\"\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ\"\s
-        MRSK_PERFORMER=\"#{performer}\"\s
-        MRSK_VERSION=\"#{version}\"\s
-        MRSK_SERVICE_VERSION=\"#{service_version}\"\s
-        MRSK_HOSTS=\"#{hosts}\"\s
-        MRSK_COMMAND=\"#{command}\"\s
-        #{"MRSK_SUBCOMMAND=\\\"#{subcommand}\\\"\\s" if subcommand}
-        #{"MRSK_RUNTIME=\\\"#{runtime}\\\"\\s" if runtime}
-        ;\s/usr/bin/env\s\.mrsk/hooks/#{hook} }x
+        KAMAL_RECORDED_AT=\"\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ\"\s
+        KAMAL_PERFORMER=\"#{performer}\"\s
+        KAMAL_VERSION=\"#{version}\"\s
+        KAMAL_SERVICE_VERSION=\"#{service_version}\"\s
+        KAMAL_HOSTS=\"#{hosts}\"\s
+        KAMAL_COMMAND=\"#{command}\"\s
+        #{"KAMAL_SUBCOMMAND=\\\"#{subcommand}\\\"\\s" if subcommand}
+        #{"KAMAL_RUNTIME=\\\"#{runtime}\\\"\\s" if runtime}
+        ;\s/usr/bin/env\s\.kamal/hooks/#{hook} }x
 
       assert_match expected, output
     end

test/cli/healthcheck_test.rb

@@ -5,12 +5,12 @@ class CliHealthcheckTest < CliTestCase
     # Prevent expected failures from outputting to terminal
     Thread.report_on_exception = false
 
-    Mrsk::Utils::HealthcheckPoller.stubs(:sleep) # No sleeping when retrying
+    Kamal::Utils::HealthcheckPoller.stubs(:sleep) # No sleeping when retrying
 
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
       .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :stop, raise_on_non_zero_exit: false)
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-      .with(:docker, :run, "--detach", "--name", "healthcheck-app-999", "--publish", "3999:3000", "--label", "service=healthcheck-app", "-e", "MRSK_CONTAINER_NAME=\"healthcheck-app\"", "--health-cmd", "\"curl -f http://localhost:3000/up || exit 1\"", "--health-interval", "\"1s\"", "dhh/app:999")
+      .with(:docker, :run, "--detach", "--name", "healthcheck-app-999", "--publish", "3999:3000", "--label", "service=healthcheck-app", "-e", "KAMAL_CONTAINER_NAME=\"healthcheck-app\"", "--health-cmd", "\"curl -f http://localhost:3000/up || exit 1\"", "--health-interval", "\"1s\"", "dhh/app:999")
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
       .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :container, :rm, raise_on_non_zero_exit: false)
 
@@ -34,12 +34,12 @@ class CliHealthcheckTest < CliTestCase
     # Prevent expected failures from outputting to terminal
     Thread.report_on_exception = false
 
-    Mrsk::Utils::HealthcheckPoller.stubs(:sleep) # No sleeping when retrying
+    Kamal::Utils::HealthcheckPoller.stubs(:sleep) # No sleeping when retrying
 
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
       .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :stop, raise_on_non_zero_exit: false)
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-      .with(:docker, :run, "--detach", "--name", "healthcheck-app-999", "--publish", "3999:3000", "--label", "service=healthcheck-app", "-e", "MRSK_CONTAINER_NAME=\"healthcheck-app\"", "--health-cmd", "\"curl -f http://localhost:3000/up || exit 1\"", "--health-interval", "\"1s\"", "dhh/app:999")
+      .with(:docker, :run, "--detach", "--name", "healthcheck-app-999", "--publish", "3999:3000", "--label", "service=healthcheck-app", "-e", "KAMAL_CONTAINER_NAME=\"healthcheck-app\"", "--health-cmd", "\"curl -f http://localhost:3000/up || exit 1\"", "--health-interval", "\"1s\"", "dhh/app:999")
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
       .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :container, :rm, raise_on_non_zero_exit: false)
 
@@ -66,6 +66,6 @@ class CliHealthcheckTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Healthcheck.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Healthcheck.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/lock_test.rb

@@ -15,6 +15,6 @@ class CliLockTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Lock.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Lock.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/main_test.rb

@@ -2,9 +2,9 @@ require_relative "cli_test_case"
 
 class CliMainTest < CliTestCase
   test "setup" do
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:server:bootstrap")
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:accessory:boot", [ "all" ])
-    Mrsk::Cli::Main.any_instance.expects(:deploy)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap")
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ])
+    Kamal::Cli::Main.any_instance.expects(:deploy)
 
     run_command("setup")
   end
@@ -12,15 +12,15 @@ class CliMainTest < CliTestCase
   test "deploy" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:registry:login", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:deliver", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:traefik:boot", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:stale_containers", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:prune:all", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:registry:login", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:deliver", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:prune:all", [], invoke_options)
 
-    Mrsk::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
+    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
     hook_variables = { version: 999, service_version: "app@999", hosts: "1.1.1.1,1.1.1.2", command: "deploy" }
 
     run_command("deploy").tap do |output|
@@ -39,13 +39,13 @@ class CliMainTest < CliTestCase
   test "deploy with skip_push" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:registry:login", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:pull", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:traefik:boot", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:stale_containers", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:prune:all", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:registry:login", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:pull", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:prune:all", [], invoke_options)
 
     run_command("deploy", "--skip_push").tap do |output|
       assert_match /Acquiring the deploy lock/, output
@@ -63,13 +63,13 @@ class CliMainTest < CliTestCase
     Thread.report_on_exception = false
 
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-      .with { |*arg| arg[0..1] == [:mkdir, :mrsk_lock] }
-      .raises(RuntimeError, "mkdir: cannot create directory ‘mrsk_lock’: File exists")
+      .with { |*arg| arg[0..1] == [:mkdir, 'kamal_lock-app'] }
+      .raises(RuntimeError, "mkdir: cannot create directory ‘kamal_lock-app’: File exists")
 
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_debug)
-      .with(:stat, :mrsk_lock, ">", "/dev/null", "&&", :cat, "mrsk_lock/details", "|", :base64, "-d")
+      .with(:stat, 'kamal_lock-app', ">", "/dev/null", "&&", :cat, "kamal_lock-app/details", "|", :base64, "-d")
 
-    assert_raises(Mrsk::Cli::LockError) do
+    assert_raises(Kamal::Cli::LockError) do
       run_command("deploy")
     end
   end
@@ -78,7 +78,7 @@ class CliMainTest < CliTestCase
     Thread.report_on_exception = false
 
     SSHKit::Backend::Abstract.any_instance.stubs(:execute)
-      .with { |*arg| arg[0..1] == [:mkdir, :mrsk_lock] }
+      .with { |*arg| arg[0..1] == [:mkdir, 'kamal_lock-app'] }
       .raises(SocketError, "getaddrinfo: nodename nor servname provided, or not known")
 
     assert_raises(SSHKit::Runner::ExecuteError) do
@@ -89,42 +89,48 @@ class CliMainTest < CliTestCase
   test "deploy errors during outside section leave remove lock" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
-    Mrsk::Cli::Main.any_instance.expects(:invoke)
-      .with("mrsk:cli:registry:login", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke)
+      .with("kamal:cli:registry:login", [], invoke_options)
       .raises(RuntimeError)
 
-    assert !MRSK.holding_lock?
+    assert !KAMAL.holding_lock?
     assert_raises(RuntimeError) do
       stderred { run_command("deploy") }
     end
-    assert !MRSK.holding_lock?
+    assert !KAMAL.holding_lock?
   end
 
   test "deploy with skipped hooks" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => true }
 
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:registry:login", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:deliver", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:traefik:boot", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:stale_containers", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:prune:all", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:registry:login", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:deliver", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:prune:all", [], invoke_options)
 
     run_command("deploy", "--skip_hooks") do
       refute_match /Running the post-deploy hook.../, output
     end
   end
 
+  test "deploy with missing secrets" do
+    assert_raises(KeyError) do
+      run_command("deploy", config_file: "deploy_with_secrets")
+    end
+  end
+
   test "redeploy" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:deliver", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:stale_containers", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:deliver", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
 
-    Mrsk::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
+    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
 
     hook_variables = { version: 999, service_version: "app@999", hosts: "1.1.1.1,1.1.1.2", command: "redeploy" }
 
@@ -141,10 +147,10 @@ class CliMainTest < CliTestCase
   test "redeploy with skip_push" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:build:pull", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:healthcheck:perform", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:stale_containers", [], invoke_options)
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:boot", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:pull", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
 
     run_command("redeploy", "--skip_push").tap do |output|
       assert_match /Pull app image/, output
@@ -155,7 +161,7 @@ class CliMainTest < CliTestCase
   test "rollback bad version" do
     Thread.report_on_exception = false
 
-    run_command("details") # Preheat MRSK const
+    run_command("details") # Preheat Kamal const
 
     run_command("rollback", "nonsense").tap do |output|
       assert_match /docker container ls --all --filter name=\^app-web-nonsense\$ --quiet/, output
@@ -172,14 +178,14 @@ class CliMainTest < CliTestCase
         .with(:docker, :container, :ls, "--all", "--filter", "name=^app-#{role}-123$", "--quiet")
         .returns("version-to-rollback\n").at_least_once
       SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-        .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=#{role}", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "grep -oE \"\\-[^-]+$\"", "|", "cut -c 2-", raise_on_non_zero_exit: false)
+        .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=#{role}", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-#{role}-}; done", raise_on_non_zero_exit: false)
         .returns("version-to-rollback\n").at_least_once
       SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
         .with(:docker, :container, :ls, "--all", "--filter", "name=^app-#{role}-123$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
         .returns("running").at_least_once # health check
     end
 
-    Mrsk::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
+    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
     hook_variables = { version: 123, service_version: "app@123", hosts: "1.1.1.1,1.1.1.2,1.1.1.3,1.1.1.4", command: "rollback" }
 
     run_command("rollback", "123", config_file: "deploy_with_accessories").tap do |output|
@@ -193,15 +199,15 @@ class CliMainTest < CliTestCase
   end
 
   test "rollback without old version" do
-    Mrsk::Cli::Main.any_instance.stubs(:container_available?).returns(true)
+    Kamal::Cli::Main.any_instance.stubs(:container_available?).returns(true)
 
-    Mrsk::Utils::HealthcheckPoller.stubs(:sleep)
+    Kamal::Utils::HealthcheckPoller.stubs(:sleep)
 
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
       .with(:docker, :container, :ls, "--filter", "name=^app-web-123$", "--quiet", raise_on_non_zero_exit: false)
       .returns("").at_least_once
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "grep -oE \"\\-[^-]+$\"", "|", "cut -c 2-", raise_on_non_zero_exit: false)
+      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
       .returns("").at_least_once
     SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
       .with(:docker, :container, :ls, "--all", "--filter", "name=^app-web-123$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
@@ -215,16 +221,16 @@ class CliMainTest < CliTestCase
   end
 
   test "details" do
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:traefik:details")
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:app:details")
-    Mrsk::Cli::Main.any_instance.expects(:invoke).with("mrsk:cli:accessory:details", [ "all" ])
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:details")
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:details")
+    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:details", [ "all" ])
 
     run_command("details")
   end
 
   test "audit" do
     run_command("audit").tap do |output|
-      assert_match /tail -n 50 mrsk-app-audit.log on 1.1.1.1/, output
+      assert_match /tail -n 50 kamal-app-audit.log on 1.1.1.1/, output
       assert_match /App Host: 1.1.1.1/, output
     end
   end
@@ -299,10 +305,10 @@ class CliMainTest < CliTestCase
     run_command("init", "--bundle").tap do |output|
       assert_match /Created configuration file in config\/deploy.yml/, output
       assert_match /Created \.env file/, output
-      assert_match /Adding MRSK to Gemfile and bundle/, output
-      assert_match /bundle add mrsk/, output
-      assert_match /bundle binstubs mrsk/, output
-      assert_match /Created binstub file in bin\/mrsk/, output
+      assert_match /Adding Kamal to Gemfile and bundle/, output
+      assert_match /bundle add kamal/, output
+      assert_match /bundle binstubs kamal/, output
+      assert_match /Created binstub file in bin\/kamal/, output
     end
   end
 
@@ -315,7 +321,7 @@ class CliMainTest < CliTestCase
 
     run_command("init", "--bundle").tap do |output|
       assert_match /Config file already exists in config\/deploy.yml \(remove first to create a new one\)/, output
-      assert_match /Binstub already exists in bin\/mrsk \(remove first to create a new one\)/, output
+      assert_match /Binstub already exists in bin\/kamal \(remove first to create a new one\)/, output
     end
   end
 
@@ -358,12 +364,12 @@ class CliMainTest < CliTestCase
   end
 
   test "version" do
-    version = stdouted { Mrsk::Cli::Main.new.version }
-    assert_equal Mrsk::VERSION, version
+    version = stdouted { Kamal::Cli::Main.new.version }
+    assert_equal Kamal::VERSION, version
   end
 
   private
     def run_command(*command, config_file: "deploy_simple")
-      stdouted { Mrsk::Cli::Main.start([*command, "-c", "test/fixtures/#{config_file}.yml"]) }
+      stdouted { Kamal::Cli::Main.start([*command, "-c", "test/fixtures/#{config_file}.yml"]) }
     end
 end

test/cli/prune_test.rb

@@ -2,8 +2,8 @@ require_relative "cli_test_case"
 
 class CliPruneTest < CliTestCase
   test "all" do
-    Mrsk::Cli::Prune.any_instance.expects(:containers)
-    Mrsk::Cli::Prune.any_instance.expects(:images)
+    Kamal::Cli::Prune.any_instance.expects(:containers)
+    Kamal::Cli::Prune.any_instance.expects(:images)
 
     run_command("all")
   end
@@ -23,6 +23,6 @@ class CliPruneTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Prune.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Prune.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/registry_test.rb

@@ -16,6 +16,6 @@ class CliRegistryTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Registry.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Registry.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/server_test.rb

@@ -30,6 +30,6 @@ class CliServerTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Server.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Server.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/cli/traefik_test.rb

@@ -4,16 +4,24 @@ class CliTraefikTest < CliTestCase
   test "boot" do
     run_command("boot").tap do |output|
       assert_match "docker login", output
-      assert_match "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{Mrsk::Commands::Traefik::DEFAULT_IMAGE} --providers.docker --log.level=DEBUG", output
+      assert_match "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{Kamal::Commands::Traefik::DEFAULT_IMAGE} --providers.docker --log.level=\"DEBUG\"", output
     end
   end
 
   test "reboot" do
-    Mrsk::Cli::Traefik.any_instance.expects(:stop)
-    Mrsk::Cli::Traefik.any_instance.expects(:remove_container)
-    Mrsk::Cli::Traefik.any_instance.expects(:boot)
+    Kamal::Commands::Registry.any_instance.expects(:login).twice
 
-    run_command("reboot")
+    run_command("reboot").tap do |output|
+      assert_match "docker container stop traefik", output
+      assert_match "docker container prune --force --filter label=org.opencontainers.image.title=Traefik", output
+      assert_match "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{Kamal::Commands::Traefik::DEFAULT_IMAGE} --providers.docker --log.level=\"DEBUG\"", output
+    end
+  end
+
+  test "reboot --rolling" do
+    run_command("reboot", "--rolling").tap do |output|
+      assert_match "Running docker container prune --force --filter label=org.opencontainers.image.title=Traefik on 1.1.1.1", output.lines[3]
+    end
   end
 
   test "start" do
@@ -29,8 +37,8 @@ class CliTraefikTest < CliTestCase
   end
 
   test "restart" do
-    Mrsk::Cli::Traefik.any_instance.expects(:stop)
-    Mrsk::Cli::Traefik.any_instance.expects(:start)
+    Kamal::Cli::Traefik.any_instance.expects(:stop)
+    Kamal::Cli::Traefik.any_instance.expects(:start)
 
     run_command("restart")
   end
@@ -60,9 +68,9 @@ class CliTraefikTest < CliTestCase
   end
 
   test "remove" do
-    Mrsk::Cli::Traefik.any_instance.expects(:stop)
-    Mrsk::Cli::Traefik.any_instance.expects(:remove_container)
-    Mrsk::Cli::Traefik.any_instance.expects(:remove_image)
+    Kamal::Cli::Traefik.any_instance.expects(:stop)
+    Kamal::Cli::Traefik.any_instance.expects(:remove_container)
+    Kamal::Cli::Traefik.any_instance.expects(:remove_image)
 
     run_command("remove")
   end
@@ -81,6 +89,6 @@ class CliTraefikTest < CliTestCase
 
   private
     def run_command(*command)
-      stdouted { Mrsk::Cli::Traefik.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Kamal::Cli::Traefik.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     end
 end

test/commander_test.rb

@@ -6,74 +6,74 @@ class CommanderTest < ActiveSupport::TestCase
   end
 
   test "lazy configuration" do
-    assert_equal Mrsk::Configuration, @mrsk.config.class
+    assert_equal Kamal::Configuration, @kamal.config.class
   end
 
   test "overwriting hosts" do
-    assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @mrsk.hosts
+    assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @kamal.hosts
 
-    @mrsk.specific_hosts = [ "1.1.1.1", "1.1.1.2" ]
-    assert_equal [ "1.1.1.1", "1.1.1.2" ], @mrsk.hosts
+    @kamal.specific_hosts = [ "1.1.1.1", "1.1.1.2" ]
+    assert_equal [ "1.1.1.1", "1.1.1.2" ], @kamal.hosts
   end
 
   test "filtering hosts by filtering roles" do
-    assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @mrsk.hosts
+    assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @kamal.hosts
 
-    @mrsk.specific_roles = [ "web" ]
-    assert_equal [ "1.1.1.1", "1.1.1.2" ], @mrsk.hosts
+    @kamal.specific_roles = [ "web" ]
+    assert_equal [ "1.1.1.1", "1.1.1.2" ], @kamal.hosts
   end
 
   test "filtering roles" do
-    assert_equal [ "web", "workers" ], @mrsk.roles.map(&:name)
+    assert_equal [ "web", "workers" ], @kamal.roles.map(&:name)
 
-    @mrsk.specific_roles = [ "workers" ]
-    assert_equal [ "workers" ], @mrsk.roles.map(&:name)
+    @kamal.specific_roles = [ "workers" ]
+    assert_equal [ "workers" ], @kamal.roles.map(&:name)
   end
 
   test "filtering roles by filtering hosts" do
-    assert_equal [ "web", "workers" ], @mrsk.roles.map(&:name)
+    assert_equal [ "web", "workers" ], @kamal.roles.map(&:name)
 
-    @mrsk.specific_hosts = [ "1.1.1.3" ]
-    assert_equal [ "workers" ], @mrsk.roles.map(&:name)
+    @kamal.specific_hosts = [ "1.1.1.3" ]
+    assert_equal [ "workers" ], @kamal.roles.map(&:name)
   end
 
   test "overwriting hosts with primary" do
-    assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @mrsk.hosts
+    assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @kamal.hosts
 
-    @mrsk.specific_primary!
-    assert_equal [ "1.1.1.1" ], @mrsk.hosts
+    @kamal.specific_primary!
+    assert_equal [ "1.1.1.1" ], @kamal.hosts
   end
 
   test "primary_host with specific hosts via role" do
-    @mrsk.specific_roles = "workers"
-    assert_equal "1.1.1.3", @mrsk.primary_host
+    @kamal.specific_roles = "workers"
+    assert_equal "1.1.1.3", @kamal.primary_host
   end
 
   test "roles_on" do
-    assert_equal [ "web" ], @mrsk.roles_on("1.1.1.1")
-    assert_equal [ "workers" ], @mrsk.roles_on("1.1.1.3")
+    assert_equal [ "web" ], @kamal.roles_on("1.1.1.1")
+    assert_equal [ "workers" ], @kamal.roles_on("1.1.1.3")
   end
 
   test "default group strategy" do
-    assert_empty @mrsk.boot_strategy
+    assert_empty @kamal.boot_strategy
   end
 
   test "specific limit group strategy" do
     configure_with(:deploy_with_boot_strategy)
 
-    assert_equal({ in: :groups, limit: 3, wait: 2 }, @mrsk.boot_strategy)
+    assert_equal({ in: :groups, limit: 3, wait: 2 }, @kamal.boot_strategy)
   end
 
   test "percentage-based group strategy" do
     configure_with(:deploy_with_percentage_boot_strategy)
 
-    assert_equal({ in: :groups, limit: 1, wait: 2 }, @mrsk.boot_strategy)
+    assert_equal({ in: :groups, limit: 1, wait: 2 }, @kamal.boot_strategy)
   end
 
   private
     def configure_with(variant)
-      @mrsk = Mrsk::Commander.new.tap do |mrsk|
-        mrsk.configure config_file: Pathname.new(File.expand_path("fixtures/#{variant}.yml", __dir__))
+      @kamal = Kamal::Commander.new.tap do |kamal|
+        kamal.configure config_file: Pathname.new(File.expand_path("fixtures/#{variant}.yml", __dir__))
       end
     end
 end

test/commands/accessory_test.rb

@@ -146,6 +146,6 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
 
   private
     def new_command(accessory)
-      Mrsk::Commands::Accessory.new(Mrsk::Configuration.new(@config), name: accessory)
+      Kamal::Commands::Accessory.new(Kamal::Configuration.new(@config), name: accessory)
     end
 end

test/commands/app_test.rb

@@ -13,13 +13,13 @@ class CommandsAppTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run.join(" ")
   end
 
   test "run with hostname" do
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 --hostname myhost -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 --hostname myhost -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run(hostname: "myhost").join(" ")
   end
 
@@ -27,7 +27,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:volumes] = ["/local/path:/container/path" ]
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --volume /local/path:/container/path --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --volume /local/path:/container/path --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run.join(" ")
   end
 
@@ -35,7 +35,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:healthcheck] = { "path" => "/healthz" }
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/healthz || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/healthz || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run.join(" ")
   end
 
@@ -43,7 +43,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:healthcheck] = { "cmd" => "/bin/up" }
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"/bin/up\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"/bin/up\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run.join(" ")
   end
 
@@ -51,14 +51,14 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:servers] = { "web" => { "hosts" => [ "1.1.1.1" ], "healthcheck" => { "cmd" => "/bin/healthy" } } }
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"/bin/healthy\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"/bin/healthy\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run.join(" ")
   end
 
   test "run with custom options" do
     @config[:servers] = { "web" => [ "1.1.1.1" ], "jobs" => { "hosts" => [ "1.1.1.2" ], "cmd" => "bin/jobs", "options" => { "mount" => "somewhere", "cap-add" => true } } }
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-jobs-999 -e MRSK_CONTAINER_NAME=\"app-jobs-999\" -e RAILS_MASTER_KEY=\"456\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"jobs\" --mount \"somewhere\" --cap-add dhh/app:999 bin/jobs",
+      "docker run --detach --restart unless-stopped --name app-jobs-999 -e KAMAL_CONTAINER_NAME=\"app-jobs-999\" -e RAILS_MASTER_KEY=\"456\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"jobs\" --mount \"somewhere\" --cap-add dhh/app:999 bin/jobs",
       new_command(role: "jobs").run.join(" ")
   end
 
@@ -66,7 +66,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:logging] = { "driver" => "local", "options" => { "max-size" => "100m", "max-file" => "3" } }
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-driver \"local\" --log-opt max-size=\"100m\" --log-opt max-file=\"3\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-driver \"local\" --log-opt max-size=\"100m\" --log-opt max-file=\"3\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.run.join(" ")
   end
 
@@ -85,13 +85,13 @@ class CommandsAppTest < ActiveSupport::TestCase
 
   test "start_or_run" do
     assert_equal \
-      "docker start app-web-999 || docker run --detach --restart unless-stopped --name app-web-999 -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker start app-web-999 || docker run --detach --restart unless-stopped --name app-web-999 -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.start_or_run.join(" ")
   end
 
   test "start_or_run with hostname" do
     assert_equal \
-      "docker start app-web-999 || docker run --detach --restart unless-stopped --name app-web-999 --hostname myhost -e MRSK_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
+      "docker start app-web-999 || docker run --detach --restart unless-stopped --name app-web-999 --hostname myhost -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e RAILS_MASTER_KEY=\"456\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label traefik.http.services.app-web.loadbalancer.server.scheme=\"http\" --label traefik.http.routers.app-web.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.middlewares.app-web-retry.retry.attempts=\"5\" --label traefik.http.middlewares.app-web-retry.retry.initialinterval=\"500ms\" --label traefik.http.routers.app-web.middlewares=\"app-web-retry@docker\" dhh/app:999",
       new_command.start_or_run(hostname: "myhost").join(" ")
   end
 
@@ -171,6 +171,13 @@ class CommandsAppTest < ActiveSupport::TestCase
       new_command.execute_in_new_container("bin/rails", "db:setup").join(" ")
   end
 
+  test "execute in new container with custom options" do
+    @config[:servers] = { "web" => { "hosts" => [ "1.1.1.1" ], "options" => { "mount" => "somewhere", "cap-add" => true } } }
+    assert_equal \
+      "docker run --rm -e RAILS_MASTER_KEY=\"456\" --mount \"somewhere\" --cap-add dhh/app:999 bin/rails db:setup",
+      new_command.execute_in_new_container("bin/rails", "db:setup").join(" ")
+  end
+
   test "execute in existing container" do
     assert_equal \
       "docker exec app-web-999 bin/rails db:setup",
@@ -182,6 +189,12 @@ class CommandsAppTest < ActiveSupport::TestCase
       new_command.execute_in_new_container_over_ssh("bin/rails", "c", host: "app-1")
   end
 
+  test "execute in new container with custom options over ssh" do
+    @config[:servers] = { "web" => { "hosts" => [ "1.1.1.1" ], "options" => { "mount" => "somewhere", "cap-add" => true } } }
+    assert_match %r|docker run -it --rm -e RAILS_MASTER_KEY=\"456\" --mount \"somewhere\" --cap-add dhh/app:999 bin/rails c|,
+      new_command.execute_in_new_container_over_ssh("bin/rails", "c", host: "app-1")
+  end
+
   test "execute in existing container over ssh" do
     assert_match %r|docker exec -it app-web-999 bin/rails c|,
       new_command.execute_in_existing_container_over_ssh("bin/rails", "c", host: "app-1")
@@ -211,6 +224,10 @@ class CommandsAppTest < ActiveSupport::TestCase
     assert_equal "ssh -J root@2.2.2.2 -t app@1.1.1.1 'ls'", new_command.run_over_ssh("ls", host: "1.1.1.1")
   end
 
+  test "run over ssh with proxy_command" do
+    @config[:ssh] = { "proxy_command" => "ssh -W %h:%p user@proxy-server" }
+    assert_equal "ssh -o ProxyCommand='ssh -W %h:%p user@proxy-server' -t root@1.1.1.1 'ls'", new_command.run_over_ssh("ls", host: "1.1.1.1")
+  end
 
   test "current_running_container_id" do
     assert_equal \
@@ -233,17 +250,17 @@ class CommandsAppTest < ActiveSupport::TestCase
 
   test "current_running_version" do
     assert_equal \
-      "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | grep -oE \"\\-[^-]+$\" | cut -c 2-",
+      "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done",
       new_command.current_running_version.join(" ")
   end
 
   test "list_versions" do
     assert_equal \
-      "docker ps --filter label=service=app --filter label=role=web --format \"{{.Names}}\" | grep -oE \"\\-[^-]+$\" | cut -c 2-",
+      "docker ps --filter label=service=app --filter label=role=web --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done",
       new_command.list_versions.join(" ")
 
     assert_equal \
-      "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | grep -oE \"\\-[^-]+$\" | cut -c 2-",
+      "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done",
       new_command.list_versions("--latest", statuses: [ :running, :restarting ]).join(" ")
   end
 
@@ -319,6 +336,6 @@ class CommandsAppTest < ActiveSupport::TestCase
 
   private
     def new_command(role: "web")
-      Mrsk::Commands::App.new(Mrsk::Configuration.new(@config, destination: @destination, version: "999"), role: role)
+      Kamal::Commands::App.new(Kamal::Configuration.new(@config, destination: @destination, version: "999"), role: role)
     end
 end

test/commands/auditor_test.rb

@@ -21,7 +21,7 @@ class CommandsAuditorTest < ActiveSupport::TestCase
       :echo,
       "[#{@recorded_at}] [#{@performer}]",
       "app removed container",
-      ">>", "mrsk-app-audit.log"
+      ">>", "kamal-app-audit.log"
     ], @auditor.record("app removed container")
   end
 
@@ -31,7 +31,7 @@ class CommandsAuditorTest < ActiveSupport::TestCase
         :echo,
         "[#{@recorded_at}] [#{@performer}] [staging]",
         "app removed container",
-        ">>", "mrsk-app-staging-audit.log"
+        ">>", "kamal-app-staging-audit.log"
       ], auditor.record("app removed container")
     end
   end
@@ -42,7 +42,7 @@ class CommandsAuditorTest < ActiveSupport::TestCase
         :echo,
         "[#{@recorded_at}] [#{@performer}] [web]",
         "app removed container",
-        ">>", "mrsk-app-audit.log"
+        ">>", "kamal-app-audit.log"
       ], auditor.record("app removed container")
     end
   end
@@ -52,13 +52,13 @@ class CommandsAuditorTest < ActiveSupport::TestCase
       :echo,
       "[#{@recorded_at}] [#{@performer}] [value]",
       "app removed container",
-      ">>", "mrsk-app-audit.log"
+      ">>", "kamal-app-audit.log"
     ], @auditor.record("app removed container", detail: "value")
   end
 
 
   private
     def new_command(destination: nil, **details)
-      Mrsk::Commands::Auditor.new(Mrsk::Configuration.new(@config, destination: destination, version: "123"), **details)
+      Kamal::Commands::Auditor.new(Kamal::Configuration.new(@config, destination: destination, version: "123"), **details)
     end
 end

test/commands/builder_test.rb

@@ -6,10 +6,10 @@ class CommandsBuilderTest < ActiveSupport::TestCase
   end
 
   test "target multiarch by default" do
-    builder = new_builder_command
+    builder = new_builder_command(builder: { "cache" => { "type" => "gha" }})
     assert_equal "multiarch", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder kamal-app-multiarch -t dhh/app:123 -t dhh/app:latest --cache-to type=gha --cache-from type=gha --label service=\"app\" --file Dockerfile .",
       builder.push.join(" ")
   end
 
@@ -21,19 +21,27 @@ class CommandsBuilderTest < ActiveSupport::TestCase
       builder.push.join(" ")
   end
 
+  test "target native cached when multiarch is off and cache is set" do
+    builder = new_builder_command(builder: { "multiarch" => false, "cache" => { "type" => "gha" }})
+    assert_equal "native/cached", builder.name
+    assert_equal \
+      "docker buildx build --push -t dhh/app:123 -t dhh/app:latest --cache-to type=gha --cache-from type=gha --label service=\"app\" --file Dockerfile .",
+      builder.push.join(" ")
+  end
+
   test "target multiarch remote when local and remote is set" do
-    builder = new_builder_command(builder: { "local" => { }, "remote" => { } })
+    builder = new_builder_command(builder: { "local" => { }, "remote" => { }, "cache" => { "type" => "gha" } })
     assert_equal "multiarch/remote", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch-remote -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder kamal-app-multiarch-remote -t dhh/app:123 -t dhh/app:latest --cache-to type=gha --cache-from type=gha --label service=\"app\" --file Dockerfile .",
       builder.push.join(" ")
   end
 
   test "target native remote when only remote is set" do
-    builder = new_builder_command(builder: { "remote" => { "arch" => "amd64" } })
+    builder = new_builder_command(builder: { "remote" => { "arch" => "amd64" }, "cache" => { "type" => "gha" } })
     assert_equal "native/remote", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64 --builder mrsk-app-native-remote -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64 --builder kamal-app-native-remote -t dhh/app:123 -t dhh/app:latest --cache-to type=gha --cache-from type=gha --label service=\"app\" --file Dockerfile .",
       builder.push.join(" ")
   end
 
@@ -62,7 +70,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase
   test "missing dockerfile" do
     Pathname.any_instance.expects(:exist?).returns(false).once
     builder = new_builder_command(builder: { "dockerfile" => "Dockerfile.xyz" })
-    assert_raises(Mrsk::Commands::Builder::Base::BuilderError) do
+    assert_raises(Kamal::Commands::Builder::Base::BuilderError) do
       builder.target.build_options.join(" ")
     end
   end
@@ -70,7 +78,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase
   test "build context" do
     builder = new_builder_command(builder: { "context" => ".." })
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile ..",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder kamal-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile ..",
       builder.push.join(" ")
   end
 
@@ -84,7 +92,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase
   test "multiarch push with build args" do
     builder = new_builder_command(builder: { "args" => { "a" => 1, "b" => 2 } })
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder kamal-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" --file Dockerfile .",
       builder.push.join(" ")
   end
 
@@ -97,6 +105,6 @@ class CommandsBuilderTest < ActiveSupport::TestCase
 
   private
     def new_builder_command(additional_config = {})
-      Mrsk::Commands::Builder.new(Mrsk::Configuration.new(@config.merge(additional_config), version: "123"))
+      Kamal::Commands::Builder.new(Kamal::Configuration.new(@config.merge(additional_config), version: "123"))
     end
 end

test/commands/docker_test.rb

@@ -5,7 +5,7 @@ class CommandsDockerTest < ActiveSupport::TestCase
     @config = {
       service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" }, servers: [ "1.1.1.1" ]
     }
-    @docker = Mrsk::Commands::Docker.new(Mrsk::Configuration.new(@config))
+    @docker = Kamal::Commands::Docker.new(Kamal::Configuration.new(@config))
   end
 
   test "install" do

test/commands/healthcheck_test.rb

@@ -10,7 +10,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" dhh/app:123",
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e KAMAL_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" dhh/app:123",
       new_command.run.join(" ")
   end
 
@@ -18,7 +18,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
     @config[:healthcheck] = { "port" => 3001 }
 
     assert_equal \
-      "docker run --detach --name healthcheck-app-123 --publish 3999:3001 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"curl -f http://localhost:3001/up || exit 1\" --health-interval \"1s\" dhh/app:123",
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3001 --label service=healthcheck-app -e KAMAL_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"curl -f http://localhost:3001/up || exit 1\" --health-interval \"1s\" dhh/app:123",
       new_command.run.join(" ")
   end
 
@@ -26,7 +26,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
     @destination = "staging"
 
     assert_equal \
-      "docker run --detach --name healthcheck-app-staging-123 --publish 3999:3000 --label service=healthcheck-app-staging -e MRSK_CONTAINER_NAME=\"healthcheck-app-staging\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" dhh/app:123",
+      "docker run --detach --name healthcheck-app-staging-123 --publish 3999:3000 --label service=healthcheck-app-staging -e KAMAL_CONTAINER_NAME=\"healthcheck-app-staging\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" dhh/app:123",
       new_command.run.join(" ")
   end
 
@@ -34,14 +34,14 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
     @config[:healthcheck] = { "cmd" => "/bin/up" }
 
     assert_equal \
-      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"/bin/up\" --health-interval \"1s\" dhh/app:123",
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e KAMAL_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"/bin/up\" --health-interval \"1s\" dhh/app:123",
       new_command.run.join(" ")
   end
 
   test "run with custom options" do
     @config[:servers] = { "web" => { "hosts" => [ "1.1.1.1" ], "options" => { "mount" => "somewhere" } } }
     assert_equal \
-      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --mount \"somewhere\" dhh/app:123",
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e KAMAL_CONTAINER_NAME=\"healthcheck-app\" --health-cmd \"curl -f http://localhost:3000/up || exit 1\" --health-interval \"1s\" --mount \"somewhere\" dhh/app:123",
       new_command.run.join(" ")
   end
 
@@ -101,6 +101,6 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
 
   private
     def new_command
-      Mrsk::Commands::Healthcheck.new(Mrsk::Configuration.new(@config, destination: @destination, version: "123"))
+      Kamal::Commands::Healthcheck.new(Kamal::Configuration.new(@config, destination: @destination, version: "123"))
     end
 end

test/commands/hook_test.rb

@@ -17,12 +17,12 @@ class CommandsHookTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal [
-      ".mrsk/hooks/foo",
+      ".kamal/hooks/foo",
       { env: {
-        "MRSK_RECORDED_AT" => @recorded_at,
-        "MRSK_PERFORMER" => @performer,
-        "MRSK_VERSION" => "123",
-        "MRSK_SERVICE_VERSION" => "app@123" } }
+        "KAMAL_RECORDED_AT" => @recorded_at,
+        "KAMAL_PERFORMER" => @performer,
+        "KAMAL_VERSION" => "123",
+        "KAMAL_SERVICE_VERSION" => "app@123" } }
     ], new_command.run("foo")
   end
 
@@ -30,15 +30,15 @@ class CommandsHookTest < ActiveSupport::TestCase
     assert_equal [
       "custom/hooks/path/foo",
       { env: {
-        "MRSK_RECORDED_AT" => @recorded_at,
-        "MRSK_PERFORMER" => @performer,
-        "MRSK_VERSION" => "123",
-        "MRSK_SERVICE_VERSION" => "app@123" } }
+        "KAMAL_RECORDED_AT" => @recorded_at,
+        "KAMAL_PERFORMER" => @performer,
+        "KAMAL_VERSION" => "123",
+        "KAMAL_SERVICE_VERSION" => "app@123" } }
     ], new_command(hooks_path: "custom/hooks/path").run("foo")
   end
 
   private
     def new_command(**extra_config)
-      Mrsk::Commands::Hook.new(Mrsk::Configuration.new(@config.merge(**extra_config), version: "123"))
+      Kamal::Commands::Hook.new(Kamal::Configuration.new(@config.merge(**extra_config), version: "123"))
     end
 end

test/commands/lock_test.rb

@@ -10,24 +10,24 @@ class CommandsLockTest < ActiveSupport::TestCase
 
   test "status" do
     assert_equal \
-      "stat mrsk_lock > /dev/null && cat mrsk_lock/details | base64 -d",
+      "stat kamal_lock-app > /dev/null && cat kamal_lock-app/details | base64 -d",
       new_command.status.join(" ")
   end
 
   test "acquire" do
     assert_match \
-      /mkdir mrsk_lock && echo ".*" > mrsk_lock\/details/m,
+      /mkdir kamal_lock-app && echo ".*" > kamal_lock-app\/details/m,
       new_command.acquire("Hello", "123").join(" ")
   end
 
   test "release" do
     assert_match \
-      "rm mrsk_lock/details && rm -r mrsk_lock",
+      "rm kamal_lock-app/details && rm -r kamal_lock-app",
       new_command.release.join(" ")
   end
 
   private
     def new_command
-      Mrsk::Commands::Lock.new(Mrsk::Configuration.new(@config, version: "123"))
+      Kamal::Commands::Lock.new(Kamal::Configuration.new(@config, version: "123"))
     end
 end

test/commands/prune_test.rb

@@ -28,6 +28,6 @@ class CommandsPruneTest < ActiveSupport::TestCase
 
   private
     def new_command
-      Mrsk::Commands::Prune.new(Mrsk::Configuration.new(@config, version: "123"))
+      Kamal::Commands::Prune.new(Kamal::Configuration.new(@config, version: "123"))
     end
 end

test/commands/registry_test.rb

@@ -10,7 +10,7 @@ class CommandsRegistryTest < ActiveSupport::TestCase
       },
       servers: [ "1.1.1.1" ]
     }
-    @registry = Mrsk::Commands::Registry.new Mrsk::Configuration.new(@config)
+    @registry = Kamal::Commands::Registry.new Kamal::Configuration.new(@config)
   end
 
   test "registry login" do
@@ -20,25 +20,25 @@ class CommandsRegistryTest < ActiveSupport::TestCase
   end
 
   test "registry login with ENV password" do
-    ENV["MRSK_REGISTRY_PASSWORD"] = "more-secret"
-    @config[:registry]["password"] = [ "MRSK_REGISTRY_PASSWORD" ]
+    ENV["KAMAL_REGISTRY_PASSWORD"] = "more-secret"
+    @config[:registry]["password"] = [ "KAMAL_REGISTRY_PASSWORD" ]
 
     assert_equal \
       "docker login hub.docker.com -u dhh -p more-secret",
       @registry.login.join(" ")
   ensure
-    ENV.delete("MRSK_REGISTRY_PASSWORD")
+    ENV.delete("KAMAL_REGISTRY_PASSWORD")
   end
 
   test "registry login with ENV username" do
-    ENV["MRSK_REGISTRY_USERNAME"] = "also-secret"
-    @config[:registry]["username"] = [ "MRSK_REGISTRY_USERNAME" ]
+    ENV["KAMAL_REGISTRY_USERNAME"] = "also-secret"
+    @config[:registry]["username"] = [ "KAMAL_REGISTRY_USERNAME" ]
 
     assert_equal \
       "docker login hub.docker.com -u also-secret -p secret",
       @registry.login.join(" ")
   ensure
-    ENV.delete("MRSK_REGISTRY_USERNAME")
+    ENV.delete("KAMAL_REGISTRY_USERNAME")
   end
 
   test "registry logout" do

test/commands/traefik_test.rb

@@ -18,67 +18,67 @@ class CommandsTraefikTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
 
     @config[:traefik]["host_port"] = "8080"
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 8080:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 8080:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
   test "run with ports configured" do
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
 
     @config[:traefik]["options"] = {"publish" => %w[9000:9000 9001:9001]}
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --publish \"9000:9000\" --publish \"9001:9001\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --publish \"9000:9000\" --publish \"9001:9001\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
   test "run with volumes configured" do
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
 
     @config[:traefik]["options"] = {"volume" => %w[./letsencrypt/acme.json:/letsencrypt/acme.json] }
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --volume \"./letsencrypt/acme.json:/letsencrypt/acme.json\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --volume \"./letsencrypt/acme.json:/letsencrypt/acme.json\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
   test "run with several options configured" do
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
 
     @config[:traefik]["options"] = {"volume" => %w[./letsencrypt/acme.json:/letsencrypt/acme.json], "publish" => %w[8080:8080], "memory" => "512m"}
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --volume \"./letsencrypt/acme.json:/letsencrypt/acme.json\" --publish \"8080:8080\" --memory \"512m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --volume \"./letsencrypt/acme.json:/letsencrypt/acme.json\" --publish \"8080:8080\" --memory \"512m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
   test "run with labels configured" do
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
 
     @config[:traefik]["labels"] = { "traefik.http.routers.dashboard.service" => "api@internal", "traefik.http.routers.dashboard.middlewares" => "auth" }
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --label traefik.http.routers.dashboard.service=\"api@internal\" --label traefik.http.routers.dashboard.middlewares=\"auth\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" --label traefik.http.routers.dashboard.service=\"api@internal\" --label traefik.http.routers.dashboard.middlewares=\"auth\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
   test "run with env configured" do
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
 
     @config[:traefik]["env"] = { "secret" => %w[EXAMPLE_API_KEY] }
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock -e EXAMPLE_API_KEY=\"456\" --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock -e EXAMPLE_API_KEY=\"456\" --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
@@ -86,7 +86,7 @@ class CommandsTraefikTest < ActiveSupport::TestCase
     @config.delete(:traefik)
 
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{Mrsk::Commands::Traefik::DEFAULT_IMAGE} --providers.docker --log.level=DEBUG",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{Kamal::Commands::Traefik::DEFAULT_IMAGE} --providers.docker --log.level=\"DEBUG\"",
       new_command.run.join(" ")
   end
 
@@ -94,7 +94,15 @@ class CommandsTraefikTest < ActiveSupport::TestCase
     @config[:logging] = { "driver" => "local", "options" => { "max-size" => "100m", "max-file" => "3" } }
 
     assert_equal \
-      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-driver \"local\" --log-opt max-size=\"100m\" --log-opt max-file=\"3\" #{@image} --providers.docker --log.level=DEBUG --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-driver \"local\" --log-opt max-size=\"100m\" --log-opt max-file=\"3\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      new_command.run.join(" ")
+  end
+
+  test "run with default args overriden" do
+    @config[:traefik]["args"]["log.level"] = "ERROR"
+
+    assert_equal \
+    "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"ERROR\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
   end
 
@@ -166,6 +174,6 @@ class CommandsTraefikTest < ActiveSupport::TestCase
 
   private
     def new_command
-      Mrsk::Commands::Traefik.new(Mrsk::Configuration.new(@config, version: "123"))
+      Kamal::Commands::Traefik.new(Kamal::Configuration.new(@config, version: "123"))
     end
 end

test/configuration/accessory_test.rb

@@ -66,7 +66,7 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
       }
     }
 
-    @config = Mrsk::Configuration.new(@deploy)
+    @config = Kamal::Configuration.new(@deploy)
   end
 
   test "service name" do
@@ -87,7 +87,7 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
 
   test "missing host" do
     @deploy[:accessories]["mysql"]["host"] = nil
-    @config = Mrsk::Configuration.new(@deploy)
+    @config = Kamal::Configuration.new(@deploy)
 
     assert_raises(ArgumentError) do
       @config.accessory(:mysql).hosts
@@ -97,7 +97,7 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
   test "setting host, hosts and roles" do
     @deploy[:accessories]["mysql"]["hosts"] = true
     @deploy[:accessories]["mysql"]["roles"] = true
-    @config = Mrsk::Configuration.new(@deploy)
+    @config = Kamal::Configuration.new(@deploy)
 
     exception = assert_raises(ArgumentError) do
       @config.accessory(:mysql).hosts
@@ -114,8 +114,8 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
     ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
 
     @config.accessory(:mysql).env_args.tap do |env_args|
-      assert_equal ["-e", "MYSQL_ROOT_PASSWORD=\"secret123\"", "-e", "MYSQL_ROOT_HOST=\"%\""], Mrsk::Utils.unredacted(env_args)
-      assert_equal ["-e", "MYSQL_ROOT_PASSWORD=[REDACTED]", "-e", "MYSQL_ROOT_HOST=\"%\""], Mrsk::Utils.redacted(env_args)
+      assert_equal ["-e", "MYSQL_ROOT_PASSWORD=\"secret123\"", "-e", "MYSQL_ROOT_HOST=\"%\""], Kamal::Utils.unredacted(env_args)
+      assert_equal ["-e", "MYSQL_ROOT_PASSWORD=[REDACTED]", "-e", "MYSQL_ROOT_HOST=\"%\""], Kamal::Utils.redacted(env_args)
     end
   ensure
     ENV["MYSQL_ROOT_PASSWORD"] = nil
@@ -132,7 +132,7 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
 
   test "dynamic file expansion" do
     @deploy[:accessories]["mysql"]["files"] << "test/fixtures/files/structure.sql.erb:/docker-entrypoint-initdb.d/structure.sql"
-    @config = Mrsk::Configuration.new(@deploy)
+    @config = Kamal::Configuration.new(@deploy)
 
     assert_match "This was dynamically expanded", @config.accessory(:mysql).files.keys[2].read
     assert_match "%", @config.accessory(:mysql).files.keys[2].read

test/configuration/builder_test.rb

@@ -0,0 +1,151 @@
+require "test_helper"
+
+class ConfigurationBuilderTest < ActiveSupport::TestCase
+  setup do
+    @deploy = {
+      service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" },
+      servers: [ "1.1.1.1" ]
+    }
+
+    @config = Kamal::Configuration.new(@deploy)
+
+    @deploy_with_builder_option = {
+      service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" },
+      servers: [ "1.1.1.1" ],
+      builder: {}
+    }
+
+    @config_with_builder_option = Kamal::Configuration.new(@deploy_with_builder_option)
+  end
+
+  test "multiarch?" do
+    assert_equal true, @config.builder.multiarch?
+  end
+
+  test "setting multiarch to false" do
+    @deploy_with_builder_option[:builder] = { "multiarch" => false }
+
+    assert_equal false, @config_with_builder_option.builder.multiarch?
+  end
+
+  test "local?" do
+    assert_equal false, @config.builder.local?
+  end
+
+  test "remote?" do
+    assert_equal false, @config.builder.remote?
+  end
+
+  test "remote_arch" do
+    assert_nil @config.builder.remote_arch
+  end
+
+  test "remote_host" do
+    assert_nil @config.builder.remote_host
+  end
+
+  test "setting both local and remote configs" do
+    @deploy_with_builder_option[:builder] = {
+      "local" => { "arch" => "arm64", "host" => "unix:///Users/<%= `whoami`.strip %>/.docker/run/docker.sock" },
+      "remote" => { "arch" => "amd64", "host" => "ssh://root@192.168.0.1" }
+    }
+
+    assert_equal true, @config_with_builder_option.builder.local?
+    assert_equal true, @config_with_builder_option.builder.remote?
+
+    assert_equal "amd64", @config_with_builder_option.builder.remote_arch
+    assert_equal "ssh://root@192.168.0.1", @config_with_builder_option.builder.remote_host
+
+    assert_equal "arm64", @config_with_builder_option.builder.local_arch
+    assert_equal "unix:///Users/<%= `whoami`.strip %>/.docker/run/docker.sock", @config_with_builder_option.builder.local_host
+  end
+
+  test "cached?" do
+    assert_equal false, @config.builder.cached?
+  end
+
+  test "invalid cache type specified" do
+    @deploy_with_builder_option[:builder] = { "cache" => { "type" => "invalid" } }
+
+    assert_raises(ArgumentError) do
+      @config_with_builder_option.builder
+    end
+  end
+
+  test "cache_from" do
+    assert_nil @config.builder.cache_from
+  end
+
+  test "cache_to" do
+    assert_nil @config.builder.cache_to
+  end
+
+  test "setting gha cache" do
+    @deploy_with_builder_option[:builder] = { "cache" => { "type" => "gha", "options" => "mode=max" } }
+
+    assert_equal "type=gha", @config_with_builder_option.builder.cache_from
+    assert_equal "type=gha,mode=max", @config_with_builder_option.builder.cache_to
+  end
+
+  test "setting registry cache" do
+    @deploy_with_builder_option[:builder] = { "cache" => { "type" => "registry", "options" => "mode=max,image-manifest=true,oci-mediatypes=true" } }
+
+    assert_equal "type=registry,ref=dhh/app-build-cache", @config_with_builder_option.builder.cache_from
+    assert_equal "type=registry,mode=max,image-manifest=true,oci-mediatypes=true,ref=dhh/app-build-cache", @config_with_builder_option.builder.cache_to
+  end
+
+  test "setting registry cache when using a custom registry" do
+    @config_with_builder_option.registry["server"] = "registry.example.com"
+    @deploy_with_builder_option[:builder] = { "cache" => { "type" => "registry", "options" => "mode=max,image-manifest=true,oci-mediatypes=true" } }
+
+    assert_equal "type=registry,ref=registry.example.com/dhh/app-build-cache", @config_with_builder_option.builder.cache_from
+    assert_equal "type=registry,mode=max,image-manifest=true,oci-mediatypes=true,ref=registry.example.com/dhh/app-build-cache", @config_with_builder_option.builder.cache_to
+  end
+
+  test "setting registry cache with image" do
+    @deploy_with_builder_option[:builder] = { "cache" => { "type" => "registry", "image" => "kamal", "options" => "mode=max" } }
+
+    assert_equal "type=registry,ref=kamal", @config_with_builder_option.builder.cache_from
+    assert_equal "type=registry,mode=max,ref=kamal", @config_with_builder_option.builder.cache_to
+  end
+
+  test "args" do
+    assert_equal({}, @config.builder.args)
+  end
+
+  test "setting args" do
+    @deploy_with_builder_option[:builder] = { "args" => { "key" => "value" } }
+
+    assert_equal({ "key" => "value" }, @config_with_builder_option.builder.args)
+  end
+
+  test "secrets" do
+    assert_equal [], @config.builder.secrets
+  end
+
+  test "setting secrets" do
+    @deploy_with_builder_option[:builder] = { "secrets" => ["GITHUB_TOKEN"] }
+
+    assert_equal ["GITHUB_TOKEN"], @config_with_builder_option.builder.secrets
+  end
+
+  test "dockerfile" do
+    assert_equal "Dockerfile", @config.builder.dockerfile
+  end
+
+  test "setting dockerfile" do
+    @deploy_with_builder_option[:builder] = { "dockerfile" => "Dockerfile.dev" }
+
+    assert_equal "Dockerfile.dev", @config_with_builder_option.builder.dockerfile
+  end
+
+  test "context" do
+    assert_equal ".", @config.builder.context
+  end
+
+  test "setting context" do
+    @deploy_with_builder_option[:builder] = { "context" => ".." }
+
+    assert_equal "..", @config_with_builder_option.builder.context
+  end
+end

test/configuration/role_test.rb

@@ -8,7 +8,7 @@ class ConfigurationRoleTest < ActiveSupport::TestCase
       env: { "REDIS_URL" => "redis://x/y" }
     }
 
-    @config = Mrsk::Configuration.new(@deploy)
+    @config = Kamal::Configuration.new(@deploy)
 
     @deploy_with_roles = @deploy.dup.merge({
       servers: {
@@ -24,7 +24,7 @@ class ConfigurationRoleTest < ActiveSupport::TestCase
       }
     })
 
-    @config_with_roles = Mrsk::Configuration.new(@deploy_with_roles)
+    @config_with_roles = Kamal::Configuration.new(@deploy_with_roles)
   end
 
   test "hosts" do
@@ -62,7 +62,7 @@ class ConfigurationRoleTest < ActiveSupport::TestCase
   end
 
   test "default traefik label on non-web role" do
-    config = Mrsk::Configuration.new(@deploy_with_roles.tap { |c|
+    config = Kamal::Configuration.new(@deploy_with_roles.tap { |c|
       c[:servers]["beta"] = { "traefik" => "true", "hosts" => [ "1.1.1.5" ] }
     })
 
@@ -98,8 +98,8 @@ class ConfigurationRoleTest < ActiveSupport::TestCase
     ENV["DB_PASSWORD"] = "secret&\"123"
 
     @config_with_roles.role(:workers).env_args.tap do |env_args|
-      assert_equal ["-e", "REDIS_PASSWORD=\"secret456\"", "-e", "DB_PASSWORD=\"secret&\\\"123\"", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Mrsk::Utils.unredacted(env_args)
-      assert_equal ["-e", "REDIS_PASSWORD=[REDACTED]", "-e", "DB_PASSWORD=[REDACTED]", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Mrsk::Utils.redacted(env_args)
+      assert_equal ["-e", "REDIS_PASSWORD=\"secret456\"", "-e", "DB_PASSWORD=\"secret&\\\"123\"", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Kamal::Utils.unredacted(env_args)
+      assert_equal ["-e", "REDIS_PASSWORD=[REDACTED]", "-e", "DB_PASSWORD=[REDACTED]", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Kamal::Utils.redacted(env_args)
     end
   ensure
     ENV["REDIS_PASSWORD"] = nil
@@ -120,8 +120,8 @@ class ConfigurationRoleTest < ActiveSupport::TestCase
     ENV["DB_PASSWORD"] = "secret123"
 
     @config_with_roles.role(:workers).env_args.tap do |env_args|
-      assert_equal ["-e", "DB_PASSWORD=\"secret123\"", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Mrsk::Utils.unredacted(env_args)
-      assert_equal ["-e", "DB_PASSWORD=[REDACTED]", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Mrsk::Utils.redacted(env_args)
+      assert_equal ["-e", "DB_PASSWORD=\"secret123\"", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Kamal::Utils.unredacted(env_args)
+      assert_equal ["-e", "DB_PASSWORD=[REDACTED]", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Kamal::Utils.redacted(env_args)
     end
   ensure
     ENV["DB_PASSWORD"] = nil
@@ -140,8 +140,8 @@ class ConfigurationRoleTest < ActiveSupport::TestCase
     ENV["REDIS_PASSWORD"] = "secret456"
 
     @config_with_roles.role(:workers).env_args.tap do |env_args|
-      assert_equal ["-e", "REDIS_PASSWORD=\"secret456\"", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Mrsk::Utils.unredacted(env_args)
-      assert_equal ["-e", "REDIS_PASSWORD=[REDACTED]", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Mrsk::Utils.redacted(env_args)
+      assert_equal ["-e", "REDIS_PASSWORD=\"secret456\"", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Kamal::Utils.unredacted(env_args)
+      assert_equal ["-e", "REDIS_PASSWORD=[REDACTED]", "-e", "REDIS_URL=\"redis://a/b\"", "-e", "WEB_CONCURRENCY=\"4\""], Kamal::Utils.redacted(env_args)
     end
   ensure
     ENV["REDIS_PASSWORD"] = nil

test/configuration/ssh_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+class ConfigurationSshTest < ActiveSupport::TestCase
+  setup do
+    @deploy = {
+      service: "app", image: "dhh/app",
+      registry: { "username" => "dhh", "password" => "secret" },
+      env: { "REDIS_URL" => "redis://x/y" },
+      servers: [ "1.1.1.1", "1.1.1.2" ],
+      volumes: ["/local/path:/container/path"]
+    }
+
+    @config = Kamal::Configuration.new(@deploy)
+  end
+
+  test "ssh options" do
+    assert_equal "root", @config.ssh.options[:user]
+
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "user" => "app" }) })
+    assert_equal "app", config.ssh.options[:user]
+    assert_equal 4, config.ssh.options[:logger].level
+
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "log_level" => "debug" }) })
+    assert_equal 0, config.ssh.options[:logger].level
+  end
+
+  test "ssh options with proxy host" do
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "proxy" => "1.2.3.4" }) })
+    assert_equal "root@1.2.3.4", config.ssh.options[:proxy].jump_proxies
+  end
+
+  test "ssh options with proxy host and user" do
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "proxy" => "app@1.2.3.4" }) })
+    assert_equal "app@1.2.3.4", config.ssh.options[:proxy].jump_proxies
+  end
+end

test/configuration/sshkit_test.rb

@@ -0,0 +1,27 @@
+require "test_helper"
+
+class ConfigurationSshkitTest < ActiveSupport::TestCase
+  setup do
+    @deploy = {
+      service: "app", image: "dhh/app",
+      registry: { "username" => "dhh", "password" => "secret" },
+      env: { "REDIS_URL" => "redis://x/y" },
+      servers: [ "1.1.1.1", "1.1.1.2" ],
+      volumes: ["/local/path:/container/path"]
+    }
+
+    @config = Kamal::Configuration.new(@deploy)
+  end
+
+  test "sshkit max concurrent starts" do
+    assert_equal 30, @config.sshkit.max_concurrent_starts
+    @config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(sshkit: { "max_concurrent_starts" => 50 }) })
+    assert_equal 50, @config.sshkit.max_concurrent_starts
+  end
+
+  test "sshkit pool idle timeout" do
+    assert_equal 900, @config.sshkit.pool_idle_timeout
+    @config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(sshkit: { "pool_idle_timeout" => 600 }) })
+    assert_equal 600, @config.sshkit.pool_idle_timeout
+  end
+end

test/configuration_test.rb

@@ -13,12 +13,12 @@ class ConfigurationTest < ActiveSupport::TestCase
       volumes: ["/local/path:/container/path"]
     }
 
-    @config = Mrsk::Configuration.new(@deploy)
+    @config = Kamal::Configuration.new(@deploy)
 
     @deploy_with_roles = @deploy.dup.merge({
       servers: { "web" => [ "1.1.1.1", "1.1.1.2" ], "workers" => { "hosts" => [ "1.1.1.1", "1.1.1.3" ] } } })
 
-    @config_with_roles = Mrsk::Configuration.new(@deploy_with_roles)
+    @config_with_roles = Kamal::Configuration.new(@deploy_with_roles)
   end
 
   teardown do
@@ -29,7 +29,7 @@ class ConfigurationTest < ActiveSupport::TestCase
   %i[ service image registry ].each do |key|
     test "#{key} config required" do
       assert_raise(ArgumentError) do
-        Mrsk::Configuration.new @deploy.tap { _1.delete key }
+        Kamal::Configuration.new @deploy.tap { _1.delete key }
       end
     end
   end
@@ -37,7 +37,7 @@ class ConfigurationTest < ActiveSupport::TestCase
   %w[ username password ].each do |key|
     test "registry #{key} required" do
       assert_raise(ArgumentError) do
-        Mrsk::Configuration.new @deploy.tap { _1[:registry].delete key }
+        Kamal::Configuration.new @deploy.tap { _1[:registry].delete key }
       end
     end
   end
@@ -67,7 +67,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal [ "1.1.1.1", "1.1.1.2" ], @config_with_roles.traefik_hosts
 
     @deploy_with_roles[:servers]["workers"]["traefik"] = true
-    config = Mrsk::Configuration.new(@deploy_with_roles)
+    config = Kamal::Configuration.new(@deploy_with_roles)
 
     assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3" ], config.traefik_hosts
   end
@@ -84,7 +84,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     ENV.delete("VERSION")
 
     @config.expects(:`).with("git rev-parse HEAD").returns("git-version")
-    @config.expects(:`).with("git status --porcelain").returns("")
+    Kamal::Utils.expects(:uncommitted_changes).returns("")
     assert_equal "git-version", @config.version
   end
 
@@ -92,7 +92,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     ENV.delete("VERSION")
 
     @config.expects(:`).with("git rev-parse HEAD").returns("git-version")
-    @config.expects(:`).with("git status --porcelain").returns("M   file\n")
+    Kamal::Utils.expects(:uncommitted_changes).returns("M   file\n")
     assert_match /^git-version_uncommitted_[0-9a-f]{16}$/, @config.version
   end
 
@@ -109,14 +109,14 @@ class ConfigurationTest < ActiveSupport::TestCase
   test "repository" do
     assert_equal "dhh/app", @config.repository
 
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c[:registry].merge!({ "server" => "ghcr.io" }) })
+    config = Kamal::Configuration.new(@deploy.tap { |c| c[:registry].merge!({ "server" => "ghcr.io" }) })
     assert_equal "ghcr.io/dhh/app", config.repository
   end
 
   test "absolute image" do
     assert_equal "dhh/app:missing", @config.absolute_image
 
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c[:registry].merge!({ "server" => "ghcr.io" }) })
+    config = Kamal::Configuration.new(@deploy.tap { |c| c[:registry].merge!({ "server" => "ghcr.io" }) })
     assert_equal "ghcr.io/dhh/app:missing", config.absolute_image
   end
 
@@ -131,18 +131,18 @@ class ConfigurationTest < ActiveSupport::TestCase
   test "env args with clear and secrets" do
     ENV["PASSWORD"] = "secret123"
 
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!({
       env: { "clear" => { "PORT" => "3000" }, "secret" => [ "PASSWORD" ] }
     }) })
 
-    assert_equal [ "-e", "PASSWORD=\"secret123\"", "-e", "PORT=\"3000\"" ], Mrsk::Utils.unredacted(config.env_args)
-    assert_equal [ "-e", "PASSWORD=[REDACTED]", "-e", "PORT=\"3000\"" ], Mrsk::Utils.redacted(config.env_args)
+    assert_equal [ "-e", "PASSWORD=\"secret123\"", "-e", "PORT=\"3000\"" ], Kamal::Utils.unredacted(config.env_args)
+    assert_equal [ "-e", "PASSWORD=[REDACTED]", "-e", "PORT=\"3000\"" ], Kamal::Utils.redacted(config.env_args)
   ensure
     ENV["PASSWORD"] = nil
   end
 
   test "env args with only clear" do
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!({
       env: { "clear" => { "PORT" => "3000" } }
     }) })
 
@@ -152,21 +152,21 @@ class ConfigurationTest < ActiveSupport::TestCase
   test "env args with only secrets" do
     ENV["PASSWORD"] = "secret123"
 
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!({
       env: { "secret" => [ "PASSWORD" ] }
     }) })
 
-    assert_equal [ "-e", "PASSWORD=\"secret123\"" ], Mrsk::Utils.unredacted(config.env_args)
-    assert_equal [ "-e", "PASSWORD=[REDACTED]" ], Mrsk::Utils.redacted(config.env_args)
+    assert_equal [ "-e", "PASSWORD=\"secret123\"" ], Kamal::Utils.unredacted(config.env_args)
+    assert_equal [ "-e", "PASSWORD=[REDACTED]" ], Kamal::Utils.redacted(config.env_args)
   ensure
     ENV["PASSWORD"] = nil
   end
 
   test "env args with missing secret" do
     assert_raises(KeyError) do
-      config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!({
+      config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!({
         env: { "secret" => [ "PASSWORD" ] }
-      }) })
+      }) }).ensure_env_available
     end
   end
 
@@ -178,52 +178,35 @@ class ConfigurationTest < ActiveSupport::TestCase
   test "hosts required for all roles" do
     # Empty server list for implied web role
     assert_raises(ArgumentError) do
-      Mrsk::Configuration.new @deploy.merge(servers: [])
+      Kamal::Configuration.new @deploy.merge(servers: [])
     end
 
     # Empty server list
     assert_raises(ArgumentError) do
-      Mrsk::Configuration.new @deploy.merge(servers: { "web" => [] })
+      Kamal::Configuration.new @deploy.merge(servers: { "web" => [] })
     end
 
     # Missing hosts key
     assert_raises(ArgumentError) do
-      Mrsk::Configuration.new @deploy.merge(servers: { "web" => {} })
+      Kamal::Configuration.new @deploy.merge(servers: { "web" => {} })
     end
 
     # Empty hosts list
     assert_raises(ArgumentError) do
-      Mrsk::Configuration.new @deploy.merge(servers: { "web" => { "hosts" => [] } })
+      Kamal::Configuration.new @deploy.merge(servers: { "web" => { "hosts" => [] } })
     end
 
     # Nil hosts
     assert_raises(ArgumentError) do
-      Mrsk::Configuration.new @deploy.merge(servers: { "web" => { "hosts" => nil } })
+      Kamal::Configuration.new @deploy.merge(servers: { "web" => { "hosts" => nil } })
     end
 
     # One role with hosts, one without
     assert_raises(ArgumentError) do
-      Mrsk::Configuration.new @deploy.merge(servers: { "web" => %w[ web ], "workers" => { "hosts" => %w[ ] } })
+      Kamal::Configuration.new @deploy.merge(servers: { "web" => %w[ web ], "workers" => { "hosts" => %w[ ] } })
     end
   end
 
-  test "ssh options" do
-    assert_equal "root", @config.ssh_options[:user]
-
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "user" => "app" }) })
-    assert_equal "app", @config.ssh_options[:user]
-  end
-
-  test "ssh options with proxy host" do
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "proxy" => "1.2.3.4" }) })
-    assert_equal "root@1.2.3.4", @config.ssh_options[:proxy].jump_proxies
-  end
-
-  test "ssh options with proxy host and user" do
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!(ssh: { "proxy" => "app@1.2.3.4" }) })
-    assert_equal "app@1.2.3.4", @config.ssh_options[:proxy].jump_proxies
-  end
-
   test "volume_args" do
     assert_equal ["--volume", "/local/path:/container/path"], @config.volume_args
   end
@@ -233,27 +216,27 @@ class ConfigurationTest < ActiveSupport::TestCase
   end
 
   test "logging args with configured options" do
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!(logging: { "options" => { "max-size" => "100m", "max-file" => 5 } }) })
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(logging: { "options" => { "max-size" => "100m", "max-file" => 5 } }) })
     assert_equal ["--log-opt", "max-size=\"100m\"", "--log-opt", "max-file=\"5\""], @config.logging_args
   end
 
   test "logging args with configured driver and options" do
-    config = Mrsk::Configuration.new(@deploy.tap { |c| c.merge!(logging: { "driver" => "local", "options" => { "max-size" => "100m", "max-file" => 5 } }) })
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(logging: { "driver" => "local", "options" => { "max-size" => "100m", "max-file" => 5 } }) })
     assert_equal ["--log-driver", "\"local\"", "--log-opt", "max-size=\"100m\"", "--log-opt", "max-file=\"5\""], @config.logging_args
   end
 
   test "erb evaluation of yml config" do
-    config = Mrsk::Configuration.create_from config_file: Pathname.new(File.expand_path("fixtures/deploy.erb.yml", __dir__))
+    config = Kamal::Configuration.create_from config_file: Pathname.new(File.expand_path("fixtures/deploy.erb.yml", __dir__))
     assert_equal "my-user", config.registry["username"]
   end
 
   test "destination yml config merge" do
     dest_config_file = Pathname.new(File.expand_path("fixtures/deploy_for_dest.yml", __dir__))
 
-    config = Mrsk::Configuration.create_from config_file: dest_config_file, destination: "world"
+    config = Kamal::Configuration.create_from config_file: dest_config_file, destination: "world"
     assert_equal "1.1.1.1", config.all_hosts.first
 
-    config = Mrsk::Configuration.create_from config_file: dest_config_file, destination: "mars"
+    config = Kamal::Configuration.create_from config_file: dest_config_file, destination: "mars"
     assert_equal "1.1.1.3", config.all_hosts.first
   end
 
@@ -261,11 +244,43 @@ class ConfigurationTest < ActiveSupport::TestCase
     dest_config_file = Pathname.new(File.expand_path("fixtures/deploy_for_dest.yml", __dir__))
 
     assert_raises(RuntimeError) do
-      config = Mrsk::Configuration.create_from config_file: dest_config_file, destination: "missing"
+      config = Kamal::Configuration.create_from config_file: dest_config_file, destination: "missing"
     end
   end
 
   test "to_h" do
-    assert_equal({ :roles=>["web"], :hosts=>["1.1.1.1", "1.1.1.2"], :primary_host=>"1.1.1.1", :version=>"missing", :repository=>"dhh/app", :absolute_image=>"dhh/app:missing", :service_with_version=>"app-missing", :env_args=>["-e", "REDIS_URL=\"redis://x/y\""], :ssh_options=>{:user=>"root", :auth_methods=>["publickey"]}, :volume_args=>["--volume", "/local/path:/container/path"], :logging=>["--log-opt", "max-size=\"10m\""], :healthcheck=>{"path"=>"/up", "port"=>3000, "max_attempts" => 7 }}, @config.to_h)
+    expected_config = \
+      { :roles=>["web"],
+        :hosts=>["1.1.1.1", "1.1.1.2"],
+        :primary_host=>"1.1.1.1",
+        :version=>"missing",
+        :repository=>"dhh/app",
+        :absolute_image=>"dhh/app:missing",
+        :service_with_version=>"app-missing",
+        :env_args=>["-e", "REDIS_URL=\"redis://x/y\""],
+        :ssh_options=>{ :user=>"root", :auth_methods=>["publickey"], log_level: :fatal, keepalive: true, keepalive_interval: 30 },
+        :sshkit=>{},
+        :volume_args=>["--volume", "/local/path:/container/path"],
+        :builder=>{},
+        :logging=>["--log-opt", "max-size=\"10m\""],
+        :healthcheck=>{ "path"=>"/up", "port"=>3000, "max_attempts" => 7 }}
+
+    assert_equal expected_config, @config.to_h
+  end
+
+  test "min version is lower" do
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(minimum_version: "0.0.1") })
+    assert_equal "0.0.1", config.minimum_version
+  end
+
+  test "min version is equal" do
+    config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(minimum_version: Kamal::VERSION) })
+    assert_equal Kamal::VERSION, config.minimum_version
+  end
+
+  test "min version is higher" do
+    assert_raises(ArgumentError) do
+      Kamal::Configuration.new(@deploy.tap { |c| c.merge!(minimum_version: "10000.0.0") })
+    end
   end
 end

test/fixtures/deploy_with_secrets.yml

@@ -0,0 +1,11 @@
+service: app
+image: dhh/app
+servers:
+  - "1.1.1.1"
+  - "1.1.1.2"
+registry:
+  username: user
+  password: pw
+env:
+  secret:
+    - PASSWORD

test/integration/accessory_test.rb

@@ -2,22 +2,22 @@ require_relative "integration_test"
 
 class AccessoryTest < IntegrationTest
   test "boot, stop, start, restart, logs, remove" do
-    mrsk :accessory, :boot, :busybox
+    kamal :accessory, :boot, :busybox
     assert_accessory_running :busybox
 
-    mrsk :accessory, :stop, :busybox
+    kamal :accessory, :stop, :busybox
     assert_accessory_not_running :busybox
 
-    mrsk :accessory, :start, :busybox
+    kamal :accessory, :start, :busybox
     assert_accessory_running :busybox
 
-    mrsk :accessory, :restart, :busybox
+    kamal :accessory, :restart, :busybox
     assert_accessory_running :busybox
 
-    logs = mrsk :accessory, :logs, :busybox, capture: true
+    logs = kamal :accessory, :logs, :busybox, capture: true
     assert_match /Starting busybox.../, logs
 
-    mrsk :accessory, :remove, :busybox, "-y"
+    kamal :accessory, :remove, :busybox, "-y"
     assert_accessory_not_running :busybox
   end
 
@@ -31,6 +31,6 @@ class AccessoryTest < IntegrationTest
     end
 
     def accessory_details(name)
-      mrsk :accessory, :details, name, capture: true
+      kamal :accessory, :details, name, capture: true
     end
 end