dry-stack 0.0.71 → 0.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068cf557c3a44aece001366bcd147616d4e6aafc3db1f6941a7b0b79c3db6799'
-  data.tar.gz: f73cdb06ddd54b2ea5b9744257172a196af3b34a4b08039580e4391e59959f67
+  metadata.gz: 7f35a469754d680757e756d963d51626b61036f72ded01624da7b83c265df270
+  data.tar.gz: 505a63cfb76e1f52e616ad8db6d2a61f4d1c414c2db1e2930f47678669b4efdc
 SHA512:
-  metadata.gz: daf9793fd47e3c90114bf80c0d05fc07ca29e8ff8c28b017a86da6b1a37887492926c350b19f7fdc6e957642a87485c043e2e6f737fcb0117848335e5e6c6613
-  data.tar.gz: 1d8bcbc7a6f7105196686f12a9cdde4ddfc0ee5f37fa75be96b79d1c3c9ba41db7c9a4a116ea5cf07a7a547b6e1a2a84e39fd124d57b6d3138e58f8843a87716
+  metadata.gz: b31cdaa49ea775772f96b7975cf2948eefb0aa2889efa4177aae65f6932d376e433c1cb3c857f1090b6576fb373c6fb0c087eef5957009d808dcbab620eba563
+  data.tar.gz: 2f5840ec782285994e355950fe7d3fa856f275729351160999c973f81520867f41f35934c9636ae3f49efe4ed0207afc5ea9b34991e23fc24063e44e53bd0578

data/bin/stack.drs

@@ -2,15 +2,19 @@ Description <<~DSC
 
 DSC
 
-Options name: 'stack_name'
+Options name: 'stack_name', traefik: true
 SwarmDeploy :sky_gates do
   context_host 'ssh://root@10.0.0.1'
   stack_name 'remote_stack'
   env REGISTRY_HOST: '10.100.0.2:5000'
 end
+Ingress admin: [
+  {host: 'backend.*'},
+  {host: 'admin.*', path: '/api', port: 4000}
+]
 
 Deploy [:admin, :operator], labels: [
-  'traefik.http.middlewares.%{service-name}_auth.basicauth.users=admin:$apr1$i7hdbc9g$Rkocxo9snhmuESvUg0TTv/',
+  'traefik.http.middlewares.%{service-name}_auth.basicauth.users=admin:$$apr1$$i7hdbc9g$$Rkocxo9snhmuESvUg0TTv/',
   "traefik.http.routers.%{service-name}.middlewares=%{service-name}_auth"
 ]
 

data/lib/dry-stack/stack.rb

@@ -13,6 +13,22 @@ require 'digest'
 # end
 
 module Dry
+  class ::Hash
+    def deep_merge!(second)
+      merger = proc { |_, v1, v2|
+        if Hash === v1 && Hash === v2
+          v1.merge!(v2, &merger)
+        else
+          if Array === v1 && Array === v2
+            v1 | v2
+          else
+            [:undefined, nil, :nil].include?(v2) ? v1 : v2
+          end
+        end
+      }
+      merge!(second.to_h, &merger)
+    end
+  end
 
   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_
@@ -182,7 +198,7 @@ module Dry
         service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s
         service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
 
-        service[:deploy].merge! @deploy[name] if @deploy[name]
+        service[:deploy].deep_merge! @deploy[name] if @deploy[name]
 
         hash = {'service-name': service_name, 'stack-name': @name}
         hash.default = ''

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.71'
+    VERSION = '0.0.72'
   end
 end

metadata

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