From 43672ec9a5b2bb150960fa5b2d9f876baac45738 Mon Sep 17 00:00:00 2001 From: Igor Alexandrov Date: Mon, 25 Mar 2024 22:42:22 +0400 Subject: [PATCH] Added destination to the lock directory --- lib/kamal/commands/lock.rb | 4 +++- test/commands/lock_test.rb | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/kamal/commands/lock.rb b/lib/kamal/commands/lock.rb index 9b535f5f..f16de3ce 100644 --- a/lib/kamal/commands/lock.rb +++ b/lib/kamal/commands/lock.rb @@ -41,7 +41,9 @@ class Kamal::Commands::Lock < Kamal::Commands::Base end def lock_dir - "#{config.run_directory}/lock-#{config.service}" + dir_name = [ config.service, config.destination ].compact.join("-") + + "#{config.run_directory}/lock-#{dir_name}" end def lock_details_file diff --git a/test/commands/lock_test.rb b/test/commands/lock_test.rb index dc8981f9..504cef46 100644 --- a/test/commands/lock_test.rb +++ b/test/commands/lock_test.rb @@ -10,24 +10,24 @@ class CommandsLockTest < ActiveSupport::TestCase test "status" do assert_equal \ - "stat .kamal/lock-app > /dev/null && cat .kamal/lock-app/details | base64 -d", + "stat .kamal/lock-app-production > /dev/null && cat .kamal/lock-app-production/details | base64 -d", new_command.status.join(" ") end test "acquire" do assert_match \ - %r{mkdir \.kamal/lock-app && echo ".*" > \.kamal/lock-app/details}m, + %r{mkdir \.kamal/lock-app-production && echo ".*" > \.kamal/lock-app-production/details}m, new_command.acquire("Hello", "123").join(" ") end test "release" do assert_match \ - "rm .kamal/lock-app/details && rm -r .kamal/lock-app", + "rm .kamal/lock-app-production/details && rm -r .kamal/lock-app-production", new_command.release.join(" ") end private def new_command - Kamal::Commands::Lock.new(Kamal::Configuration.new(@config, version: "123")) + Kamal::Commands::Lock.new(Kamal::Configuration.new(@config, version: "123", destination: "production")) end end