dry-stack 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b042eab1b6fa003ac8c4f3f92bded92fba4949bd664eb33c3632fe9b21cff3d
-  data.tar.gz: 9fcf393c3e78ae50995276375e4d827c00576aa5d5f0f5aff3f31694d32f81a9
+  metadata.gz: d5f21e65df1e5cdb3f6fc7d28dd4c4f3e9c66db5de746af952d0353da1ecc4cb
+  data.tar.gz: 1cad2e0cf7cf1def43213d490173445db4df8036332b4ded90fd6095a552d8f3
 SHA512:
-  metadata.gz: c3df1ae9f302a552c5e681f0b8ffd0efe1edfad71433e63c7552984381ad11dffb72ccd6dae3f7d9f6bbcfdbdb211ada225278d364d2d365ee8d1df024065e43
-  data.tar.gz: 9b6a4964c7345421e135e75f33969bcac512452d2ef9ae271e1850111d0ce30ea1f43d9f8aa05d277797285a852162f6f8f21bb34938c1858e70f38e3b1435f0
+  metadata.gz: 68640915ff636f73f85a5d3cf4be792aeaa541b3887c8b8da996d640193c49c839997639fe22f1bfc2d7b25c99cd41a479983ebed555a834480ad36fab4eb63c
+  data.tar.gz: cb262611e2c731eb9af706f267e2b40d7253ee070a774353ae89b956a330d4451525acb7196dc8e70f89443bfdb214bf76d1d485ae7f780a30f9f32f21995033

data/bin/stack2.drs

@@ -1,5 +1,6 @@
 PublishPorts reports: 7000
 Ingress reports: {host: 'reports.*', protocol: :http, port: 7000}
+Deploy admin: { replica: 2, 'resources.limits': { cpus: 4, memory: '500M' } }
 
 Service :admin,     image: '$REGISTRY_HOST/frontend',  env: { APP: 'admin' },      ports: 5000
 Service :reports,   image: '$REGISTRY_HOST/reports', env: { DB_URL: '$DB_URL' }

data/lib/dry-stack/stack.rb

@@ -33,9 +33,22 @@ module Dry
       @networks = {}
       @publish_ports = {}
       @ingress = {}
+      @deploy = {}
     end
 
     def stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
+    def expand_hash(hash)
+      hash.select { _1.to_s =~ /\./ }.each do |k, v|
+        name = k.to_s.scan(/([^\.]*)\.(.*)/).flatten
+        hash.delete k
+        hash[name[0]] ||= {}
+        hash[name[0]][name[1]] ||= {}
+        hash[name[0]][name[1]].merge! v if v.is_a?(Hash)
+        hash[name[0]][name[1]] = v unless v.is_a?(Hash)
+      end
+      hash.each { expand_hash(_2) if _2.is_a?(Hash) }
+      hash
+    end
 
     def nginx_host2regexp(str)
       str.to_s.gsub('.', '\.').gsub('*', '.*')
@@ -78,6 +91,8 @@ module Dry
           ]
         end
 
+        service[:deploy].merge! @deploy[name] if @deploy[name]
+
         service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
       end
 
@@ -110,6 +125,10 @@ module Dry
       @ingress.merge! services
     end
 
+    def Deploy(services)
+      @deploy.merge! expand_hash(services)
+    end
+
     def Network(name, opts = {})
       @networks[name] ||= {}
       @networks[name].merge! opts

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.12'
+    VERSION = '0.0.13'
   end
 end

metadata

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