travis-conditions 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc052238888d66a8cd6e573129090c78a3c45e4
-  data.tar.gz: 1ee9d4f0a792f3075531380001e6ec944336b47a
+  metadata.gz: 508161e7fcdb5f6b5fa7f6b62d286e8e86b5e9bc
+  data.tar.gz: eef0be00cbef1f64ef60679949a835307697a988
 SHA512:
-  metadata.gz: aad2cbd038e0e36758058f06452ff2e1968cf074801175f9bb04919761a8669ba290961384de88081312bdf6a9340401b0d4ac78b0c08c42686d3d2834b1250c
-  data.tar.gz: a4b885612b3727d7380e57b680a863027478e36cdeb90f0e8d7005011b3c8952262623e98f5dbcfe71d1959951e34e382a6f34df9a2f7b9b7b9b4f3a90b1c68d
+  metadata.gz: aaa3cbd52975af87be2348c3778bcfa91c8e8dc71b7713bb3d91ffbcff8e8d372a9f9eb72aedf8b9c8bec6810e8b350f166d429b2bc29f1ac5d3d3370704933f
+  data.tar.gz: 8041e836d7fd63a78c8f4fcdb217b9ce88f8264538c4b72caaca56de341edbfacc5876f18ca220c6b05c75cfb6e0976ab6af74d4432f44af20393f9e05c45b33

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.0.13
+
+### Fixed
+
+- Do not raise an ArgumentError if env() was used with a missing argument
+
 ## v1.0.12
 
 ### Fixed

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

@@ -9,11 +9,11 @@ module Travis
         end
 
         def [](key)
-          data[key.to_sym]
+          data[key&.to_sym]
         end
 
         def env(key)
-          value = 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

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

@@ -78,7 +78,7 @@ module Travis
             send(name.to_s.downcase, *args.map { |arg| evl(arg) })
           end
 
-          def env(key)
+          def env(key = nil)
             data.env(key)
           end
 

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

@@ -54,7 +54,7 @@ module Travis
         include Boolean, Helper
 
         VAR   = /type|repo|head_repo|os|dist|group|sudo|language|sender|fork|
-                 branch|head_branch|tag|commit_message/ix
+                 branch|head_branch|tag|commit_message/x
 
         PRED  = /present|blank|true|false/i
         FUNC  = /env|concat/i

data/lib/travis/conditions/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Conditions
-    VERSION = '1.0.12'
+    VERSION = '1.0.13'
   end
 end

data/spec/v1/conditions_spec.rb

@@ -62,10 +62,24 @@ describe Travis::Conditions::V1, 'real conditions' do
     it { should be true }
   end
 
+  describe 'env vars as hashes' do
+    let(:cond) { "repo = env(REPO)" }
+    let(:data) { { repo: 'owner/name', env: [REPO: '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
+
+  describe 'missing argument' do
+    let(:cond) { 'branch = env()' }
+    let(:data) { { branch: 'master' } }
+    subject { described_class.eval(cond, data) }
+    it { should be false }
+  end
 end

data/spec/v1/parser_spec.rb

@@ -24,6 +24,11 @@ describe Travis::Conditions::V1::Parser do
       [:call, :env, [[:val, 'FOO']]]
   end
 
+  it 'env()' do
+    should eq \
+      [:call, :env, []]
+  end
+
   # one operand
 
   it '1=1' do
@@ -476,6 +481,10 @@ describe Travis::Conditions::V1::Parser do
           [:eq, [:var, :type], [:val, 'buz']]]]
   end
 
+  it '= foo' do
+    expect { subject }.to raise_error(Travis::Conditions::ParseError)
+  end
+
   it 'branch = $FOO' do
     expect { subject }.to raise_error(Travis::Conditions::ParseError)
   end

metadata

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