travis-conditions 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ed752f8af131a4a0121e1a7016895f60a17743
-  data.tar.gz: 1abb2cd96e820aaf4f8e6786ff05956994838fde
+  metadata.gz: dedeb04bec488371ab045739237bff10a34ca15a
+  data.tar.gz: 7a4c46f91e0238bc78b6819afe98aa76d9d1f6d3
 SHA512:
-  metadata.gz: d5a2a1e2a7f9522d25e72726e05496b7a6ab6c719aef674ef3c2f7ea193867e0b2b47c6c950fdc39051bb7d0f38e97f7747fb6f5cfd1c94705561a608f716e06
-  data.tar.gz: ce2070be5d3cd20a36ac89d732aa32feb691203d391d4aa6f46b33ee2910a828e1aa635491967906ec3cd6b2dd7a529e320d0cadb84252809f9db661660a1597
+  metadata.gz: a72f8c330507570e4f013da10c68dba03cc6023815dc53059e73a15294a829aff544d0d6229dee3594bb0a52b47fc6c00aa6f00a372844b04197f14e50026ae5
+  data.tar.gz: 6b23fe2e7795cc6bdbf70c22cb7dce52e46a5f28fb734223f94c2aeb09f4215ae230feb759147c6688bb2bfd7bff7daac014dc9d5ff0715729a13567a11926c1

data/Gemfile

@@ -1,8 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'travis-env_vars', git: 'https://github.com/travis-ci/travis-env_vars', ref: 'sf-env_vars'
+gem 'sh_vars'
 gem 'parslet'
 
+gemspec
+
 group :test do
   gem 'rspec'
 end

data/Gemfile.lock

@@ -1,15 +1,15 @@
-GIT
-  remote: https://github.com/travis-ci/travis-env_vars
-  revision: 6ed4b4c27f5f9a57f4aa9f0ae8e15a6dfaf7eeb6
-  ref: sf-env_vars
+PATH
+  remote: .
   specs:
-    travis-env_vars (0.1.0)
+    travis-conditions (1.0.9)
+      parslet (~> 1.8.2)
+      sh_vars (~> 1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    parslet (1.8.0)
+    parslet (1.8.2)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -23,6 +23,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    sh_vars (1.0.2)
 
 PLATFORMS
   ruby
@@ -30,7 +31,8 @@ PLATFORMS
 DEPENDENCIES
   parslet
   rspec
-  travis-env_vars!
+  sh_vars
+  travis-conditions!
 
 BUNDLED WITH
-   1.16.1
+   2.0.2

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

@@ -1,4 +1,4 @@
-require 'travis/env_vars'
+require 'sh_vars'
 
 module Travis
   module Conditions
@@ -13,7 +13,9 @@ module Travis
         end
 
         def env(key)
-          data.fetch(:env, {})[key.to_sym]
+          value = data.fetch(:env, {})[key.to_sym]
+          value = value.gsub(/^(["'])(.*)\1$/, '\2') if value.respond_to?(:gsub)
+          value
         end
 
         private
@@ -55,9 +57,9 @@ module Travis
           end
 
           def parse(str)
-            vars = EnvVars::String.new(str).parse
+            vars = ShVars::String.new(str).parse
             vars.map { |lft, rgt| [lft, cast(unquote(rgt))] }
-          rescue EnvVars::ParseError
+          rescue ShVars::ParseError
             puts "[travis-conditions] Cannot normalize env var (#{str.inspect} given)"
             []
           end

data/lib/travis/conditions/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Conditions
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

data/spec/v1/conditions_spec.rb

@@ -32,19 +32,26 @@ describe Travis::Conditions::V1, 'real conditions' do
   end
 
   context do
-    let(:str) do
+    let(:cond) do
       %(
         repo = iribeyri/travis-experiments
         AND type != pull_request
         AND (branch = master OR tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+.*$)
       )
     end
-    it { expect { described_class.parse(str) }.to_not raise_error }
+    it { expect { described_class.parse(cond) }.to_not raise_error }
   end
 
   context do
     let(:subject) { described_class.parse(cond) }
     let(:cond) { 'commit_message !~ concat("[skip", env(TRAVIS_JOB_NAME), "]")' }
-    it { expect { subject }.to_not raise_error }
+    it { expect { described_class.parse(cond) }.to_not raise_error }
+  end
+
+  describe 'quoted env var' do
+    let(:cond) { 'branch = env(FOO)' }
+    let(:data) { { branch: 'foo', env: [FOO: '"foo"'] } }
+    subject { described_class.eval(cond, data) }
+    it { should be true }
   end
 end

data/spec/v1/data_spec.rb

@@ -12,7 +12,7 @@ describe Travis::Conditions::V1::Data do
     it { expect(subject.env('FOO')).to eq 'foo' }
   end
 
-  describe 'given an env array' do
+  describe 'given an env array of strings' do
     describe 'with a single var' do
       let(:env) { ['FOO=foo'] }
       it { expect(subject.env(:FOO)).to eq 'foo' }
@@ -63,6 +63,44 @@ describe Travis::Conditions::V1::Data do
     end
   end
 
+  describe 'given an env array of hashes' 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' }
+    end
+  end
+
+  describe 'given a double quoted string' do
+    let(:env) { [FOO: '"foo"'] }
+    it { expect(subject.env(:FOO)).to eq 'foo' }
+  end
+
+  describe 'given a single quoted string' do
+    let(:env) { [FOO: "'foo'"] }
+    it { expect(subject.env(:FOO)).to eq 'foo' }
+  end
+
+  describe 'given a string with an unbalanced double quote at the beginning' do
+    let(:env) { [FOO: '"foo'] }
+    it { expect(subject.env(:FOO)).to eq '"foo' }
+  end
+
+  describe 'given a string with an unbalanced double quote at the end' do
+    let(:env) { [FOO: 'foo"'] }
+    it { expect(subject.env(:FOO)).to eq 'foo"' }
+  end
+
+  describe 'given a string with an unbalanced single quote at the beginning' do
+    let(:env) { [FOO: "'foo"] }
+    it { expect(subject.env(:FOO)).to eq "'foo" }
+  end
+
+  describe 'given a string with an unbalanced single quote at the end' do
+    let(:env) { [FOO: "foo'"] }
+    it { expect(subject.env(:FOO)).to eq "foo'" }
+  end
+
   describe 'given a string without an = it raises an ArgumentError' do
     let(:env) { 'foo' }
     xit { expect { subject }.to raise_error Travis::Conditions::ArgumentError, 'Invalid env data ("foo" given)' }

data/travis-conditions.gemspec

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+$:.unshift File.expand_path('../lib', __FILE__)
+
+require 'travis/conditions/version'
+
+Gem::Specification.new do |s|
+  s.name         = "travis-conditions"
+  s.version      = Travis::Conditions::VERSION
+  s.authors      = ["Travis CI"]
+  s.email        = "contact@travis-ci.org"
+  s.homepage     = "https://github.com/travis-ci/travis-conditions"
+  s.summary      = "Boolean language for conditional builds, stages, jobs"
+  s.licenses     = ['MIT']
+
+  s.files        = Dir['{bin/**/*,lib/**/*,spec/**/*,[A-Z]*}']
+  s.platform     = Gem::Platform::RUBY
+  s.require_path = 'lib'
+  s.executables << 'travis-conditions'
+
+  s.add_dependency 'sh_vars', '~> 1.0.2'
+  s.add_dependency 'parslet', '~> 1.8.2'
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: travis-conditions
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parslet
+  name: sh_vars
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: travis-env_vars
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.8.2
 description: 
 email: contact@travis-ci.org
 executables:
@@ -97,6 +97,7 @@ files:
 - spec/v1/parser/var_spec.rb
 - spec/v1/parser_spec.rb
 - spec/v1/user_spec.rb
+- travis-conditions.gemspec
 homepage: https://github.com/travis-ci/travis-conditions
 licenses:
 - MIT
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Boolean language for conditional builds, stages, jobs