travis-config 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56954a8ebdcb05aee502195e9f9bf03a21845f33
-  data.tar.gz: c4a40cc2df9e9484e893184f3edba2a5482723f1
+  metadata.gz: cee7c244fc6b7734354dcc47706c460436680012
+  data.tar.gz: b63aa540817d09962adf19b7206d8c1030dba352
 SHA512:
-  metadata.gz: 0c2237af5b1c13668ea02b10cbcd8ed422d365f49b942d11567d16c897f6ca48a9124cca56c87483f4a937a263820b345e7ddad4c9ab93ef84bca7803f66feae
-  data.tar.gz: 5a674fd612ef9005b4b55a8d596e5897004cf47dda0caea9111a9d832a118c6cd6f2ad0367b6f50b607ecb86aded1de14af60dd8ef458014a5b1c08130ec91d3
+  metadata.gz: c6190c8ec399f0dc208c4df56f7dc3f50da47942340a7175089af3a32baad678dc51c2d3170e340a37f2cd3c18dee88e2e6b1fbb38637a806d8b67d8d9298a7d
+  data.tar.gz: 22d3328345ffd7943ddfcf0ba11dd8f26bae07ab4d37103bca9d3b7fe7c85501643f8ccf2d8465a4d1fb7d488141ba93e7739810841d81fa893f9b8ee35a8385

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-config (1.0.4)
+    travis-config (1.0.5)
       hashr (~> 2.0.0)
 
 GEM

data/lib/travis/config/heroku.rb

@@ -24,7 +24,8 @@ module Travis
         end
 
         def logs_database
-          Database.new(prefix: 'logs').config
+          config = Database.new(prefix: 'logs').config
+          config.empty? ? database : config
         end
 
         def amqp

data/lib/travis/config/version.rb

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

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

@@ -193,7 +193,22 @@ describe Travis::Config::Heroku, :Database do
     )
   end
 
-  it 'sets logs_database to nil if no logs db url given' do
+  it 'defaults logs_database to database if no other config is given' do
+    ENV['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 'sets logs_database to nil if no DATABASE_URL and no LOGS_DATABASE_URL is 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: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Travis CI