kamal 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7358f4d2dd4e267e0fccab45df538facb5f1cfb598cee5561495139e3b06f62
-  data.tar.gz: 6bc6d6e32693cba5af10dba86aefe0af00e48fee214eee1b9483a892f0a30d0d
+  metadata.gz: fba91f4d7c980288819db64e720bd4295ab0d5107b9ecb0178a412cbef74c175
+  data.tar.gz: a2a5c57843f85ca13eb9c1e7dbc9227b3044273ff7ca629619b03395c0eae2d1
 SHA512:
-  metadata.gz: 3629d4180a4f0350fc28f9488dbf516f79a8c6fe0e64854a56e88b4846d0f855e0e9621f3695958db12104342ef1bee90cdfc93d2b5a32583973862c71e8eba4
-  data.tar.gz: 2dbd756cf617c2afc9b70603a9da9991c83f6d7fb6cf2e0be59c07d29b65ba53d84ea875727c1b888cde0889458099c24451eed3c406017548891815329eb289
+  metadata.gz: 578305b46242ea6853beae0d5342090e64b91aea2146cdd37448e82b744645b900b9c670e509b0adc56db62b4d22b0040c2c2b03ea17d48a4cd469a8a7c5a4ab
+  data.tar.gz: e10cfcb8c13ae177822afbbcfd1024731cfd416e1cde0b2b43d8ed9b3abe93b7638246eb0432f0c0e28f98e99430f5d97610f9f5ae5c880abfe3459e8fe23f09

data/lib/kamal/commander/specifics.rb

@@ -43,7 +43,12 @@ class Kamal::Commander::Specifics
     end
 
     def specified_hosts
-      (specific_hosts || config.all_hosts) \
-        .select { |host| (specific_roles || config.roles).flat_map(&:hosts).include?(host) }
+      specified_hosts = specific_hosts || config.all_hosts
+
+      if (specific_role_hosts = specific_roles&.flat_map(&:hosts)).present?
+        specified_hosts.select { |host| specific_role_hosts.include?(host) }
+      else
+        specified_hosts
+      end
     end
 end

data/lib/kamal/version.rb

@@ -1,3 +1,3 @@
 module Kamal
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -285,7 +285,6 @@ files:
 - lib/kamal/configuration/env/tag.rb
 - lib/kamal/configuration/logging.rb
 - lib/kamal/configuration/proxy.rb
-- lib/kamal/configuration/proxy.rb.orig
 - lib/kamal/configuration/registry.rb
 - lib/kamal/configuration/role.rb
 - lib/kamal/configuration/servers.rb
@@ -337,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Deploy web apps in containers to servers running Docker with zero downtime.

data/lib/kamal/configuration/proxy.rb.orig

@@ -1,67 +0,0 @@
-class Kamal::Configuration::Proxy
-  include Kamal::Configuration::Validation
-
-  DEFAULT_LOG_REQUEST_HEADERS = [ "Cache-Control", "Last-Modified", "User-Agent" ]
-  CONTAINER_NAME = "kamal-proxy"
-
-  delegate :argumentize, :optionize, to: Kamal::Utils
-
-  attr_reader :config, :proxy_config
-
-  def initialize(config:, proxy_config:, context: "proxy")
-    @config = config
-    @proxy_config = proxy_config
-    validate! @proxy_config, with: Kamal::Configuration::Validator::Proxy, context: context
-  end
-
-  def app_port
-    proxy_config.fetch("app_port", 80)
-  end
-
-  def ssl?
-    proxy_config.fetch("ssl", false)
-  end
-
-  def hosts
-    proxy_config["hosts"] || proxy_config["host"]&.split(",") || []
-  end
-
-  def deploy_options
-    {
-<<<<<<< HEAD
-      host: hosts,
-      tls: proxy_config["ssl"] ? true : nil,
-=======
-      host: proxy_config["host"],
-      tls: proxy_config["ssl"],
->>>>>>> 530d2cb (Use `=` in kamal-proxy deploy command args)
-      "deploy-timeout": seconds_duration(config.deploy_timeout),
-      "drain-timeout": seconds_duration(config.drain_timeout),
-      "health-check-interval": seconds_duration(proxy_config.dig("healthcheck", "interval")),
-      "health-check-timeout": seconds_duration(proxy_config.dig("healthcheck", "timeout")),
-      "health-check-path": proxy_config.dig("healthcheck", "path"),
-      "target-timeout": seconds_duration(proxy_config["response_timeout"]),
-      "buffer-requests": proxy_config.fetch("buffering", { "requests": true }).fetch("requests", true),
-      "buffer-responses": proxy_config.fetch("buffering", { "responses": true }).fetch("responses", true),
-      "buffer-memory": proxy_config.dig("buffering", "memory"),
-      "max-request-body": proxy_config.dig("buffering", "max_request_body"),
-      "max-response-body": proxy_config.dig("buffering", "max_response_body"),
-      "forward-headers": proxy_config.dig("forward_headers"),
-      "log-request-header": proxy_config.dig("logging", "request_headers") || DEFAULT_LOG_REQUEST_HEADERS,
-      "log-response-header": proxy_config.dig("logging", "response_headers")
-    }.compact
-  end
-
-  def deploy_command_args(target:)
-    optionize ({ target: "#{target}:#{app_port}" }).merge(deploy_options), with: "="
-  end
-
-  def merge(other)
-    self.class.new config: config, proxy_config: proxy_config.deep_merge(other.proxy_config)
-  end
-
-  private
-    def seconds_duration(value)
-      value ? "#{value}s" : nil
-    end
-end