orchestration 0.4.21 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5364dca18181a903cf48ab9e3f41a09e1701644a4761a44a4df14ae0d967840
-  data.tar.gz: '0930a75b039913e18f4fa921edaaaf42937cfd66564336cfe2068403e1ca18e5'
+  metadata.gz: 972211f73865daa2a2ea2bcbfc35e031d9d974ba8fc129fda6bc8908073c9821
+  data.tar.gz: e1c219157ed6911b89f2af2c0b0851209ce9473c4370d9728e0600486495a564
 SHA512:
-  metadata.gz: 281d9cb2713d9e172847b495702541e82a1396281a29553b820988ea5f5f66c8e772b01ee138158e73d84c719b8317167903fcbc446e746ddb6d3ede4e7568c3
-  data.tar.gz: 041ebd73730d0531d4ffd649bf2b68125b84aea3a4bfd1b5027c3c68d3451437fddd2126bec0c7958e54906ba7f9ef2cfeb388bfeec95230dc69aa39028707d6
+  metadata.gz: 23400aeae92d13494edde9881448aa24a7fb4e4d7a96a574062c89cb0c8ff7955d884bb8fb5b1fba7a646d0c51bec4e5bc22743fdb91ea104a67d7b65f1cfc57
+  data.tar.gz: e06f3cb45140a2f90e95e7ab5492537f40600da1db892c7f9041f474119509a08882870b3a7d69a68e4727cc02a7af3a9cb80b01881cd727ac9671f65a1af1a6

data/README.md

@@ -35,7 +35,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.21'
+gem 'orchestration', '~> 0.5.0'
 ```
 
 Install:
@@ -276,10 +276,10 @@ The output from most underlying components is hidden in an effort to make contin
 tail -f log/orchestration*.log
 ```
 
-A convenience `Makefile` target `dump` is provided which will output all consumed _stdout_ and _stderr_:
+A convenience `Makefile` target `dump` is provided. The following command will output all consumed _stdout_, _stderr_, and _Docker Compose_ container logs for the test environment:
 
 ```bash
-make dump
+make dump env=test
 ```
 
 All commands also support the `verbose` flag which will output all logs immediately to the console:
@@ -395,44 +395,10 @@ This is a convention of the _Orchestration_ gem intended to make _RabbitMQ_ conf
 
 ## Alternate Database Configuration Files
 
-If you have multiple databases configured in various (e.g.) `config/database.*.yml` files then the `make wait-database` command can be used directly in continuous integration environments to verify that your database services are available.
+If you have multiple databases configured in various `config/database.*.yml` files then the `make wait` command will automatically detect database configurations.
 
-Note that all services from the relevant `docker-compose.yml` configuration will be loaded when using the `make start` or `make test-setup` (called by default `make test` command).
+If a service `database-example` is included in the relevant _Docker Compose_ configuration then `config/database.example.yml` will be used to load the connection configuration. Note that the service name _must_ begin with `database-`.
 
-Assuming the following configurations:
-```
-# orchestration/docker-compose.test.yml
-version: '3.7'
-services:
-  customdb:
-    image: postgres
-    ports:
-      - "55667:5432"
-  # ...
-```
-
-```
-# config/database.custom.yml
-test:
-  adapter: postgresql
-  host: 127.0.0.1
-  port: 55667
-  username: postgres
-  password: password
-  database: postgres
-```
-
-The following command can be used to ensure that the `customdb` service is available:
-```
-make wait-database service=custom config=config/database.custom.yml env=test
-```
-
-You may wish to extend the example `Makefile` to include something like this:
-```
-test: test-setup
-	$(MAKE) wait-database service=custom config=config/database.custom.yml env=test
-	# ...
-```
 ## License
 
 [MIT License](LICENSE)

data/lib/orchestration/templates/orchestration.mk.erb

@@ -116,15 +116,11 @@ ifeq (${env},$(filter ${env},test development))
          ) \
          || ( [ -z '${sidecar}' ] || ${fail} )
 else
-	@${compose} up --detach --scale app=$${instances:-1} ${services} ${log} || ${fail}
+	@${compose} up --detach --scale app=$${instances:-1} ${log} || ${fail}
 endif
 	@$(call printrawln,' ${green}started${reset} ${tick}')
 	@$(call println,'${yellow}Waiting for services to become available${reset} ...')
-ifdef services
-	@$(call make,wait services='${services}') 2>${stderr} || ${fail}
-else
 	@$(call make,wait) 2>${stderr} || ${fail}
-endif
 
 <% services.each do |service| %>
 .PHONY: start-<%= service %>
@@ -226,6 +222,14 @@ ifndef verbose
           $(call hr,${red}) ; \
         )
 endif
+	@echo ; \
+        $(call hr,${yellow}) ; \
+        $(call println,'${gray}docker-compose logs${reset}') ; \
+        $(call hr,${yellow}) ; \
+        echo
+	@${compose} logs
+	@echo ; \
+        $(call hr,${yellow})
 
 .PHONY: image
 image:
@@ -296,14 +300,8 @@ endif
 ### Service healthcheck commands ###
 
 .PHONY: wait
-<% services.each do |service| %>
-ifneq (,$(findstring <%= service %>,${services}))
-wait: wait-<%= service %>
-endif
-<% end %>
-ifndef services
-wait: <%= services.map { |command| "wait-#{command}" }.join(' ') %>
-endif
+wait:
+	@${rake} orchestration:wait
 	@$(call println,'${yellow}All services${reset} ${green}ready${reset}. ${tick}')
 
 ## Generic Listener healthcheck for TCP services ##
@@ -311,26 +309,6 @@ endif
 wait-listener:
 	@${rake} orchestration:listener:wait service=${service} sidecar=${sidecar}
 
-## Test/development wait commands
-
-<% services.each do |service| %>
-<% next if service.to_sym == :app %>
-.PHONY: wait-<%= service %>
-ifdef config
-wait-<%= service %>: configvar := config=$(config)
-endif
-ifdef service
-wait-<%= service %>: servicevar := service=$(service)
-endif
-wait-<%= service %>:
-	@${rake} orchestration:<%= service %>:wait $(configvar) $(servicevar)
-
-<% end %>
-
-.PHONY: wait-app
-wait-app:
-	@# no-op
-
 ### Docker build commands ###
 
 .PHONY: build

data/lib/orchestration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orchestration
-  VERSION = '0.4.21'
+  VERSION = '0.5.0'
 end

data/lib/tasks/orchestration.rake

@@ -15,6 +15,31 @@ namespace :orchestration do
     end
   end
 
+  task :wait do
+    env = Orchestration::Environment.new
+    services = Orchestration::Services
+    env.docker_compose_config['services'].each do |name, service|
+      path = nil
+
+      adapter = if name == 'database'
+                  services::Database
+                elsif name.include?('database')
+                  path = "config/database.#{name.sub('database-', '')}.yml"
+                  services::Database
+                elsif name == 'mongo'
+                  services::Mongo
+                elsif name == 'rabbitmq'
+                  services::RabbitMQ
+                else
+                  services::Listener
+                end
+
+      adapter::Healthcheck.start(
+        nil, nil, config_path: path, service_name: name, sidecar: ENV['sidecar']
+      )
+    end
+  end
+
   namespace :app do
     desc I18n.t('orchestration.rake.app.wait')
     task :wait do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.5.0
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url