travis-config 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433d2ae5f4f45116356930ff15e065024a49d71a
-  data.tar.gz: 60c43e328234c5daee5f9db106eb6794bc2038b6
+  metadata.gz: e0aafc91e58824682d0c5afd7a1ddadf4c58a0c6
+  data.tar.gz: 709ee553d716a1abf6eff22540f2a84c6ef2ba12
 SHA512:
-  metadata.gz: 2ef4c5d4471c3169d231cc2f0cc73798e8d3bcf4d22e827e2ef1d6b0848779aa0f5ad35cc922fe9664776c1f95bab00aa340ac27507f43c461f2b23fca199a94
-  data.tar.gz: 7c504acfebd025a4e9410df3fc917016dc6e9f6c387a09ed63f372c0012469aa8fea4fbc960825afd5926ce1784da474b948fe3cea7a3f2b4ac739009b61aab8
+  metadata.gz: 697c2cb63f03614519cf100e8bf39e80eb2b773179cdadcf1fc5b12479757f09285e8837fae52d09306563eac116628a29cf1a9c26942028c4fda507918b38b4
+  data.tar.gz: f58fe099937ba97f703764f8024fb3a99409f3e3e74dccbc33f74583d128aabf925324d7b250f48e89a18c6e26b49365d3800e5ae0d56be2547a3cbcb52f2ba1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    travis-config (1.1.1)
-      hashr (~> 2.0.0)
+    travis-config (1.1.2)
+      hashr (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -39,4 +39,4 @@ DEPENDENCIES
   travis-config!
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

data/lib/travis/config/env.rb

@@ -52,7 +52,7 @@ module Travis
           end
 
           def vars(env, keys, default)
-            pattern = /^#{keys.map(&:upcase).join('_')}_([\d]+)_/
+            pattern = /^#{keys.map(&:upcase).join('_')}_([\d]+)_?/
             vars = env.select { |key, _| key =~ pattern }
             vars = vars.map { |key, value| [key.sub(pattern, ''), value, $1] }
             vars.group_by(&:pop).values.map(&:to_h)
@@ -85,7 +85,11 @@ module Travis
           end
 
           def compact(hash)
-            hash.reject { |_, value| value.nil? }
+            hash.reject { |_, value| present?(value) }
+          end
+
+          def present?(value)
+            value.nil? || value.respond_to?(:empty?) && value.empty?
           end
       end
 

data/lib/travis/config/version.rb

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

data/spec/spec_helper.rb

@@ -10,7 +10,8 @@ module Travis::Test
   class Config < Travis::Config
     define amqp:     { username: 'guest', password: 'guest', host: 'localhost', prefetch: 1 },
            database: { adapter: 'postgresql', database: 'test', encoding: 'unicode' },
-           redis:    { url: 'redis://localhost:6379' }
+           redis:    { url: 'redis://localhost:6379' },
+           queues:   [ queue: 'queue' ]
 
     Env.prefix :travis
   end

data/spec/travis/config/env_spec.rb

@@ -88,3 +88,27 @@ describe Travis::Config::Env, 'arrays' do
     it { expect { config }.to raise_error(described_class::UnexpectedString) }
   end
 end
+
+module Travis::Test::Env::Queues
+  class Config < Travis::Config
+    define queues: [queue: 'queue', services: ['service']]
+
+    Env.prefix :travis
+  end
+end
+
+describe Travis::Config::Env, 'queues' do
+  let(:defaults) { { queues: [queue: 'queue', services: ['service']] } }
+  let(:config)   { Travis::Config::Env.new(defaults).load }
+
+  describe 'nested array' do
+    env TRAVIS_QUEUES_0_QUEUE: 'one',
+        TRAVIS_QUEUES_0_SERVICES_0: 'docker'
+
+    it { expect(config[:queues][0]).to eq queue: 'one', services: ['docker'] }
+  end
+
+  describe 'does not set empty arrays' do
+    it { expect(config[:queues]).to be_nil }
+  end
+end

data/spec/travis/config_spec.rb

@@ -58,7 +58,9 @@ describe Travis::Config do
   end
 
   describe 'loading from keychain and env' do
-    env travis_config: YAML.dump('redis' => { 'url' => 'redis://url' })
+    env travis_config: YAML.dump('redis' => { 'url' => 'redis://url' }, 'queues' => ['queue' => 'from_keychain']),
+        TRAVIS_QUEUES_0_QUEUE: 'from_env'
     it { expect(config.redis.url).to eq 'redis://url' }
+    it { expect(config.queues).to eq [queue: 'from_env'] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 description: Travis CI config.
 email: contact@travis-ci.org
 executables: []