dry-stack 0.0.88 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae624210dd275eb7f62eb30f4023ea37dfde7689e84b80e9f98bf4d47f5d66b4
-  data.tar.gz: '0109ac07fea18f6f942ad66d71292fd52da1f27cc0b99c2834d1620b6bdb2c67'
+  metadata.gz: 8e0189d36c23f0487d26004278fd73f0d8e94410d31a7a44237ca88521edd165
+  data.tar.gz: a7e80baf8f3cec031ec0dcd863738301e3758ebea4dfc11c4101b3f9c1ba51a2
 SHA512:
-  metadata.gz: 07a69b0fc65be43c138f561eabff1a38525ceea703b43c368c292bbcd350bdff283f64b74f992aef6f7b0b97761af6ff7e594ee07b634900b1780ef559bae281
-  data.tar.gz: fc51afc785660c574d971374b300da2ba8ce67f9673b1d700822867ba7baefc89de0addba17c52e5b3da56c32bb2b2617233cf3337f3ee64ad5e925309f46b9f
+  metadata.gz: 0bacfd11de68b970264c5749cd38797b52ea83aa9a2b6b818232798d22e50bfc1c6a8ae243cff52af1a03a35b841165bbfd08053dfbb39e1d5cb193f20e985ac
+  data.tar.gz: d3e124944972e6efaccba32322bff5edc5bf9ff9855e23981488f2ebe440cd4763781a6a9930c14b7c121ed38e5895f29e55ca54f5e017b272871d4b3e9a0812

data/lib/dry-stack/command_compose.rb

@@ -1,14 +1,13 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
-  def run(stack, params, args, extra)
-    raise "none or one deploy name may be specified: #{args}" unless args.empty? || args.size == 1
+  def run(stack, params, _args, _extra)
     _params = stack.options.merge params
-    stack.name = _params[:name] if _params[:name]
-    yaml = stack.to_compose(_params, args[0]&.to_sym ).lines[1..].join
+    yaml = stack.to_compose(_params ).lines[1..].join
+    $stdout.puts yaml
 
     # substitute ENV variables
-    _params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml.gsub("`", '\\\`')}\"")
+    # _params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml.gsub("`", '\\\`')}\"")
   end
 
   def help = ['Print stack in docker compose format',

data/lib/dry-stack/command_line.rb

@@ -37,7 +37,9 @@ module Dry
          raise 'Invalid .env file'
       end
 
-      def safe_eval(str) = Dry::Stack() { eval str, self.binding }
+      def safe_eval(drs, params)
+        Dry::Stack(params[:name], params[:configuration]) { eval drs, self.binding }
+      end
 
       def run(args)
         params = {}
@@ -68,9 +70,12 @@ module Dry
           o.on('',   '--name STACK_NAME', 'Define stack name')
           o.on('',   '--ingress', 'Generate ingress labels') { true }
           o.on('',   '--traefik', 'Generate traefik labels') { true }
-          o.on('',   '--traefik_tls', 'Generate traefik tls labels') { true }
-          o.on('',   '--host_sed /from/to/', 'Sed ingress host  /\\*/dev.*/')
-          o.on('-n', '--no-env', 'Do not process env variables') { true }
+          o.on('',   '--traefik-tls', 'Generate traefik tls labels') { true }
+          o.on('',   '--host-sed /from/to/', 'Sed ingress host  /\\*/dev.*/')
+          o.on('-n', '--no-env', 'Deprecated') { $stderr.puts 'warning: deprecated option: -n' } # TODO: remove
+          o.on('-c', '--configuration name', 'Configuration name')
+          COMMANDS.values.select{_1.options(o) if _1.respond_to? :options }
+
           o.on('-h', '--help') { puts o; exit }
           o.parse! args, into: params
 
@@ -82,7 +87,8 @@ module Dry
           stack_text = File.read(params[:stack]) if params[:stack]
           stack_text ||= STDIN.read unless $stdin.tty?
 
-          safe_eval stack_text # isolate context
+
+          safe_eval stack_text, params # isolate context
 
           Stack.last_stack.name = params[:name] if params[:name]
           COMMANDS[command.to_sym].run Stack.last_stack, params, args, extra

data/lib/dry-stack/command_swarm_deploy.rb

@@ -1,41 +1,35 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
+  def options(parser)
+    parser.on('-x', '--context-endpoint host', 'Docker context host. Created if not exists')
+  end
+
   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
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]
 
-    if context
-      name = context[:context_name]&.to_sym || args[0].to_sym
-      host = context[:context_host]
+    if params[:'context-endpoint']
+      name = params[:'context-endpoint'].gsub( /[\/.:@]/,'_').gsub( '__','_')
+      name = "dry-#{name}".to_sym
+      endpoint = params[:'context-endpoint']
       contexts = {}
-      exec_o_lines "docker context ls --format json" do |line|
+      exec_o_lines 'docker context ls --format json' do |line|
         ctx = JSON.parse line, symbolize_names: true
         contexts[ctx[:Name].to_sym] = ctx # {"Current":false,"Description":"","DockerEndpoint":"ssh://root@x.x.x.x","Error":"","Name":"prod-swarm"}
       end
 
-      if contexts[name] && contexts[name][:DockerEndpoint] != host
-        raise "context '#{name}' has different host value: #{contexts[name][:DockerEndpoint]} != #{host}"
+      if contexts[name] && contexts[name][:DockerEndpoint] != endpoint
+        raise "context '#{name}' has different host value: #{contexts[name][:DockerEndpoint]} != #{endpoint}"
       end
 
-      exec_i "docker context create #{name} --docker host=#{host}" unless contexts[name]
+      exec_i "docker context create #{name} --docker host=#{endpoint}" unless contexts[name]
 
       ENV['DOCKER_CONTEXT'] = name.to_s
-      stack.name = context[:stack_name] || stack.name
-      context[:environment].each do |k,v|
-        ENV[k.to_s] = v.to_s
-      end
     end
 
     # substitute ENV variables
-    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]
+    yaml = stack.to_compose(_params).lines[1..].join
     # system " echo \"#{yaml.gsub("`", '\\\`')}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"
 
     #  --prune  --resolve-image changed
@@ -48,7 +42,7 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
   end
 
   def help = ['Call docker stack deploy & add config readme w/ description',
-              '[... swarm_deploy sd_name -- --prune  --resolve-image changed]']
+              '[... swarm_deploy -- --prune  --resolve-image changed]']
 
 end.new
 

data/lib/dry-stack/stack.rb

@@ -39,9 +39,10 @@ module Dry
     end
   end
 
-  def Stack(name = nil, &)
+  def Stack(name = nil, configuration = nil, &)
     Stack.last_stack = Stack.new name
     Stack.last_stack.instance_exec(&) if block_given?
+    Stack.last_stack.apply_configuration configuration if configuration
   end
 
   class ServiceFunction
@@ -54,20 +55,15 @@ module Dry
     def command(cmd)= @service[:command] = cmd
     def entrypoint(cmd)= @service[:entrypoint] = cmd
     def deploy_label(str)= @service[:deploy][:labels] << str
-    def config(name = nil, opts)= (@service[:configs] ||= []) << {source: name.to_s }.merge(opts)
+    def config(name = nil, opts)= (@service[:configs] ||= []) << {source: name.to_s}.merge(opts)
     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 ingress(ing) = ((@service[:ingress] ||=[]) << ing).flatten!
   end
 
-  class SwarmFunction
-    def initialize(swarm, &); @swarm = swarm; instance_exec(&) end
-    def env(variables)= @swarm[:environment].merge! variables
-    def options(variables)= @swarm[:options].merge! variables
-    def context_host(host)= @swarm[:context_host] = host
-    def context_name(name)= @swarm[:context_name] = name
-    def stack_name(name)= @swarm[:stack_name] = name
+  class ConfigurationFunction
+    def initialize(configuration, &); @configuration = configuration; instance_exec(&) end
   end
 
   class Stack
@@ -75,12 +71,13 @@ module Dry
     class << self
       attr_accessor :last_stack
     end
-    attr_accessor :name, :options, :description, :swarm_deploy
+    attr_accessor :name, :options, :description, :configuration
 
-    def Stack(name = nil, &)
-      Stack.last_stack = Stack.new name
-      Stack.last_stack.instance_exec(&) if block_given?
-    end
+    def Stack(...) = Dry::Stack(...)
+
+    # def self.new(*args, &block)
+    #   super
+    # end
 
     def initialize(name)
       @name = name || 'stack'
@@ -97,7 +94,7 @@ module Dry
       @labels = {}
       @configs = {}
       @logging = {}
-      @swarm_deploy = {}
+      @configurations = {}
     end
 
     def expand_hash(hash)
@@ -123,12 +120,13 @@ module Dry
       end
     end
 
-    def to_compose(opts = @options, deploy_name = nil )
-      if deploy_name
-        raise "Deploy not found: #{deploy_name}" unless @swarm_deploy[deploy_name]
+    def apply_configuration(configuration)
+      raise "Configuration not found: #{configuration}" unless @configurations[configuration.to_sym]
+      @configurations[configuration.to_sym][:block_function].call
+    end
 
-        opts.merge! @swarm_deploy[deploy_name][:options]
-      end
+    def to_compose(opts = @options)
+      @name = @options[:name] || @name
 
       compose = {
         # name: @name.to_s, # https://docs.docker.com/compose/compose-file/#name-top-level-element
@@ -323,8 +321,8 @@ module Dry
     end
 
     def Options(opts)
-      warn 'WARN: Options command is used for testing purpose.\
-            Not recommended in real life configurations.' unless $0 =~ /rspec/
+      # warn 'WARN: Options command is used for testing purpose.\
+      #       Not recommended in real life configurations.' unless $0 =~ /rspec/
       @options.merge! opts
     end
 
@@ -333,7 +331,9 @@ module Dry
     end
 
     def Ingress(services)
-      @ingress.merge! services
+      services.each do |name, ing|
+        @ingress[name] = ((@ingress[name] || [] ) | [ing]).flatten
+      end
     end
 
     def Config(name, opts)
@@ -382,12 +382,12 @@ module Dry
       yield if block_given?
     end
 
-    def SwarmDeploy(name, opts = {}, &)
-      opts[:environment] = opts.delete(:env) if opts.key? :env
-
-      swarm = @swarm_deploy[name.to_sym] ||= { environment: {}, options: {} }
-      swarm.merge! opts
-      SwarmFunction.new(swarm, &) if block_given?
+    def Configuration(name, opts = {}, &)
+      configuration = @configurations[name.to_sym] ||= {}
+      configuration.merge! opts
+      configuration.merge! block_function: -> {
+        instance_exec(&) if block_given? # https://rubyreferences.github.io/rubychanges/3.3.html#anonymous-parameters-forwarding-inside-blocks-are-disallowed
+      }
     end
 
   end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.88'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.88
+  version: 0.1.1
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,9 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/dry-stack
-- bin/stack.drs
-- bin/stack1.drs
-- bin/stack2.drs
 - lib/dry-stack.rb
 - lib/dry-stack/apache_specific_md5.rb
 - lib/dry-stack/command_compose.rb

data/bin/stack.drs

@@ -1,33 +0,0 @@
-Description <<~DSC
-
-DSC
-
-Options name: 'stack_name', traefik: true
-SwarmDeploy :sky_gates do
-  context_host 'ssh://root@10.0.0.1'
-  stack_name 'remote_stack'
-  env REGISTRY_HOST: '10.100.0.2:5000'
-end
-Ingress admin: [
-  {host: 'backend.*'},
-  {host: 'admin.*', path: '/api', port: 4000}
-]
-
-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
-Service :operator,  image: 'frontend', env: {APP: 'operator'},  ports: 5000
-Service :navigator, image: 'frontend', env: {APP: 'navigator'}, ports: 5000
-
-Service :backend,   image: 'backend', ports: 3000 do
-  env APP_PORT: 3000, NODE_ENV: 'development', SKIP_GZ: true, DB_URL: '$DB_URL'
-end
-
-Service :reports, image: 'reports:0.1', env: {DB_URL: '$DB_URL'}, ports: 7000
-
-Network :default, attachable: true

data/bin/stack1.drs

@@ -1 +0,0 @@
-Service :reports, image: 'reports', ports: 7000, env: {DB_URL: '$DB_URL'}

data/bin/stack2.drs

@@ -1,8 +0,0 @@
-PublishPorts reports: 7000
-Ingress reports: {host: 'reports.*', protocol: :http, port: 7000}
-Deploy admin: { replica: 2, 'resources.limits': { cpus: 4, memory: '500M' } }
-
-Service :admin,     image: '$REGISTRY_HOST/frontend',  env: { APP: 'admin' },      ports: 5000
-Service :reports,   image: '$REGISTRY_HOST/reports', env: { DB_URL: '$DB_URL' }
-
-Network :default, attachable: true