dry-stack 0.0.78 → 0.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a17cdb3001d7c72255229cb88956602fe754b531cdb7b9e487dc2f7720a72bd4
-  data.tar.gz: e8b606cd6394aa9541cd63232af35af44b8ff200f97a2ad81e4732409b16878f
+  metadata.gz: 494e6afe2e8c38f8109678bc6f8c484c77449cf0cff675f97cc81419f0405efb
+  data.tar.gz: 4f5944de12d4532a931697c61799343c25c3a68b4c98ae23ec683f3b0df6075c
 SHA512:
-  metadata.gz: bb9ca568d9a5bf2209e2b9f6681d0b353dbcd3e6406246ec19ea4b00cd4f2e6125372eca4148000b5086c75713551a0e6a0eb1c297efaaa8ea1043215a042340
-  data.tar.gz: 4cbb642e2bf1e8b71369d861f43369a13678bdc63cc467faf1604ff7e9b9f2cfb5a6a31aeb5771395ccb98e547005c55315c5a0621f74ec63f8bd67dce6012d7
+  metadata.gz: fd69e49a774071f6589affa27995b099d854dba54e7d9f31bd0e3a1f76eb62cf3eb647c622dfac1f831d9f9cc3de3c8bd7f9b1070ca3fe3346701bcf41fbceaf
+  data.tar.gz: 4340c7640966ac12f8302042a9e04f34a1404c01823b17aba4738b81b55a9e8557ce82737e762931996a7527a3139b9da128638c185f9924b3011813115a800d

data/lib/dry-stack/command_compose.rb

@@ -2,10 +2,10 @@ require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
   def run(stack, params, args, extra)
-    raise "unsupported args: #{args}" unless args.empty?
+    raise "none or one deploy name may be specified: #{args}" unless args.empty? || args.size == 1
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]
-    yaml = stack.to_compose(_params).lines[1..].join
+    yaml = stack.to_compose(_params, args[0]&.to_sym ).lines[1..].join
 
     # substitute ENV variables
     _params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml.gsub("`", '\\\`')}\"")

data/lib/dry-stack/command_swarm_deploy.rb

@@ -33,7 +33,7 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     end
 
     # substitute ENV variables
-    yaml = stack.to_compose(_params).lines[1..].join
+    yaml = stack.to_compose(_params, c_name).lines[1..].join
     yaml = _params[:'no-env'] ? yaml : `echo \"#{yaml.gsub("`", '\\\`')}\"`
     system " echo \"#{yaml.gsub("`", '\\\`')}\"" if _params[:v]
     # system " echo \"#{yaml.gsub("`", '\\\`')}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"

data/lib/dry-stack/stack.rb

@@ -61,6 +61,7 @@ module Dry
   class SwarmFunction
     def initialize(swarm, &); @swarm = swarm; instance_exec(&) end
     def env(variables)= @swarm[:environment].merge! variables
+    def options(variables)= @swarm[:options].merge! variables
     def context_host(host)= @swarm[:context_host] = host
     def context_name(name)= @swarm[:context_name] = name
     def stack_name(name)= @swarm[:stack_name] = name
@@ -119,7 +120,12 @@ module Dry
       end
     end
 
-    def to_compose(opts = @options )
+    def to_compose(opts = @options, deploy_name = nil )
+      if deploy_name
+        raise "Deploy not found: #{deploy_name}" unless @swarm_deploy[deploy_name]
+
+        opts.merge! @swarm_deploy[deploy_name][:options]
+      end
       compose = {
         # name: @name.to_s, # https://docs.docker.com/compose/compose-file/#name-top-level-element
         # Not allowed by docker stack deploy
@@ -358,7 +364,7 @@ module Dry
     def SwarmDeploy(name, opts = {}, &)
       opts[:environment] = opts.delete(:env) if opts.key? :env
 
-      swarm = @swarm_deploy[name.to_sym] ||= { environment: {} }
+      swarm = @swarm_deploy[name.to_sym] ||= { environment: {}, options: {} }
       swarm.merge! opts
       SwarmFunction.new(swarm, &) if block_given?
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.78'
+    VERSION = '0.0.80'
   end
 end

metadata

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