orchestration 0.5.7 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9dd4904167052dde3f1cbf5f441225f2719c42467204077d943534f73bb2873
-  data.tar.gz: 873bea476a74979aa917e87449c0da23a1c63128c1257a6c0ab40414e464a2ef
+  metadata.gz: 80872dc0b6d1fe6a0e4223915a047c9ed6b3461540b64842613b4d8a0ba72f3d
+  data.tar.gz: b33f4a5c305fd48f952a92a4f98748d1dae64eae62d5b222b4831f80cc2dbe9f
 SHA512:
-  metadata.gz: bf66b2842c17ed6cb43d7a02045f9c35f7a4bf6fe70e8c7d4425ddee8c72c24a810ab64175fa00430da2c38b3c9e66dde62cedc31b65a68b5b51ba65e53c87c9
-  data.tar.gz: 4e3aa0a3ba1f8b2f9b7bd58e6a553a86924cbf0805657de8b5b6c63eeefc8ee38bea13a560f093410778690c5c0d9228359e9d8a0f38bd6e600b1c42e80bd253
+  metadata.gz: 4d83d6166ce64feb661d3952431d4b26569c96568308008f0070960343cb7959847ae5217cf30e780fa0228387cdb4e4404091ac6934996492cda355eec9b932
+  data.tar.gz: 6c78278a30cd2489e229900560c583731e29e4f88f4309530d6ff09095d59e426d6a500896d20dadcb03eca8dfdd3786b0c68d43c7b675209d7cdf4f374acbf1

data/README.md

@@ -27,7 +27,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.5.7'
+gem 'orchestration', '~> 0.5.12'
 ```
 
 Install:
@@ -191,12 +191,20 @@ make serve server='-p 3001 -b 192.168.0.1'
 A default `test` target is provided in your application's main `Makefile`. You are encouraged to modify this target to suit your application's requirements.
 
 To launch all dependency containers, run database migrations, and run tests:
-```
+```bash
 make test
 ```
 
-If you prefer to run tests manually (e.g. if you want to run tests for a specific file) then the `test-setup` target can be used:
+The default `test` command can (and should) be extended. This command is defined in the root `Makefile` in the project and, by defaults, runs `rspec` and `rubocop`.
+
+To run only the `test` command, without test setup (i.e. without restarting containers etc.), pass the `light` option:
+
+```bash
+make test light=1
 ```
+
+If you prefer to run tests manually (e.g. if you want to run tests for a specific file) then the `test-setup` target can be used:
+```bash
 make test-setup
 bundle exec rspec spec/my_class_spec.rb
 ```
@@ -227,7 +235,7 @@ To connect via _SSH_ to a remote swarm and deploy, pass the `manager` parameter:
 make deploy manager=user@manager.swarm.example.com
 ```
 
-The file `orchestration/docker-compose.production.yml` is created automatically. If your `RAILS_ENV` is set to something other than `production` then another file will need to be created (e.g. `orchestration/docker-compose.staging.yml`). In most cases this file can be a _symlink_ to the original `production` configuration and environment variables can be used to customise the content.
+The file `orchestration/docker-compose.production.yml` is created automatically. This file will always be used for deployment, regardless of _Rails_ environment. Other environments should be configured using a separate [`.env` file](#env-file) for each environment.
 
 #### Roll back a deployment
 
@@ -262,6 +270,7 @@ networks:
 ```
 
 #### Use a custom `.env` file
+<a name="env-file"></a>
 
 Specify a path to a local `.env` file (see [Docker Compose documentation](https://docs.docker.com/compose/environment-variables/#the-env-file)):
 ```

data/lib/orchestration/docker_compose/configuration.rb

@@ -62,6 +62,7 @@ module Orchestration
           .fetch(service)
           .new(config, @environment)
           .definition
+          &.tap { |definition| definition['networks'] ||= { 'local' => {} } }
       end
     end
   end

data/lib/orchestration/docker_compose/install_generator.rb

@@ -42,7 +42,7 @@ module Orchestration
           'version' => compose_config(environment).version,
           'services' => services(environment),
           'volumes' => volumes(environment),
-          'networks' => networks(environment)
+          'networks' => compose_config(environment).networks
         }
       end
 
@@ -56,12 +56,6 @@ module Orchestration
         compose_config(environment).volumes
       end
 
-      def networks(environment)
-        return {} unless environment == :production
-
-        compose_config(environment).networks
-      end
-
       def compose_config(environment)
         DockerCompose::Configuration.new(
           @env,

data/lib/orchestration/services/database/configuration.rb

@@ -82,37 +82,31 @@ module Orchestration
         end
 
         def host
-          url_config['host'] || file_config['host'] || super
+          chained_config('host') || super
         end
 
         def port
           return nil if sqlite?
 
-          url_config['port'] || file_config['port'] || super
+          chained_config('port') || super
         end
 
         def username
-          (
-            url_config['username'] ||
-            file_config['username'] ||
-            (adapter && adapter.credentials['username'])
-          )
+          chained_config('username') || (adapter && adapter.credentials['username'])
         end
 
         def password
-          (
-            url_config['password'] ||
-            file_config['password'] ||
-            (adapter && adapter.credentials['password'])
-          )
+          chained_config('password') || (adapter && adapter.credentials['password'])
         end
 
         def database
-          (
-            url_config['database'] ||
-            file_config['database'] ||
-            (adapter && adapter.credentials['database'])
-          )
+          chained_config('database') || (adapter && adapter.credentials['database'])
+        end
+
+        def chained_config(key)
+          return url_config[key] || file_config[key] if @env.environment == 'test'
+
+          file_config[key] || url_config[key]
         end
 
         def adapter_by_name(name)

data/lib/orchestration/templates/env.erb

@@ -2,5 +2,3 @@
 # e.g.:
 #
 # DISABLE_SPRING=1
-
-PUBLISH_PORT=3000

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

@@ -112,7 +112,7 @@ all: build
 
 .PHONY: start
 ifndef network
-start: network := ${compose_project_name}_default
+start: network := ${compose_project_name}
 endif
 start: _create-log-directory _clean-logs
 	@$(call print,'${yellow}Starting ${cyan}${env}${yellow} containers${reset} ...')
@@ -144,7 +144,7 @@ start-<%= service %>:
 <% end %>
 
 .PHONY: stop
-stop: network := ${compose_project_name}_default
+stop: network := ${compose_project_name}
 stop:
 	@$(call print,'${yellow}Stopping ${cyan}${env}${yellow} containers${reset} ...')
 	@if docker ps --format "{{.ID}}" | grep -q $(shell hostname) ; \
@@ -264,7 +264,7 @@ deploy: RAILS_ENV := ${env}
 deploy: RACK_ENV := ${env}
 deploy: DOCKER_TAG = ${git_version}
 deploy: base_vars = DOCKER_ORGANIZATION=${docker_organization} DOCKER_REPOSITORY=${docker_repository} DOCKER_TAG=${git_version}
-deploy: compose_deploy := ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker-compose ${env_file_option} --project-name ${project_base} -f orchestration/docker-compose.${env}.yml
+deploy: compose_deploy := ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker-compose ${env_file_option} --project-name ${project_base} -f orchestration/docker-compose.production.yml
 deploy: compose_config := ${compose_deploy} config
 deploy: deploy_cmd := echo "$${config}" | ssh "${manager}" "/bin/bash -lc 'cat | docker stack deploy --prune --with-registry-auth -c - ${project_base}'"
 deploy: out_of_sequence_error := rpc error: code = Unknown desc = update out of sequence
@@ -282,7 +282,7 @@ endif
              export config="$$(${compose_config} 2>${stderr})" ; \
              config_exit_code=$$? ; \
              if [[ "$${config_exit_code}" != "0" ]]; then exit ${config_exit_code}; fi ; \
-             output="$$(${deploy_cmd} | tee /dev/tty)" ; \
+             output="$$(${deploy_cmd} | tee)" ; \
              deploy_exit_code=$$? ; \
              if [[ "$${deploy_exit_code}" == 0 ]] ; then exit 0 ; fi ; \
              if ! echo "$${output}" | grep -q '${out_of_sequence_error}' ; then exit ${deploy_exit_code} ; fi ; \

data/lib/orchestration/templates/puma.rb.erb

@@ -1,6 +1,6 @@
 environment ENV.fetch('RAILS_ENV') { 'development' }
 
-port ENV.fetch('WEB_PORT') { 3000 }
+port ENV.fetch('WEB_PORT') { 8080 }
 workers ENV.fetch('WEB_CONCURRENCY') { 4 }
 threads_count = ENV.fetch('RAILS_MAX_THREADS') { 8 }
 

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.12
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url