travis-config 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abfb4c4846af68b332efa620d539f99364e114a4
-  data.tar.gz: 111c9e64a11eb6331b1bacb9bb565ba634f385ff
+  metadata.gz: a6e9f614609f8d04a6d02ea9839cdfa3d675ecc4
+  data.tar.gz: a8c417e4c838b2ccbedbd1b78484f5f74d786bac
 SHA512:
-  metadata.gz: 34744c5d5d60649245b11bc43e51378bfad6189304fb64f6949743723f649e4b52f16e65af8caba5f3762d7df7ab111f58aed6735217a98e726da377619aeafc
-  data.tar.gz: 124924ade87b5a6b4c844a0b806a7b741a5855583a0948d55a59e75de9bb8eff6f20e099625865deca6848cdb49998d84ed4dbe88adddb0e0351c36db2b53812
+  metadata.gz: 508ad8f7952b0ef05d02b3175ef0508fdefb29c0e1385105a1c7c18e265c3de138b1a85b237d7742625f1fe3e7302cdbb7d904de66f61600320a5d6cb254cd1c
+  data.tar.gz: 0fa3ad8e248cf61c99253e19de731f7aa67608f9ceafc81fb948dc2dfebb1b487cd727b1ef97b9dd71d7a9c93cb8d888d67aaa91147806d36034a8e2a5a764d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-config (1.0.0)
+    travis-config (1.0.1)
       hashr (~> 2.0.0)
 
 GEM
@@ -35,3 +35,6 @@ DEPENDENCIES
   mocha (~> 1.1)
   rspec (~> 3.0)
   travis-config!
+
+BUNDLED WITH
+   1.10.6

data/lib/travis/config/heroku.rb

@@ -28,7 +28,7 @@ module Travis
         end
 
         def amqp
-          compact(Url.parse(ENV['RABBITMQ_URL']).to_h)
+          compact(Url.parse(ENV['RABBITMQ_URL'] || ENV['RABBITMQ_BIGWIG_URL']).to_h) # rabbitmq-bigwig add-ons can only be attached as RABBITMQ_BIGWIG
         end
 
         def redis

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

@@ -6,7 +6,7 @@ module Travis
       class Database < Struct.new(:options)
         include Helpers
 
-        DEFAULTS = { adapter: 'postgresql', encoding: 'unicode' }
+        DEFAULTS = { adapter: 'postgresql', encoding: 'unicode', application_name: ENV['DYNO'] || $0 }
 
         def config
           config = parse_url

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-ENV['ENV'] = 'test'
+ENV['ENV']  = 'test'
+ENV['DYNO'] = 'travis-config/specs'
 
 require 'mocha'
 require 'travis/config'

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

@@ -1,12 +1,14 @@
 describe Travis::Config::Heroku, :Database do
   let(:config) { Travis::Test::Config.load(:heroku) }
-  let(:vars)   { %w(DATABASE_URL DB_POOL DATABASE_POOL_SIZE LOGS_DATABASE_URL LOGS_DB_POOL LOGS_DATABASE_POOL_SIZE) }
+  let(:vars)   { %w(DATABASE_URL DB_POOL 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' }
 
   it 'loads a DATABASE_URL with a port' do
     ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
 
     expect(config.database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       port:     1234,
@@ -21,6 +23,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['DATABASE_URL'] = 'postgres://username:password@hostname/database'
 
     expect(config.database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       database: 'database',
@@ -35,6 +38,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['DB_POOL'] = '25'
 
     expect(config.database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       port:     1234,
@@ -51,6 +55,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['DATABASE_POOL_SIZE'] = '25'
 
     expect(config.database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       port:     1234,
@@ -66,6 +71,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
 
     expect(config.logs_database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       port:     1234,
@@ -80,6 +86,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname/logs_database'
 
     expect(config.logs_database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       database: 'logs_database',
@@ -94,6 +101,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['LOGS_DB_POOL'] = '25'
 
     expect(config.logs_database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       port:     1234,
@@ -110,6 +118,7 @@ describe Travis::Config::Heroku, :Database do
     ENV['LOGS_DATABASE_POOL_SIZE'] = '25'
 
     expect(config.logs_database.to_h).to eq(
+      application_name: 'travis-config/specs',
       adapter:  'postgresql',
       host:     'hostname',
       port:     1234,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr