dry-stack 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b41f8af6bdca698d05c32a0d92a406473d6d6ccdc8b30cad42dff9545cde0f5
-  data.tar.gz: e5c3103939a0ab2b6a0205872f034d00ab60181d7e991127fa0b31adf8570cc9
+  metadata.gz: 1fdde5aef97bb0e9cd381fe8fb9191b7a4dcb3fcbb2a93daa8dc92dc09b7d8cd
+  data.tar.gz: d8205d27f505739e7dd7316170b98f2924c7cf700910ad5c5cf2e92376f68015
 SHA512:
-  metadata.gz: 2e8c41dc8516b11bf54f0470cf8cdedc105a0d6812567c59d06a98db5b22da64a7fec6111a47de1e135e1b65f49fdcca141e81effdb6e917001fdcd5a386f3a2
-  data.tar.gz: 6d74c7b2af40b3a36cdcddf9a1ff0546679b86cc4be3c50cb081db967170a7f7feafc576532e2bce8506d9872e7b03e541dfa0c0acec503757f30692481b1040
+  metadata.gz: '082bc6ed927bd5e5946c63faf531377fb3df998bafae31bd407a61256bf9a28166c78eb3b69a1e5988c6d1dec93405cc2c26a1feb6185f4d92b7261acad53748'
+  data.tar.gz: 7519e0d150a5dd434775ad88d249312d114c9229e3049c60d62f2cd8f9ba18f0889ad7929e6456bcf0851c207e80f37352f17cd36a1d0183d36eba72acc6b382

data/lib/dry-stack/stack.rb

@@ -231,13 +231,15 @@ module Dry
 
         service[:deploy].deep_merge! @deploy[name] if @deploy[name]
 
-        hash = {'service-name': service_name, 'stack-name': @name}
-        hash.default = ''
-        original_verbosity = $VERBOSE
-        $VERBOSE = nil
-        service[:deploy][:labels] = service[:deploy][:labels].map{ _1 % hash }
-        service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
-        $VERBOSE = original_verbosity
+        # hash = {'service-name': service_name, 'stack-name': @name}
+        env_sub = ->(s) {
+          s = s.to_s.dup
+          s.gsub!('%{stack-name}', @name.to_s)
+          s.gsub!('%{service-name}', service_name)
+          s
+        }
+        service[:deploy][:labels] = service[:deploy][:labels].map{ env_sub[_1] }
+        service[:environment].transform_values!{ _1.is_a?(String) ? (env_sub[_1]) : _1 }
 
         pp_i = @publish_ports[name]&.reject { _1.class == String }
         pp_s = @publish_ports[name]&.select { _1.class == String }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.14'
+    VERSION = '0.1.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Artyom B