travis-config 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b20cf6bcdcf4a21186e5a8be8ae50ed664623e32
-  data.tar.gz: 93daf81e6fb27f4b5b51f217aa8e1dec483cbcb5
+  metadata.gz: ceacc0f6edcb2ac39967e9aa9832ec98b9a9cba0
+  data.tar.gz: f33a79c5c2c5d5a18e577ff91d5ea0a985dcfed4
 SHA512:
-  metadata.gz: 35e8a089cbe00a52d086a0d3c093fc72da3ec43c9fbd1a8b8d40337d064e461dfc3dff6b1a3be3a9a724829bbde375baa6990c84b1f19e9d4cbe4dbeae5a8ec1
-  data.tar.gz: 2a274be2fcb0c7bf1c0fdd6108f239d3ea5b66c4c8fa62a8ebcf81284748420575ff60cd1f3d3ad217041bc97a67b6444e3d9e88e8b713f3019a7cd0ce0db33c
+  metadata.gz: 9e0964efaa98ae82564b5e861d322b048f923125c1b4bc15ba5e1fe0369dd1032eef43d2ec3966b51078c737fa8367aff219d2530933b93dab7bde39ac38e0a4
+  data.tar.gz: 013f0dc42b9cf4143a847db644aa6d92e878a0b2337884f2f61355da7320ca875f87c9959e3bf9fc98b184e7ea1ae53ec1d7ea967e4e2e0ccdd74674bc1de7f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-config (0.1.2)
+    travis-config (0.1.3)
       hashr (~> 0.0)
 
 GEM

data/lib/travis/config/heroku.rb

@@ -9,10 +9,7 @@ module Travis
       DATABASE_URL = %r((?:.+?)://(?<username>.+):(?<password>.+)@(?<host>[^:]+):?(?<port>.*)/(?<database>.+))
 
       def load
-        {
-          database: database,
-          logs_database: logs_database
-        }
+        compact(database: database, logs_database: logs_database)
       end
 
       private
@@ -26,7 +23,7 @@ module Travis
         def logs_database
           config = parse_database_url(logs_database_url)
           config = config.merge(pool: logs_pool_size.to_i) if logs_pool_size
-          config
+          config.merge(adapter: 'postgresql', encoding: 'unicode') unless config.empty?
         end
 
         def parse_database_url(url)

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ module Travis::Test
   class Config < Travis::Config
     define amqp: { username: 'guest', password: 'guest', host: 'localhost', prefetch: 1 }
     define database: { adapter: 'postgresql', database: 'test', encoding: 'unicode' }
-    define logs_database: { adapter: 'postgresql', database: 'logs_test', encoding: 'unicode' }
   end
 end
 

data/spec/travis/config/heroku_spec.rb

@@ -1,11 +1,11 @@
 describe Travis::Config::Heroku do
   let(:config) { Travis::Test::Config.load(:heroku) }
-  let(:vars)   { %w(DATABASE_URL POOL_SIZE) }
+  let(:vars)   { %w(DATABASE_URL DB_POOL DATABASE_POOL_SIZE LOGS_DATABASE_URL LOGS_DB_POOL LOGS_DATABASE_POOL_SIZE) }
   after        { vars.each { |key| ENV.delete(key) } }
-  before       { ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database' }
-  before       { ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database' }
 
   it 'loads a DATABASE_URL with a port' do
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database'
+
     expect(config.database.to_hash).to eq(
       adapter:  'postgresql',
       host:     'hostname',
@@ -31,6 +31,7 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads DB_POOL' do
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database'
     ENV['DB_POOL'] = '25'
 
     expect(config.database.to_hash).to eq(
@@ -46,6 +47,7 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads DATABASE_POOL_SIZE' do
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database'
     ENV['DATABASE_POOL_SIZE'] = '25'
 
     expect(config.database.to_hash).to eq(
@@ -61,6 +63,8 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads a LOGS_DATABASE_URL with a port' do
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database'
+
     expect(config.logs_database.to_hash).to eq(
       adapter:  'postgresql',
       host:     'hostname',
@@ -86,6 +90,7 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads LOGS_DB_POOL' do
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database'
     ENV['LOGS_DB_POOL'] = '25'
 
     expect(config.logs_database.to_hash).to eq(
@@ -101,6 +106,7 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads LOGS_DATABASE_POOL_SIZE' do
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database'
     ENV['LOGS_DATABASE_POOL_SIZE'] = '25'
 
     expect(config.logs_database.to_hash).to eq(
@@ -114,4 +120,8 @@ describe Travis::Config::Heroku do
       pool:     25
     )
   end
+
+  it 'sets logs_database to nil if no logs db url given' do
+    expect(config.logs_database).to be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Travis CI