dry-stack 0.0.68 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146c4a166dd6b6136a2b3f9c4068bcdf01fa38f64665148523bb7e4192d91cc7
-  data.tar.gz: 27e180472c79e5b351d51086c5595b8d5326d67bf18b0b1661d849ab9315be0e
+  metadata.gz: 347130396d5cf0de94694fdc5d5edcce940833d0dd4e7c05726fa218c0669801
+  data.tar.gz: c62702ddffe13310445c8c830fa5cabb06763ed9ae71477d4e41e15c7f8239c5
 SHA512:
-  metadata.gz: 74afa47a72fe82c508baedd4feaf3e8280f6890c540161f1fc87a3a2787d0330f6d3d05e8bc37ad5152a16243d485d477488969c37119b140cdfa6bb3a9c98a5
-  data.tar.gz: cb99fb3f874fbd03c04b9c8cef3a28ca660f60c65304e0c2977485a85f6af140a700a12d7430de0f10400aaa54dbbade3c1fa0dbd6460976328f56bf5c034da7
+  metadata.gz: 738b139b5a8ead311d1c1445a88418cdf0d31f4c18a6e200515338f32a6dd041c9e324dffb998b3df9f19d8ed1323c34b340027ef3786b6c43152ce27f007973
+  data.tar.gz: 5f67d76cf8c9d3ebb4b4b8e21dd71d6a420dfa514c955bae2c23dc6d12005d3793587c91895992f767efd18c2d16d884bbd416f39fec995f5535873985336fe6

data/lib/dry-stack/command_compose.rb

@@ -1,7 +1,7 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
-  def run(stack, params, args)
+  def run(stack, params, args, extra)
     raise "unsupported args: #{args}" unless args.empty?
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]

data/lib/dry-stack/command_line.rb

@@ -42,7 +42,10 @@ module Dry
       def run(args)
         params = {}
 
+        a, extra = ARGV.join(' ').split( / -- /)
+        ARGV.replace a.split if a
         ARGV << '-h' if ARGV.empty?
+
         OptionParser.new do |o|
           o.version = "#{Dry::Stack::VERSION}"
 
@@ -54,7 +57,7 @@ module Dry
           o.banner = "Version: #{o.version}\nUsage:\n\t#{usage.join "\n\t"}"
           o.separator ''
           o.separator 'Commands:'
-          COMMANDS.each { |name, cmd| o.separator "#{' ' * 5}#{name} -  #{cmd.help}" }
+          COMMANDS.each { |name, cmd| o.separator "#{' ' * 5}#{name} -  #{[cmd.help].flatten.join "\n#{' ' * (5+4 + name.size)}" }" }
 
           o.separator ''
           o.separator 'Options:'
@@ -82,7 +85,7 @@ module Dry
           safe_eval stack_text # isolate context
 
           Stack.last_stack.name = params[:name] if params[:name]
-          COMMANDS[command.to_sym].run Stack.last_stack, params, args
+          COMMANDS[command.to_sym].run Stack.last_stack, params, args, extra
         rescue => e
           puts e.message
           ENV['DEBUG'] ? raise : exit(1)

data/lib/dry-stack/command_swarm_deploy.rb

@@ -1,8 +1,9 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
-  def run(stack, params, args)
+  def run(stack, params, args, extra)
     unless args.empty?
+      c_name = args[0].to_sym
       raise "deploy config not found: #{args[0]}" unless stack.swarm_deploy.key? args[0].to_sym
       context = stack.swarm_deploy[args[0].to_sym]
     end
@@ -26,7 +27,7 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
 
       ENV['DOCKER_CONTEXT'] = name.to_s
       stack.name = context[:stack_name] || stack.name
-      context[:stack_name][:environment].each do |k,v|
+      context[:environment].each do |k,v|
         ENV[k.to_s] = v.to_s
       end
     end
@@ -37,7 +38,8 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     system " echo \"#{yaml.gsub("`", '\\\`')}\"" if _params[:v]
     # 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
+    #  --prune  --resolve-image changed
+    exec_i "docker stack deploy -c - #{stack.name} #{extra}", yaml
     system "docker config rm $(docker config ls --filter label=com.docker.stack.namespace=#{stack.name} --format \"{{.ID}}\")"
 
     exec_i "docker config rm #{stack.name}_readme || echo 'failed to remove config #{stack.name}_readme'"
@@ -45,7 +47,9 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     exec_i "docker config create #{stack.name}_readme -", stack.description
   end
 
-  def help = 'Call docker stack deploy & add config readme w/ description'
+  def help = ['Call docker stack deploy & add config readme w/ description',
+              '[... swarm_deploy sd_name -- --prune  --resolve-image changed]']
+
 end.new
 
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.68'
+    VERSION = '0.0.70'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.70
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake