kamal 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf6f739fb85822d7a74b5eac6bdfc373bc842a92acb9dcf9fd5f7e076fe8524
-  data.tar.gz: b2c30a95ee553009a7719760b2f2cb1f8e810bce61800819bf9b66aee3304b3e
+  metadata.gz: 63594154afe8efc69b08fd2a27b1efb4ff6604d1bd62f345dc8d24df7903b649
+  data.tar.gz: d8e8cb819aeea4212bc576e2b8a5bcd2cc6fcd67c6186ba0e04b2250999985c1
 SHA512:
-  metadata.gz: b376df173efb5f00c4624b5da611caf0607f294a868b54eb318ff653755934750c19a74139ab978fa9842759812edb69c8d5384e79bd93989e58d121d2cc4ac9
-  data.tar.gz: 289e20a34e4cdbd3b274dd20c8224c4b6ddabe179495a6812b5b2b6a879f612c5f198111925cd3d438c4aaca73de24b32430b8e1ac8fc16b038797d07859b24f
+  metadata.gz: 9da318bbc1fe8e5dac2b09cc8c89682417653de15b72567378a6998e0992fad999a1a8bca4b32f8eb2a7147f774d59efb4850b50ea15bfcde32d8426b50303fe
+  data.tar.gz: ca156878b11110b0bc7092790565bfbf5b3cdf9206a2faf210c805856dab0aef9e57b883c09f86422c6c0821f6c281a7ed892ccf061101750dc8507326ba53d3

data/lib/kamal/cli/accessory.rb

@@ -107,8 +107,9 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
     if name == "all"
       KAMAL.accessory_names.each { |accessory_name| details(accessory_name) }
     else
+      type = "Accessory #{name}"
       with_accessory(name) do |accessory, hosts|
-        on(hosts) { puts capture_with_info(*accessory.info) }
+        on(hosts) { puts_by_host host, capture_with_info(*accessory.info), type: type }
       end
     end
   end

data/lib/kamal/cli/build.rb

@@ -30,7 +30,7 @@ class Kamal::Cli::Build < Kamal::Cli::Base
           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"
+            warn "Missing compatible builder, so creating a new one first"
 
             if cli.create
               KAMAL.with_verbosity(:debug) { execute *KAMAL.builder.push }

data/lib/kamal/commander/specifics.rb

@@ -19,7 +19,7 @@ class Kamal::Commander::Specifics
   end
 
   def traefik_hosts
-    specific_hosts || config.traefik_hosts
+    config.traefik_hosts & specified_hosts
   end
 
   def accessory_hosts

data/lib/kamal/version.rb

@@ -1,3 +1,3 @@
 module Kamal
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -233,7 +233,6 @@ files:
 - lib/kamal/commands.rb
 - lib/kamal/commands/accessory.rb
 - lib/kamal/commands/app.rb
-- lib/kamal/commands/app.rb.orig
 - lib/kamal/commands/app/assets.rb
 - lib/kamal/commands/app/containers.rb
 - lib/kamal/commands/app/cord.rb

data/lib/kamal/commands/app.rb.orig

@@ -1,127 +0,0 @@
-class Kamal::Commands::App < Kamal::Commands::Base
-  include Assets, Containers, Cord, Execution, Images, Logging
-
-  ACTIVE_DOCKER_STATUSES = [ :running, :restarting ]
-
-  attr_reader :role
-
-  def initialize(config, role: nil)
-    super(config)
-    @role = role
-  end
-
-  def run(hostname: nil)
-    docker :run,
-      "--detach",
-      "--restart unless-stopped",
-      "--name", container_name,
-      *([ "--hostname", hostname ] if hostname),
-      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
-      "-e", "KAMAL_VERSION=\"#{config.version}\"",
-      *role.env_args,
-      *role.health_check_args,
-      *role.logging_args,
-      *config.volume_args,
-      *role.asset_volume_args,
-      *role.label_args,
-      *role.option_args,
-      config.absolute_image,
-      role.cmd
-  end
-
-  def start
-    docker :start, container_name
-  end
-
-  def status(version:)
-    pipe container_id_for_version(version), xargs(docker(:inspect, "--format", DOCKER_HEALTH_STATUS_FORMAT))
-  end
-
-  def stop(version: nil)
-    pipe \
-      version ? container_id_for_version(version) : current_running_container_id,
-      xargs(config.stop_wait_time ? docker(:stop, "-t", config.stop_wait_time) : docker(:stop))
-  end
-
-  def info
-    docker :ps, *filter_args
-  end
-
-
-  def current_running_container_id
-    current_running_container(format: "--quiet")
-  end
-
-  def container_id_for_version(version, only_running: false)
-    container_id_for(container_name: container_name(version), only_running: only_running)
-  end
-
-<<<<<<< HEAD
-  def current_running_version
-    pipe \
-      current_running_container(format: "--format '{{.Names}}'"),
-      extract_version_from_name
-=======
-  def current_running_version(prefix: nil)
-    list_versions("--latest", statuses: ACTIVE_DOCKER_STATUSES)
->>>>>>> 4dc8aca (Rename roles)
-  end
-
-  def list_versions(*docker_args, statuses: nil)
-    pipe \
-      docker(:ps, *filter_args(statuses: statuses), *docker_args, "--format", '"{{.Names}}"'),
-      extract_version_from_name
-  end
-
-
-  def make_env_directory
-    make_directory role.env.secrets_directory
-  end
-
-  def remove_env_file
-    [ :rm, "-f", role.env.secrets_file ]
-  end
-
-
-  private
-    def container_name(version = nil)
-      [ role.container_prefix, version || config.version ].compact.join("-")
-    end
-
-    def latest_image_id
-      docker :image, :ls, *argumentize("--filter", "reference=#{config.latest_image}"), "--format", "'{{.ID}}'"
-    end
-
-    def current_running_container(format:)
-      pipe \
-        shell(chain(latest_image_container(format: format), latest_container(format: format))),
-        [ :head, "-1" ]
-    end
-
-    def latest_image_container(format:)
-      latest_container format: format, filters: [ "ancestor=$(#{latest_image_id.join(" ")})" ]
-    end
-
-    def latest_container(format:, filters: nil)
-      docker :ps, "--latest", *format, *filter_args(statuses: ACTIVE_DOCKER_STATUSES), argumentize("--filter", filters)
-    end
-
-    def filter_args(statuses: nil)
-      argumentize "--filter", filters(statuses: statuses)
-    end
-
-    def extract_version_from_name
-      # Extract SHA from "service-role-dest-SHA"
-      %(while read line; do echo ${line##{role.container_prefix}-}; done)
-    end
-
-    def filters(statuses: nil)
-      [ "label=service=#{config.service}" ].tap do |filters|
-        filters << "label=destination=#{config.destination}" if config.destination
-        filters << "label=role=#{role}" if role
-        statuses&.each do |status|
-          filters << "status=#{status}"
-        end
-      end
-    end
-end