travis-config 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbc7a2d8183a191085935a7231c5b5dfd70aabc9
-  data.tar.gz: d93f522f61921493e144e8a1b03b4588439ab649
+  metadata.gz: b20cf6bcdcf4a21186e5a8be8ae50ed664623e32
+  data.tar.gz: 93daf81e6fb27f4b5b51f217aa8e1dec483cbcb5
 SHA512:
-  metadata.gz: 361e6fcbb5b39ae63d0463b14d362014e40f69495c19b34e251b74813655b50c3d37709dd45512e60e4cb95bc84ec3e1050022b6a997b80e0da4b666729c93f6
-  data.tar.gz: 1161fe3d03c1ef110be6d8bde3cb60b086fbfd263750e3a84f19c60584bd56bb9dba5d92293c62b963c32d9ce2d19244b4445cec79077b030b308ae33e24f5c0
+  metadata.gz: 35e8a089cbe00a52d086a0d3c093fc72da3ec43c9fbd1a8b8d40337d064e461dfc3dff6b1a3be3a9a724829bbde375baa6990c84b1f19e9d4cbe4dbeae5a8ec1
+  data.tar.gz: 2a274be2fcb0c7bf1c0fdd6108f239d3ea5b66c4c8fa62a8ebcf81284748420575ff60cd1f3d3ad217041bc97a67b6444e3d9e88e8b713f3019a7cd0ce0db33c

data/Gemfile.lock

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

data/README.md

@@ -61,5 +61,5 @@ one go:
 
 ```bash
 $ gem install gem-release
-$ gem release --tag
+$ gem bump --push --tag --release
 ```

data/lib/travis/config/heroku.rb

@@ -9,7 +9,10 @@ module Travis
       DATABASE_URL = %r((?:.+?)://(?<username>.+):(?<password>.+)@(?<host>[^:]+):?(?<port>.*)/(?<database>.+))
 
       def load
-        { database: database }
+        {
+          database: database,
+          logs_database: logs_database
+        }
       end
 
       private
@@ -20,6 +23,12 @@ module Travis
           config
         end
 
+        def logs_database
+          config = parse_database_url(logs_database_url)
+          config = config.merge(pool: logs_pool_size.to_i) if logs_pool_size
+          config
+        end
+
         def parse_database_url(url)
           matches = DATABASE_URL.match(url.to_s)
           matches ? compact(Hash[matches.names.zip(matches.captures)]) : {}
@@ -29,9 +38,17 @@ module Travis
           ENV.values_at('DB_POOL', 'DATABASE_POOL_SIZE').compact.first
         end
 
+        def logs_pool_size
+          ENV.values_at('LOGS_DB_POOL', 'LOGS_DATABASE_POOL_SIZE').compact.first
+        end
+
         def database_url
           ENV.values_at('DATABASE_URL', 'SHARED_DATABASE_URL').compact.first
         end
+
+        def logs_database_url
+          ENV.values_at('LOGS_DATABASE_URL', 'SHARED_LOGS_DATABASE_URL').compact.first
+        end
     end
   end
 end

data/lib/travis/config/version.rb

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

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ 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

@@ -3,6 +3,7 @@ describe Travis::Config::Heroku do
   let(:vars)   { %w(DATABASE_URL 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
     expect(config.database.to_hash).to eq(
@@ -58,4 +59,59 @@ describe Travis::Config::Heroku do
       pool:     25
     )
   end
+
+  it 'loads a LOGS_DATABASE_URL with a port' do
+    expect(config.logs_database.to_hash).to eq(
+      adapter:  'postgresql',
+      host:     'hostname',
+      port:     'port',
+      database: 'logs_database',
+      username: 'username',
+      password: 'password',
+      encoding: 'unicode'
+    )
+  end
+
+  it 'loads a LOGS_DATABASE_URL without a port' do
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname/logs_database'
+
+    expect(config.logs_database.to_hash).to eq(
+      adapter:  'postgresql',
+      host:     'hostname',
+      database: 'logs_database',
+      username: 'username',
+      password: 'password',
+      encoding: 'unicode'
+    )
+  end
+
+  it 'loads LOGS_DB_POOL' do
+    ENV['LOGS_DB_POOL'] = '25'
+
+    expect(config.logs_database.to_hash).to eq(
+      adapter:  'postgresql',
+      host:     'hostname',
+      port:     'port',
+      database: 'logs_database',
+      username: 'username',
+      password: 'password',
+      encoding: 'unicode',
+      pool:     25
+    )
+  end
+
+  it 'loads LOGS_DATABASE_POOL_SIZE' do
+    ENV['LOGS_DATABASE_POOL_SIZE'] = '25'
+
+    expect(config.logs_database.to_hash).to eq(
+      adapter:  'postgresql',
+      host:     'hostname',
+      port:     'port',
+      database: 'logs_database',
+      username: 'username',
+      password: 'password',
+      encoding: 'unicode',
+      pool:     25
+    )
+  end
 end

metadata

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