travis-config 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a71d9c23188fce65bc4db95fbd119dfb623b9fe5
-  data.tar.gz: 5dcaeee363fc8476baa56cd1c1a000b5fc6717de
+  metadata.gz: 05e90ddcf738b6b525debe3648d8d4d8dea01f43
+  data.tar.gz: fd9199386a47ee0ecad693dbf53957e11f497e70
 SHA512:
-  metadata.gz: 9e8a2a876d27c031a2fcb2cfb6066f9d2307cb1da9aa4d2b24463023a9137f022bcf350e6682ba7a7ca370c0993f297c488fe3d1b30b1829443eaa8c002786e5
-  data.tar.gz: 5860c7dd3e6e6ac61c9315a7f56520037d69737782c3f2050af89c2cbcf0b25021f7eeee860da029f7c49479221e00a48d0fab582f8a1d7e8845e26450ece6d8
+  metadata.gz: 607a4801164e8d3c7290aa9b5c0a680242ae86f085d7cdb3da6dcdb77625ec974d67556c381390f7a095994af57da73933b2d6d541a58613e3886c33a2ba14d9
+  data.tar.gz: 2a01df129dc6a27ab3cd5c2f1a3932d6653713583715c3ee4957eeb555cad046771be68a6018d68aa68b1acbdaf408b337cf337d1512ee8383b751f392078a63

data/Gemfile.lock

@@ -0,0 +1,40 @@
+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/lib/travis/config/files.rb

@@ -8,7 +8,13 @@ module Travis
 
       def load
         filenames.inject({}) do |config, filename|
-          deep_merge(config, load_file(filename)[Config.env] || {})
+          file_config = load_file(filename)
+          if Config.env != "production" and file_config[Config.env].nil?
+            puts "Warning: config in #{filename} has no data for current env #{Config.env}"
+            puts "If you are expecting config to be loaded from this file, please make sure"
+            puts "your config is indented under a key of the environment (#{Config.env})"
+          end
+          deep_merge(config, file_config[Config.env] || {})
         end
       end
 

data/lib/travis/config/heroku.rb

@@ -13,7 +13,8 @@ module Travis
           logs_database: logs_database,
           amqp: amqp,
           redis: redis,
-          memcached: memcached
+          memcached: memcached,
+          sentry: sentry
         )
       end
 
@@ -35,6 +36,10 @@ module Travis
           compact(url: redis_url)
         end
 
+        def sentry
+          compact(dsn: sentry_dsn)
+        end
+
         def memcached
           Memcached.new.config
         end
@@ -47,6 +52,10 @@ module Travis
         def redis_url
           ENV['TRAVIS_REDIS_URL'] || ENV['REDIS_URL']
         end
+
+        def sentry_dsn
+          ENV['TRAVIS_SENTRY_DSN'] || ENV['SENTRY_DSN']
+        end
     end
   end
 end

data/lib/travis/config/version.rb

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

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

@@ -0,0 +1,17 @@
+describe Travis::Config::Heroku, :Sentry do
+  let(:config) { Travis::Test::Config.load(:heroku) }
+  let(:dsn)    { 'http://foo:bar@app.getsentry.com/1' }
+
+  before       { ENV[key] = dsn }
+  after        { ENV.delete('SENTRY_DSN') }
+
+  describe 'loads a SENTRY_DSN' do
+    let(:key)  { 'SENTRY_DSN' }
+    it { expect(config.sentry.to_h).to eq(dsn: dsn) }
+  end
+
+  describe 'loads a TRAVIS_SENTRY_DSN' do
+    let(:key)  { 'TRAVIS_SENTRY_DSN' }
+    it { expect(config.sentry.to_h).to eq(dsn: dsn) }
+  end
+end

data/travis-config.gemspec

@@ -0,0 +1,22 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - lib/travis/config.rb
@@ -50,7 +51,9 @@ files:
 - spec/travis/config/heroku/database_spec.rb
 - spec/travis/config/heroku/memcached_spec.rb
 - spec/travis/config/heroku/redis_spec.rb
+- spec/travis/config/heroku/sentry_spec.rb
 - spec/travis/config_spec.rb
+- travis-config.gemspec
 homepage: https://github.com/travis-ci/travis-config
 licenses:
 - MIT
@@ -71,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Travis CI config