travis-conditions 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dedeb04bec488371ab045739237bff10a34ca15a
-  data.tar.gz: 7a4c46f91e0238bc78b6819afe98aa76d9d1f6d3
+  metadata.gz: 1f5550042752d66fdf3b72b0d9c0990e3f09c954
+  data.tar.gz: a408b3f617cf6754abb579856f26ba2de9487da5
 SHA512:
-  metadata.gz: a72f8c330507570e4f013da10c68dba03cc6023815dc53059e73a15294a829aff544d0d6229dee3594bb0a52b47fc6c00aa6f00a372844b04197f14e50026ae5
-  data.tar.gz: 6b23fe2e7795cc6bdbf70c22cb7dce52e46a5f28fb734223f94c2aeb09f4215ae230feb759147c6688bb2bfd7bff7daac014dc9d5ff0715729a13567a11926c1
+  metadata.gz: e0ce5f91ec4bc825d987df57411f07313dca588042fc3bace4f8bd0ca6f8954851c74ed76356c720a27676bc4cc08382b5ac710e1ecaacbee8c71e93c12e86d0
+  data.tar.gz: dab76f7f8f8188b684c7e245370c5862b1585e6df00deef89b3131360af839f38e48ff757ee080884d0026c83a59643f2391d3cb6fa976015eb20becd2f26692

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.0.8
+
+### Fixed
+
+- Do not raise Type Error when a missing env var is used as a regular expression
+
 ## v1.0.7
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-conditions (1.0.9)
+    travis-conditions (1.0.10)
       parslet (~> 1.8.2)
       sh_vars (~> 1.0.2)
 
@@ -10,19 +10,19 @@ GEM
   specs:
     diff-lcs (1.3)
     parslet (1.8.2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     sh_vars (1.0.2)
 
 PLATFORMS

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

@@ -34,7 +34,8 @@ module Travis
           end
 
           def match(lft, rgt)
-            evl(lft) =~ evl(rgt)
+            lft, rgt = evl(lft), evl(rgt)
+            lft && rgt && lft =~ rgt
           end
 
           def not_match(lft, rgt)
@@ -63,7 +64,8 @@ module Travis
           end
 
           def reg(expr)
-            Regexp.new(evl(expr))
+            str = evl(expr)
+            Regexp.new(str) if str
           end
 
           def var(name)

data/lib/travis/conditions/version.rb

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

data/spec/v1/conditions_spec.rb

@@ -54,4 +54,18 @@ describe Travis::Conditions::V1, 'real conditions' do
     subject { described_class.eval(cond, data) }
     it { should be true }
   end
+
+  describe 'env vars as hashes' do
+    let(:cond) { 'repo = env(SLUG)' }
+    let(:data) { { repo: 'owner/name', env: [SLUG: 'owner/name'] } }
+    subject { described_class.eval(cond, data) }
+    it { should be true }
+  end
+
+  describe 'missing env var' do
+    let(:cond) { 'branch =~ env(PATTERN)' }
+    let(:data) { { branch: 'master', env: [] } }
+    subject { described_class.eval(cond, data) }
+    it { should be false }
+  end
 end

data/spec/v1/data_spec.rb

@@ -69,6 +69,12 @@ describe Travis::Conditions::V1::Data do
       it { expect(subject.env(:FOO)).to eq 'foo' }
       it { expect(subject.env('FOO')).to eq 'foo' }
     end
+
+    describe 'with several vars' do
+      let(:env) { [{ FOO: 'foo' }, { BAR: 'bar' }] }
+      it { expect(subject.env(:BAR)).to eq 'bar' }
+      it { expect(subject.env('BAR')).to eq 'bar' }
+    end
   end
 
   describe 'given a double quoted string' do

data/spec/v1/eval_spec.rb

@@ -173,6 +173,26 @@ describe Travis::Conditions::V1, 'eval' do
       let(:str) { 'env(foo) =~ concat("^", env(foo), "$")' }
       it { should be true }
     end
+
+    context do
+      let(:str) { 'env(missing) =~ str' }
+      it { should be false }
+    end
+
+    context do
+      let(:str) { 'str =~ env(missing)' }
+      it { should be false }
+    end
+
+    context do
+      let(:str) { 'env(missing) =~ ^.*$' }
+      it { should be false }
+    end
+
+    context do
+      let(:str) { '^.*$ =~ env(missing)' }
+      it { should be false }
+    end
   end
 
   describe 'in' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-conditions
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sh_vars