travis-config 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01e2ead5a4c4320d76ba27ab1ddadfb1e38ad084
-  data.tar.gz: 9259351d3b135e6177042cfe48ed67169c3399d8
+  metadata.gz: 0ef1a02277339c9c3f8f26ace76974090635ca7f
+  data.tar.gz: 2b874c972e135d322e470e6758390c59ed23b6c2
 SHA512:
-  metadata.gz: 2108e59adca723d5ea77c9ec0637161635c917f43c7c9626ab76b1065369c3bf41c05fdcf7f9121123fcee537aafcd2ccfcf8f54b9f384f3ea5817b52c40e0a1
-  data.tar.gz: 71807a6d9e917136adc15af1017476cca9f180cc04e822afe30118f99fefa84d74cb8629e66651e9eee05abd7c2f4bd9a48d6cffd33e4803c5e3f0c88ca7f093
+  metadata.gz: 34d9a4d344e3a683dcc128732a015d77b24ce7b749236d9e0535908bb9268c4e7afeba743e1857d1f758fdc923961ff524a6a57a15b3e6a76fc6b76cbd8c7d92
+  data.tar.gz: e6dad88f4181ec55a9669d350e3df5e8171ecb3301f2a653e04b5fc20b7d5af71f1536e8181f87b773ff55763c98d28035535237b4fac3abfd6483c59364b2d5

data/Gemfile.lock

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

data/lib/travis/config/heroku.rb

@@ -28,16 +28,25 @@ module Travis
         end
 
         def amqp
-          compact(Url.parse(ENV['RABBITMQ_URL'] || ENV['RABBITMQ_BIGWIG_URL']).to_h) # rabbitmq-bigwig add-ons can only be attached as RABBITMQ_BIGWIG
+          compact(Url.parse(amqp_url).to_h)
         end
 
         def redis
-          compact(url: ENV['REDIS_URL'])
+          compact(url: redis_url)
         end
 
         def memcached
           Memcached.new.config
         end
+
+        def amqp_url
+          # rabbitmq-bigwig add-ons can only be attached as RABBITMQ_BIGWIG
+          ENV['TRAVIS_RABBITMQ_URL'] || ENV['RABBITMQ_URL'] || ENV['RABBITMQ_BIGWIG_URL']
+        end
+
+        def redis_url
+          ENV['TRAVIS_REDIS_URL'] || ENV['REDIS_URL']
+        end
     end
   end
 end

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

@@ -6,27 +6,24 @@ module Travis
       class Database < Struct.new(:options)
         include Helpers
 
-        DEFAULTS = { adapter: 'postgresql', encoding: 'unicode', application_name: ENV['DYNO'] || $0 }
+        VARIABLES = { application_name: ENV['DYNO'] || $0, statement_timeout: 10_000 }
+        DEFAULTS  = { adapter: 'postgresql', encoding: 'unicode', variables: VARIABLES }
 
         def config
-          config = parse_url
-          config = DEFAULTS.merge(config) unless config.empty?
+          config = compact(Url.parse(url).to_h)
+          config = deep_merge(DEFAULTS, config) unless config.empty?
           config[:pool] = pool.to_i if pool
           config
         end
 
         private
 
-          def parse_url
-            compact(Url.parse(url).to_h)
+          def url
+            env('TRAVIS_DATABASE_URL', 'DATABASE_URL').compact.first
           end
 
           def pool
-            env('DB_POOL', 'DATABASE_POOL_SIZE').compact.first
-          end
-
-          def url
-            env('DATABASE_URL').compact.first
+            env('TRAVIS_DATABASE_POOL_SIZE', 'DATABASE_POOL_SIZE', 'DB_POOL').compact.first
           end
 
           def env(*keys)

data/lib/travis/config/version.rb

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

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

@@ -1,21 +1,36 @@
 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 DYNO) }
+  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' }
 
+  it 'loads a TRAVIS_DATABASE_URL with a port' do
+    ENV['TRAVIS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
+
+    expect(config.database.to_h).to eq(
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
+    )
+  end
+
   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,
-      database: 'database',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode'
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
     )
   end
 
@@ -23,30 +38,30 @@ 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',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode'
+      adapter:   'postgresql',
+      host:      'hostname',
+      database:  'database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      variables:  { application_name: 'travis-config/specs', statement_timeout: 10_000 }
     )
   end
 
-  it 'loads DB_POOL' do
+  it 'loads DATABASE_POOL_SIZE' do
     ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
-    ENV['DB_POOL'] = '25'
+    ENV['DATABASE_POOL_SIZE'] = '25'
 
     expect(config.database.to_h).to eq(
-      application_name: 'travis-config/specs',
-      adapter:  'postgresql',
-      host:     'hostname',
-      port:     1234,
-      database: 'database',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode',
-      pool:     25
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      pool:      25,
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
     )
   end
 
@@ -55,15 +70,32 @@ 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,
-      database: 'database',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode',
-      pool:     25
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      pool:      25,
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
+    )
+  end
+
+  it 'loads DB_POOL' do
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
+    ENV['DB_POOL'] = '25'
+
+    expect(config.database.to_h).to eq(
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      pool:      25,
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
     )
   end
 
@@ -71,14 +103,14 @@ 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,
-      database: 'logs_database',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode'
+      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
 
@@ -86,13 +118,13 @@ 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',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode'
+      adapter:   'postgresql',
+      host:      'hostname',
+      database:  'logs_database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
     )
   end
 
@@ -101,15 +133,15 @@ describe Travis::Config::Heroku, :Database do
     ENV['LOGS_DB_POOL'] = '1'
 
     expect(config.logs_database.to_h).to eq(
-      application_name: 'travis-config/specs',
-      adapter:  'postgresql',
-      host:     'hostname',
-      port:     1234,
-      database: 'logs_database',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode',
-      pool:     1
+      adapter:   'postgresql',
+      host:      'hostname',
+      port:      1234,
+      database:  'logs_database',
+      username:  'username',
+      password:  'password',
+      encoding:  'unicode',
+      pool:      1,
+      variables: { application_name: 'travis-config/specs', statement_timeout: 10_000 }
     )
   end
 
@@ -118,15 +150,15 @@ 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,
-      database: 'logs_database',
-      username: 'username',
-      password: 'password',
-      encoding: 'unicode',
-      pool:     25
+      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
 

metadata

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