dry-stack 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25076e926da29d61b22b6be14379e4e9e23af5bf1146c2c5d0ef64f917023a24
-  data.tar.gz: 023ed0ce2c46e14303f1fefdba6811e2401a7c9ac08f4bb44e288cce30943dae
+  metadata.gz: b6b0981566e92e24a2da8878f387d0db385cf91c330bdbdf85cafd99f2c57561
+  data.tar.gz: f1a39d9413754ebe20c0249f9e7ea2c344c136387c0211ab9aa98c7fc37b4a24
 SHA512:
-  metadata.gz: 4fc1f361dbde144d87b4a3c0d90b859940f0fca6d3f84c02fd28bf9a4849fb373e1bb8f8a3bc2d0665c22106ba642481e1b8c85adc71199e719c99b95249e8f2
-  data.tar.gz: bc466a6b44eeab9f10a9596316f2b4563c63d42b8632e81f4cc90af87d1ba0117ea4d5079c8554f5c8d8ba3da44013ec1160a0a9560f9cbcf92e53960e06eea9
+  metadata.gz: b81863c9ebe1e517bdb3e3060e80673ea0ea870c307519c44ef0464bdd04f9aef5a0a18945973bc6d4fd97cb4dfe79822fa3d0511500366bcf05f7e360dbcad1
+  data.tar.gz: 3de0c4bd30868e4c82763d642e4b3904915ce3351dea066ae95b2933ee624aeded11bc4792afac46e8e6369797625c83ad15cf7be5d2bbcb9d1b8f20fb38b5ae

data/bin/stack.drs

@@ -1,19 +1,16 @@
-Stack :simple_stack do
+HttpFront services: {admin: 'admin.*', operator: 'operator.*', reports: 'reports.*',
+                     navigator: 'navigator.*', backend: 'admin.*, operator.*, navigator.*'}
 
-  HttpFront services: {admin: 'admin.*', operator: 'operator.*', reports: 'reports.*',
-                       navigator: 'navigator.*', backend: 'admin.*, operator.*, navigator.*'}
+PublishPorts admin: 4000, operator: 4001, navigator: 4002, reports: 7000 # mode: ingress, protocol: tcp
 
-  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 :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 :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
+Service :reports, image: 'reports:0.1', env: {DB_URL: '$DB_URL'}, ports: 7000
 
-  Network :default, attachable: true
-end
+Network :default, attachable: true

data/bin/stack1.drs

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

data/bin/stack2.drs

@@ -0,0 +1,8 @@
+PublishPorts reports: 7000
+Ingress reports: {host: 'reports.*', protocol: :http, port: 7000}
+
+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
+Network :ingress_routing, external: true, name: 'ingress-routing'

data/lib/dry-stack/command_line.rb

@@ -47,7 +47,8 @@ module Dry
           command = args.shift || ''
           raise "Unknown command: #{command}" unless COMMANDS.key?(command.to_sym)
 
-          eval $stdin.tty? ? File.read(params[:stack]) : STDIN.read
+          stack_text = $stdin.tty? ? File.read(params[:stack]) : STDIN.read
+          Dry::Stack() { eval stack_text }
           COMMANDS[command.to_sym].run Stack.last_stack, params, args
         rescue => e
           puts e.message

data/lib/dry-stack/stack.rb

@@ -4,7 +4,7 @@ require 'optparse'
 
 module Dry
 
-  def Stack(name, &)
+  def Stack(name = nil, &)
     Stack.last_stack = Stack.new name
     Stack.last_stack.instance_exec(&) if block_given?
   end
@@ -12,6 +12,8 @@ module Dry
   class ServiceFunction
     def initialize(service, &); @service = service; instance_exec(&) end
     def env(variables)= @service[:environment].merge! variables
+    def image(name)= @service[:image] = name
+    def ports(ports)= ((@service[:ports] ||= []) << ports).flatten!
   end
 
   class Stack
@@ -19,11 +21,17 @@ module Dry
       attr_accessor :last_stack
     end
 
+    def Stack(name = nil, &)
+      Stack.last_stack = Stack.new name
+      Stack.last_stack.instance_exec(&) if block_given?
+    end
+
     def initialize(name)
       @name = name
       @services = {}
       @networks = {}
       @publish_ports = {}
+      @ingress = {}
     end
 
     def stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
@@ -35,11 +43,18 @@ module Dry
       }
 
       compose[:services].each do |name, service|
-        service[:ports] = @publish_ports[name]&.zip(service[:ports])&.map { _1.join ':' }
-        service.delete_if { _2.nil? || _2.empty? }
+        @ingress[name][:port] ||= service[:ports]&.first if @ingress[name]
+        service[:deploy] ||= {}
+        service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
+
+        service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
       end
 
-      compose.delete_if { _2.nil? || _2.empty? }
+      prune = ->(o) {
+        o.each { prune[_2] }  if o.is_a? Hash
+        o.delete_if { _2.nil? || (_2.respond_to?(:empty?) && _2.empty?) } if o.is_a? Hash
+      }
+      prune[compose]
       stringify(compose).to_yaml
     end
 
@@ -60,6 +75,10 @@ module Dry
       ServiceFunction.new(@services[name], &)  if block_given?
     end
 
+    def Ingress(services)
+      @ingress.merge! services
+    end
+
     def Network(name, opts = {})
       @networks[name] ||= {}
       @networks[name].merge! opts

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.3'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,6 +103,8 @@ extra_rdoc_files: []
 files:
 - bin/dry-stack
 - bin/stack.drs
+- bin/stack1.drs
+- bin/stack2.drs
 - lib/dry-stack.rb
 - lib/dry-stack/command_compose.rb
 - lib/dry-stack/command_line.rb