dry-stack 0.0.30 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f963ad419ec4bc9369167b55795a7567276b68562cbcd6c78cb0be12f3f23f7e
-  data.tar.gz: 5c533b595b8d277d57371a6277ca6c53e01781569344b8f3959b65b60cc233b5
+  metadata.gz: 2b95bf09c2912cbd942ecb2e6b37b47d9960503dbea2d3ed946871ca4a226711
+  data.tar.gz: eb507efcf03ec6c83f542f8aba9b9dabdfca36828a46b69ac92d58271475a982
 SHA512:
-  metadata.gz: c42cd31297f740d1c6ad10f90c3c1f2e17be118fd5e049b77a63acda3c8ef7b149e654983ad3a2a31425b011f0689aec2e389d0875b9d233764924506c47965d
-  data.tar.gz: 7d9d6459a9727727b24ae3515c5895ed34f6e348c5a7e9e9997daea04926d356f4c46e4c715bc00e263bb4976ae6e9c6a8b693f6534768ee44fd9e761a7c5877
+  metadata.gz: 24209e54f2166e64485790bc8cf232937905a6eab15146385618a6e87062850da29a9cbb1aab8279e2f79f4dc8dce4583aab25d026ca78aa7524e6d149fcb294
+  data.tar.gz: e9aca70888043d039039841dcc312d39f49ed80cf818c7d6685cd7a0a16c1a12440789a6b2666dcfc3520c448eec0d368dd6824caf8068b043babe9d978cbfd2

data/lib/dry-stack/command_line.rb

@@ -1,4 +1,15 @@
 require_relative '../version'
+require 'open3'
+
+def exec_i(cmd, input_string)
+    puts "exec_i(inputs.size #{input_string.size}): #{cmd}"
+    Open3.popen3(cmd) do |i, o, e, t|
+	i.puts input_string
+	i.close
+	while line = o.gets; puts "o: " + line end
+	while line = e.gets; puts "o: " + line end
+    end
+end
 
 module Dry
   module CommandLine

data/lib/dry-stack/command_swarm_deploy.rb

@@ -9,10 +9,12 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     # substitute ENV variables
     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"
-    system " docker config rm #{stack.name}_readme"
-    puts " printf \"#{stack.description}\" | docker config create #{stack.name}_readme -"
-    system " printf \"#{stack.description}\" | docker config create #{stack.name}_readme -"
+    # 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 #{stack.name}_readme"
+    puts "stack description: #{stack.description}"
+    exec_i "docker config create #{stack.name}_readme -", stack.description
   end
 
   def help = 'Call docker stack deploy & add config readme w/ description'

data/lib/dry-stack/stack.rb

@@ -138,7 +138,10 @@ module Dry
 
         service[:deploy].merge! @deploy[name] if @deploy[name]
 
-        service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
+        pp_i = @publish_ports[name]&.reject { _1.class == String }
+        pp_s = @publish_ports[name]&.select { _1.class == String }
+        service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
+        service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
       end
 
       prune = ->(o) {

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.30'
+    VERSION = '0.0.32'
   end
 end

metadata

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