update

Author: artyomb

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-stack (0.1.55)
+    dry-stack (0.1.57)
 
 GEM
   remote: https://rubygems.org/

lib/dry-stack/stack.rb

@@ -415,18 +415,31 @@ def After(&block)
       (@after_blocks ||=[]) << block
     end
 
+    def normalize_service_hook_args(name, opts)
+      if name.is_a?(Hash) && opts.empty?
+        opts = name
+        name = nil
+      end
+
+      opts = opts.dup
+      except = [opts.delete(:except)].flatten.compact
+      [[name].flatten.compact, opts, except]
+    end
+
     def BeforeService(name = nil, opts = {}, &block)
-      (@before_blocks ||=[]).push names: [name].flatten.compact, except: opts[:except],
+      names, opts, except = normalize_service_hook_args(name, opts)
+      (@before_blocks ||=[]).push names:, except:,
                                   block: ->(s_name) {
         _ServiceImplementation s_name, opts, &block
       }
     end
 
     def AfterService(name = nil, opts = {}, &block)
+      names, opts, except = normalize_service_hook_args(name, opts)
       After do
-        names = [name || @services.keys].flatten
-        names -= [opts[:except]].flatten if opts.key? :except
-        names.each do |s_name|
+        hook_names = names.empty? ? @services.keys : names
+        hook_names -= except
+        hook_names.each do |s_name|
           _ServiceImplementation s_name, opts, &block
         end
       end

lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.56'
+    VERSION = '0.1.57'
   end
 end

spec/data/stack20-compose.yml

@@ -0,0 +1,61 @@
+---
+version: '3.8'
+services:
+  front:
+    environment:
+      BEFORE_HOOK: enabled
+      TEST2: enabled
+      TEST1: enabled
+      STACK_NAME: stack
+      STACK_SERVICE_NAME: front
+    deploy:
+      labels:
+      - traefik.enable=true
+      - traefik.http.routers.stack_front-0.service=stack_front-0
+      - traefik.http.middlewares.stack_front-0_oauth_provider.forwardauth.address=http://oauth2_slim:7000/auth
+      - traefik.http.middlewares.stack_front-0_oauth_provider.forwardauth.authResponseHeadersRegex=^X-
+      - traefik.http.routers.stack_front-0.rule=HostRegexp(`{name:front\..*}`)
+      - traefik.http.routers.stack_front-0.middlewares=stack_front-0_oauth_provider
+    networks:
+      default:
+      ingress_routing:
+    init: true
+    image: frontend
+  admin:
+    environment:
+      TEST2: enabled
+      STACK_NAME: stack
+      STACK_SERVICE_NAME: admin
+    deploy:
+      labels:
+      - traefik.enable=true
+      - traefik.http.routers.stack_admin-0.service=stack_admin-0
+      - traefik.http.routers.stack_admin-0.rule=HostRegexp(`{name:admin\..*}`)
+    networks:
+      default:
+      ingress_routing:
+    init: true
+    image: admin
+  worker:
+    environment:
+      BEFORE_HOOK: enabled
+      TEST2: enabled
+      STACK_NAME: stack
+      STACK_SERVICE_NAME: worker
+    deploy:
+      labels:
+      - traefik.enable=true
+      - traefik.http.routers.stack_worker-0.service=stack_worker-0
+      - traefik.http.middlewares.stack_worker-0_oauth_provider.forwardauth.address=http://oauth2_slim:7000/auth
+      - traefik.http.middlewares.stack_worker-0_oauth_provider.forwardauth.authResponseHeadersRegex=^X-
+      - traefik.http.routers.stack_worker-0.rule=HostRegexp(`{name:worker\..*}`)
+      - traefik.http.routers.stack_worker-0.middlewares=stack_worker-0_oauth_provider
+    networks:
+      default:
+      ingress_routing:
+    init: true
+    image: worker
+networks:
+  ingress_routing:
+    external: true
+    name: ingress-routing

spec/data/stack20.drs

@@ -0,0 +1,23 @@
+Service :front, image: 'frontend' do
+  ingress host: 'front.*'
+end
+Service :admin, image: 'admin' do
+  ingress host: 'admin.*'
+end
+Service :worker, image: 'worker' do
+  ingress host: 'worker.*'
+end
+
+BeforeService except: [:admin] do
+  env BEFORE_HOOK: 'enabled'
+  oauth_provider 'oauth2_slim:7000/auth'
+end
+
+BeforeService do
+  env TEST2: 'enabled'
+end
+
+BeforeService %i[front] do
+  env TEST1: 'enabled'
+end
+