dry-stack 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5010fb1f68c965e46cfc971af6bc8cd51396b4ba0d536a941d05a8b1c57ad9e
-  data.tar.gz: c1969aae21a128f7f6258bb40de6da55870d5cf2e111102d3dcde9783a07c372
+  metadata.gz: ee77026f4dbbad4d93821303e117f494ca9ee63277d6ac75f9ee4bd4bf8f85f3
+  data.tar.gz: 115fd41b201a1483b0485639309e06f132f1247a7712f8c4a49ed26197ef3fa9
 SHA512:
-  metadata.gz: f8b7e31c2c065ddb71b39aac76abaf0cd669c862eeebf5f9b2504ea76722e67a9d7bc0f2e98a68120c3ac6ef66d5c46d8d843a1eafa3f1d37d6a6f7809f4d213
-  data.tar.gz: e4aa2c968ecec428dfe77fd5bb1813e2dd3330720da92b279b659062b141eb5ac41364f873f27f6e8591899429df7ef16f88483422b21a74f777eee6756ebf4b
+  metadata.gz: da8b13fa2ede538ad057ff761e5a66c9764e4c246581687bdafafbe6f7783fe036c3b1ff4580032a4fc103b4e2ff936a4001b62efa16b4be1342fb421ffb9969
+  data.tar.gz: 75fd19165a78349b402fd32c1a913c5b0697e833a448de9284e890657e7f9ea2c1aab94f281f877e6afcb51ada962c49eb485f88e0ea9941f265d2a94f0ff4fa

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

@@ -31,7 +31,7 @@ module Dry
     end
   end
 
-  def each_recursive(parent, each_ =-> { _1.respond_to?(:each) ? _1.each : [] }, path = [], &blk)
+  def each_recursive(parent, each_ = -> { _1.respond_to?(:each) ? _1.each : [] }, path = [], &blk)
     each2_ = each_.is_a?(Array) ? ->(p) { (m = each_.find { p.respond_to? _1 }) ? p.send(m) : [] } : each_
     (each2_[parent] || []).each do |(k,v)|
       blk.call [path + [parent], k, v, path]
@@ -45,6 +45,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
 
@@ -147,7 +151,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
 
@@ -332,13 +336,19 @@ module Dry
       (@after_blocks ||=[]) << block
     end
 
-    # TODO: latter
-    # def ServicesEach(names, &)
-    # def ServicesEach(names, opts, &)
-    def ServicesEach(&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
-        @services.values.each do |svc|
-          ServiceFunction.new(svc, &block) if block_given?
+        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
@@ -347,13 +357,28 @@ 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.merge! opts
-      ServiceFunction.new(service, &)  if block_given?
+      service.deep_merge! opts
+      ServiceFunction.new(service, &) if block_given?
     end
 
     def Description(string)

data/lib/version.rb

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

metadata

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