dry-stack 0.0.29 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6a26f6bec5b6052d6d1d3ba5d8da6364bd57be09e36c50df7619b30ffb3580
-  data.tar.gz: 5414baf2c1dbff34e6db0dfd68fb314569dc41e7a05c9ee0a356c4e06ad2f814
+  metadata.gz: 2d15a946b86497d529dc191697a55abb8ff207dd70da6807640b7a87ef4f2269
+  data.tar.gz: b17a4ac10cdc98485cb31aec4ddf4d68e46bc5486dbf163312c6536ef437bde2
 SHA512:
-  metadata.gz: 2c981de0665c1744c01a79c1c9b30e6df2278de89d22be0f796b3e00c48862d50dad34259bbb7e11faf8547ae567d78a89017bb5cbc803adcbdc68c9830a243f
-  data.tar.gz: 1b20dfae0ec340458c2bc53c5b3f4f694271cc2faf23d95c25bf91296d9af39a3374cb7a86d0242687f9d7984aec08ff87927819d5acee758de3cc835c2d552b
+  metadata.gz: 90e203c189bedd2dea18e0fe4407d7992d5173a5a74eaf055af9b1350ad700a9da4313e6e9d6bb548a924c2d9a122e198b7351f4ea9a4dfc685ce0c2b1d8135d
+  data.tar.gz: 949c056d38082987d914d81da31a6ec832b1b06fe16a5e8504f64d113f8234370b353061aa371961d664e6c109e62312f95240f496e01ab4913527890d71aa1c

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

@@ -12,6 +12,7 @@ module Dry
   class ServiceFunction
     def initialize(service, &); @service = service; instance_exec(&) end
     def env(variables)= @service[:environment].merge! variables
+    def volume(opts)= ((@service[:volumes] ||= []) << opts).flatten!
     def image(name)= @service[:image] = name
     def ports(ports)= ((@service[:ports] ||= []) << ports).flatten!
     def command(cmd)= @service[:command] = cmd
@@ -36,13 +37,21 @@ module Dry
       @options = {}
       @services = {}
       @networks = {}
+      @volumes = {}
       @publish_ports = {}
       @ingress = {}
       @deploy = {}
       @labels = {}
     end
 
-    def stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
+    def stringify(obj)
+      case
+        when obj.is_a?(Hash); obj.to_h { |k, v| [k.to_s, stringify(v)] }
+        when obj.is_a?(Array); obj.map { stringify(_1) }
+        else obj
+      end
+    end
+
     def expand_hash(hash)
       hash.select { _1.to_s =~ /\./ }.each do |k, v|
         name = k.to_s.scan(/([^\.]*)\.(.*)/).flatten
@@ -72,6 +81,7 @@ module Dry
         # Not allowed by docker stack deploy
         version: @version,
         services: YAML.load(@services.to_yaml),
+        volumes: YAML.load(@volumes.to_yaml),
         networks: YAML.load(@networks.to_yaml),
       }
 
@@ -179,6 +189,12 @@ module Dry
       @networks[name].merge! opts
       yield if block_given?
     end
+
+    def Volume(name, opts = {})
+      @volumes[name] ||= {}
+      @volumes[name].merge! opts
+      yield if block_given?
+    end
   end
 end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.29'
+    VERSION = '0.0.31'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.31
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake