travis-conditions 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792a4640727f5262342fd6970a660617f5716c68
-  data.tar.gz: fe13ae1b89ad26522014b5fc95d383f09f1ca3a5
+  metadata.gz: fe9d64997d04ba4b4925925576c6db93a385e16a
+  data.tar.gz: 2bce042c0602dccfba8a0b3efc961771ac6e0885
 SHA512:
-  metadata.gz: 1303ea01cbc8f80e19279b5e620ce82812d199f9238247b934250ba1d233497942f4bbbb02ff86a401915a8a59b9fd57e4ff32e0a9f50af742a35a410c2df3f4
-  data.tar.gz: 0e34fc4489a9b7ab9ee26364c64429adc830b23fd654a066041b13b1d65aab09eee3a2ce52fd8d40bf5fed8502924f536a31f291640241974f64a283b89ff57c
+  metadata.gz: 1b6a7a59c84e4a420b557cfeea1c106c58ef3b748f8b2c864c872e0db5b532207e857007f1013422787c8fef677734dfb71be32db9d0f6b5f76ec8c6f4c95110
+  data.tar.gz: 7f9ec4437737eb2bd3b686598b3a7ad51270da53046c279fdc8b9ee2fed8badd40b55898a394e8c38123bd8328cb40368a06ce373b5d171bf2ece035fc81af10

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'travis-env_vars', git: 'https://github.com/travis-ci/travis-env_vars', ref: 'sf-env_vars'
 gem 'parslet'
 
 group :test do

data/Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/travis-ci/travis-env_vars
+  revision: c592ec523dd2ae6b6f3432656864478df189b2b1
+  ref: sf-env_vars
+  specs:
+    travis-env_vars (0.1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -23,6 +30,7 @@ PLATFORMS
 DEPENDENCIES
   parslet
   rspec
+  travis-env_vars!
 
 BUNDLED WITH
    1.16.1

data/README.md

@@ -40,7 +40,7 @@ true
 
 Conditions can be used to filter out, and reject builds, stages, and jobs by
 specifying conditions in your build configuration (your `.travis.yml` file).
-See [Conditional Builds, Stages, and Jobs](/user/conditional-builds-stages-jobs)
+See [Conditional Builds, Stages, and Jobs](https://docs.travis-ci.com/user/conditional-builds-stages-jobs/)
 for details.
 
 ### Examples

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

@@ -1,10 +1,9 @@
+require 'travis/env_vars'
+
 module Travis
   module Conditions
     module V1
       class Data < Struct.new(:data)
-        PAIRS = /((?:\\.|[^= ]+)*)=("(?:\\.|[^"\\]+)*"|(?:\\.|[^ "\\]+)*)/
-        QUOTE = /^(["'])(.*)\1$/
-
         def initialize(data)
           super(normalize(data))
         end
@@ -19,6 +18,12 @@ module Travis
 
         private
 
+          def normalize(data)
+            data = symbolize(data)
+            data[:env] = normalize_env(data[:env])
+            data
+          end
+
           def symbolize(obj)
             case obj
             when Hash
@@ -30,27 +35,10 @@ module Travis
             end
           end
 
-          def cast(obj)
-            case obj.to_s.downcase
-            when 'false'
-              false
-            when 'true'
-              true
-            else
-              obj
-            end
-          end
-
-          def normalize(data)
-            data = symbolize(data)
-            data[:env] = normalize_env(data[:env])
-            data
-          end
-
           def normalize_env(env)
             symbolize(to_h(env || {}))
           rescue TypeError
-            raise arg_error(env)
+            raise error(env)
           end
 
           def to_h(obj)
@@ -63,16 +51,31 @@ module Travis
           end
 
           def parse(str)
-            str = str.strip
-            raise arg_error(str) if str.empty? || !str.include?("=")
-            str.scan(PAIRS).map { |lft, rgt| [lft, cast(unquote(rgt))] }
+            vars = EnvVars.new(str).to_h
+            vars.map { |lft, rgt| [lft, cast(unquote(rgt))] }
+          rescue EnvVars::String::ParseError
+            puts "[travis-conditions] Cannot normalize env var (#{str.inspect} given)"
+            []
+          end
+
+          def cast(obj)
+            case obj.to_s.downcase
+            when 'false'
+              false
+            when 'true'
+              true
+            else
+              obj
+            end
           end
 
+          QUOTE = /^(["'])(.*)\1$/
+
           def unquote(str)
             QUOTE =~ str && $2 || str
           end
 
-          def arg_error(arg)
+          def error(arg)
             ArgumentError.new("Invalid env data (#{arg.inspect} given)")
           end
       end

data/lib/travis/conditions/version.rb

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

data/spec/v1/data_spec.rb

@@ -7,38 +7,63 @@ describe Travis::Conditions::V1::Data do
   it { expect(subject['branch']).to eq 'branch' }
 
   describe 'given an env hash' do
-    let(:env) { { foo: 'FOO' } }
-    it { expect(subject.env(:foo)).to eq 'FOO' }
-    it { expect(subject.env('foo')).to eq 'FOO' }
+    let(:env) { { FOO: 'foo' } }
+    it { expect(subject.env(:FOO)).to eq 'foo' }
+    it { expect(subject.env('FOO')).to eq 'foo' }
   end
 
   describe 'given an env array' do
     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' }
+      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' }
+      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' }
+      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
+
+    describe 'with an escaped space' do
+      let(:env) { ['FOO=foo\ bar'] }
+      it { expect(subject.env(:FOO)).to eq 'foo\ bar' }
+    end
+
+    describe 'with backticks and single quotes' do
+      let(:env) { ["FOO=`bar 'baz'`" ] }
+      it { expect(subject.env(:FOO)).to eq "`bar 'baz'`" }
+    end
+
+    describe 'with backticks and double quotes' do
+      let(:env) { ['FOO=`bar "baz"`' ] }
+      it { expect(subject.env(:FOO)).to eq '`bar "baz"`' }
+    end
+
+    describe 'with a subshell and single quotes' do
+      let(:env) { ["FOO=$(bar 'baz')" ] }
+      it { expect(subject.env(:FOO)).to eq "$(bar 'baz')" }
+    end
+
+    describe 'with a subshell and double quotes' do
+      let(:env) { ["FOO=$(bar 'baz')" ] }
+      it { expect(subject.env(:FOO)).to eq "$(bar 'baz')" }
     end
   end
 
   describe 'given a string without an = it raises an ArgumentError' do
     let(:env) { 'foo' }
-    it { expect { subject }.to raise_error Travis::Conditions::ArgumentError, 'Invalid env data ("foo" given)' }
+    xit { expect { subject }.to raise_error Travis::Conditions::ArgumentError, 'Invalid env data ("foo" given)' }
   end
 
   describe 'given an empty string it raises an ArgumentError' do
     let(:env) { '' }
-    it { expect { subject }.to raise_error Travis::Conditions::ArgumentError, 'Invalid env data ("" given)' }
+    xit { expect { subject }.to raise_error Travis::Conditions::ArgumentError, 'Invalid env data ("" given)' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-conditions
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: travis-env_vars
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
 email: contact@travis-ci.org
 executables: