travis-config 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef1a02277339c9c3f8f26ace76974090635ca7f
-  data.tar.gz: 2b874c972e135d322e470e6758390c59ed23b6c2
+  metadata.gz: 56954a8ebdcb05aee502195e9f9bf03a21845f33
+  data.tar.gz: c4a40cc2df9e9484e893184f3edba2a5482723f1
 SHA512:
-  metadata.gz: 34d9a4d344e3a683dcc128732a015d77b24ce7b749236d9e0535908bb9268c4e7afeba743e1857d1f758fdc923961ff524a6a57a15b3e6a76fc6b76cbd8c7d92
-  data.tar.gz: e6dad88f4181ec55a9669d350e3df5e8171ecb3301f2a653e04b5fc20b7d5af71f1536e8181f87b773ff55763c98d28035535237b4fac3abfd6483c59364b2d5
+  metadata.gz: 0c2237af5b1c13668ea02b10cbcd8ed422d365f49b942d11567d16c897f6ca48a9124cca56c87483f4a937a263820b345e7ddad4c9ab93ef84bca7803f66feae
+  data.tar.gz: 5a674fd612ef9005b4b55a8d596e5897004cf47dda0caea9111a9d832a118c6cd6f2ad0367b6f50b607ecb86aded1de14af60dd8ef458014a5b1c08130ec91d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-config (1.0.3)
+    travis-config (1.0.4)
       hashr (~> 2.0.0)
 
 GEM
@@ -37,4 +37,4 @@ DEPENDENCIES
   travis-config!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/travis/config/heroku/database.rb

@@ -19,19 +19,20 @@ module Travis
         private
 
           def url
-            env('TRAVIS_DATABASE_URL', 'DATABASE_URL').compact.first
+            env('DATABASE_URL').compact.first
           end
 
           def pool
-            env('TRAVIS_DATABASE_POOL_SIZE', 'DATABASE_POOL_SIZE', 'DB_POOL').compact.first
+            env('DATABASE_POOL_SIZE', 'DB_POOL').compact.first
           end
 
           def env(*keys)
-            ENV.values_at(*keys.map { |key| prefix(key) })
+            ENV.values_at(*keys.map { |key| prefix(key) }.flatten)
           end
 
           def prefix(key)
-            [options[:prefix], key].compact.join('_').upcase
+            key = [options[:prefix], key].compact.join('_').upcase
+            ["TRAVIS_#{key}", key]
           end
 
           def options

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/travis/config/heroku/database_spec.rb

@@ -1,8 +1,7 @@
 describe Travis::Config::Heroku, :Database do
   let(:config) { Travis::Test::Config.load(:heroku) }
-  let(:vars)   { %w(TRAVIS_DATABASE_URL DATABASE_URL DB_POOL TRAVIS_DATABASE_POOL_SIZE DATABASE_POOL_SIZE LOGS_DATABASE_URL LOGS_DB_POOL LOGS_DATABASE_POOL_SIZE DYNO) }
-  after        { vars.each { |key| ENV.delete(key) } }
   before       { ENV['DYNO'] = 'app_name' }
+  after        { ENV.clear }
 
   it 'loads a TRAVIS_DATABASE_URL with a port' do
     ENV['TRAVIS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
@@ -48,9 +47,9 @@ describe Travis::Config::Heroku, :Database do
     )
   end
 
-  it 'loads DATABASE_POOL_SIZE' do
-    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
-    ENV['DATABASE_POOL_SIZE'] = '25'
+  it 'loads TRAVIS_DATABASE_POOL_SIZE' do
+    ENV['TRAVIS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
+    ENV['TRAVIS_DATABASE_POOL_SIZE'] = '25'
 
     expect(config.database.to_h).to eq(
       adapter:   'postgresql',
@@ -99,6 +98,21 @@ describe Travis::Config::Heroku, :Database do
     )
   end
 
+  it 'loads a TRAVIS_LOGS_DATABASE_URL with a port' do
+    ENV['TRAVIS_LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
+
+    expect(config.logs_database.to_h).to eq(
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'logs_database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
+    )
+  end
+
   it 'loads a LOGS_DATABASE_URL with a port' do
     ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
 
@@ -145,6 +159,23 @@ describe Travis::Config::Heroku, :Database do
     )
   end
 
+  it 'loads TRAVIS_LOGS_DATABASE_POOL_SIZE' do
+    ENV['TRAVIS_LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
+    ENV['TRAVIS_LOGS_DATABASE_POOL_SIZE'] = '25'
+
+    expect(config.logs_database.to_h).to eq(
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'logs_database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      pool:      25,
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
+    )
+  end
+
   it 'loads LOGS_DATABASE_POOL_SIZE' do
     ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
     ENV['LOGS_DATABASE_POOL_SIZE'] = '25'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr