travis-conditions 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6d3e53b4b901ce98eba3163f1032654784961c
-  data.tar.gz: d28a8be8838b6db1d8d6ce29ff51e592dbb60f43
+  metadata.gz: 792a4640727f5262342fd6970a660617f5716c68
+  data.tar.gz: fe13ae1b89ad26522014b5fc95d383f09f1ca3a5
 SHA512:
-  metadata.gz: 518227b13beb67aa1fd7853de9fb51a398ead71f1d09ab40724299cd3e25b74d062c36a7c2045115b0804a780f65231a100050894edc932098ba81911b6fc23c
-  data.tar.gz: 22607b55555edf9f45f0b3ca9c2849717fd1d4cf36ca7a36f9939d5097fd9ec24a1b250e65cd9e9c290b9607cee5be7bbcea5bda04237834711cf03f93604600
+  metadata.gz: 1303ea01cbc8f80e19279b5e620ce82812d199f9238247b934250ba1d233497942f4bbbb02ff86a401915a8a59b9fd57e4ff32e0a9f50af742a35a410c2df3f4
+  data.tar.gz: 0e34fc4489a9b7ab9ee26364c64429adc830b23fd654a066041b13b1d65aab09eee3a2ce52fd8d40bf5fed8502924f536a31f291640241974f64a283b89ff57c

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

@@ -2,6 +2,9 @@ module Travis
   module Conditions
     module V1
       class Data < Struct.new(:data)
+        PAIRS = /((?:\\.|[^= ]+)*)=("(?:\\.|[^"\\]+)*"|(?:\\.|[^ "\\]+)*)/
+        QUOTE = /^(["'])(.*)\1$/
+
         def initialize(data)
           super(normalize(data))
         end
@@ -55,15 +58,18 @@ module Travis
             when Hash
               obj
             else
-              Array(obj).map { |obj| split(obj.to_s) }.to_h
+              Array(obj).map { |obj| parse(obj.to_s) }.flatten(1).to_h
             end
           end
 
-          def split(str)
+          def parse(str)
             str = str.strip
             raise arg_error(str) if str.empty? || !str.include?("=")
-            lft, rgt = str.split('=', 2)
-            [lft, cast(rgt)]
+            str.scan(PAIRS).map { |lft, rgt| [lft, cast(unquote(rgt))] }
+          end
+
+          def unquote(str)
+            QUOTE =~ str && $2 || str
           end
 
           def arg_error(arg)

data/lib/travis/conditions/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Conditions
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/v1/data_spec.rb

@@ -13,9 +13,23 @@ describe Travis::Conditions::V1::Data do
   end
 
   describe 'given an env array' do
-    let(:env) { ['foo=FOO'] }
-    it { expect(subject.env(:foo)).to eq 'FOO' }
-    it { expect(subject.env('foo')).to eq 'FOO' }
+    describe 'with a single var' do
+      let(:env) { ['foo=FOO'] }
+      it { expect(subject.env(:foo)).to eq 'FOO' }
+      it { expect(subject.env('foo')).to eq 'FOO' }
+    end
+
+    describe 'with several vars on one string' do
+      let(:env) { ['foo=FOO bar=BAR'] }
+      it { expect(subject.env(:foo)).to eq 'FOO' }
+      it { expect(subject.env(:bar)).to eq 'BAR' }
+    end
+
+    describe 'with quoted vars' do
+      let(:env) { ['foo="FOO BAR" bar="BAR BAZ"'] }
+      it { expect(subject.env(:foo)).to eq 'FOO BAR' }
+      it { expect(subject.env(:bar)).to eq 'BAR BAZ' }
+    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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet