orchestration 0.6.12 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de0a5221b816f60d95a04376bb965de0f6381b585b454f3b8d49f1c0e05086d
-  data.tar.gz: 811bba578ba6e1166db99f95bf51dbb4e33e349f82e442013725651640d0bb63
+  metadata.gz: 7891efd1c4930036b2245fad46bc9bc78c0de97b3c2cce26ede48d5a6de34a2c
+  data.tar.gz: c56d7d3193fd6cafe76dc823924bcc1ba74fda288090d1424bfdce148789cb51
 SHA512:
-  metadata.gz: 8fe95b455287bd1e7c4b874c3bccffc8595b259f11ea892419e23ba074c60235e1a1f48a8eeb71aef8a5a76522e0833717c3b22b06987326b8a67a5d4a0c128e
-  data.tar.gz: 716c7c3389b69be2d80ee0b1f690d42f66f09f047752c97d5b806aa88bd85998b446bf266b2ef7a57b357ae37337f3cea4a6e391a88456246f4f6fa726306b13
+  metadata.gz: c82db0ac9646d8b93ad2ef72cff3216106e8558f670c086cd0647f5496559f0a0c32309b8e2680323e627345a9f6da9f2745d4d67a5a1d8d1e7a56d2fc91417c
+  data.tar.gz: c0fc26b8ea7f66f7a50b52de3991fe5f4a99ec73b9186312e397fce229c184f8bdf8182d8bca991a79cb5b95f24ed3ce1907048bf27dceff482437129ce18ad4

data/.gitignore

@@ -9,6 +9,8 @@
 # rspec failure tracking
 .rspec_status
 
+Gemfile.lock
+
 *.swp
 *.swo
 
@@ -32,3 +34,5 @@ docker/.build/
 docker/.context.tar
 
 .DS_Store
+
+.ruby-version

data/.strong_versions.yml

@@ -1,3 +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.8'
+gem 'orchestration', '~> 0.6.6'
 ```
 
 Install:
@@ -52,12 +60,6 @@ To rebuild all build-out at any time, pass `force=yes` to the above install comm
 
 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.
 
-Override these values from the command line by passing `project` and `organization` variables:
-
-```bash
-rake orchestration:install project=myapp organization=myorg
-```
-
 #### Configuration files
 
 _Orchestration_ generates the following files where appropriate. Backups are created if a file is replaced.
@@ -163,15 +165,30 @@ make push
 
 ### Development
 
-A [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
+An [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
 
 #### Launching a development server
 
-Use vanilla _Rails_ commands to load a server or console. If present, a `.env` file will be read and loaded (via the [dotenv](https://github.com/bkeepers/dotenv) gem) to populate the environment.
+To load all variables from `.env` and launch a development server, run the following command:
 
 ```bash
-bundle exec rails s # Launch a server
-bundle exec rails c # Launch a console
+make serve
+```
+
+To load a _Rails_ console:
+```bash
+make console
+```
+
+The application environment will be output on launch for convenience.
+
+To pass extra commands to the _Rails_ server:
+```bash
+# Custom server, custom port
+make serve server='webrick -p 3001'
+
+# Default server, custom port, custom bind address
+make serve server='-p 3001 -b 192.168.0.1'
 ```
 
 ### Testing

data/lib/orchestration/docker_compose/app_service.rb

@@ -54,7 +54,7 @@ module Orchestration
           raise ArgumentError,
                 I18n.t(
                   'orchestration.rake.app.unspported_web_server',
-                  server: server,
+                  server:,
                   expected: %w[puma unicorn]
                 )
         end

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -77,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/environment.rb

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

data/lib/orchestration/file_helpers.rb

@@ -6,7 +6,7 @@ module Orchestration
 
     def orchestration_dir
       path = @env.orchestration_root
-      FileUtils.mkdir_p(path)
+      FileUtils.mkdir(path) unless Dir.exist?(path)
 
       path
     end
@@ -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

@@ -17,8 +17,10 @@ module Orchestration
     end
 
     def orchestration_configuration
-      configure_orchestration_settings
-      relpath = relative_path(@env.orchestration_configuration_path)
+      path = @env.orchestration_configuration_path
+      @terminal.ask_setting('docker.organization')
+      @terminal.ask_setting('docker.repository', @env.default_app_name)
+      relpath = relative_path(path)
       return @terminal.write(:create, relpath) unless @settings.exist? || force?
       return @terminal.write(:update, relpath) if @settings.dirty?
 
@@ -66,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
@@ -147,19 +149,6 @@ module Orchestration
         healthcheck: DockerCompose::AppService.healthcheck
       )
     end
-
-    def configure_orchestration_settings
-      @terminal.ask_setting(
-        'docker.organization',
-        override: ENV.fetch('organization', nil)
-      )
-
-      @terminal.ask_setting(
-        'docker.repository',
-        default: @env.default_app_name,
-        override: ENV.fetch('project', nil)
-      )
-    end
   end
   # rubocop:enable Metrics/ClassLength
 end

data/lib/orchestration/make/orchestration.mk

@@ -2,8 +2,7 @@
 ### Environment setup ###
 SHELL:=/bin/bash
 MAKE:=mkpath=${mkpath} make --no-print-directory
-ORCHESTRATION_DISABLE_ENV=1
-export
+
 TERM ?= 'dumb'
 pwd:=$(shell pwd)
 
@@ -53,14 +52,14 @@ println=$(call print,$1'\n')
 printraw=printf $1
 stdout=${pwd}/log/orchestration.stdout.log
 stderr=${pwd}/log/orchestration.stderr.log
-log_path_length:=$(shell echo "${stdout}" | wc -c)
+log_path_length=$(shell echo "${stdout}" | wc -c)
 ifndef verbose
 log_tee:= 2>&1 | tee -a ${stdout}
 log:= >>${stdout} 2>>${stderr}
 progress_point:=perl -e 'printf("[${magenta}busy${reset}] "); while( my $$line = <STDIN> ) { printf("."); select()->flush(); }'
 log_progress:= > >(tee -ai ${stdout} >&1 | ${progress_point}) 2> >(tee -ai ${stderr} 2>&1 | ${progress_point})
 endif
-hr:=$(call println,"$1$(shell head -c ${log_path_length} < /dev/zero | tr '\0' '=')${reset}")
+hr=$(call println,"$1$(shell head -c ${log_path_length} < /dev/zero | tr '\0' '=')${reset}")
 managed_env_tag:=\# -|- ORCHESTRATION
 standard_env_path:=${pwd}/.env
 backup_env_path:=${pwd}/.env.orchestration.backup
@@ -108,9 +107,7 @@ endif
 ifneq (${env},test)
   ifeq (,$(findstring test,$(MAKECMDGOALS)))
     ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
-      ifeq (,$(findstring setup,$(MAKECMDGOALS)))
-        -include ${env_path}
-      endif
+      -include ${env_path}
     endif
   endif
 endif
@@ -125,9 +122,7 @@ ifneq (,$(findstring test,$(MAKECMDGOALS)))
   env=test
 endif
 
-ifneq (,$(RAILS_ENV))
-  env=$(RAILS_ENV)
-else ifneq (,$(env))
+ifneq (,$(env))
   # `env` set by current shell.
 else ifneq (,$(RAILS_ENV))
   env=$(RAILS_ENV)
@@ -143,7 +138,7 @@ DOCKER_TAG ?= latest
 ifneq (,$(wildcard ./Gemfile))
   bundle_cmd = bundle exec
 endif
-rake=ORCHESTRATION_DISABLE_ENV=1 DEVPACK_DISABLE=1 RACK_ENV=${env} SECRET_KEY_BASE='placeholder-secret' 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}))
   ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
@@ -190,7 +185,7 @@ else
   compose_project_name = ${project_base}
 endif
 
-compose_base:=env -i \
+compose_base=env -i \
              PATH=$(PATH) \
              HOST_UID=$(shell id -u) \
              DOCKER_ORGANIZATION="${docker_organization}" \
@@ -200,14 +195,14 @@ compose_base:=env -i \
              docker-compose \
              -f ${orchestration_dir}/docker-compose.${env}.yml
 
-git_branch := $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || echo no-branch))
+git_branch ?= $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || echo no-branch))
 ifndef dev
-  git_version := $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
+  git_version ?= $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
 else
-  git_version := dev
+  git_version = dev
 endif
 
-docker_image:=${docker_organization}/${docker_repository}:${git_version}
+docker_image=${docker_organization}/${docker_repository}:${git_version}
 
 compose=${compose_base}
 compose_human=docker-compose -f ${orchestration_dir_name}/docker-compose.${env}.yml
@@ -221,16 +216,11 @@ all: build
 
 ### Container management commands ###
 
-.PHONY: pull
-pull:
-	@$(call system,${compose_human} pull)
-	@${compose} pull
-
 .PHONY: start
 ifndef network
 start: network := ${compose_project_name}
 endif
-start: _create-log-directory _clean-logs pull
+start: _create-log-directory _clean-logs
 ifneq (,${compose_services})
 	@$(call system,${compose_human} up --detach)
 ifeq (${env},$(filter ${env},test development))
@@ -315,7 +305,7 @@ db-console:
 
 .PHONY: setup
 ifneq (,$(wildcard config/database.yml))
-setup: url := $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
+setup: url = $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
 endif
 setup: _log-notify
 	@$(call echo,Setting up ${env_human} environment)
@@ -323,16 +313,16 @@ setup: _log-notify
 ifneq (,$(wildcard config/database.yml))
 	@$(call echo,Preparing ${env_human} database)
 	@$(call system,rake db:create RAILS_ENV="${env}")
-	@${rake} db:create RAILS_ENV=${env} DATABASE_URL='${url}' ${log} || : ${log}
+	@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
   ifneq (,$(wildcard db/structure.sql))
-	@$(call system,rake db:structure:load RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@$(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 RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@$(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 RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
-	@${rake} db:migrate RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
+	@$(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}") \

data/lib/orchestration/make.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
-ENV['ORCHESTRATION_DISABLE_ENV'] = '1'
-
 require 'orchestration'
 puts Orchestration.makefile

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/rabbitmq.yml.erb

@@ -12,4 +12,4 @@ test:
 
 production:
   url: <%%= ENV['RABBITMQ_URL'] %>
-  management_url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
+  url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>

data/lib/orchestration/terminal.rb

@@ -39,19 +39,14 @@ module Orchestration
       result
     end
 
-    def ask_setting(setting, default: nil, override: nil)
+    def ask_setting(setting, default = nil)
       return unless @settings.get(setting).nil?
-      return @settings.set(setting, override) unless override.nil?
 
       write(:setup, t("settings.#{setting}.description"))
       prompt = t("settings.#{setting}.prompt")
       @settings.set(setting, read(prompt, default))
     end
 
-    def print_variable(variable, value)
-      $stderr.print "#{Paint[variable, :blue]}#{Paint['=', :white]}#{Paint[value, :cyan]}"
-    end
-
     private
 
     def prompt(message, default)

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -33,67 +33,28 @@ require 'orchestration/terminal'
 require 'orchestration/version'
 
 module Orchestration
-  class << self
-    def root
-      Pathname.new(File.dirname(__dir__))
-    end
-
-    def makefile
-      root.join('lib', 'orchestration', 'make', 'orchestration.mk')
-    end
-
-    def rakefile
-      root.join('lib', 'Rakefile')
-    end
-
-    def error(key, options = {})
-      warn('# Orchestration Error')
-      warn("# #{I18n.t("orchestration.#{key}", options)}")
-    end
-
-    def random_local_port
-      socket = Socket.new(:INET, :STREAM, 0)
-      socket.bind(Addrinfo.tcp('127.0.0.1', 0))
-      port = socket.local_address.ip_port
-      socket.close
-      port
-    end
-
-    def print_environment
-      return unless File.exist?('.env')
-
-      $stderr.puts
-      warn("#{prefix} #{Paint['Loading environment from', :cyan]} #{Paint['.env', :green]}")
-      $stderr.puts
-      environment_variables.each do |variable, value|
-        terminal.print_variable(variable, value)
-      end
-      $stderr.puts
-    end
-
-    private
+  def self.root
+    Pathname.new(File.dirname(__dir__))
+  end
 
-    def terminal
-      @terminal ||= Terminal.new(Environment.new.settings)
-    end
+  def self.makefile
+    root.join('lib', 'orchestration', 'make', 'orchestration.mk')
+  end
 
-    def prefix
-      "#{Paint['[', :white]}#{Paint['orchestration', :cyan]}#{Paint[']', :white]}"
-    end
+  def self.rakefile
+    root.join('lib', 'Rakefile')
+  end
 
-    def environment_variables
-      File.readlines('.env').reject { |line| line.match(/^\s*#/) }
-          .select { |line| line.include?('=') }
-          .map do |line|
-            variable, _, value = line.partition('=')
-            [variable, value]
-          end
-    end
+  def self.error(key, options = {})
+    warn('# Orchestration Error')
+    warn("# #{I18n.t("orchestration.#{key}", options)}")
   end
-end
 
-if ENV['RAILS_ENV'] == 'development' && !ENV.key?('ORCHESTRATION_DISABLE_ENV')
-  require 'dotenv-rails'
-  Dotenv::Railtie.load
-  Orchestration.print_environment
+  def self.random_local_port
+    socket = Socket.new(:INET, :STREAM, 0)
+    socket.bind(Addrinfo.tcp('127.0.0.1', 0))
+    port = socket.local_address.ip_port
+    socket.close
+    port
+  end
 end

data/lib/tasks/orchestration.rake

@@ -110,9 +110,6 @@ post-setup:
   namespace :db do
     desc I18n.t('orchestration.rake.db.url')
     task :url do
-      ENV['DATABASE_URL'] = nil
-      ENV['DEVELOPMENT_DATABASE_URL'] = nil
-      ENV['TEST_DATABASE_URL'] = nil
       config = Rails.application.config_for(:database).transform_keys(&:to_sym)
 
       if config[:adapter] == 'sqlite3'
@@ -127,7 +124,7 @@ post-setup:
     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

data/orchestration.gemspec

@@ -22,35 +22,33 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.required_ruby_version = '>= 2.6'
+  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 'dotenv-rails', '~> 2.8'
   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', '>= 4.1'
-  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 'activerecord-postgis-adapter', '~> 7.1'
-  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.12
+  version: 0.7.0
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: dotenv-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -58,280 +44,266 @@ 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: '4.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        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
-  name: activerecord-postgis-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     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
@@ -352,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
@@ -370,11 +342,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".strong_versions.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - Makefile
 - README.md
@@ -454,14 +424,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit

data/.ruby-version

@@ -1 +0,0 @@
-2.6.9

data/Gemfile.lock

@@ -1,275 +0,0 @@
-PATH
-  remote: .
-  specs:
-    orchestration (0.6.12)
-      database_url (~> 0.1.2)
-      dotenv-rails (~> 2.8)
-      erubis (~> 2.7)
-      i18n (>= 0.5)
-      paint (~> 2.0)
-      rails (>= 4.1)
-      thor (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      mail (>= 2.7.1)
-    actionmailer (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.7)
-      actionview (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.4.7)
-      activesupport (= 6.1.4.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.7)
-      activesupport (= 6.1.4.7)
-      globalid (>= 0.3.6)
-    activemodel (6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activerecord (6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activerecord-postgis-adapter (7.1.1)
-      activerecord (~> 6.1)
-      rgeo-activerecord (~> 7.0.0)
-    activestorage (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      marcel (~> 1.0.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.4.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    amq-protocol (2.3.2)
-    ast (2.4.2)
-    bson (4.15.0)
-    builder (3.2.4)
-    bunny (2.20.1)
-      amq-protocol (~> 2.3, >= 2.3.1)
-      sorted_set (~> 1, >= 1.0.2)
-    concurrent-ruby (1.1.10)
-    crack (0.4.5)
-      rexml
-    crass (1.0.6)
-    database_url (0.1.2)
-    date (3.3.3)
-    devpack (0.3.3)
-    diff-lcs (1.5.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
-    erubi (1.12.0)
-    erubis (2.7.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    hashdiff (1.0.1)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    loofah (2.19.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.8.0)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    minitest (5.17.0)
-    mongo (2.18.2)
-      bson (>= 4.14.1, < 5.0.0)
-    mongoid (7.5.2)
-      activemodel (>= 5.1, < 7.1, != 7.0.0)
-      mongo (>= 2.10.5, < 3.0.0)
-      ruby2_keywords (~> 0.0.5)
-    mysql2 (0.5.4)
-    net-imap (0.3.4)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.1)
-      timeout
-    net-smtp (0.3.3)
-      net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.10-x86_64-linux)
-      racc (~> 1.4)
-    paint (2.3.0)
-    parallel (1.22.1)
-    parser (3.2.0.0)
-      ast (~> 2.4.1)
-    pg (1.4.5)
-    public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (2.2.5)
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rails (6.1.4.7)
-      actioncable (= 6.1.4.7)
-      actionmailbox (= 6.1.4.7)
-      actionmailer (= 6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actiontext (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      bundler (>= 1.15.0)
-      railties (= 6.1.4.7)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
-    rainbow (3.1.1)
-    rake (10.5.0)
-    rbtree (0.4.6)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
-    rgeo (2.4.0)
-    rgeo-activerecord (7.0.1)
-      activerecord (>= 5.0)
-      rgeo (>= 1.0.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.42.0)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-rails (2.17.4)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.16.0)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    set (1.0.3)
-    sorted_set (1.0.3)
-      rbtree
-      set (~> 1.0)
-    sprockets (4.2.0)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.5.4-x86_64-linux)
-    strong_versions (0.4.5)
-      i18n (>= 0.5)
-      paint (~> 2.0)
-    thor (1.2.1)
-    timeout (0.3.1)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.0)
-    webmock (3.18.1)
-      addressable (>= 2.8.0)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.6)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  activerecord (~> 6.0)
-  activerecord-postgis-adapter (~> 7.1)
-  bunny (~> 2.12)
-  devpack (~> 0.3.2)
-  mongoid (~> 7.0)
-  mysql2 (~> 0.5.2)
-  orchestration!
-  pg (~> 1.1)
-  rails (~> 6.0)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec-its (~> 1.2)
-  rubocop (~> 1.12)
-  rubocop-rails (~> 2.9)
-  rubocop-rake (~> 0.5.1)
-  rubocop-rspec (~> 2.2)
-  sqlite3 (~> 1.3)
-  strong_versions (~> 0.4.5)
-  webmock (~> 3.4)
-
-BUNDLED WITH
-   2.3.11