travis-config 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67de0f0017df11901eb406bc43cf6b7ad52f4857
-  data.tar.gz: 05b1962b2089d429cf1c62196167b8c1520e2069
+  metadata.gz: ece7b075d7cfafadd4396a14bbe84fbdac918b0e
+  data.tar.gz: 8e676abb5ced7f60cd329393eec3569404649ed3
 SHA512:
-  metadata.gz: 5ae88bf2d9be78bc13914f2ef22069a55eb4da7ade28e6281d9ffda974bc642cc93b8ea2485334fbc552bef39acd65e7840fa96f459b7bfede6e6096e2bf8426
-  data.tar.gz: d50ac580463df69f5662f7dfcf17ba772f67f012499a4807d5a9194ef4c1302e5fd315e9562498c11c9aaa54edcc6cb5cfda9b337076fe640c73c2ff9eef1ffc
+  metadata.gz: 317b2e96faa0bd261834a517f0337f764bcb4b2f4b527fa83091e14c155613fc993ab4f5bf0578409f1cd7d651ff5f31a2ffb8b8712811ea428dc8fea9ba0cee
+  data.tar.gz: 08d4f9ebd80a763543d62370b847c4eb0bd2552632adc5650c26183a351c5a7e3e0e853223c2fa0c77f9f9f55e94d9872d74958a1516eae3f811750619053915

data/Gemfile.lock

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

data/lib/travis/config.rb

@@ -17,7 +17,9 @@ module Travis
       end
 
       def load(*names)
-        new(load_from(*names))
+        config = load_from(*names)
+        config = normalize(config)
+        new(config)
       end
 
       private
@@ -32,6 +34,11 @@ module Travis
           names = [:files, :env, :heroku, :docker] if names.empty?
           names.map { |name| const_get(camelize(name)).new }
         end
+
+        def normalize(config)
+          config[:logs_database] = config[:database] if blank?(config[:logs_database])
+          config
+        end
     end
 
     def env

data/lib/travis/config/env.rb

@@ -1,6 +1,6 @@
 module Travis
   class Config
-    class Env
+    class Env # TODO rename to keychain
       def load
         ENV['travis_config'] ? YAML.load(ENV['travis_config']) : {}
       end

data/lib/travis/config/helpers.rb

@@ -34,7 +34,7 @@ module Travis
       end
 
       def blank?(obj)
-        obj.respond_to?(:empty?) ? !!obj.empty? : !obj
+        obj.respond_to?(:empty?) ? obj.empty? : !obj
       end
 
       def camelize(string)

data/lib/travis/config/heroku.rb

@@ -4,7 +4,7 @@ require 'travis/config/heroku/memcached'
 
 module Travis
   class Config
-    class Heroku
+    class Heroku # TODO rename to EnvVar
       include Helpers
 
       def load
@@ -24,8 +24,7 @@ module Travis
         end
 
         def logs_database
-          config = Database.new(prefix: 'logs').config
-          config.empty? ? database : config
+          Database.new(prefix: 'logs').config
         end
 
         def amqp

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

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

@@ -193,22 +193,7 @@ describe Travis::Config::Heroku, :Database do
     )
   end
 
-  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
+  it 'sets logs_database to nil if no LOGS_DATABASE_URL is given' do
     expect(config.logs_database).to be_nil
   end
 end

data/spec/travis/config_spec.rb

@@ -47,9 +47,31 @@ describe Travis::Config do
     end
   end
 
-
   it 'deep symbolizes arrays, too' do
     config = Travis::Config.new('queues' => [{ 'slug' => 'rails/rails', 'queue' => 'rails' }])
     expect(config.queues.first.values_at(:slug, :queue)).to eq(['rails/rails', 'rails'])
   end
+
+  describe 'logs_database config' do
+    before { ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database' }
+    after  { ENV['DATABASE_URL'] = nil }
+
+    describe 'given logs_database is defined in a config file' do
+      before do
+        Dir.stubs(:[]).returns ['config/travis.yml']
+        YAML.stubs(:load_file).with('config/travis.yml').returns('test' => { 'logs_database' => { 'database' => 'config_file' } })
+      end
+      it { expect(config.logs_database.database).to eq 'config_file' }
+    end
+
+    describe 'given logs_database is defined in the keychain' do
+      before { ENV['travis_config'] = YAML.dump('logs_database' => { 'database' => 'keychain' }) }
+      after  { ENV['travis_config'] = nil }
+      it { expect(config.logs_database.database).to eq 'keychain' }
+    end
+
+    describe 'given logs_database is not defined anywhere it defaults to database' do
+      it { expect(config.logs_database.database).to eq 'database' }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr