dry-stack 0.0.48 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9869544e65771b3a67dc978d70980aed68a0c5315cf0b72299c1e6b0a3c4b62
-  data.tar.gz: 4bbfb8544667bcac8d0ef564dfd3d14f93bfb1cd789ec508580edc8239e07082
+  metadata.gz: 5cc929029911fa4edc7a3ec23a68a6b10c802d6a235685a561f38e6647399a22
+  data.tar.gz: e44f26a375005eb7c7e934f3be84b61c74bf48b30ecccca003404afca135e356
 SHA512:
-  metadata.gz: dabb2d39c64d81c3f72a22ab857a94aed55c4404545b0aeb15815b85ab03d1c8342ae7ffd19a6abffab0305de731c9d0146fc5e256ad7043a3bdb8d07ff784bc
-  data.tar.gz: 8eb313b41315302ed6019f9deb704c6f632ad3067cffb252e269a8b7798265f2d96587eeeaf2b1d676764e14b48db5f9d8f140e6a2ca9c4d4076162030e50d49
+  metadata.gz: eb10f6c18d5e7e900960e4c20433977f4b2d7ad0918a8a6fe2ed4dd8e9af60872f0374538d9d586b0e7f5fe9ee95e87a9e3b53e3696ed2a8bae3dfdc600ad2c7
+  data.tar.gz: dd6a5c1e6d0fbfca3ac4801b85ec6dc42b7a572dba16bc1c488d5bf428ddd92a1a3698ea413d1cafdf84a282e533a3899fc547b08be9be6085ec5ad2e651ef96

data/lib/dry-stack/command_compose.rb

@@ -3,6 +3,7 @@ require_relative 'command_line'
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
   def run(stack, params)
     _params = stack.options.merge params
+    stack.name = _params[:name] if _params[:name]
     yaml = stack.to_compose(_params).lines[1..].join
 
     # substitute ENV variables

data/lib/dry-stack/command_swarm_deploy.rb

@@ -12,6 +12,8 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     # system " echo \"#{yaml.gsub("`", '\\\`')}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"
 
     exec_i "docker stack deploy -c - #{stack.name} --prune  --resolve-image changed", yaml
+    system "docker config rm $(docker config ls --filter label=com.docker.stack.namespace=#{stack.name} --format \"{{.ID}}\")"
+
     system "docker config rm #{stack.name}_readme"
     puts "stack description: #{stack.description}"
     exec_i "docker config create #{stack.name}_readme -", stack.description

data/lib/dry-stack/stack.rb

@@ -3,8 +3,24 @@ require 'yaml'
 require 'optparse'
 require 'digest'
 
+# class TrueClass
+#   def encode_with(coder) = coder.represent_scalar('tag:yaml.org,2002:str', 'true')
+# end
+#
+# class FalseClass
+#   def encode_with(coder)= coder.represent_scalar('tag:yaml.org,2002:str', 'false')
+# end
+
 module Dry
 
+  def each_recursive(parent, each_ =-> { _1.respond_to?(:each) ? _1.each : [] }, path = [], &blk)
+    each2_ = each_.is_a?(Array) ? ->(p) { (m = each_.find { p.respond_to? _1 }) ? p.send(m) : [] } : each_
+    (each2_[parent] || []).each do |(k,v)|
+      blk.call [path + [parent], k, v, path]
+      each_recursive(v || k, each_, path + [parent], &blk)
+    end
+  end
+
   def Stack(name = nil, &)
     Stack.last_stack = Stack.new name
     Stack.last_stack.instance_exec(&) if block_given?
@@ -185,6 +201,11 @@ module Dry
         o.delete_if { _2.nil? || (_2.respond_to?(:empty?) && _2.empty?) } if o.is_a? Hash
       }
       prune[compose]
+
+      each_recursive compose do |_path, node, _v|
+        _path.last[node] = _v.to_s if node.to_s == 'fluentd-async'
+      end
+
       stringify(compose).to_yaml
     end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.48'
+    VERSION = '0.0.50'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.50
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake