wait_pg 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16907dc9186b682642d7176bd967d38204009462a821a58407b0d11dc59ed086
-  data.tar.gz: 15e7f0cce220e116102367f1abde99bbedc51346401a80175ac982385ac6ccac
+  metadata.gz: 2aeba2bbc35ea77471696967ab1c05e4ba4b9dc89b1b85386f04d480367dd832
+  data.tar.gz: 5ef2c0f9253b2bd8676ec4b9e2399d82484aa4814500c8775fc68fe3ef6dc55e
 SHA512:
-  metadata.gz: f035bc4f8397514fcf7a8d21b3eca5947e7d82b3327960c01f516e449a5a4b87ec5383a669f986d7ad5a53d4e607e0be69cd868903fa51e36fb63659a5d956cb
-  data.tar.gz: c0c30b482b0cfcf4bbf644684efdc1ff9b9ccdabfd6d81aa6bdc28124b1c51e5b1f5d82c0cfbf45713efda0b29c464e62d54fd29bf96d293e7ccae8b0c84a8b6
+  metadata.gz: 800c913c3d6e98f37dec2a22b0cfe987556a402c65973b9ee987afdee5616f32578554266f5b9722d6e269278a567eaf0e97a4464606da4a4377b17f783f80bf
+  data.tar.gz: 870a969051ef69439db4057af03d63af49e5f09270734cfaf1019fbb9f891b6b817871c1e230d293ee7357ae6a9a51ef9e3e2ac4f53ea92a1a7a844fca4445b9

data/bin/wait_pg

@@ -3,30 +3,44 @@ require 'erb'
 require 'pg'
 require 'yaml'
 
-# Wait for 60 seconds for a connection
-retries = 30
-interval = 2
+SUCCESS = 0
+ERROR = 1
+
+def connection_options
+  rails_env = ENV.fetch('RAILS_ENV') { 'development' }
+
+  path = File.expand_path('./config/database.yml')
+  yaml = YAML.load(ERB.new(File.read(path)).result)[rails_env]
+
+  # Active Record uses it as a default
+  return ENV['DATABASE_URL'] unless yaml&.exist?
 
-rails_env = ENV.fetch('RAILS_ENV') { 'development' }
-database_yml = YAML.load(ERB.new(File.read(File.expand_path('./config/database.yml'))).result)[rails_env]
+  # Set the default adapter (for cases like PostGIS)
+  config = yaml['url'].sub(/^.*:\/\//, 'postgres://')
 
-connection_options = {
-  user: database_yml['username'],
-  host: database_yml['host'],
-  password: database_yml['password'],
-  port: database_yml['port'],
-}
+  config ||= {
+    user: yaml['username'],
+    host: yaml['host'],
+    password: yaml['password'],
+    port: yaml['port'],
+  }
 
-if database_yml['database_url'] && !database_yml['database_url'].empty?
-  # Use the default adapter
-  connection_options = database_yml['database_url'].gsub(/^.*:\/\//, 'postgres://')
+  config ||= ENV['DATABASE_URL']
 end
 
+def connection_successful?
+  PG::PQPING_OK == PG::Connection.ping(connection_options)
+end
+
+# Wait for 60 seconds for a connection
+retries = 30
+interval = 2
+
 puts 'Waiting for PostgreSQL...'
 
 retries.times do
-  exit 0 if PG::PQPING_OK == PG::Connection.ping(connection_options)
+  exit SUCCESS if connection_successful?
   sleep interval
 end
 
-exit 1
+exit ERROR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wait_pg
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - mroutis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg