dry-stack 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b41f8af6bdca698d05c32a0d92a406473d6d6ccdc8b30cad42dff9545cde0f5
-  data.tar.gz: e5c3103939a0ab2b6a0205872f034d00ab60181d7e991127fa0b31adf8570cc9
+  metadata.gz: b5ebf65f6db6234c39d5bfe0b4b6c0be4dc1a2528a361a497b3aa80d093b3e02
+  data.tar.gz: 823bc35c24d568a2c76b4ed921e13e2ed6c9779a1deab5abcf22cc54bb97bc58
 SHA512:
-  metadata.gz: 2e8c41dc8516b11bf54f0470cf8cdedc105a0d6812567c59d06a98db5b22da64a7fec6111a47de1e135e1b65f49fdcca141e81effdb6e917001fdcd5a386f3a2
-  data.tar.gz: 6d74c7b2af40b3a36cdcddf9a1ff0546679b86cc4be3c50cb081db967170a7f7feafc576532e2bce8506d9872e7b03e541dfa0c0acec503757f30692481b1040
+  metadata.gz: 0eb24c92c82d33345308c66f430ffce14cad8fc841c212c9f9927f13c3273c9d66eff66f9dffe25ca7aad43e26a10b5cedda1fef1572b45ac23875490497e03c
+  data.tar.gz: 829f7596fda69391400a2166256632c2e4b5516cf6b07ae445a7c7eb49c24c90e8df80cc9558424b2dc9d3e6f36a33fc0e2abb56eb82be89fac18f262dd17a30

data/lib/dry-stack/stack.rb

@@ -41,6 +41,19 @@ module Dry
     end
   end
 
+  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
+
   attr_accessor :cmd_params
   @cmd_params = {}
 
@@ -64,6 +77,7 @@ module Dry
     def command(cmd)= @service[:command] = cmd
     def entrypoint(cmd)= @service[:entrypoint] = cmd
     def deploy_label(str)= @service[:deploy][:labels] << str
+    def deploy(opts)=@service[:deploy].merge! expand_hash(opts)
     def config(name = nil, opts)= (@service[:configs] ||= []) << {source: name.to_s}.merge(opts)
     def logging(opts) = (@service[:logging] ||= {}).merge!  opts
     def user(user) = @service[:user] = user #  "${UID}:${GID}", "www-data:www-data"
@@ -106,19 +120,6 @@ module Dry
       @configurations = {}
     end
 
-    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)
       # http://nginx.org/en/docs/http/server_names.html
       if str[0] == '~'
@@ -231,13 +232,15 @@ module Dry
 
         service[:deploy].deep_merge! @deploy[name] if @deploy[name]
 
-        hash = {'service-name': service_name, 'stack-name': @name}
-        hash.default = ''
-        original_verbosity = $VERBOSE
-        $VERBOSE = nil
-        service[:deploy][:labels] = service[:deploy][:labels].map{ _1 % hash }
-        service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
-        $VERBOSE = original_verbosity
+        # hash = {'service-name': service_name, 'stack-name': @name}
+        env_sub = ->(s) {
+          s = s.to_s.dup
+          s.gsub!('%{stack-name}', @name.to_s)
+          s.gsub!('%{service-name}', service_name)
+          s
+        }
+        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_s = @publish_ports[name]&.select { _1.class == String }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.14'
+    VERSION = '0.1.16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake