orchestration 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12e2e03dddf05c889b4938735bb407532671c958ad7e1e39ce37ad7ee07a4eec
-  data.tar.gz: 1a0fc371d1230959b7869094cb4cc13a59f9c8e2129c1f62b295d954218a1d75
+  metadata.gz: 60c52d91f6eb17469c4244093217f7c37bdf083bc9b045e175869788178a9196
+  data.tar.gz: 2b70b8a444c78beb19ffbf9b2690349e942374c16ca36edecd714f33d798bae0
 SHA512:
-  metadata.gz: 73d3df8af18ce92fce2e837bab16ca6f9be03051240a6f89e9e3e549aad659ec5bdb0d03eb11ca3f4ba8ae2ab839ddbf121ab14abf1d63e13267faac4672b325
-  data.tar.gz: 9779cef3d3d921dfc34ba41bdb29ef94642c08d7c92967c742bd52ca8d6527826bf3e040504228a4dd4dfc53c6a8d1e7334af4ebf6f98c247bbb06a820e6e0f8
+  metadata.gz: 03efb92b5de3ef15940464ae6e5ba5739c98c4b18d312490f70a497ed0e2fdc2f8094cc482301fe0f81e6667a254fc481783a9f5e349e98a4f0b598d54827640
+  data.tar.gz: bbc0087cd77db01f1a87f69222425a91ff2f5f8d204794795b4872d8f5157df208caa05343c5fed67bd1461633baa3aed344ebe2db52a82998932f32c215843a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orchestration (0.6.9)
+    orchestration (0.6.11)
       database_url (~> 0.1.2)
       dotenv-rails (~> 2.8)
       erubis (~> 2.7)
@@ -59,6 +59,9 @@ GEM
     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)
@@ -134,7 +137,7 @@ GEM
       racc (~> 1.4)
     paint (2.3.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.4.5)
     public_suffix (5.0.1)
@@ -173,6 +176,10 @@ GEM
     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)
@@ -189,14 +196,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.41.1)
+    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.23.0, < 2.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)
@@ -230,7 +237,7 @@ GEM
     timeout (0.3.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -245,6 +252,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 6.0)
+  activerecord-postgis-adapter (~> 7.1)
   bunny (~> 2.12)
   devpack (~> 0.3.2)
   mongoid (~> 7.0)

data/lib/orchestration/make/orchestration.mk

@@ -2,7 +2,8 @@
 ### Environment setup ###
 SHELL:=/bin/bash
 MAKE:=mkpath=${mkpath} make --no-print-directory
-
+ORCHESTRATION_DISABLE_ENV=1
+export
 TERM ?= 'dumb'
 pwd:=$(shell pwd)
 
@@ -52,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
@@ -142,7 +143,7 @@ DOCKER_TAG ?= latest
 ifneq (,$(wildcard ./Gemfile))
   bundle_cmd = bundle exec
 endif
-rake=DEVPACK_DISABLE=1 RACK_ENV=${env} SECRET_KEY_BASE='placeholder-secret' RAILS_ENV=${env} ${bundle_cmd} rake
+rake=ORCHESTRATION_DISABLE_ENV=1 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)))
@@ -189,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}" \
@@ -199,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
@@ -314,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/make.rb

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

data/lib/orchestration/terminal.rb

@@ -48,7 +48,7 @@ module Orchestration
     end
 
     def print_variable(variable, value)
-      $stdout.print "#{Paint[variable, :blue]}#{Paint['=', :white]}#{Paint[value, :cyan]}"
+      $stderr.print "#{Paint[variable, :blue]}#{Paint['=', :white]}#{Paint[value, :cyan]}"
     end
 
     private

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -62,13 +62,13 @@ module Orchestration
     def print_environment
       return unless File.exist?('.env')
 
-      $stdout.puts
-      $stdout.puts("#{prefix} #{Paint['Loading environment from', :cyan]} #{Paint['.env', :green]}")
-      $stdout.puts
+      $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
-      $stdout.puts
+      $stderr.puts
     end
 
     private
@@ -92,7 +92,7 @@ module Orchestration
   end
 end
 
-if ENV['RAILS_ENV'] == 'development'
+if ENV['RAILS_ENV'] == 'development' && !ENV.key?('ORCHESTRATION_DISABLE_ENV')
   require 'dotenv-rails'
   Dotenv::Railtie.load
   Orchestration.print_environment

data/orchestration.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 1.0'
 
   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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !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