orchestration 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afb24c9efeefd9ccd9799fa399c7ff62f4f0f6cc242e62363503138c7403784
-  data.tar.gz: e1da14692011a5ef18572265418050273ea8013a572a1f225afbc09f7f7f40b1
+  metadata.gz: 8569b93a7b22313b5633bb0d396a31c8a718f24eaa09f7968a8facd20a749934
+  data.tar.gz: 14c9f928ebb9e19d4d5d437aa6e72c65d7c1cc3bfa56ff69ab42a81e23ce71c4
 SHA512:
-  metadata.gz: e2694f7b030351f1e02483c80d071cd070cf626bcfc8787580c058f96a5f5cf9c42bb0c82e09cb8d1e9bd32aba249f4874699f126f1593e2335f794e7d472bf5
-  data.tar.gz: 1d9fe30e7fd4b3320fb90dd05bd34456c45ed82dfe9ab21a2f176aa78141d97d3f94012bb19407c848c4b45876e03bd564bccaffe9d2364bbca9cfc5417f263c
+  metadata.gz: 9297540aa796b86d44bb62f4e34c94a44bc24463f66dd01d2f744e016eb0598085a80cf5393c7c4932293918db9e3f6110cfa6150eb989432c01d5cf907df72a
+  data.tar.gz: affd54e64411b8f4f3be7096fc0525f25c50a1b46b4b3f01ae1588032cfe4c7e640fdc2c49890b1b63979da4fd3a8be5ed832af37760dbb5b774e0c28a994460

data/README.md

@@ -11,7 +11,7 @@ _Orchestration_ is a toolkit for testing, building, and deploying _Ruby_ (includ
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.3.7'
+gem 'orchestration', '~> 0.3.8'
 ```
 
 Install:

data/lib/orchestration/services/healthcheck_base.rb

@@ -48,7 +48,8 @@ module Orchestration
       def configuration_class
         # Find the relevant `Configuration` class for whatever `Healthcheck`
         # class we happen to be included in.
-        self.class.parent.const_get(:Configuration)
+        instance_eval(self.class.name.rpartition('::').first)
+          .const_get(:Configuration)
       end
 
       def devnull

data/lib/orchestration/templates/Dockerfile.erb

@@ -19,6 +19,6 @@ RUN . /root/.bashrc && yarn install
 <% end %>
 COPY entrypoint.sh /
 ADD .build/context.tar.gz .
-<% if defined?(Webpacker) %>RUN . /root/.bashrc && yarn install && bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN 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 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production bundle exec rake assets:precompile<% end %>
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["bundle", "exec", "unicorn", "-c", "/app/config/unicorn.rb"]

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

@@ -1,20 +1,30 @@
 -include .env
 export
 
+ifneq (,$(RAILS_ENV))
+  env:=$(RAILS_ENV)
+else ifneq (,$(RACK_ENV))
+  env:=$(RACK_ENV)
+endif
+
 verify-environment:
 ifndef VIRTUAL_HOST
-        @$(error VIRTUAL_HOST must be defined in environment)
+        @$(error `VIRTUAL_HOST` must be defined in environment)
 endif
 
 ifndef LISTEN_PORT
-        @$(error LISTEN_PORT must be defined in environment)
+        @$(error `LISTEN_PORT` must be defined in environment)
+endif
+
+ifndef env
+        @$(error Either `env`, `RACK_ENV` or `RAILS_ENV` must be defined in environment)
 endif
 
 compose_base:=env HOST_UID=$(shell id -u) \
               DOCKER_ORGANIZATION=%%ORGANIZATION%% \
               DOCKER_REPOSITORY=%%REPOSITORY%%:%%VERSION%% \
               docker-compose \
-              -p %%REPOSITORY%% \
+              -p %%REPOSITORY%%_${env} \
               -f docker-compose.yml
 
 compose:=${compose_base} -f docker-compose.production.yml -f docker-compose.override.yml
@@ -22,7 +32,7 @@ compose:=${compose_base} -f docker-compose.production.yml -f docker-compose.over
 .PHONY: deploy
 deploy:
 	@echo "Deploying application to Docker swarm..."
-	@${compose} config | docker stack deploy -c - %%REPOSITORY%%
+	@${compose} config | docker stack deploy -c - %%REPOSITORY%%_${env}
 
 .PHONY: stop
 stop:

data/lib/orchestration/templates/entrypoint.sh.erb

@@ -2,7 +2,7 @@
 set -u
 id owner >/dev/null 2>&1 || useradd -u ${HOST_UID} -m -o owner
 mkdir -p /app/tmp/pids
-chown -R owner:owner /app/tmp /app/log /app/db
+chown -Rf owner:owner /app/tmp /app/log /app/db
 rm -f /app/tmp/pids/unicorn.pid
 mkdir -p /var/www/public/
 ln -nfs /app/public/* /var/www/public/

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

@@ -26,7 +26,7 @@ compose_base:=env HOST_UID=$(shell id -u) \
               DOCKER_ORGANIZATION=${docker_organization} \
               DOCKER_REPOSITORY=${docker_repository} \
               docker-compose \
-              -p ${docker_repository} \
+              -p ${docker_repository}_${env} \
               -f <%= env.orchestration_dir_name %>/docker-compose.yml
 
 git_branch:=$(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD))

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -3,7 +3,11 @@
 require 'colorize'
 require 'erubis'
 require 'i18n'
-require 'rails'
+begin
+  require 'rails'
+rescue LoadError
+  STDERR.puts('Rails not detected; continuing without Rails support.')
+end
 
 I18n.load_path += Dir[File.join(File.expand_path('..', __dir__),
                                 'config', 'locales', '**', '*.yml')]
@@ -14,7 +18,7 @@ require 'orchestration/docker_compose'
 require 'orchestration/environment'
 require 'orchestration/errors'
 require 'orchestration/install_generator'
-require 'orchestration/railtie'
+require 'orchestration/railtie' if defined?(Rails)
 require 'orchestration/service_check'
 require 'orchestration/services'
 require 'orchestration/settings'

data/orchestration.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '~> 0.8.1'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
   spec.add_runtime_dependency 'i18n', '>= 0.5'
+  spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'unicorn', '~> 5.4'
 
   spec.add_development_dependency 'activerecord', '~> 5.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement