dry-stack 0.0.77 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a44dfe7eace61d17fa137d2b2a78b9c2a5108dc6f9546d15720b12da71d0edf
-  data.tar.gz: 597f836d5ee46984566fc5e34c6ac5562203d5360d8d7554868ba11eaec0cace
+  metadata.gz: 8823f4774a66a511374052a8358d1f55b5fdd9828fe5de1805078ca2d6ed6e6f
+  data.tar.gz: 92c42ce074daa1565f3b927eeee50c90721741be2ec1748c220016d53c5e21a7
 SHA512:
-  metadata.gz: b5393cfb1d0a60401a43d4361a79b95e8fb45f968b05563dc295175af05c3331e5c4ea49d44c35f70a048b61c39da97d3c09429d06e4fc3666345755e85365df
-  data.tar.gz: 22a3f8ed7f8f6d1a8feb1d62b0a3e0e2400bfbb7f33a46f35230d4c6d4def543f2b0b514e618d753e2bd551060b127e8fc622903b260650c6eae606d9701c231
+  metadata.gz: fe64f228952239381ea0babe811d65f2f0a868e4f21a8452e3568314f0b89f2baf2da28c220620f4d7c46a8af586e3e417c1f35856f891f52164a6008e54ca3b
+  data.tar.gz: 4ab470216298a7d48417a5db86b1c5d955ab1eaf393aa4f3ec4b746c41995bfb098ffca4a19c896218d5f27fbb269c8b2954b225f9f30071212570fb0957527a

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/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
@@ -248,7 +254,7 @@ module Dry
       compose[:configs].update(compose[:configs]) do |name, config|
         if config[:file_content]
           md5 = Digest::MD5.hexdigest config[:file_content]
-          fname = "./#{@name}.config.#{name}"
+          fname = "./#{@name}.config.#{name}.#{md5}" # use MD5, when rn in parallel may have different content
           File.write fname, config[:file_content]
           {name: "#{name}-#{md5}", file: fname}.merge config.except(:file_content)
         elsif config[:file]
@@ -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.77'
+    VERSION = '0.0.79'
   end
 end

metadata

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