orchestration 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8603abb707884b67824a5f71c402bff863e53a812be3172cfeb4e9229d448d5
-  data.tar.gz: 9b7cc45a5c9abec3fec6b6e09101dd8f04c9c1dbf54ce7e0b280942345fe5a6d
+  metadata.gz: fbfd1a39b0bcb3ea2c74b59a500d0978eae650317ee8845f9fa7221e8f076fbb
+  data.tar.gz: 92f8a91158821b0a4d32fdec00cbe2a11f2a75799ac7291a241aa223613b5c45
 SHA512:
-  metadata.gz: d51f959f91e6d740fa6491037561364035ec489131003877f973a1ce3827c1baba24e96f533cbce9e146b5fd30b89e8b8d0b79aec81e543d26f0b27d7711f6c6
-  data.tar.gz: a59cf9b833da91425f07c4cc798e2f0949a6fe01ff06f77fed9bfb5c1bce8f2c7f4b97f2b9f2d562d0cd5f262b43a3291cc66e7293d282bff6ffaa90f9a7b2e7
+  metadata.gz: bf663765ed79df877060ad431ac9b35d208633d93fce31b5ccdfe03e69662014a7e1b5e2fef4767834f10417f514a4e44d81886f3d6b7a4c0b31f430d461a8cf
+  data.tar.gz: 2a9f37acbfa2b3e0b5bb239042069ce8c3c4afa9d3d30b57376e5341d8af1c0bb7477078725907c466c8153d549fe54d20ee9c2f811403c81b46333029e98683

data/README.md

@@ -35,7 +35,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.14'
+gem 'orchestration', '~> 0.4.15'
 ```
 
 Install:
@@ -160,6 +160,11 @@ To load all variables from `.env` and launch a development server, run the follo
 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:

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task' unless ENV.key?('ORCHESTRATION_TOOLKIT_ONLY')
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) if defined?(RSpec)
 

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

@@ -6,8 +6,12 @@ SHELL:=/bin/bash
 ifdef env_file
   -include ${env_file}
 else
+ifneq (${env},test)
+ifeq (,$(findstring test,$(MAKECMDGOALS)))
   -include .env
 endif
+endif
+endif
 
 export
 
@@ -158,22 +162,28 @@ compose:
 .PHONY: serve
 serve: env_file ?= ./.env
 serve: rails = RAILS_ENV='${env}' bundle exec rails server ${server}
-serve: _verify_env
-	@if [ "${custom_env_file}" == "1" ] && [ ! -f "${env_file}" ] ; \
-         then \
-           $(call println_error,'${red}Error${reset}: Environment file "${yellow}${env_file}${reset}" not found. ${cross}') ; \
-           ${fail} ; \
-         fi
+serve:
+	@if [ -f "${env_file}" ] ; \
+         then ( \
+                $(call println,'${yellow}Environment${reset}: ${green}${env_file}${reset}') && \
+                cat '${env_file}' | ${format_env} && \
+                $(call println,'') \
+            ) ; \
+        fi
+	${rails}
+
+.PHONY: console
+console: env_file ?= ./.env
+console: rails = RAILS_ENV='${env}' bundle exec rails
+console:
 	@if [ -f "${env_file}" ] ; \
          then ( \
                 $(call println,'${yellow}Environment${reset}: ${green}${env_file}${reset}') && \
                 cat '${env_file}' | ${format_env} && \
-                $(call println,'') && \
-                set -a && . '${env_file}' && set +a && \
-                ${rails} \
+                $(call println,'') \
             ) ; \
-         else ${rails} ; \
-         fi
+        fi
+	${rails} console
 
 .PHONY: test-setup
 test-setup: env := test
@@ -248,7 +258,6 @@ ifndef manager
 endif
 	@$(call println,'${yellow}Deploying stack via${reset} ${green}${manager}${reset} ...') && \
           ( \
-            $(call make,_verify_compose env_file=${env_file} env=${env}) && \
             $(call make,bundle path='${path}/bundle.tar') ${log} && \
             cd '${path}' ${log} && \
             tar xf 'bundle.tar' ${log} && \
@@ -332,7 +341,12 @@ build:
 	@git archive --format 'tar' -o '${context}' '${git_branch}' ${log} || ${fail}
 	@temp=$$(mktemp -d) ; ( cd "$${temp}" && tar -uvf '${context}' . ) ${log} || ${fail}
 	@$(call printrawln,'${green}complete.${reset} ${tick}')
+ifdef sidecar
+        # Assume we are in a line-buffered environment (e.g. Jenkins)
+	@$(call println,'${yellow}Building image${reset} ...')
+else
 	@$(call print,'${yellow}Building image${reset} ...')
+endif
 	@docker build \
                         --build-arg BUNDLE_GITHUB__COM \
                         --build-arg BUNDLE_BITBUCKET__ORG \
@@ -352,26 +366,6 @@ push:
 
 ### Internal Commands ###
 #
-.PHONY: _verify_app_image
-_verify_app_image:
-	@docker inspect '${docker_image}'
-
-.PHONY: _verify_compose
-_verify_compose: _verify_env
-	@$(call print,'${yellow}Verifying compose file(s)${reset} ... ')
-	@${replace_env}
-	@${compose} config ${log} || ${fail}
-	@${restore_env}
-	@$(call printrawln,'${green}success${reset}. ${tick}')
-
-.PHONY: _verify_env
-_verify_env:
-	@if [ "${custom_env_file}" == "1" ] && [ ! -f "${env_file}" ] ; \
-         then \
-           $(call print_error,'${red}Error${reset}: Environment file "${yellow}${env_file}${reset}" not found. ${cross}') ; \
-           exit 1 ; \
-         fi
-
 .PHONY: _clean-logs
 _clean-logs:
 	@rm -f '${stdout}' '${stderr}'

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url