dry-stack 0.0.56 → 0.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bd67e7d11d77e49df991d208a9869fa9de8e101ac7a586121f79ef5d3c36e6
-  data.tar.gz: 328bd27ee9a1dc7830cfa58e798bbd6ff040a87be2ee8e8e70b15f8ff372f66e
+  metadata.gz: 9fa6584334d5ba14f5751832a22022acc8967f00dd0d5f079d144e9693495fbf
+  data.tar.gz: 0cf0d100def1503252e813cccb00f18d7c34df0bd409efccc52288dee2d98e72
 SHA512:
-  metadata.gz: 5377a18b93f7a858b4575c78bf283eb29e3e84cbc1c0117237ad182668d867e75c5d22d54663693939399c4cef784b35d8a58847ddc08f5f74135bae5d7c5071
-  data.tar.gz: 104d1c872184ea53eb70bbdf21ff7187b42191ac055402323403d7352215d42f186d0a6c7c6fe1ac4d3655009c8a576dfdd9e6f1b62765e7cdecb03517839acb
+  metadata.gz: 312bfa9f5400ddef74fc3d6efe69736e484605808392e766eff65be3d8d26608377a2978d00c0cc2a823f26000b5dee540ab3cda26ee2448461f6e576a29d0ef
+  data.tar.gz: 9885973a1fbe7e7909c022272f4daac15bf844e7f2ebf4fa08211d41b91f0e24beee4bdf344b572a6099b78f7bdee67cda9135a2ddaf580ee863e8887e94fe43

data/lib/dry-stack/stack.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'yaml'
+require 'json'
 require 'optparse'
 require 'digest'
 
@@ -68,14 +69,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
@@ -133,15 +126,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
@@ -185,6 +174,8 @@ module Dry
         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
@@ -206,11 +197,16 @@ 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
+      JSON.parse(compose.to_json).to_yaml
     end
 
     def PublishPorts(ports)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.56'
+    VERSION = '0.0.58'
   end
 end

metadata

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