dry-stack 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15007db0e8720d467e40e7251fbf35aa4fd505f767cdf0b4883ba9b6d5a53eb
-  data.tar.gz: cfcde2ffaa68e445c2bb5aeefc37453c84d284d675cd68f05a41a4e64c87cade
+  metadata.gz: 000e72ba91d5454bb7f2ce2a1d8cbed44a7f0f4dd5871e1fcbdc36c0b920fa2e
+  data.tar.gz: dc062105a679cf8511abf2695da5a97e49e0e80abcfc29da775c77afa4ee8555
 SHA512:
-  metadata.gz: 96312828ace2b79bee3e73e8f7015c74d3259786ab556b2e85779ef9a6b087fbbf3f966c65798aac457932cb6cc2dad69f4631463a64b7f94d2ccf96ac7366e1
-  data.tar.gz: d1cc5c3e5c70cbcd7e19d6728eaa21ee976e029c95d6804356896127612588fdd2fc91c2cf04dad9174c017ac6dbeb1bacf29b0d66c100a462f4cf5284390eae
+  metadata.gz: a1279e12ad98a68d99aed909875ebd2a21439c7f66d9489969a896bc2af43e70e2caf11bb4f4a42cfd3ac7c7b182878830ebf966f2b18b2510751db85d895629
+  data.tar.gz: a99cb4f87e876f89e4f370dd43160b8df7db23c17e5ffa4d7116e2deb8bc1c5e02a532455d420840a234d5ea654a4b4aa66db652ebbdc5f29b6b7d961a67353a

data/lib/dry-stack/stack.rb

@@ -159,11 +159,16 @@ module Dry
           end
         end
 
-        hash = {'service-name': service_name}
+        service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
+        service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s
+        service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
+
+        hash = {'service-name': service_name, 'stack-name': @name}
         hash.default = ''
         original_verbosity = $VERBOSE
         $VERBOSE = nil
         service[:deploy][:labels].map!{ _1 % hash }
+        service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
         $VERBOSE = original_verbosity
 
         service[:deploy].merge! @deploy[name] if @deploy[name]
@@ -173,10 +178,6 @@ module Dry
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
         service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
 
-        service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
-        service[:environment].merge! STACK_NAME: @name, STACK_SERVICE_NAME: name
-
-        service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
         service[:logging] ||= @logging[name.to_sym]
 
         service[:configs]&.each do |config|

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.60'
+    VERSION = '0.0.61'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake