dry-stack 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 403875b3b25f3013021e71d706b898b63182e701fcc18bd9e78a774a865a8e2f
-  data.tar.gz: 11e22ff1905d049950f7f1c4f92a09c0e47d59d2f65d5dc9d125e9892dc46f5e
+  metadata.gz: f963ad419ec4bc9369167b55795a7567276b68562cbcd6c78cb0be12f3f23f7e
+  data.tar.gz: 5c533b595b8d277d57371a6277ca6c53e01781569344b8f3959b65b60cc233b5
 SHA512:
-  metadata.gz: ed5d8a4ab6440ba0e2f7c51c896002174f90d2338da0a000b6e3c20718f89d344f5f6975e6c4d1903ab2e9ab71177579db7db61c1a7b06a2a887f6ebc6e73591
-  data.tar.gz: fe098127aa49253c710b026bb152420250d01e3b72f35e3ec975d253f9bbe767833469a54103a6530a35d059b7613c540f61b5dc52ba84bce5e35d97ab037ad6
+  metadata.gz: c42cd31297f740d1c6ad10f90c3c1f2e17be118fd5e049b77a63acda3c8ef7b149e654983ad3a2a31425b011f0689aec2e389d0875b9d233764924506c47965d
+  data.tar.gz: 7d9d6459a9727727b24ae3515c5895ed34f6e348c5a7e9e9997daea04926d356f4c46e4c715bc00e263bb4976ae6e9c6a8b693f6534768ee44fd9e761a7c5877

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,12 +37,21 @@ module Dry
       @options = {}
       @services = {}
       @networks = {}
+      @volumes = {}
       @publish_ports = {}
       @ingress = {}
       @deploy = {}
+      @labels = {}
+    end
+
+    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 stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
     def expand_hash(hash)
       hash.select { _1.to_s =~ /\./ }.each do |k, v|
         name = k.to_s.scan(/([^\.]*)\.(.*)/).flatten
@@ -71,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),
       }
 
@@ -82,6 +93,7 @@ module Dry
         @ingress[name][:port] ||= service[:ports]&.first if @ingress[name]
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
+        service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
 
         if @ingress[name] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
           service[:networks] ||= []
@@ -160,6 +172,10 @@ module Dry
       @options.merge! opts
     end
 
+    def Labels(labels)
+      @labels.merge! labels
+    end
+
     def Ingress(services)
       @ingress.merge! services
     end
@@ -173,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.28'
+    VERSION = '0.0.30'
   end
 end

metadata

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