dry-stack 0.0.69 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d18a6292393e8f5f02702fc817a79919e54ad2ba51741593befcee11d60e42
-  data.tar.gz: 9cc4966982e230b7917ba8b0580cfa6bf6aa9ccea39bb8646a660dbd7249ce2e
+  metadata.gz: '068cf557c3a44aece001366bcd147616d4e6aafc3db1f6941a7b0b79c3db6799'
+  data.tar.gz: f73cdb06ddd54b2ea5b9744257172a196af3b34a4b08039580e4391e59959f67
 SHA512:
-  metadata.gz: b74523d6dafa1ba2be675a221ca7b9f4f064c0d1e5cbbc0e10505b881c7b0ffd19dfdef5ba29f49ddecdbcea09b537fb60b7e79d4f2a88d63a68c1d04bf554a6
-  data.tar.gz: c67d9edd77c96176e80d9b6a0511fbe3ebab6d3f4f02fbcc72dd4de247af8c382a145d12f24f6e77da2276ad33670d711ad63979eaa6bf1f27761eb5b28071b6
+  metadata.gz: daf9793fd47e3c90114bf80c0d05fc07ca29e8ff8c28b017a86da6b1a37887492926c350b19f7fdc6e957642a87485c043e2e6f737fcb0117848335e5e6c6613
+  data.tar.gz: 1d8bcbc7a6f7105196686f12a9cdde4ddfc0ee5f37fa75be96b79d1c3c9ba41db7c9a4a116ea5cf07a7a547b6e1a2a84e39fd124d57b6d3138e58f8843a87716

data/bin/stack.drs

@@ -9,6 +9,11 @@ SwarmDeploy :sky_gates do
   env REGISTRY_HOST: '10.100.0.2:5000'
 end
 
+Deploy [:admin, :operator], labels: [
+  'traefik.http.middlewares.%{service-name}_auth.basicauth.users=admin:$apr1$i7hdbc9g$Rkocxo9snhmuESvUg0TTv/',
+  "traefik.http.routers.%{service-name}.middlewares=%{service-name}_auth"
+]
+
 PublishPorts admin: 4000, operator: 4001, navigator: 4002, reports: 7000 # mode: ingress, protocol: tcp
 
 Service :admin,     image: 'frontend', env: {APP: 'admin'},     ports: 5000

data/lib/dry-stack/command_compose.rb

@@ -1,7 +1,7 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
-  def run(stack, params, args)
+  def run(stack, params, args, extra)
     raise "unsupported args: #{args}" unless args.empty?
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]

data/lib/dry-stack/command_line.rb

@@ -42,7 +42,10 @@ module Dry
       def run(args)
         params = {}
 
+        a, extra = ARGV.join(' ').split( / -- /)
+        ARGV.replace a.split if a
         ARGV << '-h' if ARGV.empty?
+
         OptionParser.new do |o|
           o.version = "#{Dry::Stack::VERSION}"
 
@@ -54,7 +57,7 @@ module Dry
           o.banner = "Version: #{o.version}\nUsage:\n\t#{usage.join "\n\t"}"
           o.separator ''
           o.separator 'Commands:'
-          COMMANDS.each { |name, cmd| o.separator "#{' ' * 5}#{name} -  #{cmd.help}" }
+          COMMANDS.each { |name, cmd| o.separator "#{' ' * 5}#{name} -  #{[cmd.help].flatten.join "\n#{' ' * (5+4 + name.size)}" }" }
 
           o.separator ''
           o.separator 'Options:'
@@ -82,7 +85,7 @@ module Dry
           safe_eval stack_text # isolate context
 
           Stack.last_stack.name = params[:name] if params[:name]
-          COMMANDS[command.to_sym].run Stack.last_stack, params, args
+          COMMANDS[command.to_sym].run Stack.last_stack, params, args, extra
         rescue => e
           puts e.message
           ENV['DEBUG'] ? raise : exit(1)

data/lib/dry-stack/command_swarm_deploy.rb

@@ -1,8 +1,9 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
-  def run(stack, params, args)
+  def run(stack, params, args, extra)
     unless args.empty?
+      c_name = args[0].to_sym
       raise "deploy config not found: #{args[0]}" unless stack.swarm_deploy.key? args[0].to_sym
       context = stack.swarm_deploy[args[0].to_sym]
     end
@@ -37,7 +38,8 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     system " echo \"#{yaml.gsub("`", '\\\`')}\"" if _params[:v]
     # 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
+    #  --prune  --resolve-image changed
+    exec_i "docker stack deploy -c - #{stack.name} #{extra}", yaml
     system "docker config rm $(docker config ls --filter label=com.docker.stack.namespace=#{stack.name} --format \"{{.ID}}\")"
 
     exec_i "docker config rm #{stack.name}_readme || echo 'failed to remove config #{stack.name}_readme'"
@@ -45,7 +47,9 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     exec_i "docker config create #{stack.name}_readme -", stack.description
   end
 
-  def help = 'Call docker stack deploy & add config readme w/ description'
+  def help = ['Call docker stack deploy & add config readme w/ description',
+              '[... swarm_deploy sd_name -- --prune  --resolve-image changed]']
+
 end.new
 
 

data/lib/dry-stack/stack.rb

@@ -182,16 +182,16 @@ module Dry
         service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s
         service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
 
+        service[:deploy].merge! @deploy[name] if @deploy[name]
+
         hash = {'service-name': service_name, 'stack-name': @name}
         hash.default = ''
         original_verbosity = $VERBOSE
         $VERBOSE = nil
-        service[:deploy][:labels].map!{ _1 % hash }
+        service[:deploy][:labels] = service[:deploy][:labels].map{ _1 % hash }
         service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
         $VERBOSE = original_verbosity
 
-        service[:deploy].merge! @deploy[name] if @deploy[name]
-
         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 ':' }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.69'
+    VERSION = '0.0.71'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.71
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake