dry-stack 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5010fb1f68c965e46cfc971af6bc8cd51396b4ba0d536a941d05a8b1c57ad9e
-  data.tar.gz: c1969aae21a128f7f6258bb40de6da55870d5cf2e111102d3dcde9783a07c372
+  metadata.gz: 6c88b6bc038fa30ed2b132c936cdae39d7cbc28a2fcfa0b303fc89fff05a53bb
+  data.tar.gz: fcce7e5376b5fa037ac96c9becf52f889115636e20ba9f42a1d3f929fdc5ffec
 SHA512:
-  metadata.gz: f8b7e31c2c065ddb71b39aac76abaf0cd669c862eeebf5f9b2504ea76722e67a9d7bc0f2e98a68120c3ac6ef66d5c46d8d843a1eafa3f1d37d6a6f7809f4d213
-  data.tar.gz: e4aa2c968ecec428dfe77fd5bb1813e2dd3330720da92b279b659062b141eb5ac41364f873f27f6e8591899429df7ef16f88483422b21a74f777eee6756ebf4b
+  metadata.gz: 255a433586527977da9d6ff9f7c579bcd646adc91c0616eb09345f55c8e715eb8d430939331013a651b369cf3c8eb8e56bd5552b7430916e31d3a0846d760e77
+  data.tar.gz: 9b749419d4c4ec2fe4b7ad330e7a3fddcd500757cd025ac6c90c48eafedf86708995c9f491e9e214c90feff71d48102d7e9f61820140d3980d38f25a24e5f399

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]
@@ -332,13 +332,11 @@ module Dry
       (@after_blocks ||=[]) << block
     end
 
-    # TODO: latter
-    # def ServicesEach(names, &)
-    # def ServicesEach(names, opts, &)
-    def ServicesEach(&block)
+    def ServicesEach(name = nil, opts = {}, &block)
       After do
-        @services.values.each do |svc|
-          ServiceFunction.new(svc, &block) if block_given?
+        name ||= @services.keys
+        [name].flatten.each do |s_name|
+          Service s_name, opts, &block
         end
       end
     end
@@ -348,12 +346,13 @@ module Dry
     end
 
     def Service(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.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Artyom B