travis-config 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05e90ddcf738b6b525debe3648d8d4d8dea01f43
-  data.tar.gz: fd9199386a47ee0ecad693dbf53957e11f497e70
+  metadata.gz: 0997a79b3e1da9db64c9cba5b94b5b2d51621e32
+  data.tar.gz: 9369e30f3ff7a61fd27676c78fff5ea4dbf726f7
 SHA512:
-  metadata.gz: 607a4801164e8d3c7290aa9b5c0a680242ae86f085d7cdb3da6dcdb77625ec974d67556c381390f7a095994af57da73933b2d6d541a58613e3886c33a2ba14d9
-  data.tar.gz: 2a01df129dc6a27ab3cd5c2f1a3932d6653713583715c3ee4957eeb555cad046771be68a6018d68aa68b1acbdaf408b337cf337d1512ee8383b751f392078a63
+  metadata.gz: 3530a85d18b1150fde81ab80cb0395c142a43794ac494632a82997eb67e92b017a18a328af3c33880519ed91983feaec7be1b1b577e484014eabff1e28c0178e
+  data.tar.gz: bd0ba8452584938c3f7f79ce747bf3d1ae881f1cd98b6ace2d1d837c5b22b3c0e52a77cc82e940a6d62ff0e7524e93bc50880f5fd09f4d36e6f9a3ebd03440ad

data/README.md

@@ -2,6 +2,8 @@
 
 Shared way of loading and reading configuration in Travis CI.
 
+Internal documentation for Travis CI Builders on how configs are loaded for Travis apps can be found [here](https://github.com/travis-pro/team-teal/wiki/How-config-files-are-handled). (not publicly accessible)
+
 Users can either set defaults and include logic directly to the class
 `Travis::Config` or extend the class to, e.g. `Travis::Logs::Config`.
 

data/lib/travis/config.rb

@@ -18,7 +18,6 @@ module Travis
 
       def load(*names)
         config = load_from(*names)
-        config = normalize(config)
         new(config)
       end
 
@@ -34,11 +33,6 @@ 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/heroku/url.rb

@@ -22,7 +22,18 @@ module Travis
             super.reject { |key, value| key == :database }.merge(vhost: vhost)
           end
         end
-        Amqps = Amqp
+
+        # The amqps:// protocol needs to also pass along that it has SSL enabled
+        # for adapters such as march_hare
+        class Amqps < Amqp
+          def ssl
+            true
+          end
+
+          def to_h
+            super.merge(ssl: ssl)
+          end
+        end
 
         class << self
           def parse(url)

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
 end

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

@@ -29,6 +29,7 @@ describe Travis::Config::Heroku, :Amqp do
         vhost:    'vhost',
         username: 'username',
         password: 'password',
+        ssl:      true,
         prefetch: 1
       )
     end

data/spec/travis/config_spec.rb

@@ -70,8 +70,8 @@ describe Travis::Config do
       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' }
+    describe 'given logs_database is not defined anywhere it does not default to database' do
+      it { expect(config.logs_database).to eq nil }
     end
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: Travis CI config.
@@ -30,20 +30,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- lib/travis/config.rb
 - lib/travis/config/docker.rb
 - lib/travis/config/env.rb
 - lib/travis/config/files.rb
 - lib/travis/config/helpers.rb
-- lib/travis/config/heroku.rb
 - lib/travis/config/heroku/database.rb
 - lib/travis/config/heroku/memcached.rb
 - lib/travis/config/heroku/url.rb
+- lib/travis/config/heroku.rb
 - lib/travis/config/version.rb
+- lib/travis/config.rb
 - spec/spec_helper.rb
 - spec/travis/config/docker_spec.rb
 - spec/travis/config/files_spec.rb
@@ -53,7 +49,9 @@ files:
 - spec/travis/config/heroku/redis_spec.rb
 - spec/travis/config/heroku/sentry_spec.rb
 - spec/travis/config_spec.rb
-- travis-config.gemspec
+- Gemfile
+- LICENSE
+- README.md
 homepage: https://github.com/travis-ci/travis-config
 licenses:
 - MIT
@@ -64,19 +62,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.4.5
+rubyforge_project: '[none]'
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Travis CI config
 test_files: []
-has_rdoc: 

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    travis-config (1.0.11)
-      hashr (~> 2.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    hashr (2.0.0)
-    metaclass (0.0.4)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  hashr (~> 2.0.0)
-  mocha (~> 1.1)
-  rspec (~> 3.0)
-  travis-config!
-
-BUNDLED WITH
-   1.12.5

data/travis-config.gemspec

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'travis/config/version'
-
-Gem::Specification.new do |s|
-  s.name         = "travis-config"
-  s.version      = TravisConfig::VERSION
-  s.authors      = ["Travis CI"]
-  s.email        = "contact@travis-ci.org"
-  s.homepage     = "https://github.com/travis-ci/travis-config"
-  s.summary      = "Travis CI config"
-  s.description  = "#{s.summary}."
-  s.license      = "MIT"
-
-  s.files        = Dir['{lib/**/*,spec/**/*,[A-Z]*}']
-  s.platform     = Gem::Platform::RUBY
-  s.require_path = 'lib'
-  s.rubyforge_project = '[none]'
-
-  s.add_dependency 'hashr', '~> 2.0.0'
-end