dry-stack 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee77026f4dbbad4d93821303e117f494ca9ee63277d6ac75f9ee4bd4bf8f85f3
-  data.tar.gz: 115fd41b201a1483b0485639309e06f132f1247a7712f8c4a49ed26197ef3fa9
+  metadata.gz: 54ac4c65eb9a540d8b78351dc5bdc4510034618928f212532fa18a18db143ac2
+  data.tar.gz: cc6ccabf6a2a75b31236355012cfb033ce732f1b2379996aa519068ba95a51bd
 SHA512:
-  metadata.gz: da8b13fa2ede538ad057ff761e5a66c9764e4c246581687bdafafbe6f7783fe036c3b1ff4580032a4fc103b4e2ff936a4001b62efa16b4be1342fb421ffb9969
-  data.tar.gz: 75fd19165a78349b402fd32c1a913c5b0697e833a448de9284e890657e7f9ea2c1aab94f281f877e6afcb51ada962c49eb485f88e0ea9941f265d2a94f0ff4fa
+  metadata.gz: 4873a1ff78e0ff316448b84d33d2dee65c928069b30a575dc45af76635884ee77de33dd8aa6178aff29e21d05cbd2dc35c488d21c4cc92ff71830414771bc2b0
+  data.tar.gz: 8f85f6126686c34d6219dd8a21f50d8765d34fe1db4e9a4b6f753894d48bb5f0a609035dc9fd92b550d9df863b27948044ad081208d528435b9996c7977e1fdf

data/lib/dry-stack/stack.rb

@@ -14,6 +14,8 @@ require_relative 'apache_specific_md5'
 # end
 
 module Dry
+  EMPTY_HASH = :empty_hash
+
   class ::Hash
     def deep_merge!(second)
       merger = proc { |_, v1, v2|
@@ -65,7 +67,7 @@ module Dry
     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
+    def network(name, opts = {}) = (@service[:networks][name] ||={}).merge! opts
     def ingress(ing) = ((@service[:ingress] ||=[]) << ing).flatten!
   end
 
@@ -160,9 +162,9 @@ module Dry
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
 
         if ingress[0] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
-          service[:networks] ||= []
-          service[:networks] << 'default' if service[:networks].empty?
-          service[:networks] << 'ingress_routing'
+          service[:networks] ||= {}
+          service[:networks][:default] ||= {} if service[:networks].empty?
+          service[:networks][:ingress_routing] ||= {}
         end
 
         ingress.each do |rule|
@@ -266,21 +268,15 @@ module Dry
           end
         end
 
-        service[:networks]&.map! do |network|
-          if network.is_a?(Hash)
-            if network.key?(:name)
-              n_name = network[:name].gsub('-','_').to_sym
-              if n_name != :default
-                (compose[:networks][n_name] ||= {}).merge! network
-              end
-              n_name
-            else
-              $stderr.puts ':name must be specified in network declaration'
-              raise 'invalid network declaration'
-            end
-          else
-            network
+        service[:networks]&.each do |name, network|
+          next unless network.is_a? Hash
+
+          if network[:name]
+            (compose[:networks][name] ||= {}).merge! network.except(:aliases).merge(name: network[:name])
           end
+          network.delete :external
+          network.delete :name
+          service[:networks][name] = EMPTY_HASH if network.empty?
         end
 
         service[:configs]&.each_with_index do |config, index|
@@ -309,16 +305,22 @@ module Dry
         end
       end
 
+      compose[:networks].transform_values! do |network|
+        network.empty? ? EMPTY_HASH : network
+      end
+
       prune = ->(o) {
         o.each { prune[_2] }  if o.is_a? Hash
-        o.delete_if { _2.nil? || (_2.respond_to?(:empty?) && _2.empty?) } if o.is_a? Hash
+        o.delete_if { _2.nil? || ( _2.respond_to?(:empty?) && _2.empty?) } if o.is_a? Hash
       }
       prune[compose]
 
       each_recursive _root: compose do |_path, node, v|
+
         v.transform_keys!(&:to_s) if v.is_a? Hash
         node.transform_keys!(&:to_s) if node.is_a? Hash
         _path.last[node] = v.to_s if v.is_a? Symbol
+        _path.last[node] = nil if v == EMPTY_HASH
 
         _path.last[node] = v.to_s if node.to_s == 'fluentd-async'
       end
@@ -376,7 +378,7 @@ module Dry
       opts[:ports] = [opts[:ports]].flatten if opts.key? :ports
       opts[:environment] = opts.delete(:env) if opts.key? :env
 
-      service = @services[name.to_sym] ||= {environment: {}, deploy: {labels: []}}
+      service = @services[name.to_sym] ||= {environment: {}, deploy: {labels: []}, networks: {}}
       service.deep_merge! opts
       ServiceFunction.new(service, &) if block_given?
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.11'
+    VERSION = '0.1.13'
   end
 end

metadata

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