travis-conditions 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f3895aa6a6ddb15cb94763bda8b7a0a00f4686b
-  data.tar.gz: '0298417dfee215df91b373adaf2525c1de50a255'
+  metadata.gz: 2d21734c118195f32645a5c0e2b1027af5d08eea
+  data.tar.gz: e1f922b4297f34c652f6687b9323cd6f47c2f62f
 SHA512:
-  metadata.gz: 263a0cc9740135b403deff8ab38a63b0db446e3e935614920e7d5b61d81a8d84d318b9a43358c11278ad2d6a8698aecf5c3a94cd161da360eb3d5d1c39712449
-  data.tar.gz: f2b05cd398731419a43ff71fabaf8d4a2b99fb8466e071ff914c747b55abaa839528efd858fa347f3acf0e2bf2a3598e84f3f3f7ce4d0eccbef6a8a2b47e5554
+  metadata.gz: ce9269426c3c4e98689114cae49d81e9f97e7f0267bf83ff7226569176dcdb77dd4c8c12bf3eaeec0c22ef6fbaee36edaa6bf7e97477e247cadaed176ba420bb
+  data.tar.gz: 92cd8f86ff5db7a41e7ac127af103359ed4070c864b57dec49372311a46864af358837ff33180b798b1a4d2c236428e2d380af6943115f5342318390110c0eab

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/travis-ci/travis-env_vars
-  revision: c592ec523dd2ae6b6f3432656864478df189b2b1
+  revision: 6ed4b4c27f5f9a57f4aa9f0ae8e15a6dfaf7eeb6
   ref: sf-env_vars
   specs:
     travis-env_vars (0.1.0)

data/lib/travis/conditions/v1/data.rb

@@ -35,6 +35,8 @@ module Travis
             end
           end
 
+          # TODO move this to travis-env_vars
+
           def normalize_env(env)
             symbolize(to_h(env || {}))
           rescue TypeError
@@ -45,13 +47,15 @@ module Travis
             case obj
             when Hash
               obj
+            when Array
+              obj.map { |obj| to_h(obj).to_a }.flatten(1).to_h
             else
-              Array(obj).map { |obj| parse(obj.to_s) }.flatten(1).to_h
+              parse(obj.to_s.strip)
             end
           end
 
           def parse(str)
-            vars = EnvVars.new(str).to_h
+            vars = EnvVars::String.new(str).parse
             vars.map { |lft, rgt| [lft, cast(unquote(rgt))] }
           rescue EnvVars::ParseError
             puts "[travis-conditions] Cannot normalize env var (#{str.inspect} given)"

data/lib/travis/conditions/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Conditions
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/spec/v1/data_spec.rb

@@ -55,6 +55,11 @@ describe Travis::Conditions::V1::Data do
       let(:env) { ["FOO=$(bar 'baz')" ] }
       it { expect(subject.env(:FOO)).to eq "$(bar 'baz')" }
     end
+
+    describe 'with a string and a secure env var' do
+      let(:env) { ["FOO=foo BAR=bar", { secure: '12345' }] }
+      it { expect(subject.env(:FOO)).to eq 'foo' }
+    end
   end
 
   describe 'given a string without an = it raises an ArgumentError' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-conditions
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet