orchestration 0.6.8 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d60dd6a324c493308690336d31236ab4e25ff8d6def5b54c77c5d8f1f77186f
-  data.tar.gz: 642a8a710f2b7a6989fba3e6146768d521ceb0c35d0cee693601824e2d43029e
+  metadata.gz: f1582f2621a3d1b76eb01abe94e305c9b4e302b0644f923d19ff11731cccdcae
+  data.tar.gz: 4f33c21464eecbd1bc904bf7f580e0154a4cea20db93b971759380f65e29ce01
 SHA512:
-  metadata.gz: 7d4f6dc1c456af1cf954699dc9fed1a1990622aea6e220cfec88dd0ebe56576b75f5574cde538c1688b7f724eecc7da616a1d58c844e6ba09f479fa3b2254b05
-  data.tar.gz: 596b42d049cabec555f8b13cfeaf728d9780f0cfd90138b93a887f4271e25ea5286dbfd2c57bf1c33032ac561c4ec5716dc7294e5c788b342bc99a28cc18918f
+  metadata.gz: aa78fcd687d3fd5492588212059db15ba5ff9ee84ec57d5950ed3ae55f01965d6e91133cd4e04049f9256431a39d9918bc61e84ab92f3417be936abfa6f42082
+  data.tar.gz: 6b1317f6cb99a6c1427e120eb95f23b356c6f7dee2bb8880581b038469eb0a7f2999f2d53cb70bbc79c472794183320faf3c6baa585589cb5ea0a46e490948f3

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    orchestration (0.6.7)
+    orchestration (0.6.10)
       database_url (~> 0.1.2)
+      dotenv-rails (~> 2.8)
       erubis (~> 2.7)
       i18n (>= 0.5)
       paint (~> 2.0)
@@ -58,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)
@@ -71,13 +75,13 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     amq-protocol (2.3.2)
     ast (2.4.2)
     bson (4.15.0)
     builder (3.2.4)
-    bunny (2.19.0)
+    bunny (2.20.1)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
     concurrent-ruby (1.1.10)
@@ -85,44 +89,62 @@ GEM
       rexml
     crass (1.0.6)
     database_url (0.1.2)
+    date (3.3.3)
     devpack (0.3.3)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
+      railties (>= 3.2)
+    erubi (1.12.0)
     erubis (2.7.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    json (2.6.3)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     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)
+    minitest (5.17.0)
+    mongo (2.18.2)
+      bson (>= 4.14.1, < 5.0.0)
+    mongoid (7.5.2)
       activemodel (>= 5.1, < 7.1, != 7.0.0)
       mongo (>= 2.10.5, < 3.0.0)
       ruby2_keywords (~> 0.0.5)
     mysql2 (0.5.4)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.6-x86_64-linux)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
-    paint (2.2.1)
+    paint (2.3.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.0.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)
+    pg (1.4.5)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rack (2.2.5)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails (6.1.4.7)
       actioncable (= 6.1.4.7)
       actionmailbox (= 6.1.4.7)
@@ -141,8 +163,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (6.1.4.7)
       actionpack (= 6.1.4.7)
       activesupport (= 6.1.4.7)
@@ -151,79 +173,86 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (10.5.0)
-    rbtree (0.4.5)
-    regexp_parser (2.4.0)
+    rbtree (0.4.6)
+    regexp_parser (2.6.1)
     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)
+    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)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.42.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      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.18.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.18.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-rails (2.14.2)
+    rubocop-rails (2.17.4)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
     rubocop-rake (0.5.1)
       rubocop
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.16.0)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    set (1.0.2)
+    set (1.0.3)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    sprockets (4.0.3)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.5.4-x86_64-linux)
     strong_versions (0.4.5)
       i18n (>= 0.5)
       paint (~> 2.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    timeout (0.3.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    webmock (3.14.0)
+    unicode-display_width (2.4.0)
+    webmock (3.18.1)
       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)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 6.0)
+  activerecord-postgis-adapter (~> 7.1)
   bunny (~> 2.12)
   devpack (~> 0.3.2)
   mongoid (~> 7.0)

data/README.md

@@ -162,30 +162,15 @@ make push
 
 ### Development
 
-An [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
+A [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
 
 #### Launching a development server
 
-To load all variables from `.env` and launch a development server, run the following command:
+Use vanilla _Rails_ commands to load a server or console. If present, a `.env` file will be read and loaded (via the [dotenv](https://github.com/bkeepers/dotenv) gem) to populate the environment.
 
 ```bash
-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:
-```bash
-# Custom server, custom port
-make serve server='webrick -p 3001'
-
-# Default server, custom port, custom bind address
-make serve server='-p 3001 -b 192.168.0.1'
+bundle exec rails s # Launch a server
+bundle exec rails c # Launch a console
 ```
 
 ### Testing

data/lib/orchestration/file_helpers.rb

@@ -6,7 +6,7 @@ module Orchestration
 
     def orchestration_dir
       path = @env.orchestration_root
-      FileUtils.mkdir(path) unless Dir.exist?(path)
+      FileUtils.mkdir_p(path)
 
       path
     end

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

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

@@ -47,6 +47,10 @@ module Orchestration
       @settings.set(setting, read(prompt, default))
     end
 
+    def print_variable(variable, value)
+      $stderr.print "#{Paint[variable, :blue]}#{Paint['=', :white]}#{Paint[value, :cyan]}"
+    end
+
     private
 
     def prompt(message, default)

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -33,28 +33,67 @@ require 'orchestration/terminal'
 require 'orchestration/version'
 
 module Orchestration
-  def self.root
-    Pathname.new(File.dirname(__dir__))
-  end
+  class << self
+    def root
+      Pathname.new(File.dirname(__dir__))
+    end
 
-  def self.makefile
-    root.join('lib', 'orchestration', 'make', 'orchestration.mk')
-  end
+    def makefile
+      root.join('lib', 'orchestration', 'make', 'orchestration.mk')
+    end
 
-  def self.rakefile
-    root.join('lib', 'Rakefile')
-  end
+    def rakefile
+      root.join('lib', 'Rakefile')
+    end
 
-  def self.error(key, options = {})
-    warn('# Orchestration Error')
-    warn("# #{I18n.t("orchestration.#{key}", options)}")
-  end
+    def error(key, options = {})
+      warn('# Orchestration Error')
+      warn("# #{I18n.t("orchestration.#{key}", options)}")
+    end
+
+    def random_local_port
+      socket = Socket.new(:INET, :STREAM, 0)
+      socket.bind(Addrinfo.tcp('127.0.0.1', 0))
+      port = socket.local_address.ip_port
+      socket.close
+      port
+    end
+
+    def print_environment
+      return unless File.exist?('.env')
 
-  def self.random_local_port
-    socket = Socket.new(:INET, :STREAM, 0)
-    socket.bind(Addrinfo.tcp('127.0.0.1', 0))
-    port = socket.local_address.ip_port
-    socket.close
-    port
+      $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
+      $stderr.puts
+    end
+
+    private
+
+    def terminal
+      @terminal ||= Terminal.new(Environment.new.settings)
+    end
+
+    def prefix
+      "#{Paint['[', :white]}#{Paint['orchestration', :cyan]}#{Paint[']', :white]}"
+    end
+
+    def environment_variables
+      File.readlines('.env').reject { |line| line.match(/^\s*#/) }
+          .select { |line| line.include?('=') }
+          .map do |line|
+            variable, _, value = line.partition('=')
+            [variable, value]
+          end
+    end
   end
 end
+
+if ENV['RAILS_ENV'] == 'development' && !ENV.key?('ORCHESTRATION_DISABLE_ENV')
+  require 'dotenv-rails'
+  Dotenv::Railtie.load
+  Orchestration.print_environment
+end

data/orchestration.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'database_url', '~> 0.1.2'
+  spec.add_runtime_dependency 'dotenv-rails', '~> 2.8'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
   spec.add_runtime_dependency 'i18n', '>= 0.5'
   spec.add_runtime_dependency 'paint', '~> 2.0'
@@ -35,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.8
+  version: 0.6.10
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: dotenv-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -108,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