update

Author: artyomb

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-stack (0.1.32)
+    dry-stack (0.1.33)
 
 GEM
   remote: https://rubygems.org/

README.md

@@ -6,7 +6,7 @@ This gem allows ...
 cat simple_stack.drs | dry-stack -e to_compose | docker stack deploy -c - simple_stack
 
 $ dry-stack
-Version: 0.1.32
+Version: 0.1.33
 Usage:
 	dry-stack -s stackfile [options] COMMAND
 	cat stackfile | dry-stack COMMAND

lib/dry-stack/command_line.rb

@@ -1,16 +1,22 @@
 require_relative '../version'
 require 'open3'
 
-def exec_i(cmd, input_string = nil)
+def exec_i(cmd, input_string = nil, &block)
   puts "exec_i(inputs.size #{input_string&.size}): #{cmd}"
   Open3.popen3(cmd) do |i, o, e, wait_thr|
+    std_out, std_err = '', ''
     i.puts input_string unless input_string.nil?
     i.close
-    while line = o.gets; puts "o: " + line end
-    while line = e.gets; puts "o: " + line end
+    while line = o.gets; puts "o: #{line}"; std_out += "#{line}\n" end
+    while line = e.gets; puts "o: #{line}"; std_err += "#{line}\n" end
     return_value = wait_thr.value
     puts "Error level was: #{return_value.exitstatus}" unless return_value.success?
-    exit return_value.exitstatus unless return_value.success?
+
+    if block_given?
+      block.call return_value, std_out, std_err
+    else
+      exit return_value.exitstatus unless return_value.success?
+    end
   end
 end
 

lib/dry-stack/command_swarm_deploy.rb

@@ -26,8 +26,11 @@ def run(stack, params, args, extra)
       raise "context '#{name}' has different host value: #{contexts[name][:DockerEndpoint]} != #{endpoint}"
     end
 
-    exec_i "docker context create #{name} --docker host=#{endpoint}" unless contexts[name]
-    # TODO: o: context "dry-ssh__gis-master_ru" already exists
+    unless contexts[name]
+      exec_i "docker context create #{name} --docker host=#{endpoint}" do |return_value, _o, e|
+        exit return_value.exitstatus unless return_value.success? || e !~ /already exists/m
+      end
+    end
 
     ENV['DOCKER_CONTEXT'] = name.to_s
 

lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.32'
+    VERSION = '0.1.33'
   end
 end