dry-stack 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c88b6bc038fa30ed2b132c936cdae39d7cbc28a2fcfa0b303fc89fff05a53bb
-  data.tar.gz: fcce7e5376b5fa037ac96c9becf52f889115636e20ba9f42a1d3f929fdc5ffec
+  metadata.gz: ee77026f4dbbad4d93821303e117f494ca9ee63277d6ac75f9ee4bd4bf8f85f3
+  data.tar.gz: 115fd41b201a1483b0485639309e06f132f1247a7712f8c4a49ed26197ef3fa9
 SHA512:
-  metadata.gz: 255a433586527977da9d6ff9f7c579bcd646adc91c0616eb09345f55c8e715eb8d430939331013a651b369cf3c8eb8e56bd5552b7430916e31d3a0846d760e77
-  data.tar.gz: 9b749419d4c4ec2fe4b7ad330e7a3fddcd500757cd025ac6c90c48eafedf86708995c9f491e9e214c90feff71d48102d7e9f61820140d3980d38f25a24e5f399
+  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

@@ -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,11 +336,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,7 +357,21 @@ 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

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.10'
+    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.10
+  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