dry-stack 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4c014e08d5156845c9dc3c0884ab04fe72f0f75eaffe03415a0d24be6e4b2a
-  data.tar.gz: c2faae7a7822c71d4e97590b0c7eec7abec5e5f32fb3cbd3baaa31534a302e96
+  metadata.gz: 6cc31d2b83307688e1d43bc7b204f641cc03c3b81e5b51edad67b1c59ecf88b9
+  data.tar.gz: '04284bddd3f1e10b39ae1cfc113953c9cc52aa20c00b06fd24e6cf34fe29ab59'
 SHA512:
-  metadata.gz: 48df74bbb2801e09b50a40d5f9a771f0da561b1e617d3ac30709ad5de97ce2b59a31b6f49d6991cc0502df3ee3e70f858a85e1d7bf577083fa0c2233c143b9bc
-  data.tar.gz: ceed8407e46f9142d772873813cbeee78869f0f2bf305815e319a03ebabd2e10b6b26d1821e8f129c8043dbb1f674ef6f26e636e6bf1b9d9c2af0bbd1f78172f
+  metadata.gz: 1f4e9f33b0dc3a2a192f2f85a3cba5a390b0c0c2197a057be65ed5819f107f6958a2be9f88efbc39ee8a1b357e05f45447912c56fcaefaac023e5259a49183b8
+  data.tar.gz: 8ef6dafd0c4645afea6341a753554dfb3a747727d8e8d866aada49b971be9b54b31bc6f7a30ae553397d24d0e78d77575c0666455d16e05938bc1aa218906ad8

data/lib/dry-stack/stack.rb

@@ -270,11 +270,23 @@ module Dry
         service[:deploy][:labels] = service[:deploy][:labels].map{ env_sub[_1] }
         service[:environment].transform_values!{ _1.is_a?(String) ? (env_sub[_1]) : _1 }
 
-        pp_i = @publish_ports[name]&.reject { _1.class == String }
+        pp_h = @publish_ports[name]&.select { _1.class == Hash }
+        pp_i = @publish_ports[name]&.select { _1.class == Integer }
         pp_s = @publish_ports[name]&.select { _1.class == String }
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
         service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
 
+        if pp_h&.any?
+          service[:ports] = service[:ports].map { |s|
+            if s.class == String
+              published, target = s.split(':').map(&:to_i)
+              { published:, target:, protocol: 'tcp', mode: 'ingress'}
+            else
+              s
+            end
+          } + pp_h
+        end
+
         service[:logging] ||= @logging[name.to_sym]
 
         service[:volumes]&.map!&.with_index do |volume, index|
@@ -391,7 +403,7 @@ module Dry
     end
 
     def PublishPorts(ports)
-      @publish_ports.merge! ports.to_h { |k, v| [k,[v].flatten] }
+      @publish_ports.merge! ports.to_h { |k, v| [k,@publish_ports[k].to_a + [v].flatten] }
     end
 
     def Service(name, opts = {}, &block)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.26'
+    VERSION = '0.1.27'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Artyom B
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake