orchestration 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec214938f5a9d352579f7fa8f84ae16ef4c957698eab47ab058fa0cdbb1bde7b
-  data.tar.gz: e3e10e2c892d33271ecf36d48ffff35b861e13aeee59f0d49bdf08c4e3b30763
+  metadata.gz: 5e0cff2ba702a69453da3a15fb8d316ffb3885d0b464af20aa8e72f753e8476a
+  data.tar.gz: dd0b4d18a96e7bc6cc6fc4249f021692b323e456bd45f5155eb515a0ad540fd6
 SHA512:
-  metadata.gz: dcd8cd6fd5b6b8dbec62e42a1a8dbc6c199d8b822eac2c8fb46350e7057ce8f8d397f0f0baf61239e5e65ede48fdbfe799d3a4ae4db8bba7e9bc6514e1c6ca89
-  data.tar.gz: 10253172f0a5f1c984134c71a375c71388b7eeeff2afdb160ff10e4a7179e80c4a440227cf892487d1d9634edc6e6deeaed083ba476a755fc2c3df7794c8f8e1
+  metadata.gz: 0a504bca615203bb7338cadfd80f5ae255ba0fa7692f704cd56fba2c8249a9c423f0bb740380a615e9e2a423be21f2e29f830975f800a65bfb1fb752e64c5b56
+  data.tar.gz: fdd6bd51d62c861d1191ea2a414acf44f5447f05f855a282a18e3f58f8a7433fa720b6b7694cf973da0e147bd6d9ff4d758abadf5114fdb961315b509c86cf96

data/Gemfile.lock

@@ -66,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)
@@ -114,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)
@@ -137,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)
@@ -181,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)
@@ -242,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/config/locales/en.yml

@@ -40,5 +40,6 @@ en:
 
     dbconsole:
       postgresql: "PGPASSWORD='%<password>s' psql --username=%<username>s --host=%<host>s --port=%<port>s --dbname=%<database>s"
+      postgis: "PGPASSWORD='%<password>s' psql --username=%<username>s --host=%<host>s --port=%<port>s --dbname=%<database>s"
       sqlite3: "sqlite3 %<database>s"
       mysql2: "mysql --user=%<username>s --port=%<port>s --host=%<host>s --password=%<password>s --no-auto-rehash %<database>s"

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

@@ -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.7.4'
+  VERSION = '0.7.6'
 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.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.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2023-03-09 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: '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
@@ -413,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
@@ -466,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit