dry-stack 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c88b6bc038fa30ed2b132c936cdae39d7cbc28a2fcfa0b303fc89fff05a53bb
-  data.tar.gz: fcce7e5376b5fa037ac96c9becf52f889115636e20ba9f42a1d3f929fdc5ffec
+  metadata.gz: cbaeac98b043b8dccbbd59e01fd5777b7e9f6a94a7020e560750ee537c283e83
+  data.tar.gz: 7cb8549b37702848f761d7a56afb4baed6a73a419282415bd680aae2b76d7ebd
 SHA512:
-  metadata.gz: 255a433586527977da9d6ff9f7c579bcd646adc91c0616eb09345f55c8e715eb8d430939331013a651b369cf3c8eb8e56bd5552b7430916e31d3a0846d760e77
-  data.tar.gz: 9b749419d4c4ec2fe4b7ad330e7a3fddcd500757cd025ac6c90c48eafedf86708995c9f491e9e214c90feff71d48102d7e9f61820140d3980d38f25a24e5f399
+  metadata.gz: 20109696956962c30782c47495ffcf267e7c9360fd9793bff44e9dbd30cdec3efb2824b8ac729399f01b2abcc3544daa61c5b71c5ba31f6593af1ce34a41d5ea
+  data.tar.gz: a14a9a310271f6dfa43059ad027dc6f8e3ac18d8e776d952af24ce9a4de11e365d58ce25de5b46914e454665ebed1d8c432604048947a5451667d5de74ff3ac2

data/lib/dry-stack/command_line.rb

@@ -40,7 +40,6 @@ module Dry
       def safe_eval(drs, params)
         Dry::Stack(params[:name], params[:configuration]) do
           eval drs, self.binding
-          @after_blocks&.each { instance_exec &_1 }
         end
       end
 

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|
@@ -45,6 +47,10 @@ module Dry
   def Stack(name = nil, configuration = nil, &)
     Stack.last_stack = Stack.new name
     Stack.last_stack.instance_exec(&) if block_given?
+    Stack.last_stack.instance_exec do
+      @services_blocks&.each { instance_exec &_1 }
+      @after_blocks&.each { instance_exec &_1 }
+    end
     Stack.last_stack.apply_configuration configuration if configuration
   end
 
@@ -61,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
 
@@ -147,7 +153,7 @@ module Dry
 
       compose[:services].each do |name, service|
 
-        service[:image].gsub!(/:latest$/, '') # let docker swarm to create tag: :latest@sha265:0000...
+        service[:image].gsub!(/:latest$/, '') if service[:image] # let docker swarm to create tag: :latest@sha265:0000...
 
         ingress = [@ingress[name], service[:ingress] || [] ].flatten.compact
 
@@ -156,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|
@@ -262,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|
@@ -307,14 +307,16 @@ module Dry
 
       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
@@ -332,11 +334,19 @@ module Dry
       (@after_blocks ||=[]) << block
     end
 
-    def ServicesEach(name = nil, opts = {}, &block)
+    def BeforeService(name = nil, opts = {}, &block)
+      (@before_blocks ||=[]).push names: [name].flatten.compact, except: opts[:except],
+                                  block: ->(s_name) {
+        _ServiceImplementation s_name, opts, &block
+      }
+    end
+
+    def AfterService(name = nil, opts = {}, &block)
       After do
-        name ||= @services.keys
-        [name].flatten.each do |s_name|
-          Service s_name, opts, &block
+        names = [name || @services.keys].flatten
+        names -= [opts[:except]].flatten if opts.key? :except
+        names.each do |s_name|
+          _ServiceImplementation s_name, opts, &block
         end
       end
     end
@@ -345,12 +355,26 @@ module Dry
       @publish_ports.merge! ports.to_h { |k, v| [k,[v].flatten] }
     end
 
-    def Service(name, opts = {}, &)
+    def Service(name, opts = {}, &block)
+      @services_blocks ||=[]
+      (@services_blocks ||=[]).push -> { _ServiceDeferred(name, opts, &block) }
+    end
+
+    def _ServiceDeferred(name, opts = {}, &block)
+      (@before_blocks || []).each do |before|
+        next unless before[:names].empty? || before[:names].include?(name)
+        next if before[:except]&.include? name
+        before[:block].call(name)
+      end
+      _ServiceImplementation(name, opts, &block)
+    end
+
+    def _ServiceImplementation(name, opts = {}, &)
       opts = opts.dup
       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.10'
+    VERSION = '0.1.12'
   end
 end

metadata

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