orchestration 0.6.4 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99bdeb106830843d2a0e600151a4d80b411d21e86f25010d6c2379810ef85273
-  data.tar.gz: 4b3828ec78541d1680d3e5749c0a2e428bed328313d17e13d3f4e0dc1bdb0e8b
+  metadata.gz: 9cb2b72a148e2687680311cd050b426ccd06c063e4ab01e0affc03be0afbc16d
+  data.tar.gz: 97210bd8c3133b7d246ed4b8cd92f56c148a91c283b3ad51f8c4d61e8d6ed690
 SHA512:
-  metadata.gz: 0e5a03e78c1e442daa079a5d92540df52a148b7ea08b8fa3ecd55919d045e7fc239d5638d8a850565044b9c1d7065b39c4401a72db0daef0d299c622e86ee02f
-  data.tar.gz: e2061ef7628599f65c05d28380376ef841a329f85408c2dfa84172907ada7392dc0ba556b01a6559f3869b1f7b6809304615ebe91a9970e71adc31d04a0e82ed
+  metadata.gz: 751f8433ec5094ee87639115d4c0f43e14ed0d7f2c5382fd8d79dd050d9ae27073f962304776d83d74e2b57bb97ae3e2bf774fff9a967a0b534e950462914689
+  data.tar.gz: 19b986c4ec255c2f451d99616d310235e10abcf8c403f87ef02bd1b5551da4189fdf7bf72be47f07499ed12142193b7d16e3c67b803f6c0951c6227d02d9b380

data/.gitignore

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

data/.ruby-version

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

data/.strong_versions.yml

@@ -1,2 +1,3 @@
 ignore:
   - i18n
+  - rails

data/Gemfile.lock

@@ -0,0 +1,246 @@
+PATH
+  remote: .
+  specs:
+    orchestration (0.6.7)
+      database_url (~> 0.1.2)
+      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)
+    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.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    amq-protocol (2.3.2)
+    ast (2.4.2)
+    bson (4.15.0)
+    builder (3.2.4)
+    bunny (2.19.0)
+      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)
+    devpack (0.3.3)
+    diff-lcs (1.5.0)
+    erubi (1.10.0)
+    erubis (2.7.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    hashdiff (1.0.1)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.18.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.15.0)
+    mongo (2.17.1)
+      bson (>= 4.8.2, < 5.0.0)
+    mongoid (7.4.0)
+      activemodel (>= 5.1, < 7.1, != 7.0.0)
+      mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
+    mysql2 (0.5.4)
+    nio4r (2.5.8)
+    nokogiri (1.13.6-x86_64-linux)
+      racc (~> 1.4)
+    paint (2.2.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pg (1.3.5)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 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.2)
+      loofah (~> 2.3)
+    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.5)
+    regexp_parser (2.4.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-rails (2.14.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    set (1.0.2)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    sprockets (4.0.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    strong_versions (0.4.5)
+      i18n (>= 0.5)
+      paint (~> 2.0)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      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.5.4)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.0)
+  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

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.6.4'
+gem 'orchestration', '~> 0.6.7'
 ```
 
 Install:

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
@@ -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

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') { ENV.fetch('RACK_ENV', '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') { ENV.fetch('DATABASE_URL', nil) }
       when 'test'
-        ENV['TEST_DATABASE_URL'] || ENV['DATABASE_URL']
+        ENV.fetch('TEST_DATABASE_URL') { 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/make/orchestration.mk

@@ -99,13 +99,23 @@ 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)))
+      ifeq (,$(findstring setup,$(MAKECMDGOALS)))
+        -include ${env_path}
+      endif
+    endif
+  endif
 endif
+
+ifneq (,$(findstring deploy,$(MAKECMDGOALS)))
+  RAILS_ENV=$(shell grep '^RAILS_ENV=' '${env_path}' | tail -n1 | sed 's/^RAILS_ENV=//')
 endif
 
 export
@@ -114,7 +124,9 @@ ifneq (,$(findstring test,$(MAKECMDGOALS)))
   env=test
 endif
 
-ifneq (,$(env))
+ifneq (,$(RAILS_ENV))
+  env=$(RAILS_ENV)
+else ifneq (,$(env))
   # `env` set by current shell.
 else ifneq (,$(RAILS_ENV))
   env=$(RAILS_ENV)
@@ -130,11 +142,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 +228,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 +309,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}")
-	@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
+	@$(call system,rake db:create RAILS_ENV="${env}")
+	@${rake} db:create RAILS_ENV=${env} DATABASE_URL='${url}' ${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}" ${url_prefix}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}" ${url_prefix}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}" ${url_prefix}DATABASE_URL="${url}")
+	@${rake} db:migrate RAILS_ENV="${env}" DATABASE_URL='${url}' ${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 +436,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/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/templates/rabbitmq.yml.erb

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

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.6.7'
 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,106 @@ 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)
+      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'
         puts "sqlite3:#{config[:database]}"
+      elsif !config[:url].nil?
+        puts config[:url]
       else
         puts DatabaseUrl.to_active_record_url(config)
       end
@@ -71,7 +164,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,7 +22,7 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.required_ruby_version = '~> 2.7'
+  spec.required_ruby_version = '>= 2.6'
   spec.bindir = 'bin'
   spec.executables = []
   spec.require_paths = ['lib']
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   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 'rails', '>= 4.1'
   spec.add_runtime_dependency 'thor', '~> 1.0'
 
   spec.add_development_dependency 'activerecord', '~> 6.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.7
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -70,16 +70,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -342,9 +342,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".strong_versions.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - Makefile
 - README.md
@@ -422,16 +424,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit