orchestration 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de47b72daeab700a9646fa1c930e747bf7b5f03c630fe63d7ee3fee7aa95d8e3
-  data.tar.gz: 5a92f1d0826e717fff61ad1b5bf386801907cdf7cf4874a444c5051553f24795
+  metadata.gz: 80872dc0b6d1fe6a0e4223915a047c9ed6b3461540b64842613b4d8a0ba72f3d
+  data.tar.gz: b33f4a5c305fd48f952a92a4f98748d1dae64eae62d5b222b4831f80cc2dbe9f
 SHA512:
-  metadata.gz: aba93e5eb3921c239d1a350e007df868b49ae0c038e25dff0db2d188574f55309871b4cf155b6102c135b65ce0e1d39cacffd3837abbca5736150f96a341015f
-  data.tar.gz: d99a48140ecd9b170b868083dc3023437a4ca212b5ad8f14512f5b2959025988350083b4fd1d6dd96b437a6a360ebc2311cf809b884146db9cc6998d6383afb7
+  metadata.gz: 4d83d6166ce64feb661d3952431d4b26569c96568308008f0070960343cb7959847ae5217cf30e780fa0228387cdb4e4404091ac6934996492cda355eec9b932
+  data.tar.gz: 6c78278a30cd2489e229900560c583731e29e4f88f4309530d6ff09095d59e426d6a500896d20dadcb03eca8dfdd3786b0c68d43c7b675209d7cdf4f374acbf1

data/README.md

@@ -27,7 +27,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.5.11'
+gem 'orchestration', '~> 0.5.12'
 ```
 
 Install:

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

@@ -82,37 +82,31 @@ module Orchestration
         end
 
         def host
-          url_config['host'] || file_config['host'] || super
+          chained_config('host') || super
         end
 
         def port
           return nil if sqlite?
 
-          url_config['port'] || file_config['port'] || super
+          chained_config('port') || super
         end
 
         def username
-          (
-            url_config['username'] ||
-            file_config['username'] ||
-            (adapter && adapter.credentials['username'])
-          )
+          chained_config('username') || (adapter && adapter.credentials['username'])
         end
 
         def password
-          (
-            url_config['password'] ||
-            file_config['password'] ||
-            (adapter && adapter.credentials['password'])
-          )
+          chained_config('password') || (adapter && adapter.credentials['password'])
         end
 
         def database
-          (
-            url_config['database'] ||
-            file_config['database'] ||
-            (adapter && adapter.credentials['database'])
-          )
+          chained_config('database') || (adapter && adapter.credentials['database'])
+        end
+
+        def chained_config(key)
+          return url_config[key] || file_config[key] if @env.environment == 'test'
+
+          file_config[key] || url_config[key]
         end
 
         def adapter_by_name(name)

data/lib/orchestration/templates/puma.rb.erb

@@ -1,6 +1,6 @@
 environment ENV.fetch('RAILS_ENV') { 'development' }
 
-port ENV.fetch('WEB_PORT') { 3000 }
+port ENV.fetch('WEB_PORT') { 8080 }
 workers ENV.fetch('WEB_CONCURRENCY') { 4 }
 threads_count = ENV.fetch('RAILS_MAX_THREADS') { 8 }
 

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url