orchestration 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd668d1ea77820075d2ad454dde1691304daed2c1e26d7e446e2e729a62625db
-  data.tar.gz: 0d3e1d8796810142973303a530972b9bb38e165822c7b403c52ddfb439d91947
+  metadata.gz: 15cc577b20dab6949e4af0dbddccd6d120f66762602dd30cd8c4e34928ebff80
+  data.tar.gz: 909b1dee4b04df4be8f31dee5c2b7946f3cb652ca28093e33d5e7d4a8fb7a8ce
 SHA512:
-  metadata.gz: d308e88beaaf4c792c2aea6c7ac3ea78c5249ac956da2f1a8ae0637432321a1118a02d9ccef59ae6abf51ac0f381e4bf7e7be249721d1bd2138a51e4fda63f4a
-  data.tar.gz: 322620f4c68eb845f63006531355d93193df31757dae2ca97b6bc5d45186262557da6a4f9381fd8dfa6754e619cb370d0b5d93aa6e155f053fb3265e2639ab06
+  metadata.gz: ac93a79951078f867958e22d82f752ead2539a0406b2cc5509362d87c05cbfd6bf0f32aa5eb262853f240a8b632f4738e074757f81d50cf463a879a755753d19
+  data.tar.gz: 2d14f57dd29b45861c4c2abda51b12182ce7ed91c53325d217c6e56078836f09cdde2635f743986383fd238e26a959c725f679011dfa9270ba91659c6a345930

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    orchestration (0.7.2)
+    orchestration (0.7.4)
       database_url (~> 0.1.2)
+      dotenv-rails (~> 2.8)
       erubis (~> 2.7)
       i18n
       paint (~> 2.2)
@@ -65,6 +66,9 @@ GEM
     activerecord (7.0.3)
       activemodel (= 7.0.3)
       activesupport (= 7.0.3)
+    activerecord-postgis-adapter (8.0.1)
+      activerecord (~> 7.0.0)
+      rgeo-activerecord (~> 7.0.0)
     activestorage (7.0.3)
       actionpack (= 7.0.3)
       activejob (= 7.0.3)
@@ -94,6 +98,10 @@ GEM
     devpack (0.4.0)
     diff-lcs (1.5.0)
     digest (3.1.0)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
+      railties (>= 3.2)
     erubi (1.10.0)
     erubis (2.7.0)
     globalid (1.0.0)
@@ -109,6 +117,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     mongo (2.17.1)
       bson (>= 4.8.2, < 5.0.0)
@@ -132,6 +141,9 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     paint (2.2.1)
@@ -176,6 +188,10 @@ GEM
     redis (4.6.0)
     regexp_parser (2.4.0)
     rexml (3.2.5)
+    rgeo (2.4.0)
+    rgeo-activerecord (7.0.1)
+      activerecord (>= 5.0)
+      rgeo (>= 1.0.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -237,10 +253,12 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   activerecord (>= 6.0)
+  activerecord-postgis-adapter (~> 8.0)
   bunny (~> 2.19)
   devpack (~> 0.4.0)
   mongoid (~> 7.4)

data/README.md

@@ -166,30 +166,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/docker_compose/app_service.rb

@@ -118,6 +118,7 @@ module Orchestration
       def database_url
         {
           'postgresql' => 'postgresql://postgres:password@database-local:5432/production',
+          'postgis' => 'postgis://postgres:password@database-local:5432/production',
           'mysql2' => 'mysql2://root:password@database-local:3306/production',
           'sqlite3' => 'sqlite3:db/production.sqlite3'
         }.fetch(DockerCompose::ComposeConfiguration.database_adapter_name, nil)

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -5,6 +5,7 @@ module Orchestration
     class ComposeConfiguration
       def self.database_adapter_name
         return nil unless defined?(ActiveRecord)
+        return 'postgis' if defined?(::POSTGIS)
         return 'postgresql' if defined?(::PG)
         return 'mysql2' if defined?(::Mysql2)
         return 'sqlite3' if defined?(::SQLite3)
@@ -28,6 +29,7 @@ module Orchestration
         return nil unless defined?(ActiveRecord)
 
         base = Orchestration::Services::Database::Adapters
+        return base::Postgis.new if defined?(::PostGIS)
         return base::Postgresql.new if defined?(::PG)
         return base::Mysql2.new if defined?(::Mysql2)
         return base::Sqlite3.new if defined?(::SQLite3)

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/services/database/adapters/postgis.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Database
+      module Adapters
+        class Postgis
+          include AdapterBase
+
+          def name
+            'postgis'
+          end
+
+          def image
+            'postgis/postgis:15-3.3'
+          end
+
+          def credentials
+            {
+              'username' => 'postgres',
+              'password' => 'password',
+              'database' => 'postgres'
+            }
+          end
+
+          def errors
+            [PG::ConnectionBad]
+          end
+
+          def default_port
+            5432
+          end
+
+          def environment
+            {
+              'POSTGRES_PASSWORD' => 'password',
+              'PGDATA' => data_dir
+            }
+          end
+
+          def data_dir
+            '/var/pgdata'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/database/adapters.rb

@@ -12,4 +12,5 @@ end
 require 'orchestration/services/database/adapters/adapter_base'
 require 'orchestration/services/database/adapters/mysql2'
 require 'orchestration/services/database/adapters/postgresql'
+require 'orchestration/services/database/adapters/postgis'
 require 'orchestration/services/database/adapters/sqlite3'

data/lib/orchestration/services/database/configuration.rb

@@ -118,6 +118,7 @@ module Orchestration
             'mysql2' => adapters::Mysql2,
             'mysql' => adapters::Mysql2,
             'postgresql' => adapters::Postgresql,
+            'postgis' => adapters::Postgis,
             'sqlite3' => adapters::Sqlite3
           }.fetch(name).new(self)
         rescue KeyError

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.7.3'
+  VERSION = '0.7.5'
 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'
   spec.add_runtime_dependency 'paint', '~> 2.2'
@@ -35,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 1.2'
 
   spec.add_development_dependency 'activerecord', '>= 6.0'
+  spec.add_development_dependency 'activerecord-postgis-adapter', '~> 8.0'
   spec.add_development_dependency 'bunny', '~> 2.19'
   spec.add_development_dependency 'devpack', '~> 0.4.0'
   spec.add_development_dependency 'mongoid', '~> 7.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-17 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: '8.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -399,6 +427,7 @@ files:
 - lib/orchestration/services/database/adapters.rb
 - lib/orchestration/services/database/adapters/adapter_base.rb
 - lib/orchestration/services/database/adapters/mysql2.rb
+- lib/orchestration/services/database/adapters/postgis.rb
 - lib/orchestration/services/database/adapters/postgresql.rb
 - lib/orchestration/services/database/adapters/sqlite3.rb
 - lib/orchestration/services/database/configuration.rb