orchestration 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99bdeb106830843d2a0e600151a4d80b411d21e86f25010d6c2379810ef85273
-  data.tar.gz: 4b3828ec78541d1680d3e5749c0a2e428bed328313d17e13d3f4e0dc1bdb0e8b
+  metadata.gz: 7891efd1c4930036b2245fad46bc9bc78c0de97b3c2cce26ede48d5a6de34a2c
+  data.tar.gz: c56d7d3193fd6cafe76dc823924bcc1ba74fda288090d1424bfdce148789cb51
 SHA512:
-  metadata.gz: 0e5a03e78c1e442daa079a5d92540df52a148b7ea08b8fa3ecd55919d045e7fc239d5638d8a850565044b9c1d7065b39c4401a72db0daef0d299c622e86ee02f
-  data.tar.gz: e2061ef7628599f65c05d28380376ef841a329f85408c2dfa84172907ada7392dc0ba556b01a6559f3869b1f7b6809304615ebe91a9970e71adc31d04a0e82ed
+  metadata.gz: c82db0ac9646d8b93ad2ef72cff3216106e8558f670c086cd0647f5496559f0a0c32309b8e2680323e627345a9f6da9f2745d4d67a5a1d8d1e7a56d2fc91417c
+  data.tar.gz: c0fc26b8ea7f66f7a50b52de3991fe5f4a99ec73b9186312e397fce229c184f8bdf8182d8bca991a79cb5b95f24ed3ce1907048bf27dceff482437129ce18ad4

data/.strong_versions.yml

@@ -1,2 +1,4 @@
 ignore:
   - i18n
+  - rails
+  - activerecord

data/README.md

@@ -26,10 +26,18 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 
 ### Install
 
-Add _Orchestration_ to your Gemfile:
+Add _Orchestration_ to your `Gemfile`:
+
+_Ruby 3.x_:
+
+```ruby
+gem 'orchestration', '~> 0.7.0'
+```
+
+_Ruby 2.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.6.4'
+gem 'orchestration', '~> 0.6.6'
 ```
 
 Install:
@@ -50,11 +58,6 @@ rake orchestration:install server=unicorn # (or 'puma' [default], etc.)
 
 To rebuild all build-out at any time, pass `force=yes` to the above install command.
 
-To rebuild just `orchestration/Makefile` (useful after upgrading the _Orchestration_ gem):
-```bash
-rake orchestration:install:makefile
-```
-
 You will be prompted to enter values for your _Docker_ organisation and repository name. For example, the _organisation_ and _repository_ for https://hub.docker.com/r/rubyorchestration/sampleapp are `rubyorchestration` and `sampleapp` respectively. If you are unsure of these values, they can be modified later by editing `.orchestration.yml` in the root of your project directory.
 
 #### Configuration files

data/UPGRADE.md

@@ -1,6 +1,18 @@
-# Upgrade guide
+# Upgrade guide (0.5 to 0.6)
 
-## 0.5 to 0.6
+## Automatic Upgrade
+
+A _Rake_ task is provided to automatically upgrade your application:
+
+```bash
+bundle exec rake orchestration:upgrade
+```
+
+Obsolete files will be removed and required modifications to existing files will be applied.
+
+It is recommended to manually verify the validity of all changes to ensure that no custom configuration is lost.
+
+## Manual Upgrade
 
 ### Delete/rename files
 
@@ -48,6 +60,14 @@ post-setup:
 
 Replace the body of this target with any commands that you want to take place once the initial setup (launching development/test containers, running migrations, etc.) is complete. For example, running migrations for a secondary database.
 
+### Update Dockerfile healthcheck
+
+Edit `orchestration/Dockerfile` and edit the `HEALTHCHECK` directive's `CMD` to:
+
+```
+CMD ["bundle","exec","rake","orchestration:healthcheck"]
+```
+
 ### Continuous Integration files
 
 Update any continuous integration scripts (e.g. `Jenkinsfile`) to run the `setup` target before `test`, e.g.:

data/config/locales/en.yml

@@ -28,6 +28,7 @@ en:
 
     rake:
       config: "Parse and output Orchestration config (internal use)"
+      upgrade: "Upgrade from Orchestration 0.5.x to 0.6.x"
       healthcheck: "Execute healthcheck; used for HEALTHCHECK command in Docker image"
       compose_services: "Output configured services for a given environment (RAILS_ENV)"
       install: "Install Orchestration tools"

data/lib/orchestration/docker_compose/app_service.rb

@@ -3,6 +3,8 @@
 module Orchestration
   module DockerCompose
     class AppService
+      include ComposeHelpers
+
       def initialize(config, environment)
         @environment = environment
         @config = config
@@ -52,7 +54,7 @@ module Orchestration
           raise ArgumentError,
                 I18n.t(
                   'orchestration.rake.app.unspported_web_server',
-                  server: server,
+                  server:,
                   expected: %w[puma unicorn]
                 )
         end
@@ -89,10 +91,6 @@ module Orchestration
         }
       end
 
-      def networks
-        { 'local' => {} }
-      end
-
       def environment
         {
           'RAILS_LOG_TO_STDOUT' => '1',

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -42,6 +42,8 @@ module Orchestration
         ports(name).find { |mapping| mapping[:remote] == remote_port }
                    .fetch(:local)
                    .to_i
+      rescue NoMethodError
+        nil
       end
 
       private
@@ -75,7 +77,7 @@ module Orchestration
         # '{sidecar-27018:}27017' => '27018:27017'
         local, _, remote = mapping.sub(/\${sidecar-(\d+):}/, '\1:')
                                   .partition(':')
-        { local: local, remote: remote }
+        { local:, remote: }
       end
     end
   end

data/lib/orchestration/docker_compose/compose_helpers.rb

@@ -13,6 +13,12 @@ module Orchestration
         # "3306" (docker will use an ephemeral host port which we will not use)
         "${sidecar-#{port}:}"
       end
+
+      def networks
+        service = self.class.name.rpartition('::').last.partition('Service').first.downcase
+        network_alias = %i[development test].include?(@environment) ? service : "#{service}-local"
+        { 'local' => { 'aliases' => [network_alias] } }
+      end
     end
   end
 end

data/lib/orchestration/docker_compose/database_service.rb

@@ -33,12 +33,6 @@ module Orchestration
         adapter.default_port
       end
 
-      def networks
-        return {} unless @environment == :deployment
-
-        { 'local' => { 'aliases' => ['database-local'] } }
-      end
-
       def ports
         return {} unless %i[development test].include?(@environment)
 

data/lib/orchestration/docker_compose/mongo_service.rb

@@ -15,7 +15,7 @@ module Orchestration
       def definition
         return nil unless @config.enabled?
 
-        { 'image' => 'library/mongo' }.merge(ports).merge(volumes)
+        { 'image' => 'library/mongo', 'networks' => networks }.merge(ports).merge(volumes)
       end
 
       private

data/lib/orchestration/docker_compose/rabbitmq_service.rb

@@ -13,7 +13,7 @@ module Orchestration
       def definition
         return nil unless @config.enabled?
 
-        { 'image' => 'library/rabbitmq:management' }.merge(ports)
+        { 'image' => 'library/rabbitmq:management', 'networks' => networks }.merge(ports)
       end
 
       def ports

data/lib/orchestration/environment.rb

@@ -9,7 +9,7 @@ module Orchestration
     def environment
       return @environment unless @environment.nil?
 
-      ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+      ENV.fetch('RAILS_ENV', nil) || ENV.fetch('RACK_ENV', nil) || 'development'
     end
 
     def web_server
@@ -20,16 +20,16 @@ module Orchestration
     def database_url
       case environment
       when 'development'
-        ENV['DEVELOPMENT_DATABASE_URL'] || ENV['DATABASE_URL']
+        ENV.fetch('DEVELOPMENT_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
       when 'test'
-        ENV['TEST_DATABASE_URL'] || ENV['DATABASE_URL']
+        ENV.fetch('TEST_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
       else
-        ENV['DATABASE_URL']
+        ENV.fetch('DATABASE_URL', nil)
       end
     end
 
     def mongo_url
-      ENV['MONGO_URL']
+      ENV.fetch('MONGO_URL', nil)
     end
 
     def mongoid_configuration_path

data/lib/orchestration/file_helpers.rb

@@ -95,9 +95,9 @@ module Orchestration
     end
 
     def ensure_line_in_file(path, line, echo: true, regex: nil)
-      return if line_in_file?(path, line: line, regex: regex)
+      return if line_in_file?(path, line:, regex:)
 
-      append_file(path, "\n#{line.chomp}\n", echo: echo)
+      append_file(path, "\n#{line.chomp}\n", echo:)
       true
     end
 
@@ -131,7 +131,7 @@ module Orchestration
 
     def force?
       # Rake task was invoked with `force=yes`
-      ENV['force'] == 'yes'
+      ENV.fetch('force', nil) == 'yes'
     end
   end
 end

data/lib/orchestration/install_generator.rb

@@ -68,7 +68,7 @@ module Orchestration
       path = @env.root.join('config', 'unicorn.rb')
       create_file(path, content, backup: true)
       regex = /gem\s+['"]unicorn['"]/
-      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex: regex)
+      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex:)
     end
 
     def database_yml

data/lib/orchestration/make/orchestration.mk

@@ -99,13 +99,21 @@ exit_fail=( \
         )
 
 ifdef env_file
-  -include ${env_file}
+  env_path=${env_file}
 else
-ifneq (${env},test)
-ifeq (,$(findstring test,$(MAKECMDGOALS)))
-  -include .env
+  env_path=.env
 endif
+
+ifneq (${env},test)
+  ifeq (,$(findstring test,$(MAKECMDGOALS)))
+    ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
+      -include ${env_path}
+    endif
+  endif
 endif
+
+ifneq (,$(findstring deploy,$(MAKECMDGOALS)))
+  RAILS_ENV=$(shell grep '^RAILS_ENV=' '${env_path}' | tail -n1 | sed 's/^RAILS_ENV=//')
 endif
 
 export
@@ -130,11 +138,13 @@ DOCKER_TAG ?= latest
 ifneq (,$(wildcard ./Gemfile))
   bundle_cmd = bundle exec
 endif
-rake=DEVPACK_DISABLE=1 RACK_ENV=${env} RAILS_ENV=${env} ${bundle_cmd} rake
+rake=DEVPACK_DISABLE=1 RACK_ENV=${env} SECRET_KEY_BASE='placeholder-secret' RAILS_ENV=${env} ${bundle_cmd} rake
 
 ifneq (,$(wildcard ${env_file}))
-  rake_cmd:=${rake}
-  rake=. ${env_file} && ${rake_cmd}
+  ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
+    rake_cmd:=${rake}
+    rake=. ${env_file} && ${rake_cmd}
+  endif
 endif
 
 docker_config:=$(shell DEVPACK_DISABLE=1 RAILS_ENV=development ${bundle_cmd} rake orchestration:config 2>/dev/null || echo no-org no-repo)
@@ -214,7 +224,7 @@ start: _create-log-directory _clean-logs
 ifneq (,${compose_services})
 	@$(call system,${compose_human} up --detach)
 ifeq (${env},$(filter ${env},test development))
-	${compose} up --detach --force-recreate --renew-anon-volumes --remove-orphans ${services} ${log} || ${exit_fail}
+	@${compose} up --detach --force-recreate --renew-anon-volumes --remove-orphans ${services} ${log} || ${exit_fail}
 	@[ -n '${sidecar}' ] && \
          ( \
            $(call echo,(joining dependency network ${cyan}${network}${reset})) ; \
@@ -295,27 +305,27 @@ db-console:
 
 .PHONY: setup
 ifneq (,$(wildcard config/database.yml))
-setup: url = $(shell ${rake} orchestration:db:url RAILS_ENV=${env})
+setup: url = $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
 endif
 setup: _log-notify
 	@$(call echo,Setting up ${env_human} environment)
 	@$(call make,start env=${env})
 ifneq (,$(wildcard config/database.yml))
 	@$(call echo,Preparing ${env_human} database)
-	@$(call system,rake db:create DATABASE_URL="${url}")
+	@$(call system,rake db:create RAILS_ENV="${env}")
 	@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
   ifneq (,$(wildcard db/structure.sql))
-	@$(call system,rake db:schema:load DATABASE_URL="${url}")
-	@${rake} db:schema:load DATABASE_URL='${url}' ${log} || ${exit_fail}
+	@$(call system,rake db:structure:load RAILS_ENV="${env}" DATABASE_URL="${url}")
+	@${rake} db:structure:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
   else ifneq (,$(wildcard db/schema.rb))
-	@$(call system,rake db:schema:load DATABASE_URL="${url}")
-	@${rake} db:schema:load DATABASE_URL='${url}' ${log} || ${exit_fail}
+	@$(call system,rake db:schema:load RAILS_ENV="${env}" DATABASE_URL="${url}")
+	@${rake} db:schema:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
   endif
-	@$(call system,rake db:migrate DATABASE_URL="${url}")
-	@${rake} db:migrate RAILS_ENV=${env}
+	@$(call system,rake db:migrate RAILS_ENV="${env}" DATABASE_URL="${url}")
+	@${rake} db:migrate RAILS_ENV=${env} ${log} || ${exit_fail}
 endif
 	@if $(MAKE) -n post-setup >/dev/null 2>&1; then \
-          $(call system,make post-setup RAILS_ENV=${env}) \
+          $(call system,make post-setup RAILS_ENV="${env}") \
           && $(MAKE) post-setup RAILS_ENV=${env}; fi
 	@$(call echo,${env_human} environment setup complete ${tick})
 
@@ -422,15 +432,9 @@ wait-listener:
 build: _log-notify _clean-logs
 build: build_dir = ${orchestration_dir}/.build
 build: context = ${build_dir}/context.tar
-build: build_args := --build-arg GIT_COMMIT='${git_version}'
+build: build_args := --build-arg GIT_COMMIT='${git_version}' $(shell grep '^ARG ' orchestration/Dockerfile | sed -e 's/=.*$$//' -e 's/^ARG /--build-arg /')
 build: tag_human = ${cyan}${docker_organization}/${docker_repository}:${git_version}${reset}
 build: latest_tag_human = ${cyan}${docker_organization}/${docker_repository}:latest${reset}
-ifdef BUNDLE_GITHUB__COM
-build: build_args := ${build_args} --build-arg BUNDLE_GITHUB__COM
-endif
-ifdef BUNDLE_BITBUCKET__ORG
-build: build_args := ${build_args} --build-arg BUNDLE_BITBUCKET__ORG
-endif
 build: _create-log-directory check-local-changes
 	@$(call echo,Preparing build context from ${cyan}${git_branch}${reset} (${cyan}${git_version}${reset})${reset})
 	@$(call system,git archive --format "tar" -o "${context}" "${git_branch}")

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

@@ -21,10 +21,10 @@ module Orchestration
         def settings(healthcheck: false)
           {
             adapter: adapter.name,
-            host: host,
-            port: port,
-            username: username,
-            password: password,
+            host:,
+            port:,
+            username:,
+            password:,
             database: healthcheck ? adapter.credentials['database'] : database
           }.transform_keys(&:to_s)
         end
@@ -64,7 +64,7 @@ module Orchestration
           return {} unless File.exist?(database_configuration_path) || custom?
 
           yaml = ERB.new(File.read(database_configuration_path)).result
-          YAML.safe_load(yaml, [], [], true)[@env.environment] || {}
+          YAML.safe_load(yaml, aliases: true)[@env.environment] || {}
         end
 
         def url_config

data/lib/orchestration/services/mixins/configuration_base.rb

@@ -74,7 +74,7 @@ module Orchestration
 
       def yaml(content)
         # Whitelist `Symbol` and permit aliases:
-        YAML.safe_load(content, [Symbol], [], true)
+        YAML.safe_load(content, permitted_classes: [Symbol], aliases: true)
       end
     end
   end

data/lib/orchestration/services/mixins/http_healthcheck.rb

@@ -19,7 +19,7 @@ module Orchestration
 
       def connection_error(code)
         raise HTTPConnectionError,
-              I18n.t('orchestration.http.connection_error', code: code)
+              I18n.t('orchestration.http.connection_error', code:)
       end
 
       def connection_error?(code)

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

@@ -64,7 +64,7 @@ module Orchestration
           return {} unless File.exist?(@env.mongoid_configuration_path)
 
           yaml = File.read(@env.mongoid_configuration_path)
-          config = YAML.safe_load(yaml, [], [], true)
+          config = YAML.safe_load(yaml, aliases: true)
           env = config.fetch(@env.environment, nil)
           return {} if env.nil?
 

data/lib/orchestration/templates/Dockerfile.erb

@@ -23,7 +23,7 @@ RUN bundle config set deployment 'true' \
  && bundle config set without 'development test' \
  && bundle install
 ADD .build/context.tar .
-<% if defined?(Webpacker) %>RUN . /root/.bashrc ; NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% end %>
+<% if defined?(Webpacker) %>RUN . /root/.bashrc ; NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=placeholder-secret bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=placeholder-secret bundle exec rake assets:precompile<% end %>
 RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \

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

@@ -30,11 +30,8 @@ post-setup:
 # Launch all dependencies needed for a development environment and set up the
 # development database.
 #
-.PHONY: setup
+.PHONY: develop
 develop:
 	bundle install
-	@$(MAKE) start env=test
-	@$(MAKE) start env=development
-	bundle exec rake db:create
-	bundle exec rake db:migrate
-	bundle exec rake db:seed
+	@$(MAKE) setup env=test
+	@$(MAKE) setup env=development

data/lib/orchestration/terminal.rb

@@ -3,9 +3,13 @@
 module Orchestration
   COLOR_MAP = {
     failure: %i[red bright],
+    success: %i[green],
+    info: %i[blue],
     error: %i[red],
     ready: %i[green],
     create: %i[green],
+    delete: %i[red],
+    rename: %i[blue],
     update: %i[yellow],
     backup: %i[blue],
     status: %i[blue],

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -3,6 +3,7 @@
 require 'erb'
 require 'pathname'
 require 'socket'
+require 'yaml'
 
 require 'database_url'
 require 'erubis'

data/lib/tasks/orchestration.rake

@@ -19,13 +19,103 @@ namespace :orchestration do
     puts "#{config['docker']['organization']} #{config['docker']['repository']}"
   end
 
+  desc I18n.t('orchestration.rake.upgrade')
+  task :upgrade do
+    terminal = Orchestration::Terminal.new(Orchestration::Environment.new.settings)
+    %w[
+      orchestration/docker-compose.yml
+      orchestration/docker-compose.override.yml
+      orchestration/Makefile
+      orchestration/deploy.mk
+      orchestration/yaml.bash
+      orchestration/healthcheck.rb
+    ].each.map { |path| Pathname.new(path) }.each do |path|
+      next unless path.exist?
+
+      terminal.write(:delete, path)
+      path.unlink
+    end
+
+    src  = 'orchestration/docker-compose.production.yml'
+    dest = 'orchestration/docker-compose.deployment.yml'
+    if File.exist?(src)
+      terminal.write(:rename, "#{src} => #{dest}")
+      File.rename(src, dest)
+    end
+
+    makefile = File.read('Makefile')
+    makefile.gsub!(
+      %r{^include orchestration/Makefile$},
+      %[include $(shell bundle exec ruby -e 'require "orchestration/make"')]
+    )
+    makefile.gsub!(/^test: test-setup$/, 'test:')
+    lines = makefile.lines(chomp: true)
+    post_setup_start = lines.index('ifndef light')
+    if post_setup_start.nil?
+      updated_makefile = lines.join("\n")
+      post_setup = []
+    else
+      post_setup_end = post_setup_start + lines[post_setup_start..].index('endif')
+      post_setup = lines[(post_setup_start + 1)...post_setup_end]
+      updated_makefile = lines.each.with_index.reject do |_line, index|
+        (post_setup_start..post_setup_end).cover?(index)
+      end.map(&:first).join("\n")
+    end
+    if makefile.match(/^post-setup:$/).nil?
+      updated_makefile += %(
+
+.PHONY: post-setup
+post-setup:
+	@# Setup tasks that are not already provided by Orchestration go here.
+#{post_setup.join("\n")}
+)
+    end
+    if updated_makefile != makefile
+      terminal.write(:update, 'Makefile')
+      File.write('Makefile', updated_makefile)
+    end
+
+    %w[orchestration/docker-compose.test.yml orchestration/docker-compose.development.yml].each do |path|
+      terminal.write(:update, path)
+      config = YAML.safe_load(File.read(path))
+      config['networks'] ||= {}
+      config['networks']['local'] = { 'name' => '${COMPOSE_PROJECT_NAME}' }
+      config['services'] ||= {}
+      config['services'].each do |name, service|
+        service['networks'] = { 'local' => { 'aliases' => [name] } }
+      end
+      File.write(path, config.to_yaml)
+    end
+
+    dockerfile_path = 'orchestration/Dockerfile'
+    dockerfile = File.read(dockerfile_path)
+    updated_dockerfile = dockerfile.dup
+    updated_dockerfile.gsub!(
+      'CMD ["ruby","/app/orchestration/healthcheck.rb"]',
+      'CMD ["bundle","exec","rake","orchestration:healthcheck"]'
+    )
+    if updated_dockerfile != dockerfile
+      terminal.write(:update, dockerfile_path)
+      File.write(dockerfile_path, updated_dockerfile)
+    end
+
+    terminal.write(:success, 'Upgrade complete.')
+    terminal.write(:info, '`make test` will now only run tests, skipping setup.')
+    terminal.write(:info, 'Run `make setup test` to load test containers, run migrations, etc.')
+    terminal.write(:info, 'Run `make setup` to load development environment.')
+    terminal.write(:info, 'Run `make setup RAILS_ENV=test` to load test environment without running tests.')
+    terminal.write(:info, 'Edit the `post-setup` recipe in `Makefile` to perform custom setup actions.')
+  end
+
   namespace :db do
     desc I18n.t('orchestration.rake.db.url')
     task :url do
-      config = Rails.application.config_for(:database)
+      config = Rails.application.config_for(:database).transform_keys(&:to_sym)
 
       if config[:adapter] == 'sqlite3'
         puts "sqlite3:#{config[:database]}"
+      elsif !config[:url].nil?
+        puts config[:url]
       else
         puts DatabaseUrl.to_active_record_url(config)
       end
@@ -34,7 +124,7 @@ namespace :orchestration do
     desc I18n.t('orchestration.rake.db.console')
     task :console do
       env = Orchestration::Environment.new
-      options = ENV['db'] ? { config_path: "config/database.#{ENV['db']}.yml" } : {}
+      options = ENV['db'] ? { config_path: "config/database.#{ENV.fetch('db', nil)}.yml" } : {}
       sh Orchestration::Services::Database::Configuration.new(env, nil, options).console_command
     end
   end
@@ -71,7 +161,7 @@ namespace :orchestration do
                 end
 
       adapter::Healthcheck.start(
-        nil, nil, config_path: path, service_name: name, sidecar: ENV['sidecar']
+        nil, nil, config_path: path, service_name: name, sidecar: ENV.fetch('sidecar', nil)
       )
     end
   end

data/orchestration.gemspec

@@ -22,33 +22,33 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.required_ruby_version = '~> 2.7'
+  spec.required_ruby_version = '>= 3.1'
   spec.bindir = 'bin'
   spec.executables = []
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'database_url', '~> 0.1.2'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
-  spec.add_runtime_dependency 'i18n', '>= 0.5'
-  spec.add_runtime_dependency 'paint', '~> 2.0'
-  spec.add_runtime_dependency 'rails', '~> 6.0'
-  spec.add_runtime_dependency 'thor', '~> 1.0'
+  spec.add_runtime_dependency 'i18n'
+  spec.add_runtime_dependency 'paint', '~> 2.2'
+  spec.add_runtime_dependency 'rails', '>= 6.1'
+  spec.add_runtime_dependency 'thor', '~> 1.2'
 
-  spec.add_development_dependency 'activerecord', '~> 6.0'
-  spec.add_development_dependency 'bunny', '~> 2.12'
-  spec.add_development_dependency 'devpack', '~> 0.3.2'
-  spec.add_development_dependency 'mongoid', '~> 7.0'
-  spec.add_development_dependency 'mysql2', '~> 0.5.2'
-  spec.add_development_dependency 'pg', '~> 1.1'
-  spec.add_development_dependency 'rails', '~> 6.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec-its', '~> 1.2'
-  spec.add_development_dependency 'rubocop', '~> 1.12'
-  spec.add_development_dependency 'rubocop-rails', '~> 2.9'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'activerecord', '>= 6.0'
+  spec.add_development_dependency 'bunny', '~> 2.19'
+  spec.add_development_dependency 'devpack', '~> 0.4.0'
+  spec.add_development_dependency 'mongoid', '~> 7.4'
+  spec.add_development_dependency 'mysql2', '~> 0.5.3'
+  spec.add_development_dependency 'pg', '~> 1.3'
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.11'
+  spec.add_development_dependency 'rspec-its', '~> 1.3'
+  spec.add_development_dependency 'rubocop', '~> 1.28'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.14'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.10'
+  spec.add_development_dependency 'sqlite3', '~> 1.4'
   spec.add_development_dependency 'strong_versions', '~> 0.4.5'
-  spec.add_development_dependency 'webmock', '~> 3.4'
+  spec.add_development_dependency 'webmock', '~> 3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -44,68 +44,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -114,196 +114,196 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: devpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.4'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: strong_versions
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.14'
 description: Tools to help launch apps in Docker
 email:
 - git@bob.frl
@@ -422,16 +422,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit