dry-stack 0.0.59 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db28aafaf697c35d0d22af2e1a88324bf3a9e7b41e02cb1eacf6a3d7ebed4e33
-  data.tar.gz: 5cf7ee660829205448125a5239f804926c3dabba1ea0b61e53e905ab300578c3
+  metadata.gz: 000e72ba91d5454bb7f2ce2a1d8cbed44a7f0f4dd5871e1fcbdc36c0b920fa2e
+  data.tar.gz: dc062105a679cf8511abf2695da5a97e49e0e80abcfc29da775c77afa4ee8555
 SHA512:
-  metadata.gz: 96b0e2e7970381f5ffca09821ff7d19f000b3cf0dbdcdc0e74d255347700b292cf55f588f193bcf32e93721c1b8abf8e0aa90e02ed1570316b593fd6e8569437
-  data.tar.gz: 8caf7048124220fe63e08ce2b757a0a17236eeaaed3981d954fa71171207c9e1a2a4a1aea6663f2fa05c52f867ca03eb58517aaeac268f30b95055e590fc90d3
+  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,11 +178,14 @@ 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|
+          if config[:file_content]
+            compose[:configs][config[:source].to_sym] = {file_content: config[:file_content]}
+            config.delete :file_content
+          end
+        end
       end
 
       compose[:configs].update(compose[:configs]) do |name, config|

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.59'
+    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.59
+  version: 0.0.61
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake