orchestration 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd01f40026116b804917069fba7d1e5c44d8aeee5a544b45e0815fb62f69ed5
-  data.tar.gz: cc69537b606cb64b5fa681af09f629cac90c7e2d4c2d98bcf173c3306b214588
+  metadata.gz: 0cb5ae60827d78174136105aa5d569442403e0c66fbd91b52dc1fa960d54b901
+  data.tar.gz: ebc464ac7f85474af8cd888571583f863d2a0ffe6629190e8a6d412e6abc20dd
 SHA512:
-  metadata.gz: 9ac9f6b9d04f74ed0cdea5e653296b300f9e1c04184340ede3dbb4a1e726ab4c32e2b3f6bc4e3bdddfc79315d2eaa8cb0ab1fe8877a3131f55179ca787268d86
-  data.tar.gz: a66c75b212e0992130b1e289781d516fe5b4be7bd5176c1a9a91c86bf927a9853ee8da7ed26192ecbf307d6cb66aa16dd579b5dd370bdd8e4f598df1b4d7ec38
+  metadata.gz: 20653aa7ed7ee911d562cab05df0184525655af43a156082840a2052ed687575cd46c8a34fc975721fb97eaea0899c4b7e9d0244e6af67531905f91f6fdef569
+  data.tar.gz: 9aa560232ac183ba7368c23109e17d382f6483c1f125fbf155f3f8a58eddf25f1cf626ac85581ca1dbe0b8e0dfb3110774b3ca549890a816c7e90e0c17423617

data/.gitignore

@@ -30,3 +30,5 @@ TODO
 
 docker/.build/
 docker/.context.tar
+
+.DS_Store

data/README.md

@@ -29,7 +29,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.0'
+gem 'orchestration', '~> 0.4.3'
 ```
 
 Install:
@@ -237,9 +237,9 @@ See related documentation:
 
 | Variable | Meaning | Default Value |
 |-|-|-|
-| `WEB_HOST` | Host to reach application (relevant to application container) | `localhost` |
-| `WEB_PORT` | Port to reach application (relevant to application container) | `8080` |
-| `WEB_HEALTHCHECK_PATH` | Path of expected successful response | `/` |
+| `WEB_HOST` | Host to reach application (from inside application container) | `localhost` |
+| `WEB_PORT` | Port to reach application (from inside application container) | `8080` |
+| `WEB_HEALTHCHECK_PATH` | Path expected to return a successful response | `/` |
 | `WEB_HEALTHCHECK_READ_TIMEOUT` | Number of seconds to wait for data before failing healthcheck | `10` |
 | `WEB_HEALTHCHECK_OPEN_TIMEOUT` | Number of seconds to wait for connection before failing healthcheck | `10` |
 | `WEB_HEALTHCHECK_SUCCESS_CODES` | Comma-separated list of HTTP status codes that will be deemed a success | `200,202,204` |
@@ -271,14 +271,27 @@ An [entrypoint](https://docs.docker.com/engine/reference/builder/#entrypoint) sc
 <a name="rabbitmq-configuration"></a>
 ## RabbitMQ Configuration
 
-The [Bunny](https://github.com/ruby-amqp/bunny) _RabbitMQ_ gem does not recognise `config/rabbitmq.yml`. If your application uses _RabbitMQ_ then you must manually update your code to reference this file, e.g.:
+The [Bunny](https://github.com/ruby-amqp/bunny) _RabbitMQ_ gem does not recognise `config/rabbitmq.yml` or `RABBITMQ_URL`. If your application uses _RabbitMQ_ then you must manually update your code to reference this file, e.g.:
 
 ```ruby
 connection = Bunny.new(config_for(:rabbit_mq)['url'])
 connection.start
 ```
 
-The environment variable `RABBITMQ_URL` can be used to configure _Bunny_ in production (similar to `DATABASE_URL` and `MONGO_URL`).
+_Orchestration_ generates the following `config/rabbitmq.yml`:
+
+```
+development:
+  url: amqp://127.0.0.1:51070
+
+test:
+  url: amqp://127.0.0.1:51068
+
+production:
+  url: <%= ENV['RABBITMQ_URL'] %>
+```
+
+Using this approach, the environment variable `RABBITMQ_URL` can be used to configure _Bunny_ in production (similar to `DATABASE_URL` and `MONGO_URL`).
 
 This is a convention of the _Orchestration_ gem intended to make _RabbitMQ_ configuration consistent with other services.
 

data/lib/orchestration/file_helpers.rb

@@ -60,10 +60,9 @@ module Orchestration
         return @terminal.write(:skip, relative_path(path))
       end
 
+      backup(path, previous_content) if options.fetch(:backup, false)
       File.write(path, content)
       @terminal.write(:update, relative_path(path))
-
-      backup(path, previous_content) if options.fetch(:backup, false)
     end
 
     def skip?(present, content, previous_content, options)
@@ -75,6 +74,8 @@ module Orchestration
     end
 
     def backup(path, previous_content)
+      return if previous_content.nil?
+
       backup_path = Pathname.new("#{path}.bak")
       File.write(backup_path, previous_content)
       @terminal.write(:backup, relative_path(backup_path))

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

@@ -32,7 +32,8 @@ else
 endif
 
 ifneq (,$(wildcard ${env_file}))
-  rake=. ${env_file} && ${rake}
+  rake_cmd:=${rake}
+  rake=. ${env_file} && ${rake_cmd}
 endif
 
 docker_organization=$(shell bash ${orchestration_dir}/yaml.bash docker_organization)
@@ -201,11 +202,11 @@ endif
 
 .PHONY: deploy
 ifndef manager
-	@$(call println_error,'Missing `manager` parameter: `make deploy manager=swarm-manager.example.cor`')
+	@$(call println_error,'Missing `manager` parameter: `make deploy manager=swarm-manager.example.com`')
 endif
 deploy: env := production
 deploy: project_name = ${docker_repository}_${env}
-deploy: path = $(shell mktemp -d)
+deploy: path := $(shell mktemp -d)
 deploy: RAILS_ENV = ${env}
 deploy: RACK_ENV = ${env}
 deploy: DOCKER_TAG = ${git_version}
@@ -215,7 +216,7 @@ deploy:
             $(call make,_verify_compose env_file=${env_file} env=${env}) && \
             $(call make,bundle path='${path}/bundle.tar') ${log} && \
             cd '${path}' ${log} && \
-            tar xf './bundle.tar' ${log} && \
+            tar xf 'bundle.tar' ${log} && \
             cd '${docker_repository}' ${log} && \
                ( [ -z '${env_file}' ] || cp '${env_file}' './.env' ${log} ) && \
                $(call println,'${yellow}Deployment environment${reset}:') && \

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url