dry-stack 0.0.55 → 0.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7d2d41bcd06f472670d0ccd39d48aa522ba263a52bf261e9ddeb0c8706a7c3
-  data.tar.gz: c8d0f679e1403247ee48ef9fc7f071fb2ae27b3f028f08e3690144465453f9f6
+  metadata.gz: 3c71ef427e2a4703a3653ef4e804d4e7b6e3f96ebcdbbd238949f397680b0416
+  data.tar.gz: df2eb1ce11120dea1e973863c550e6cad37063bf9469563909ef17fd584f0131
 SHA512:
-  metadata.gz: 6562bd497bdeb86b5a526f995a2f19505973add70464f3859779d4359430f7a14f5ab898e771684127461b33655654cc2769d4d6f034f3225f8b7297046c1635
-  data.tar.gz: e88f4d9a6df6aaa2188ca62b07e9891dfd156a36dd705dd074f5306ab3a5b6a6c0027ab98d12b782a42ad4815e3cb94917cd9b62be32c6a4bf8214be58e77fb6
+  metadata.gz: a006773cc22c9c1eb18bdb297bca0fef62436daf40c09129c28dec205565339820407c764fbf55ff3746ca1c6488c3958e304cd939d16913489adca33196ca4a
+  data.tar.gz: cc0350b67c82ae974fb0567d0722c32ceb91902677264ac69b88a38617f1868cfa1bb4574d35a66e74c32a225f7b208922173ec010d841596eb88709303c3f92

data/lib/dry-stack/stack.rb

@@ -59,6 +59,7 @@ module Dry
       @services = {}
       @networks = {}
       @volumes = {}
+      @environment = {}
       @publish_ports = {}
       @ingress = {}
       @deploy = {}
@@ -67,14 +68,6 @@ module Dry
       @logging = {}
     end
 
-    def stringify(obj)
-      case
-        when obj.is_a?(Hash); obj.to_h { |k, v| [k.to_s, stringify(v)] }
-        when obj.is_a?(Array); obj.map { stringify(_1) }
-        else obj
-      end
-    end
-
     def expand_hash(hash)
       hash.select { _1.to_s =~ /\./ }.each do |k, v|
         name = k.to_s.scan(/([^\.]*)\.(.*)/).flatten
@@ -132,15 +125,11 @@ module Dry
           end
         end
 
-        if ingress[0] && opts[:ingress]
-          ingress[0][:port] ||= service[:ports]&.first
-          service[:deploy][:labels] = ingress[0]&.map { |k, v| "ingress.#{k}=#{v}" }
-        end
-
         service_name = "#{@name}_#{name}"
 
         if ingress[0] && (opts[:traefik] || opts[:traefik_tls])
           service[:deploy][:labels] << 'traefik.enable=true'
+          ingress[0][:port] ||= service[:ports]&.first
 
           ingress.each_with_index do |ing, index|
             ing[:port] ||= service[:ports]&.first
@@ -183,6 +172,9 @@ module Dry
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
         service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
 
+        service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
+        service[:environment].merge! STACK_NAME: @name, STACK_SERVICE_NAME: name
+
         service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
         service[:logging] ||= @logging[name.to_sym]
       end
@@ -204,11 +196,15 @@ module Dry
       }
       prune[compose]
 
-      each_recursive compose do |_path, node, _v|
-        _path.last[node] = _v.to_s if node.to_s == 'fluentd-async'
+      each_recursive _root: compose do |_path, node, v|
+        v.transform_keys!(&:to_s) if v.is_a? Hash
+        node.transform_keys!(&:to_s) if node.is_a? Hash
+        _path.last[node] = v.to_s if v.is_a? Symbol
+
+        _path.last[node] = v.to_s if node.to_s == 'fluentd-async'
       end
 
-      stringify(compose).to_yaml
+      compose.to_yaml
     end
 
     def PublishPorts(ports)
@@ -256,6 +252,16 @@ module Dry
       end
     end
 
+    def Environment(names = nil, envs)
+      if names
+        [names].flatten.each do |name|
+          (@environment[name.to_sym] ||= {}).merge! envs
+        end
+      else
+        @environment.merge! envs
+      end
+    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.55'
+    VERSION = '0.0.57'
   end
 end

metadata

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