dry-stack 0.0.74 → 0.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c09ec9f2621d4f04f4aa4578c6a523a88830721d10d3ec5582f92678fc728cf
-  data.tar.gz: 9d8871217ff3e0dba94346c916a6f2764ed261c3fbeaae1df884e767bdd6b13c
+  metadata.gz: fc66cd52245000ece4ab555e7de7bebfb8bbc430fa874b7a193a98cb1b4252c7
+  data.tar.gz: fca08f1524e5108238fa3ed1767caec60b9760a1c8b4c29fb0805cc29faa7645
 SHA512:
-  metadata.gz: 86f2a7e6d7ef991952b4b3689ad7b112b27c759d181e357074439dab9f6946d2def17b0c9e95968f47ccb0377cfab7beedb0771b290e1c0855b276d6d138469b
-  data.tar.gz: 6d3822249f9d87632da48600ced3cbaaabf317d0fe075a3ba3f7ec48163b1830811255a58a3d82fa423575a1a805c3d2a7eb584c7dc680118ae89105fb319d7a
+  metadata.gz: 4dc22324c06865377ab541b63793070395df81fd2df72b7f3957482b603b712392436f579f27dfcb776cef9571798a12829c04701c67e88071ab80ef03016984
+  data.tar.gz: e339f2530b9529dbe94883bf8ef63757da1e66e05b23c7bbb90b1cb8ae694a4e00062563366ae083d00187c8fe038e432461b0822e4a21b28e7fffefd6bb05c4

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,12 +215,32 @@ module Dry
 
         service[:logging] ||= @logging[name.to_sym]
 
-        service[:configs]&.each do |config|
+        service[:volumes]&.map!&.with_index do |volume, index|
+          if volume.is_a? Hash
+            if (volume.key?(:name) && volume.key?(:source)) || (!volume.key?(:name) && !volume.key?(:source))  
+              $stderr.puts 'Use either :name or :source in volume declaration as a Hash'
+              $stderr.puts ':name will create Volume section automatically'
+              raise 'invalid volume declaration'
+            end
+            if volume.key? :name
+              v_name = "#{service_name}-volume-#{index}".to_sym
+              compose[:volumes][v_name] ||= {}
+              compose[:volumes][v_name].merge! volume.slice(:name, :driver, :driver_opts)
+              volume[:type] ||= 'volume'
+              volume.except(:name, :driver, :driver_opts).merge source: v_name
+            else
+              volume
+            end
+          else
+            volume
+          end
+        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
+          config.replace config.except :file_content, :file, :name
         end
       end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.74'
+    VERSION = '0.0.76'
   end
 end

metadata

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