dry-stack 0.0.73 → 0.0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37226df6d0e55d14a71d2d58fe9bb9c2cbff43fc7f91e81f23d33bb9a1deb37f
-  data.tar.gz: 18e0f8893cb5cc8b26fe7ed0ae23d0b60c91b93c4fa06799d333ac553ee3e9f1
+  metadata.gz: 8221d44d262648628af5b10e205e899b1975f42f8858d53454e2eb71574ad790
+  data.tar.gz: 13ef00456e8f06f4d16f8bfd2f2910a23d6a85d98f677e01af6842a64a41474d
 SHA512:
-  metadata.gz: 713ede878b90a841206f6ecc51dc6468de0168a6b401f5c3b9d9f054329b0f190cd7c6e9730befb21a631a08353dd97590ce25107c2b7ec7da0e92468bc4b6a2
-  data.tar.gz: 0e61ba0b8a116d1d386e1b032f08f85fa4dd73acc1e3e1b46b6529a126480ba0c24255e55083df2be204348d0887cd51d048b934db8dd10bc4c157e74e7fde3f
+  metadata.gz: 8a8d2bc4f1d15191cec5a4958657f33f0ddfa850c1dfcf7e0bb7ffc7b4cd7306002852b89120a828a0a2392572fdf4d78f20cb9b27ebd39fae48917ed7988334
+  data.tar.gz: 6cbdad4504e7d3cb57344cd78e7057c4b88cef873f9b8187d0adec24b82947c8e1a367d8a62680543a45b07ff4cac0fba46447eb24f1c3571e5cfd6208366fc8

data/lib/dry-stack/stack.rb

@@ -52,7 +52,7 @@ module Dry
     def command(cmd)= @service[:command] = cmd
     def entrypoint(cmd)= @service[:entrypoint] = cmd
     def deploy_label(str)= @service[:deploy][:labels] << str
-    def config(name, opts)= (@service[:configs] ||= []) << {source: name.to_s }.merge(opts)
+    def config(name = nil, opts)= (@service[:configs] ||= []) << {source: name.to_s }.merge(opts)
     def logging(opts) = (@service[:logging] ||= {}).merge!  opts
     def user(user) = @service[:user] = user #  "${UID}:${GID}", "www-data:www-data"
     def network(names) = (@service[:networks] ||= []) << names
@@ -215,11 +215,13 @@ module Dry
 
         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
+        service[:configs]&.each_with_index do |config, index|
+          config[:source] = "#{service_name}-config-#{index}" if config[:source].to_s.empty?
+          compose[:configs][config[:source].to_sym] ||= {}
+          compose[:configs][config[:source].to_sym].merge! config.except(:source, :target)
+          config.delete :file_content
+          config.delete :file
+          config.delete :name
         end
       end
 
@@ -229,6 +231,10 @@ module Dry
           fname = "./#{@name}.config.#{name}"
           File.write fname, config[:file_content]
           {name: "#{name}-#{md5}", file: fname}.merge config.except(:file_content)
+        elsif config[:file]
+          body = File.read config[:file] rescue ''
+          md5 = Digest::MD5.hexdigest body
+          {name: "#{name}-#{md5}", file: fname}.merge config
         else
           config
         end
@@ -321,7 +327,6 @@ module Dry
       else
         @logging.merge! expand_hash(opts)
       end
-
     end
 
     def Volume(name, opts = {})

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.73'
+    VERSION = '0.0.75'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.75
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake