dry-stack 0.0.79 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8823f4774a66a511374052a8358d1f55b5fdd9828fe5de1805078ca2d6ed6e6f
-  data.tar.gz: 92c42ce074daa1565f3b927eeee50c90721741be2ec1748c220016d53c5e21a7
+  metadata.gz: 758974f16669de0183b226fe54b60a63ff0f83dce670049922d86968b5d4d7ad
+  data.tar.gz: afeaef4ec662565cda18cd38deef6b7e55977ab8b96838622665d2ac0e4c88f4
 SHA512:
-  metadata.gz: fe64f228952239381ea0babe811d65f2f0a868e4f21a8452e3568314f0b89f2baf2da28c220620f4d7c46a8af586e3e417c1f35856f891f52164a6008e54ca3b
-  data.tar.gz: 4ab470216298a7d48417a5db86b1c5d955ab1eaf393aa4f3ec4b746c41995bfb098ffca4a19c896218d5f27fbb269c8b2954b225f9f30071212570fb0957527a
+  metadata.gz: '09f0cbddbcc9ccc2465352bf5dd1365e0b0cb2a2f5788536b09e4018c7b4b5f9cb7677930540ab6e82c064724e1aa805c88c18a79e6a2e66bc27388f72b33ea0'
+  data.tar.gz: 4d1a5fe073d29742e48a8d26eef50620f37ff4f7a3d42b9c899d303824f64e472900ae9545d6b76d733cc0521b95ec9386afb78375820af91d5727a89fc2a2e7

data/lib/dry-stack/command_compose.rb

@@ -11,7 +11,9 @@ Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
     _params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml.gsub("`", '\\\`')}\"")
   end
 
-  def help = 'Print stack in docker compose format'
+  def help = ['Print stack in docker compose format',
+              '[... to_compose <deploy name>] ']
+
 end.new
 
 

data/lib/dry-stack/command_swarm_deploy.rb

@@ -33,7 +33,7 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     end
 
     # substitute ENV variables
-    yaml = stack.to_compose(_params).lines[1..].join
+    yaml = stack.to_compose(_params, c_name).lines[1..].join
     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"

data/lib/dry-stack/stack.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'json'
 require 'optparse'
 require 'digest'
+require 'bcrypt'
 
 # class TrueClass
 #   def encode_with(coder) = coder.represent_scalar('tag:yaml.org,2002:str', 'true')
@@ -56,6 +57,7 @@ module Dry
     def logging(opts) = (@service[:logging] ||= {}).merge!  opts
     def user(user) = @service[:user] = user #  "${UID}:${GID}", "www-data:www-data"
     def network(names) = (@service[:networks] ||= []) << names
+    def basic_auth(user_and_password) = @service[:basic_auth] = user_and_password
   end
 
   class SwarmFunction
@@ -126,6 +128,7 @@ module Dry
 
         opts.merge! @swarm_deploy[deploy_name][:options]
       end
+
       compose = {
         # name: @name.to_s, # https://docs.docker.com/compose/compose-file/#name-top-level-element
         # Not allowed by docker stack deploy
@@ -146,6 +149,14 @@ module Dry
         service[:deploy][:labels] ||= []
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
 
+        if service[:basic_auth]
+          ba_user, ba_password = service[:basic_auth].split ':'
+          hashed_password = BCrypt::Password.create ba_password
+          service[:deploy][:labels] << "traefik.http.middlewares.%{service-name}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
+          service[:deploy][:labels] << "traefik.http.routers.%{service-name}.middlewares=%{service-name}_auth"
+          service.delete :basic_auth
+        end
+
         if ingress[0] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
           service[:networks] ||= []
           service[:networks] << 'default' if service[:networks].empty?

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.79'
+    VERSION = '0.0.81'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.79
+  version: 0.0.81
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement