dash 3.1.5 → 3.2.1

data/lib/{kamal → dash}/utils.rb

@@ -1,6 +1,6 @@
 require "active_support/core_ext/object/try"
 
-module Kamal::Utils
+module Dash::Utils
   extend self
 
   DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX = /\$(?!{[^\}]*\})/
@@ -31,13 +31,13 @@ module Kamal::Utils
           "--#{key}"
         else
           rendered = "--#{key}#{with}#{escape ? escape_shell_value(value) : value}"
-          value.is_a?(Kamal::Utils::Sensitive) ? sensitive(rendered, redaction: "--#{key}#{with}#{value.redaction}") : rendered
+          value.is_a?(Dash::Utils::Sensitive) ? sensitive(rendered, redaction: "--#{key}#{with}#{value.redaction}") : rendered
         end
       end
     else
       flatten_args(args).collect do |(key, value)|
         rendered = value == true ? nil : escape ? escape_shell_value(value) : value
-        rendered = sensitive(rendered, redaction: value.redaction) if value.is_a?(Kamal::Utils::Sensitive)
+        rendered = sensitive(rendered, redaction: value.redaction) if value.is_a?(Dash::Utils::Sensitive)
         [ "--#{key}", rendered ]
       end
     end
@@ -47,8 +47,18 @@ module Kamal::Utils
 
   # kamal-proxy takes durations as Go duration strings; deploy.yml takes plain
   # seconds. Zero is a real value (it disables the timeout), so only nil drops out.
+  #
+  # A value that already carries a unit is passed through untouched. Appending
+  # "s" to it would not just be redundant, it would change the meaning: "5m"
+  # would become "5ms", which Go parses happily as five milliseconds. An
+  # operator who writes a Go duration should get the duration they wrote or an
+  # error from the proxy, never a silently different one.
+  NUMERIC_DURATION = /\A-?\d+(\.\d+)?\z/
+
   def seconds_duration(value)
-    "#{value}s" if value
+    return if value.nil?
+
+    value.to_s.match?(NUMERIC_DURATION) ? "#{value}s" : value.to_s
   end
 
   # Flattens a one-to-many structure into an array of two-element arrays each containing a key-value pair
@@ -60,7 +70,7 @@ module Kamal::Utils
   # Pass `redaction:` to change the default `"[REDACTED]"` redaction, e.g.
   # `sensitive "#{arg}=#{secret}", redaction: "#{arg}=xxxx"
   def sensitive(...)
-    Kamal::Utils::Sensitive.new(...)
+    Dash::Utils::Sensitive.new(...)
   end
 
   def redacted(value)

data/lib/dash/version.rb

@@ -0,0 +1,3 @@
+module Dash
+  VERSION = "3.2.1"
+end

data/lib/{kamal.rb → dash.rb}

@@ -1,4 +1,4 @@
-module Kamal
+module Dash
   class ConfigurationError < StandardError; end
 end
 
@@ -8,11 +8,11 @@ require "yaml"
 require "tmpdir"
 require "pathname"
 require "uri"
-# Proxy::Run.digest reaches for Digest::SHA256 from inside `on(KAMAL.proxy_hosts)`,
+# Proxy::Run.digest reaches for Digest::SHA256 from inside `on(DASH.proxy_hosts)`,
 # so the first reference happens in several SSHKit threads at once. Digest defines
 # SHA256 lazily — `Digest.const_missing(:SHA256)` runs `require "digest/sha2"`, and
 # that path is not mutex-guarded — so the threads race it and one loses with
-# "Digest::Base cannot be directly inherited in Ruby", failing `kamal proxy boot`
+# "Digest::Base cannot be directly inherited in Ruby", failing `dash proxy boot`
 # on a random host.
 #
 # Requiring "digest" alone does NOT fix this: it defines the module but leaves
@@ -21,6 +21,6 @@ require "uri"
 require "digest/sha2"
 
 loader = Zeitwerk::Loader.for_gem
-loader.ignore(File.join(__dir__, "kamal", "sshkit_with_ext.rb"))
+loader.ignore(File.join(__dir__, "dash", "sshkit_with_ext.rb"))
 loader.setup
-loader.eager_load_namespace(Kamal::Cli) # We need all commands loaded.
+loader.eager_load_namespace(Dash::Cli) # We need all commands loaded.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dash
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.1
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
@@ -161,230 +167,179 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-email: mikael@mhenrixon.com
+email: mikael@zoolutions.llc
 executables:
 - dash
-- kamal
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
 - bin/dash
-- bin/kamal
-- lib/kamal.rb
-- lib/kamal/cli.rb
-- lib/kamal/cli/accessory.rb
-- lib/kamal/cli/alias/command.rb
-- lib/kamal/cli/app.rb
-- lib/kamal/cli/app/assets.rb
-- lib/kamal/cli/app/boot.rb
-- lib/kamal/cli/app/error_pages.rb
-- lib/kamal/cli/app/rollout_boot.rb
-- lib/kamal/cli/app/ssl_certificates.rb
-- lib/kamal/cli/base.rb
-- lib/kamal/cli/build.rb
-- lib/kamal/cli/build/clone.rb
-- lib/kamal/cli/build/port_forwarding.rb
-- lib/kamal/cli/doctor.rb
-- lib/kamal/cli/doctor/config_checks.rb
-- lib/kamal/cli/doctor/endpoint_checks.rb
-- lib/kamal/cli/doctor/host_checks.rb
-- lib/kamal/cli/healthcheck/barrier.rb
-- lib/kamal/cli/healthcheck/drift_error.rb
-- lib/kamal/cli/healthcheck/error.rb
-- lib/kamal/cli/healthcheck/poller.rb
-- lib/kamal/cli/lock.rb
-- lib/kamal/cli/main.rb
-- lib/kamal/cli/proxy.rb
-- lib/kamal/cli/proxy/drift.rb
-- lib/kamal/cli/proxy/loadbalancer_claim.rb
-- lib/kamal/cli/proxy/loadbalancer_reboot.rb
-- lib/kamal/cli/proxy/reboot.rb
-- lib/kamal/cli/prune.rb
-- lib/kamal/cli/registry.rb
-- lib/kamal/cli/secrets.rb
-- lib/kamal/cli/server.rb
-- lib/kamal/cli/templates/deploy.yml
-- lib/kamal/cli/templates/sample_hooks/docker-setup.sample
-- lib/kamal/cli/templates/sample_hooks/post-app-boot.sample
-- lib/kamal/cli/templates/sample_hooks/post-app-stop.sample
-- lib/kamal/cli/templates/sample_hooks/post-deploy.sample
-- lib/kamal/cli/templates/sample_hooks/post-proxy-deploy.sample
-- lib/kamal/cli/templates/sample_hooks/post-proxy-reboot.sample
-- lib/kamal/cli/templates/sample_hooks/pre-app-boot.sample
-- lib/kamal/cli/templates/sample_hooks/pre-app-stop.sample
-- lib/kamal/cli/templates/sample_hooks/pre-build.sample
-- lib/kamal/cli/templates/sample_hooks/pre-connect.sample
-- lib/kamal/cli/templates/sample_hooks/pre-deploy.sample
-- lib/kamal/cli/templates/sample_hooks/pre-proxy-deploy.sample
-- lib/kamal/cli/templates/sample_hooks/pre-proxy-reboot.sample
-- lib/kamal/cli/templates/secrets
-- lib/kamal/commander.rb
-- lib/kamal/commander/specifics.rb
-- lib/kamal/commands.rb
-- lib/kamal/commands/accessory.rb
-- lib/kamal/commands/accessory/proxy.rb
-- lib/kamal/commands/app.rb
-- lib/kamal/commands/app/assets.rb
-- lib/kamal/commands/app/containers.rb
-- lib/kamal/commands/app/error_pages.rb
-- lib/kamal/commands/app/execution.rb
-- lib/kamal/commands/app/images.rb
-- lib/kamal/commands/app/logging.rb
-- lib/kamal/commands/app/proxy.rb
-- lib/kamal/commands/auditor.rb
-- lib/kamal/commands/base.rb
-- lib/kamal/commands/builder.rb
-- lib/kamal/commands/builder/base.rb
-- lib/kamal/commands/builder/clone.rb
-- lib/kamal/commands/builder/cloud.rb
-- lib/kamal/commands/builder/hybrid.rb
-- lib/kamal/commands/builder/local.rb
-- lib/kamal/commands/builder/pack.rb
-- lib/kamal/commands/builder/remote.rb
-- lib/kamal/commands/docker.rb
-- lib/kamal/commands/hook.rb
-- lib/kamal/commands/loadbalancer.rb
-- lib/kamal/commands/lock.rb
-- lib/kamal/commands/proxy.rb
-- lib/kamal/commands/proxy/cert_transfer.rb
-- lib/kamal/commands/prune.rb
-- lib/kamal/commands/registry.rb
-- lib/kamal/commands/server.rb
-- lib/kamal/configuration.rb
-- lib/kamal/configuration/accessory.rb
-- lib/kamal/configuration/alias.rb
-- lib/kamal/configuration/boot.rb
-- lib/kamal/configuration/builder.rb
-- lib/kamal/configuration/docs/accessory.yml
-- lib/kamal/configuration/docs/alias.yml
-- lib/kamal/configuration/docs/boot.yml
-- lib/kamal/configuration/docs/builder.yml
-- lib/kamal/configuration/docs/configuration.yml
-- lib/kamal/configuration/docs/env.yml
-- lib/kamal/configuration/docs/logging.yml
-- lib/kamal/configuration/docs/output.yml
-- lib/kamal/configuration/docs/proxy.yml
-- lib/kamal/configuration/docs/registry.yml
-- lib/kamal/configuration/docs/role.yml
-- lib/kamal/configuration/docs/servers.yml
-- lib/kamal/configuration/docs/ssh.yml
-- lib/kamal/configuration/docs/sshkit.yml
-- lib/kamal/configuration/env.rb
-- lib/kamal/configuration/env/tag.rb
-- lib/kamal/configuration/loadbalancer.rb
-- lib/kamal/configuration/logging.rb
-- lib/kamal/configuration/output.rb
-- lib/kamal/configuration/proxy.rb
-- lib/kamal/configuration/proxy/acme.rb
-- lib/kamal/configuration/proxy/boot.rb
-- lib/kamal/configuration/proxy/run.rb
-- lib/kamal/configuration/registry.rb
-- lib/kamal/configuration/role.rb
-- lib/kamal/configuration/role/healthcheck.rb
-- lib/kamal/configuration/servers.rb
-- lib/kamal/configuration/ssh.rb
-- lib/kamal/configuration/sshkit.rb
-- lib/kamal/configuration/validation.rb
-- lib/kamal/configuration/validator.rb
-- lib/kamal/configuration/validator/accessory.rb
-- lib/kamal/configuration/validator/alias.rb
-- lib/kamal/configuration/validator/builder.rb
-- lib/kamal/configuration/validator/configuration.rb
-- lib/kamal/configuration/validator/env.rb
-- lib/kamal/configuration/validator/proxy.rb
-- lib/kamal/configuration/validator/registry.rb
-- lib/kamal/configuration/validator/role.rb
-- lib/kamal/configuration/validator/servers.rb
-- lib/kamal/configuration/volume.rb
-- lib/kamal/docker.rb
-- lib/kamal/env_file.rb
-- lib/kamal/git.rb
-- lib/kamal/otel_shipper.rb
-- lib/kamal/output/base_logger.rb
-- lib/kamal/output/file_logger.rb
-- lib/kamal/output/formatter.rb
-- lib/kamal/output/otel_logger.rb
-- lib/kamal/secrets.rb
-- lib/kamal/secrets/adapters.rb
-- lib/kamal/secrets/adapters/aws_secrets_manager.rb
-- lib/kamal/secrets/adapters/base.rb
-- lib/kamal/secrets/adapters/bitwarden.rb
-- lib/kamal/secrets/adapters/bitwarden_secrets_manager.rb
-- lib/kamal/secrets/adapters/doppler.rb
-- lib/kamal/secrets/adapters/enpass.rb
-- lib/kamal/secrets/adapters/gcp_secret_manager.rb
-- lib/kamal/secrets/adapters/last_pass.rb
-- lib/kamal/secrets/adapters/one_password.rb
-- lib/kamal/secrets/adapters/passbolt.rb
-- lib/kamal/secrets/adapters/test.rb
-- lib/kamal/secrets/dotenv/inline_command_substitution.rb
-- lib/kamal/sshkit_with_ext.rb
-- lib/kamal/tags.rb
-- lib/kamal/utils.rb
-- lib/kamal/utils/sensitive.rb
-- lib/kamal/version.rb
-homepage: https://github.com/mhenrixon/kamal
+- lib/dash.rb
+- lib/dash/cli.rb
+- lib/dash/cli/accessory.rb
+- lib/dash/cli/alias/command.rb
+- lib/dash/cli/app.rb
+- lib/dash/cli/app/assets.rb
+- lib/dash/cli/app/boot.rb
+- lib/dash/cli/app/error_pages.rb
+- lib/dash/cli/app/rollout_boot.rb
+- lib/dash/cli/app/ssl_certificates.rb
+- lib/dash/cli/base.rb
+- lib/dash/cli/build.rb
+- lib/dash/cli/build/clone.rb
+- lib/dash/cli/build/port_forwarding.rb
+- lib/dash/cli/doctor.rb
+- lib/dash/cli/doctor/config_checks.rb
+- lib/dash/cli/doctor/endpoint_checks.rb
+- lib/dash/cli/doctor/host_checks.rb
+- lib/dash/cli/healthcheck/barrier.rb
+- lib/dash/cli/healthcheck/drift_error.rb
+- lib/dash/cli/healthcheck/error.rb
+- lib/dash/cli/healthcheck/poller.rb
+- lib/dash/cli/lock.rb
+- lib/dash/cli/main.rb
+- lib/dash/cli/main/migrate.rb
+- lib/dash/cli/proxy.rb
+- lib/dash/cli/proxy/drift.rb
+- lib/dash/cli/proxy/loadbalancer_claim.rb
+- lib/dash/cli/proxy/loadbalancer_reboot.rb
+- lib/dash/cli/proxy/reboot.rb
+- lib/dash/cli/prune.rb
+- lib/dash/cli/registry.rb
+- lib/dash/cli/secrets.rb
+- lib/dash/cli/server.rb
+- lib/dash/cli/templates/deploy.yml
+- lib/dash/cli/templates/sample_hooks/docker-setup.sample
+- lib/dash/cli/templates/sample_hooks/post-app-boot.sample
+- lib/dash/cli/templates/sample_hooks/post-app-stop.sample
+- lib/dash/cli/templates/sample_hooks/post-deploy.sample
+- lib/dash/cli/templates/sample_hooks/post-proxy-deploy.sample
+- lib/dash/cli/templates/sample_hooks/post-proxy-reboot.sample
+- lib/dash/cli/templates/sample_hooks/pre-app-boot.sample
+- lib/dash/cli/templates/sample_hooks/pre-app-stop.sample
+- lib/dash/cli/templates/sample_hooks/pre-build.sample
+- lib/dash/cli/templates/sample_hooks/pre-connect.sample
+- lib/dash/cli/templates/sample_hooks/pre-deploy.sample
+- lib/dash/cli/templates/sample_hooks/pre-proxy-deploy.sample
+- lib/dash/cli/templates/sample_hooks/pre-proxy-reboot.sample
+- lib/dash/cli/templates/secrets
+- lib/dash/commander.rb
+- lib/dash/commander/specifics.rb
+- lib/dash/commands.rb
+- lib/dash/commands/accessory.rb
+- lib/dash/commands/accessory/proxy.rb
+- lib/dash/commands/app.rb
+- lib/dash/commands/app/assets.rb
+- lib/dash/commands/app/containers.rb
+- lib/dash/commands/app/error_pages.rb
+- lib/dash/commands/app/execution.rb
+- lib/dash/commands/app/images.rb
+- lib/dash/commands/app/logging.rb
+- lib/dash/commands/app/proxy.rb
+- lib/dash/commands/auditor.rb
+- lib/dash/commands/base.rb
+- lib/dash/commands/builder.rb
+- lib/dash/commands/builder/base.rb
+- lib/dash/commands/builder/clone.rb
+- lib/dash/commands/builder/cloud.rb
+- lib/dash/commands/builder/hybrid.rb
+- lib/dash/commands/builder/local.rb
+- lib/dash/commands/builder/pack.rb
+- lib/dash/commands/builder/remote.rb
+- lib/dash/commands/docker.rb
+- lib/dash/commands/hook.rb
+- lib/dash/commands/loadbalancer.rb
+- lib/dash/commands/lock.rb
+- lib/dash/commands/proxy.rb
+- lib/dash/commands/proxy/cert_transfer.rb
+- lib/dash/commands/prune.rb
+- lib/dash/commands/registry.rb
+- lib/dash/commands/server.rb
+- lib/dash/configuration.rb
+- lib/dash/configuration/accessory.rb
+- lib/dash/configuration/alias.rb
+- lib/dash/configuration/boot.rb
+- lib/dash/configuration/builder.rb
+- lib/dash/configuration/docs/accessory.yml
+- lib/dash/configuration/docs/alias.yml
+- lib/dash/configuration/docs/boot.yml
+- lib/dash/configuration/docs/builder.yml
+- lib/dash/configuration/docs/configuration.yml
+- lib/dash/configuration/docs/env.yml
+- lib/dash/configuration/docs/logging.yml
+- lib/dash/configuration/docs/output.yml
+- lib/dash/configuration/docs/proxy.yml
+- lib/dash/configuration/docs/registry.yml
+- lib/dash/configuration/docs/role.yml
+- lib/dash/configuration/docs/servers.yml
+- lib/dash/configuration/docs/ssh.yml
+- lib/dash/configuration/docs/sshkit.yml
+- lib/dash/configuration/env.rb
+- lib/dash/configuration/env/tag.rb
+- lib/dash/configuration/loadbalancer.rb
+- lib/dash/configuration/logging.rb
+- lib/dash/configuration/output.rb
+- lib/dash/configuration/proxy.rb
+- lib/dash/configuration/proxy/acme.rb
+- lib/dash/configuration/proxy/boot.rb
+- lib/dash/configuration/proxy/run.rb
+- lib/dash/configuration/registry.rb
+- lib/dash/configuration/role.rb
+- lib/dash/configuration/role/healthcheck.rb
+- lib/dash/configuration/servers.rb
+- lib/dash/configuration/ssh.rb
+- lib/dash/configuration/sshkit.rb
+- lib/dash/configuration/validation.rb
+- lib/dash/configuration/validator.rb
+- lib/dash/configuration/validator/accessory.rb
+- lib/dash/configuration/validator/alias.rb
+- lib/dash/configuration/validator/builder.rb
+- lib/dash/configuration/validator/configuration.rb
+- lib/dash/configuration/validator/env.rb
+- lib/dash/configuration/validator/proxy.rb
+- lib/dash/configuration/validator/registry.rb
+- lib/dash/configuration/validator/role.rb
+- lib/dash/configuration/validator/servers.rb
+- lib/dash/configuration/volume.rb
+- lib/dash/docker.rb
+- lib/dash/env_file.rb
+- lib/dash/git.rb
+- lib/dash/otel_shipper.rb
+- lib/dash/output/base_logger.rb
+- lib/dash/output/file_logger.rb
+- lib/dash/output/formatter.rb
+- lib/dash/output/otel_logger.rb
+- lib/dash/project_directory.rb
+- lib/dash/secrets.rb
+- lib/dash/secrets/adapters.rb
+- lib/dash/secrets/adapters/aws_secrets_manager.rb
+- lib/dash/secrets/adapters/base.rb
+- lib/dash/secrets/adapters/bitwarden.rb
+- lib/dash/secrets/adapters/bitwarden_secrets_manager.rb
+- lib/dash/secrets/adapters/doppler.rb
+- lib/dash/secrets/adapters/enpass.rb
+- lib/dash/secrets/adapters/gcp_secret_manager.rb
+- lib/dash/secrets/adapters/last_pass.rb
+- lib/dash/secrets/adapters/one_password.rb
+- lib/dash/secrets/adapters/passbolt.rb
+- lib/dash/secrets/adapters/test.rb
+- lib/dash/secrets/dotenv/inline_command_substitution.rb
+- lib/dash/sshkit_with_ext.rb
+- lib/dash/tags.rb
+- lib/dash/utils.rb
+- lib/dash/utils/sensitive.rb
+- lib/dash/version.rb
+homepage: https://github.com/zoolutions/dash
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/zoolutions/dash
+  source_code_uri: https://github.com/zoolutions/dash/tree/main
+  changelog_uri: https://github.com/zoolutions/dash/releases
+  bug_tracker_uri: https://github.com/zoolutions/dash/issues
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -399,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.9
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Deploy web apps in containers to servers running Docker with zero downtime.
 test_files: []

data/bin/kamal

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-# Prevent failures from being reported twice.
-Thread.report_on_exception = false
-
-require "kamal"
-
-begin
-  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"]
-  exit 1
-rescue => e
-  puts "  \e[31mERROR (#{e.class}): #{e.message}\e[0m"
-  puts e.backtrace if ENV["VERBOSE"]
-  exit 1
-end

data/lib/kamal/cli/alias/command.rb

@@ -1,10 +0,0 @@
-class Kamal::Cli::Alias::Command < Thor::DynamicCommand
-  def run(instance, args = [])
-    if (command = KAMAL.resolve_alias(name))
-      KAMAL.reset
-      Kamal::Cli::Main.start(Shellwords.split(command) + ARGV[1..-1])
-    else
-      super
-    end
-  end
-end

data/lib/kamal/cli/build/clone.rb

@@ -1,59 +0,0 @@
-class Kamal::Cli::Build::Clone
-  attr_reader :sshkit
-  delegate :info, :error, :execute, :capture_with_info, to: :sshkit
-
-  def initialize(sshkit)
-    @sshkit = sshkit
-  end
-
-  def prepare
-    begin
-      clone_repo
-    rescue SSHKit::Command::Failed => e
-      if e.message =~ /already exists and is not an empty directory/
-        reset
-      else
-        raise Kamal::Cli::Build::BuildError, "Failed to clone repo: #{e.message}"
-      end
-    end
-
-    validate!
-  rescue Kamal::Cli::Build::BuildError => e
-    error "Error preparing clone: #{e.message}, deleting and retrying..."
-
-    FileUtils.rm_rf KAMAL.config.builder.clone_directory
-    clone_repo
-    validate!
-  end
-
-  private
-    def clone_repo
-      info "Cloning repo into build directory `#{KAMAL.config.builder.build_directory}`..."
-
-      FileUtils.mkdir_p KAMAL.config.builder.clone_directory
-      execute *KAMAL.builder.clone
-    end
-
-    def reset
-      info "Resetting local clone as `#{KAMAL.config.builder.build_directory}` already exists..."
-
-      KAMAL.builder.clone_reset_steps.each { |step| execute *step }
-    rescue SSHKit::Command::Failed => e
-      raise Kamal::Cli::Build::BuildError, "Failed to clone repo: #{e.message}"
-    end
-
-    def validate!
-      status = capture_with_info(*KAMAL.builder.clone_status).strip
-
-      unless status.empty?
-        raise Kamal::Cli::Build::BuildError, "Clone in #{KAMAL.config.builder.build_directory} is dirty, #{status}"
-      end
-
-      revision = capture_with_info(*KAMAL.builder.clone_revision).strip
-      if revision != Kamal::Git.revision
-        raise Kamal::Cli::Build::BuildError, "Clone in #{KAMAL.config.builder.build_directory} is not on the correct revision, expected `#{Kamal::Git.revision}` but got `#{revision}`"
-      end
-    rescue SSHKit::Command::Failed => e
-      raise Kamal::Cli::Build::BuildError, "Failed to validate clone: #{e.message}"
-    end
-end

data/lib/kamal/cli/healthcheck/error.rb

@@ -1,2 +0,0 @@
-class Kamal::Cli::Healthcheck::Error < StandardError
-end

data/lib/kamal/cli/templates/sample_hooks/docker-setup.sample

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Docker set up on $KAMAL_HOSTS..."

data/lib/kamal/cli/templates/sample_hooks/post-app-boot.sample

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-echo "Booted app version $KAMAL_VERSION on $KAMAL_HOSTS..."

data/lib/kamal/cli/templates/sample_hooks/post-app-stop.sample

@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-# Runs on each host just after the previous container has been stopped.
-#
-# NOTE: $KAMAL_VERSION is the version that was STOPPED, not the one being deployed.
-#
-# A failure here is logged and the deploy continues.
-
-echo "Stopped $KAMAL_ROLE version $KAMAL_VERSION on $KAMAL_HOSTS"

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

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