dry-stack 0.0.36 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca411e8c6c4aecd1657a57d5398b106d4f42892f82400038ccca3c671240dde
-  data.tar.gz: feb5cd80f56da06a126607004aa625bbb23a64def1a64d21e1a69cdeee8511a5
+  metadata.gz: 552fc69a9e66540b6dda0684697a9f6d61fca3df74237622d7c332bbdff055ef
+  data.tar.gz: 47525a271a081a4eb8f0ced2ffed4ef8292e86959efcb45aa0e08aff2a86a4e3
 SHA512:
-  metadata.gz: 15789f821fde3f33328b8408d41feeab190cb67ea645a06a1ddfee73634687310b86ee009efa932a1da5045860809564fb622954fd12ef6fb07c4a836f171395
-  data.tar.gz: 5b3feef8d7a39a7cfd1d2fb64be19aea632a217f05c88e48ef648c632fc9e216fbd9b8045b355ef185104a20b0ef9acb24396e52f90910097a28c729d1ca0053
+  metadata.gz: abdc1e2747cfe02adedbaff0c56d5b2ccba4406c4705313b618e1889bd6a47bcba6d0f0cc9b1b0eaaa73fa62f511ab734c1d07c839a8ca9f070c405365783c48
+  data.tar.gz: e07c5699910cbaecda40dceab572a693e20bb069526b340d1763549c8354a2b2d7ce82ba294909bff4f2de5b841b09e6d24c62c6b7b656108c5d5c4fbd49a5c6

data/lib/dry-stack/stack.rb

@@ -16,7 +16,7 @@ module Dry
     def image(name)= @service[:image] = name
     def ports(ports)= ((@service[:ports] ||= []) << ports).flatten!
     def command(cmd)= @service[:command] = cmd
-    def label(str)= @service[:deploy][:labels] << str
+    def deploy_label(str)= @service[:deploy][:labels] << str
   end
 
   class Stack
@@ -91,33 +91,36 @@ module Dry
       end
 
       compose[:services].each do |name, service|
-        @ingress[name][:port] ||= service[:ports]&.first if @ingress[name]
+        ingress = [@ingress[name]].flatten
+        ingress[0][:port] ||= service[:ports]&.first if ingress[0]
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
 
-        if @ingress[name] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
+        if ingress[0] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
           service[:networks] ||= []
           service[:networks] << 'default' if service[:networks].empty?
           service[:networks] << 'ingress_routing'
         end
 
-        if opts[:host_sed] && @ingress.dig(name,:host)
-          a, b = opts[:host_sed].split('/').reject(&:empty?)
-          @ingress[name][:host].gsub! %r{#{a}}, b
+        ingress.each do |rule|
+          if opts[:host_sed] && rule[:host]
+            a, b = opts[:host_sed].split('/').reject(&:empty?)
+            rule[:host].gsub! %r{#{a}}, b
+          end
         end
 
-        if @ingress[name] && opts[:ingress]
-          service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
+        if ingress[0] && opts[:ingress]
+          service[:deploy][:labels] = ingress[0]&.map { |k, v| "ingress.#{k}=#{v}" }
         end
 
-        if @ingress[name] && (opts[:traefik] || opts[:traefik_tls])
-          service_name = "#{@name}_#{name}"
+        service_name = "#{@name}_#{name}"
 
+        if ingress[0] && (opts[:traefik] || opts[:traefik_tls])
           service[:deploy][:labels] += [
             'traefik.enable=true',
             "traefik.http.routers.#{service_name}.service=#{service_name}",
-            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
+            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{ingress[0][:port]}"
           ]
 
           if opts[:traefik_tls]
@@ -131,13 +134,24 @@ module Dry
             ]
           end
 
-          rule = []
-          rule << "HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)" if @ingress[name][:host]
-          rule << "PathPrefix(`#{nginx_host2regexp @ingress[name][:path]}`)" if @ingress[name][:path]
-          rule << "#{@ingress[name][:rule]}" if @ingress[name][:rule]
-          service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{rule.join ' && '}"
+          rule_group = ingress.map do|r|
+            rule = []
+            rule << "HostRegexp(`{name:#{nginx_host2regexp r[:host]}}`)" if r[:host]
+            rule << "PathPrefix(`#{nginx_host2regexp r[:path]}`)" if r[:path]
+            rule << "#{r[:rule]}" if r[:rule]
+            rule.join ' && '
+          end
+          rule = rule_group.size > 1 ? rule_group.map{"(#{_1})"}.join(' || ') : rule_group[0]
+          service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{rule}"
         end
 
+        hash = {'service-name': service_name}
+        hash.default = ''
+        original_verbosity = $VERBOSE
+        $VERBOSE = nil
+        service[:deploy][:labels].map!{ _1 % hash }
+        $VERBOSE = original_verbosity
+
         service[:deploy].merge! @deploy[name] if @deploy[name]
 
         pp_i = @publish_ports[name]&.reject { _1.class == String }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.36'
+    VERSION = '0.0.38'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.38
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake