dash 3.1.5 → 3.2.1

data/lib/{kamal → dash}/configuration/validator/registry.rb

@@ -1,4 +1,4 @@
-class Kamal::Configuration::Validator::Registry < Kamal::Configuration::Validator
+class Dash::Configuration::Validator::Registry < Dash::Configuration::Validator
   STRING_OR_ONE_ITEM_ARRAY_KEYS = [ "username", "password" ]
 
   def validate!

data/lib/{kamal → dash}/configuration/validator/role.rb

@@ -1,4 +1,4 @@
-class Kamal::Configuration::Validator::Role < Kamal::Configuration::Validator
+class Dash::Configuration::Validator::Role < Dash::Configuration::Validator
   def validate!
     validate_type! config, Array, Hash
 

data/lib/{kamal → dash}/configuration/validator/servers.rb

@@ -1,4 +1,4 @@
-class Kamal::Configuration::Validator::Servers < Kamal::Configuration::Validator
+class Dash::Configuration::Validator::Servers < Dash::Configuration::Validator
   def validate!
     validate_type! config, Array, Hash, NilClass
 

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

@@ -1,4 +1,4 @@
-class Kamal::Configuration::Validator
+class Dash::Configuration::Validator
   attr_reader :config, :example, :context
 
   def initialize(config, example:, context:)
@@ -91,7 +91,7 @@ class Kamal::Configuration::Validator
       else
         validate_type! value, type
       end
-    rescue Kamal::ConfigurationError
+    rescue Dash::ConfigurationError
       type_error(Array, type)
     end
 
@@ -187,7 +187,7 @@ class Kamal::Configuration::Validator
     end
 
     def error(message)
-      raise Kamal::ConfigurationError, "#{error_context}#{message}"
+      raise Dash::ConfigurationError, "#{error_context}#{message}"
     end
 
     def type_error(*expected_types)
@@ -245,7 +245,7 @@ class Kamal::Configuration::Validator
       validate_health_option_expansion!(options)
     end
 
-    # Kamal::Utils::DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX escapes a bare `$` but exempts
+    # Dash::Utils::DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX escapes a bare `$` but exempts
     # `${...}`, leaving it for the deploy host's shell to expand at docker run time. Role env
     # never reaches that shell, so `${SOME_ENV}` in a health command silently becomes empty and
     # the container sits `starting` until deploy_timeout. Reject it where it is most likely written.

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

@@ -1,6 +1,6 @@
-class Kamal::Configuration::Volume
+class Dash::Configuration::Volume
   attr_reader :host_path, :container_path, :options
-  delegate :argumentize, to: Kamal::Utils
+  delegate :argumentize, to: Dash::Utils
 
   def initialize(host_path:, container_path:, options: nil)
     @host_path = host_path

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

@@ -5,11 +5,15 @@ require "active_support/core_ext/hash/keys"
 require "erb"
 require "net/ssh/proxy/jump"
 
-class Kamal::Configuration
+class Dash::Configuration
   HOOKS_OUTPUT_LEVELS = [ :quiet, :verbose ].freeze
 
+  # The pre-3b name of #run_directory. Referenced only by the one-shot host
+  # migration in Dash::Commands::Base; nothing reads paths under it.
+  LEGACY_RUN_DIRECTORY = ".kamal"
+
   delegate :service, :labels, :hooks_path, to: :raw_config, allow_nil: true
-  delegate :argumentize, :optionize, to: Kamal::Utils
+  delegate :argumentize, :optionize, to: Dash::Utils
 
   attr_reader :destination, :raw_config, :secrets
   attr_reader :accessories, :aliases, :boot, :builder, :env, :logging, :output, :proxy, :proxy_boot, :servers, :ssh, :sshkit, :registry
@@ -18,7 +22,7 @@ class Kamal::Configuration
 
   class << self
     def create_from(config_file:, destination: nil, version: nil)
-      ENV["KAMAL_DESTINATION"] = destination
+      ENV["DASH_DESTINATION"] = ENV["KAMAL_DESTINATION"] = destination
 
       raw_config = load_raw_config(config_file: config_file, destination: destination)
 
@@ -56,9 +60,9 @@ class Kamal::Configuration
     @destination = destination
     @declared_version = version
 
-    validate! raw_config, example: validation_yml.symbolize_keys, context: "", with: Kamal::Configuration::Validator::Configuration
+    validate! raw_config, example: validation_yml.symbolize_keys, context: "", with: Dash::Configuration::Validator::Configuration
 
-    @secrets = Kamal::Secrets.new(destination: destination, secrets_path: secrets_path)
+    @secrets = Dash::Secrets.new(destination: destination, secrets_path: secrets_path)
 
     # Eager load config to validate it, these are first as they have dependencies later on
     @servers = Servers.new(config: self)
@@ -292,8 +296,14 @@ class Kamal::Configuration
     raw_config.stop_timeout
   end
 
+  # Where dash keeps its per-host state - app env and assets, the proxy's
+  # options/image/run_command files and apps-config bind mount, loadbalancer
+  # service claims, deploy locks and the audit log - under the SSH user's home.
+  # Renamed from `.kamal` in stage 3b of the server artifact rename
+  # (zoolutions/dash#118); hosts still on the old name are migrated in place by
+  # Dash::Commands::Base#ensure_run_directory.
   def run_directory
-    ".kamal"
+    ".dash"
   end
 
   def apps_directory
@@ -313,11 +323,11 @@ class Kamal::Configuration
   end
 
   def hooks_path
-    raw_config.hooks_path || ".kamal/hooks"
+    raw_config.hooks_path || Dash::ProjectDirectory.join("hooks")
   end
 
   def secrets_path
-    raw_config.secrets_path || ".kamal/secrets"
+    raw_config.secrets_path || Dash::ProjectDirectory.join("secrets")
   end
 
   def asset_path
@@ -379,26 +389,26 @@ class Kamal::Configuration
 
     def ensure_required_keys_present
       %i[ service registry ].each do |key|
-        raise Kamal::ConfigurationError, "Missing required configuration for #{key}" unless raw_config[key].present?
+        raise Dash::ConfigurationError, "Missing required configuration for #{key}" unless raw_config[key].present?
       end
 
-      raise Kamal::ConfigurationError, "Missing required configuration for image" if image.blank?
+      raise Dash::ConfigurationError, "Missing required configuration for image" if image.blank?
 
       if raw_config.servers.nil?
-        raise Kamal::ConfigurationError, "No servers or accessories specified" unless raw_config.accessories.present?
+        raise Dash::ConfigurationError, "No servers or accessories specified" unless raw_config.accessories.present?
       else
         unless role(primary_role_name).present?
-          raise Kamal::ConfigurationError, "The primary_role #{primary_role_name} isn't defined"
+          raise Dash::ConfigurationError, "The primary_role #{primary_role_name} isn't defined"
         end
 
         if primary_role.hosts.empty?
-          raise Kamal::ConfigurationError, "No servers specified for the #{primary_role.name} primary_role"
+          raise Dash::ConfigurationError, "No servers specified for the #{primary_role.name} primary_role"
         end
 
         unless allow_empty_roles?
           roles.each do |role|
             if role.hosts.empty?
-              raise Kamal::ConfigurationError, "No servers specified for the #{role.name} role. You can ignore this with allow_empty_roles: true"
+              raise Dash::ConfigurationError, "No servers specified for the #{role.name} role. You can ignore this with allow_empty_roles: true"
             end
           end
         end
@@ -408,21 +418,21 @@ class Kamal::Configuration
     end
 
     def ensure_valid_service_name
-      raise Kamal::ConfigurationError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9_-]+$/i
+      raise Dash::ConfigurationError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9_-]+$/i
 
       true
     end
 
     def ensure_valid_kamal_version
-      if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Kamal::VERSION)
-        raise Kamal::ConfigurationError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
+      if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Dash::VERSION)
+        raise Dash::ConfigurationError, "Current version is #{Dash::VERSION}, minimum required is #{minimum_version}"
       end
 
       true
     end
 
     def ensure_retain_containers_valid
-      raise Kamal::ConfigurationError, "Must retain at least 1 container" if retain_containers < 1
+      raise Dash::ConfigurationError, "Must retain at least 1 container" if retain_containers < 1
 
       true
     end
@@ -431,7 +441,7 @@ class Kamal::Configuration
       hooks = %w[ pre-traefik-reboot post-traefik-reboot ].select { |hook_file| File.exist?(File.join(hooks_path, hook_file)) }
 
       if hooks.any?
-        raise Kamal::ConfigurationError, "Found #{hooks.join(", ")}, these should be renamed to (pre|post)-proxy-reboot"
+        raise Dash::ConfigurationError, "Found #{hooks.join(", ")}, these should be renamed to (pre|post)-proxy-reboot"
       end
 
       true
@@ -451,7 +461,7 @@ class Kamal::Configuration
       return true if offenders.empty?
 
       warn "Non-proxied role(s) #{offenders.map(&:name).join(", ")} have no healthcheck. " \
-        "Without one, Kamal accepts the container as ready #{readiness_delay}s after it merely starts " \
+        "Without one, dash accepts the container as ready #{readiness_delay}s after it merely starts " \
         "and then stops the previous container — traffic can be dropped. Add a `healthcheck:` block, " \
         "or opt out explicitly with `healthcheck: false`. This warning will become an error in a future release."
 
@@ -492,7 +502,7 @@ class Kamal::Configuration
 
       return true if offenders.empty?
 
-      raise Kamal::ConfigurationError, "Role(s) #{offenders.map(&:name).join(", ")}: " \
+      raise Dash::ConfigurationError, "Role(s) #{offenders.map(&:name).join(", ")}: " \
         "proxy/sleep requires proxy/run/docker_socket - kamal-proxy can only stop and start containers " \
         "through the container runtime socket, and it is not mounted into the proxy without it"
     end
@@ -577,7 +587,7 @@ class Kamal::Configuration
       paced = roles.select(&:boot)
       return true if paced.empty? || boot.parallel_roles != false
 
-      raise Kamal::ConfigurationError, "servers/#{paced.first.name}/boot cannot be combined with boot/parallel_roles: false, " \
+      raise Dash::ConfigurationError, "servers/#{paced.first.name}/boot cannot be combined with boot/parallel_roles: false, " \
         "which boots each host's roles in turn and so cannot pace one role's hosts. Remove one of them"
     end
 
@@ -602,7 +612,7 @@ class Kamal::Configuration
       hosts = roles.select(&:ssl?).flat_map { |role| role.proxy.hosts }
       duplicates = hosts.tally.filter_map { |host, count| host if count > 1 }
 
-      raise Kamal::ConfigurationError, "Different roles can't share the same host for SSL: #{duplicates.join(", ")}" if duplicates.any?
+      raise Dash::ConfigurationError, "Different roles can't share the same host for SSL: #{duplicates.join(", ")}" if duplicates.any?
 
       true
     end
@@ -610,7 +620,7 @@ class Kamal::Configuration
     def ensure_local_registry_remote_builder_has_ssh_url
       if registry.local? && builder.remote?
         unless URI(builder.remote).scheme == "ssh"
-          raise Kamal::ConfigurationError, "Local registry with remote builder requires an SSH URL (e.g., ssh://user@host)"
+          raise Dash::ConfigurationError, "Local registry with remote builder requires an SSH URL (e.g., ssh://user@host)"
         end
       end
 
@@ -621,7 +631,7 @@ class Kamal::Configuration
       all_hosts.each do |host|
         run_configs = proxy_runs(host)
         if run_configs.uniq.size > 1
-          raise Kamal::ConfigurationError, "Conflicting proxy run configurations for host #{host}"
+          raise Dash::ConfigurationError, "Conflicting proxy run configurations for host #{host}"
         end
       end
     end
@@ -634,7 +644,7 @@ class Kamal::Configuration
     # accessories-only configuration has nothing to run it on.
     def ensure_valid_loadbalancer
       if proxy.loadbalancer == true && primary_role.nil?
-        raise Kamal::ConfigurationError, "proxy/loadbalancer: can't be enabled without servers"
+        raise Dash::ConfigurationError, "proxy/loadbalancer: can't be enabled without servers"
       end
 
       true
@@ -656,16 +666,16 @@ class Kamal::Configuration
     def validate_hooks_output_level!(level, hook = nil)
       return if HOOKS_OUTPUT_LEVELS.include?(level)
       context = hook ? " for hook '#{hook}'" : ""
-      raise Kamal::ConfigurationError, "Invalid hooks_output '#{level}'#{context}, must be one of: #{HOOKS_OUTPUT_LEVELS.join(', ')}"
+      raise Dash::ConfigurationError, "Invalid hooks_output '#{level}'#{context}, must be one of: #{HOOKS_OUTPUT_LEVELS.join(', ')}"
     end
 
     def git_version
       @git_version ||=
-        if Kamal::Git.used?
-          if Kamal::Git.uncommitted_changes.present? && !builder.git_clone?
+        if Dash::Git.used?
+          if Dash::Git.uncommitted_changes.present? && !builder.git_clone?
             uncommitted_suffix = "_uncommitted_#{SecureRandom.hex(8)}"
           end
-          [ Kamal::Git.revision, uncommitted_suffix ].compact.join
+          [ Dash::Git.revision, uncommitted_suffix ].compact.join
         else
           raise "Can't use commit hash as version, no git repository found in #{Dir.pwd}"
         end

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

@@ -1,7 +1,7 @@
 require "tempfile"
 require "open3"
 
-module Kamal::Docker
+module Dash::Docker
   extend self
   BUILD_CHECK_TAG = "kamal-local-build-check"
 

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

@@ -1,5 +1,5 @@
 # Encode an env hash as a string where secret values have been looked up and all values escaped for Docker.
-class Kamal::EnvFile
+class Dash::EnvFile
   def initialize(env)
     @env = env
   end

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

@@ -1,4 +1,4 @@
-module Kamal::Git
+module Dash::Git
   extend self
 
   def used?

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

@@ -4,7 +4,7 @@ require "json"
 require "securerandom"
 require "uri"
 
-class Kamal::OtelShipper
+class Dash::OtelShipper
   BATCH_SIZE = 100
   FLUSH_INTERVAL = 5.seconds
 
@@ -38,7 +38,7 @@ class Kamal::OtelShipper
     @run_id = SecureRandom.uuid
     @resource_attributes = [
       { key: "service.name", value: { stringValue: "kamal" } },
-      { key: "service.version", value: { stringValue: Kamal::VERSION } },
+      { key: "service.version", value: { stringValue: Dash::VERSION } },
       { key: "kamal.run_id", value: { stringValue: @run_id } },
       *tags.tags.map do |key, value|
         otel_key = OTEL_ATTRIBUTE_KEYS.fetch(key, "kamal.#{key}")
@@ -156,7 +156,7 @@ class Kamal::OtelShipper
       payload = {
         resourceLogs: [ {
           resource: { attributes: @resource_attributes },
-          scopeLogs: [ { scope: { name: "kamal", version: Kamal::VERSION }, logRecords: records } ]
+          scopeLogs: [ { scope: { name: "kamal", version: Dash::VERSION }, logRecords: records } ]
         } ]
       }
 

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

@@ -1,6 +1,6 @@
 require "logger"
 
-class Kamal::Output::BaseLogger < ::Logger
+class Dash::Output::BaseLogger < ::Logger
   def initialize
     super(nil)
     @subscription = ActiveSupport::Notifications.subscribe("modify.kamal", self)

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

@@ -1,4 +1,4 @@
-class Kamal::Output::FileLogger < Kamal::Output::BaseLogger
+class Dash::Output::FileLogger < Dash::Output::BaseLogger
   attr_reader :path
 
   def self.build(settings:, config:)

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

@@ -1,4 +1,4 @@
-class Kamal::Output::Formatter < SSHKit::Formatter::Pretty
+class Dash::Output::Formatter < SSHKit::Formatter::Pretty
   def initialize(output, logger)
     @logger = logger
     super(output)

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

@@ -1,16 +1,16 @@
-class Kamal::Output::OtelLogger < Kamal::Output::BaseLogger
+class Dash::Output::OtelLogger < Dash::Output::BaseLogger
   def self.build(settings:, config:)
     raise ArgumentError, "OTel endpoint is required" unless settings["endpoint"]
     new(
       endpoint: settings["endpoint"],
-      tags: Kamal::Tags.from_config(config).except(:service_version, :recorded_at),
+      tags: Dash::Tags.from_config(config).except(:service_version, :recorded_at),
       service: config.service
     )
   end
 
   def initialize(endpoint:, tags:, service: nil)
     @endpoint = endpoint
-    @shipper = Kamal::OtelShipper.new(endpoint: endpoint, tags: tags)
+    @shipper = Dash::OtelShipper.new(endpoint: endpoint, tags: tags)
     @service = service
     super()
   end

data/lib/dash/project_directory.rb

@@ -0,0 +1,28 @@
+# Where a project keeps its dash-owned files - secrets and hooks - in the
+# operator's own repository. Renamed from `.kamal` in stage 3a of the server
+# artifact rename (zoolutions/dash#118); `.kamal` stays readable until 5.0 so an
+# upgrade doesn't turn every existing project into a missing-secret error.
+#
+# Deliberately not memoized: `dash migrate` moves the directory inside a single
+# process, and a cached answer would be stale for the rest of that invocation.
+class Dash::ProjectDirectory
+  CURRENT = ".dash"
+  LEGACY = ".kamal"
+
+  class << self
+    def path
+      legacy? ? LEGACY : CURRENT
+    end
+
+    # The predicate tests the directory rather than a specific file: a project
+    # holding only `secrets-common` or `secrets.<destination>` must still
+    # resolve, and Dash::Secrets synthesizes those names from the base path.
+    def legacy?
+      !Dir.exist?(CURRENT) && Dir.exist?(LEGACY)
+    end
+
+    def join(*parts)
+      File.join(path, *parts)
+    end
+  end
+end

data/lib/{kamal → dash}/secrets/adapters/aws_secrets_manager.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::AwsSecretsManager < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::AwsSecretsManager < Dash::Secrets::Adapters::Base
   def requires_account?
     false
   end

data/lib/{kamal → dash}/secrets/adapters/base.rb

@@ -1,5 +1,5 @@
-class Kamal::Secrets::Adapters::Base
-  delegate :optionize, to: Kamal::Utils
+class Dash::Secrets::Adapters::Base
+  delegate :optionize, to: Dash::Utils
 
   def fetch(secrets, account: nil, from: nil)
     raise RuntimeError, "Missing required option '--account'" if requires_account? && account.blank?

data/lib/{kamal → dash}/secrets/adapters/bitwarden.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::Bitwarden < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::Bitwarden < Dash::Secrets::Adapters::Base
   private
     def login(account)
       status = run_command("status")

data/lib/{kamal → dash}/secrets/adapters/bitwarden_secrets_manager.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::BitwardenSecretsManager < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::BitwardenSecretsManager < Dash::Secrets::Adapters::Base
   def requires_account?
     false
   end

data/lib/{kamal → dash}/secrets/adapters/doppler.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::Doppler < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::Doppler < Dash::Secrets::Adapters::Base
   def requires_account?
     false
   end

data/lib/{kamal → dash}/secrets/adapters/enpass.rb

@@ -4,11 +4,11 @@
 # Usage
 #
 # Fetch all password from FooBar item
-# `kamal secrets fetch --adapter enpass --from /Users/YOUR_USERNAME/Library/Containers/in.sinew.Enpass-Desktop/Data/Documents/Vaults/primary FooBar`
+# `dash secrets fetch --adapter enpass --from /Users/YOUR_USERNAME/Library/Containers/in.sinew.Enpass-Desktop/Data/Documents/Vaults/primary FooBar`
 #
 # Fetch only DB_PASSWORD from FooBar item
-# `kamal secrets fetch --adapter enpass --from /Users/YOUR_USERNAME/Library/Containers/in.sinew.Enpass-Desktop/Data/Documents/Vaults/primary FooBar/DB_PASSWORD`
-class Kamal::Secrets::Adapters::Enpass < Kamal::Secrets::Adapters::Base
+# `dash secrets fetch --adapter enpass --from /Users/YOUR_USERNAME/Library/Containers/in.sinew.Enpass-Desktop/Data/Documents/Vaults/primary FooBar/DB_PASSWORD`
+class Dash::Secrets::Adapters::Enpass < Dash::Secrets::Adapters::Base
   def requires_account?
     false
   end

data/lib/{kamal → dash}/secrets/adapters/gcp_secret_manager.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::GcpSecretManager < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::GcpSecretManager < Dash::Secrets::Adapters::Base
   private
     def login(account)
       # Since only the account option is passed from the cli, we'll use it for both account and service account

data/lib/{kamal → dash}/secrets/adapters/last_pass.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::LastPass < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::LastPass < Dash::Secrets::Adapters::Base
   private
     def login(account)
       unless loggedin?(account)

data/lib/{kamal → dash}/secrets/adapters/one_password.rb

@@ -1,5 +1,5 @@
-class Kamal::Secrets::Adapters::OnePassword < Kamal::Secrets::Adapters::Base
-  delegate :optionize, to: Kamal::Utils
+class Dash::Secrets::Adapters::OnePassword < Dash::Secrets::Adapters::Base
+  delegate :optionize, to: Dash::Utils
 
   private
     def login(account)

data/lib/{kamal → dash}/secrets/adapters/passbolt.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::Passbolt < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::Passbolt < Dash::Secrets::Adapters::Base
   def requires_account?
     false
   end

data/lib/{kamal → dash}/secrets/adapters/test.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Adapters::Test < Kamal::Secrets::Adapters::Base
+class Dash::Secrets::Adapters::Test < Dash::Secrets::Adapters::Base
   private
     def login(account)
       true

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

@@ -1,5 +1,5 @@
 require "active_support/core_ext/string/inflections"
-module Kamal::Secrets::Adapters
+module Dash::Secrets::Adapters
   def self.lookup(name)
     name = "one_password" if name.downcase == "1password"
     name = "last_pass" if name.downcase == "lastpass"
@@ -9,7 +9,7 @@ module Kamal::Secrets::Adapters
   end
 
   def self.adapter_class(name)
-    Object.const_get("Kamal::Secrets::Adapters::#{name.camelize}").new
+    Object.const_get("Dash::Secrets::Adapters::#{name.camelize}").new
   rescue NameError => e
     raise RuntimeError, "Unknown secrets adapter: #{name}"
   end

data/lib/{kamal → dash}/secrets/dotenv/inline_command_substitution.rb

@@ -1,4 +1,4 @@
-class Kamal::Secrets::Dotenv::InlineCommandSubstitution
+class Dash::Secrets::Dotenv::InlineCommandSubstitution
   # Unlike dotenv, this regex does not match escaped
   # parentheses when looking for command substitutions.
   INTERPOLATED_SHELL_COMMAND = /
@@ -29,7 +29,9 @@ class Kamal::Secrets::Dotenv::InlineCommandSubstitution
           $LAST_MATCH_INFO[0][1..]
         else
           command = ::Dotenv::Substitutions::Variable.call(command, env)
-          if command =~ /\A\s*kamal\s*secrets\s+/
+          # Accept the legacy `kamal secrets` spelling too — secrets files
+          # written before the dash rename still use it.
+          if command =~ /\A\s*(dash|kamal)\s*secrets\s+/
             # Inline the command
             inline_secrets_command(command)
           else
@@ -41,7 +43,7 @@ class Kamal::Secrets::Dotenv::InlineCommandSubstitution
     end
 
     def inline_secrets_command(command)
-      Kamal::Cli::Main.start(command.shellsplit[1..] + [ "--inline" ]).chomp
+      Dash::Cli::Main.start(command.shellsplit[1..] + [ "--inline" ]).chomp
     end
   end
 end

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

@@ -1,11 +1,11 @@
 require "dotenv"
 
-class Kamal::Secrets
-  Kamal::Secrets::Dotenv::InlineCommandSubstitution.install!
+class Dash::Secrets
+  Dash::Secrets::Dotenv::InlineCommandSubstitution.install!
 
-  def initialize(destination: nil, secrets_path: ".kamal/secrets")
+  def initialize(destination: nil, secrets_path: nil)
     @destination = destination
-    @secrets_path = secrets_path
+    @secrets_path = secrets_path || Dash::ProjectDirectory.join("secrets")
     @mutex = Mutex.new
   end
 
@@ -13,9 +13,9 @@ class Kamal::Secrets
     synchronized_fetch(key)
   rescue KeyError
     if secrets_files.present?
-      raise Kamal::ConfigurationError, "Secret '#{key}' not found in #{secrets_files.join(", ")}"
+      raise Dash::ConfigurationError, "Secret '#{key}' not found in #{secrets_files.join(", ")}"
     else
-      raise Kamal::ConfigurationError, "Secret '#{key}' not found, no secret files (#{secrets_filenames.join(", ")}) provided"
+      raise Dash::ConfigurationError, "Secret '#{key}' not found, no secret files (#{secrets_filenames.join(", ")}) provided"
     end
   end
 

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

@@ -1,6 +1,6 @@
 require "time"
 
-class Kamal::Tags
+class Dash::Tags
   attr_reader :config, :tags
 
   class << self
@@ -10,7 +10,7 @@ class Kamal::Tags
 
     def default_tags(config)
       { recorded_at: Time.now.utc.iso8601,
-        performer: Kamal::Git.email.presence || `whoami`.chomp,
+        performer: Dash::Git.email.presence || `whoami`.chomp,
         destination: config.destination,
         version: config.version,
         service_version: service_version(config),
@@ -26,8 +26,13 @@ class Kamal::Tags
     @tags = tags.compact
   end
 
+  # Both prefixes carry the same value: hooks are operator-written and apps read
+  # these at runtime, so the old names stay until 5.0 (zoolutions/dash#118).
   def env
-    tags.transform_keys { |detail| "KAMAL_#{detail.upcase}" }
+    tags.each_with_object({}) do |(detail, value), env|
+      env["DASH_#{detail.upcase}"] = value
+      env["KAMAL_#{detail.upcase}"] = value
+    end
   end
 
   def to_s

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

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