travis-config 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db328b9fff6ec2788a6c6b297005601117a8045
-  data.tar.gz: 239d6c3e786ea50e771b22134c6c514ddc43e7fe
+  metadata.gz: 433d2ae5f4f45116356930ff15e065024a49d71a
+  data.tar.gz: 60c43e328234c5daee5f9db106eb6794bc2038b6
 SHA512:
-  metadata.gz: 30d43b9068219b5c555a713c631c81b862ef60b129646f11f3e7095a40783ef835a5f1128b51ebf3a7b3743b855eee6d86b2dea6601736b69762f781c77acf80
-  data.tar.gz: fd874e4d30b6ca7d298dd72b68fb2e26dcf6e8b2ea749b23530cb43bdf299960d69b92f851a81be2332b8625e340e2ec4e4a36b4b2879092bb645c1d11802f15
+  metadata.gz: 2ef4c5d4471c3169d231cc2f0cc73798e8d3bcf4d22e827e2ef1d6b0848779aa0f5ad35cc922fe9664776c1f95bab00aa340ac27507f43c461f2b23fca199a94
+  data.tar.gz: 7c504acfebd025a4e9410df3fc917016dc6e9f6c387a09ed63f372c0012469aa8fea4fbc960825afd5926ce1784da474b948fe3cea7a3f2b4ac739009b61aab8

data/Gemfile.lock

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

data/lib/travis/config/env.rb

@@ -14,15 +14,16 @@ module Travis
         FALSE = /^(false|no|off)$/
 
         def to_h
-          defaults.deep_merge(hash(ENV, prefix.dup, defaults))
+          hash(ENV, prefix.dup, defaults)
         end
 
         private
 
           def hash(env, prefix, defaults)
-            defaults.inject({}) do |config, (key, default)|
+            hash = defaults.inject({}) do |config, (key, default)|
               config.merge key => obj(env, prefix + [key], default)
             end
+            compact(hash)
           end
 
           def obj(env, keys, default)
@@ -45,7 +46,7 @@ module Travis
 
           def var(env, key, default)
             key = key.map(&:upcase).join('_')
-            value = env.fetch(key, default)
+            value = env[key]
             raise UnexpectedString.new(key, value) if value.is_a?(String) && hashes?(default)
             default.is_a?(Array) ? split(value) : cast(value, default)
           end
@@ -70,7 +71,7 @@ module Travis
             when ''
               nil
             else
-              default.is_a?(Symbol) ? value.to_sym : value
+              value && default.is_a?(Symbol) ? value.to_sym : value
             end
           end
 
@@ -82,6 +83,10 @@ module Travis
           def hashes?(obj)
             obj.is_a?(Array) && obj.first.is_a?(Hash)
           end
+
+          def compact(hash)
+            hash.reject { |_, value| value.nil? }
+          end
       end
 
       def self.prefix(prefix = nil)

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/travis/config_spec.rb

@@ -1,5 +1,5 @@
 describe Travis::Config do
-  let(:config) { Travis::Test::Config.load(:files, :keychain, :heroku, :docker) }
+  let(:config) { Travis::Test::Config.load }
 
   describe 'Hashr behaviour' do
     after :each do
@@ -56,4 +56,9 @@ describe Travis::Config do
       it { expect(config.logs_database).to eq nil }
     end
   end
+
+  describe 'loading from keychain and env' do
+    env travis_config: YAML.dump('redis' => { 'url' => 'redis://url' })
+    it { expect(config.redis.url).to eq 'redis://url' }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr