dash 3.2.0 → 4.0.0

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

@@ -8,7 +8,7 @@
 #
 # Fetch only DB_PASSWORD from FooBar item
 # `dash 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
+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 = /
@@ -43,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
 

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
@@ -45,10 +45,20 @@ module Kamal::Utils
     options.flatten.compact
   end
 
-  # kamal-proxy takes durations as Go duration strings; deploy.yml takes plain
+  # dash-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 = "4.0.0"
+end

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

@@ -1,4 +1,4 @@
-module Kamal
+module Dash
   class ConfigurationError < StandardError; end
 end
 
@@ -8,7 +8,7 @@ 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
@@ -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.