orchestration 0.7.6 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e0cff2ba702a69453da3a15fb8d316ffb3885d0b464af20aa8e72f753e8476a
-  data.tar.gz: dd0b4d18a96e7bc6cc6fc4249f021692b323e456bd45f5155eb515a0ad540fd6
+  metadata.gz: a7f2c48f8cea2252de2052ebe5f7f5a668b1fc61163cc08e299f14c0029dce8e
+  data.tar.gz: b886c269f560b78e6123285b476dd30ceee7c234a530e5ba6bbfc5eeb83b9e2a
 SHA512:
-  metadata.gz: 0a504bca615203bb7338cadfd80f5ae255ba0fa7692f704cd56fba2c8249a9c423f0bb740380a615e9e2a423be21f2e29f830975f800a65bfb1fb752e64c5b56
-  data.tar.gz: fdd6bd51d62c861d1191ea2a414acf44f5447f05f855a282a18e3f58f8a7433fa720b6b7694cf973da0e147bd6d9ff4d758abadf5114fdb961315b509c86cf96
+  metadata.gz: 4d4e59b7abdeabc3b354b6826a5d3fcceb8f4dcdfd7ce76008e765a6a94e334a335589374ee5dca2da7ee762ffc615c9d789ad469149cdadca25408c958c986e
+  data.tar.gz: b17ebc5095a553993b64df89d56671cc61852d136e1dcc8c1a0217d74a4cd355d9d513401259e59143158ce91c220a765ad17083c66c596a190b10fb4904fd14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orchestration (0.7.4)
+    orchestration (0.7.9)
       database_url (~> 0.1.2)
       dotenv-rails (~> 2.8)
       erubis (~> 2.7)

data/README.md

@@ -60,6 +60,12 @@ 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.

data/lib/orchestration/install_generator.rb

@@ -17,10 +17,8 @@ module Orchestration
     end
 
     def orchestration_configuration
-      path = @env.orchestration_configuration_path
-      @terminal.ask_setting('docker.organization')
-      @terminal.ask_setting('docker.repository', @env.default_app_name)
-      relpath = relative_path(path)
+      configure_orchestration_settings
+      relpath = relative_path(@env.orchestration_configuration_path)
       return @terminal.write(:create, relpath) unless @settings.exist? || force?
       return @terminal.write(:update, relpath) if @settings.dirty?
 
@@ -155,6 +153,19 @@ 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

@@ -53,14 +53,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
@@ -190,7 +190,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 +200,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
@@ -315,7 +315,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)

data/lib/orchestration/terminal.rb

@@ -39,8 +39,9 @@ module Orchestration
       result
     end
 
-    def ask_setting(setting, default = nil)
+    def ask_setting(setting, default: nil, override: 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")

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.9
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url