dry-stack 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650b0226416d2a1f6c7ce540d792d6721c37c248bff0794ea9d469a289d01866
-  data.tar.gz: b1c3554c45fdb137b176deae57ec2cf29926c5403b68a701ccf46b931c4f8f31
+  metadata.gz: d5f21e65df1e5cdb3f6fc7d28dd4c4f3e9c66db5de746af952d0353da1ecc4cb
+  data.tar.gz: 1cad2e0cf7cf1def43213d490173445db4df8036332b4ded90fd6095a552d8f3
 SHA512:
-  metadata.gz: 744e043617e076fde81f5c424fb290456318d0b22d70977ed02896bceedc67d569745c26e0f1241b8d726c7e6444e357239c1c9ac967c148bc462ab9585530cc
-  data.tar.gz: 6bb3474c6b3cc7bd5ea5c0f9c4581ddd59cf0d1da801c8eae5ba19e0ba667ee3f2c4b5224c6e896330b77e7b62226946292f7c6bb1122e9dcedfcc1af0e0824a
+  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/command_line.rb

@@ -38,6 +38,7 @@ module Dry
           #  in all caps are required
           o.on('-s', '--stack STACK_NAME', 'Stack file')
           o.on('-e', '--env', 'Load .env file') { load_env }
+          o.on('',   '--name STACK_NAME', 'Define stack name')
           o.on('',   '--ingress', 'Generate ingress labels') { true }
           o.on('',   '--traefik', 'Generate traefik labels') { true }
           o.on('-n', '--no-env', 'Do not process env variables') { true }
@@ -51,10 +52,11 @@ module Dry
 
           stack_text = $stdin.tty? ? File.read(params[:stack]) : STDIN.read
           Dry::Stack() { eval stack_text }
+          Stack.last_stack.name = params[:name] if params[:name]
           COMMANDS[command.to_sym].run Stack.last_stack, params
-        # rescue => e
-        #   puts e.message
-        #   exit 1
+        rescue => e
+          puts e.message
+          exit 1
         end
       end
     end

data/lib/dry-stack/stack.rb

@@ -20,6 +20,7 @@ module Dry
     class << self
       attr_accessor :last_stack
     end
+    attr_accessor :name
 
     def Stack(name = nil, &)
       Stack.last_stack = Stack.new name
@@ -32,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('*', '.*')
@@ -77,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
 
@@ -109,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.11'
+    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.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Artyom B