kamal-backup 0.3.0.beta14 → 0.3.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78dad6331e7a06890125c303e9631e8701d6a1aeffe953134905456910a9e445
-  data.tar.gz: af988f114c9449b3f5d6fe8fecb6b09ecddddf20887aadf7d98700b8f2023c5d
+  metadata.gz: 7640fc151eabbf4abbcd390ce9633d85638fd7a9d9580652af69567be2c02178
+  data.tar.gz: 39976b40a0987b36f01b6ed835ea6f32486ef5a6e512eeae522c2e431d3b0c06
 SHA512:
-  metadata.gz: 7af73531536f8179425f95ebd4b5a9d3522e4fe0e2a109564795a4da318e73b9b85e26427bb4d7ee7b388cea94deb9f1670b9ca18c7b5a4592d8906182b9c794
-  data.tar.gz: 4b32db0463641ca0f51dc35f23cb5b6d00bc36ac09518921efec1636d0517bc39624d1ef36fc1f86ad53efb554dd880c583dd5e9e5f4ff6c9efe39a3b5888d75
+  metadata.gz: abae67de65b6c5e5af29da2f3cca84122e145ef6b2c460ee3bc71aa05c3d1c4bf67d2973a5ea5e65bf43437c5a64849a449b3e50909ea11dee7a1c2049f3c95b
+  data.tar.gz: a6d2036b16727cf72b13a1622ddf49e62eda37ca70fb9c48a41a730cfead991e75485aa6deb5160be0f7c3739f6f9147606c0755a7b9d7f2e72f085473016107

data/lib/kamal_backup/kamal_bridge.rb

@@ -283,7 +283,11 @@ module KamalBackup
           normalized_hosts(fetch(accessory_config, :hosts))
         end
 
-        hosts.first if hosts.size == 1
+        return hosts.first if hosts.size == 1
+        return if hosts.any?
+
+        all_hosts = normalized_hosts(fetch(config, :hosts))
+        all_hosts.first if all_hosts.size == 1
       end
 
       def normalized_hosts(value)
@@ -299,9 +303,20 @@ module KamalBackup
 
       def default_accessory_service_name(accessory_name)
         service = fetch(config, :service).to_s
+        service = service_from_rendered_config if service.empty?
         "#{service}-#{accessory_name}" unless service.empty?
       end
 
+      def service_from_rendered_config
+        service_with_version = fetch(config, :service_with_version).to_s
+        version = fetch(config, :version).to_s
+        suffix = "-#{version}"
+
+        if !service_with_version.empty? && !version.empty? && service_with_version.end_with?(suffix)
+          service_with_version.delete_suffix(suffix)
+        end
+      end
+
       class FilteringIO
         def initialize(io, &reject)
           @io = io

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta14"
+  VERSION = "0.3.0.beta15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta14
+  version: 0.3.0.beta15
 platform: ruby
 authors:
 - crmne