vx-service_connector 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a644158a4529078ea389df2d73c1b2c3df150d
-  data.tar.gz: 185499dd531104a3a8e09b5d65e04ccf072f7543
+  metadata.gz: 368fb19bb348c6f4eb12c4ad053b0e94dcbb24fe
+  data.tar.gz: 4eade9c653a9990590af1966b593aefe1857aa2b
 SHA512:
-  metadata.gz: e62b8c91054ce0899ede861895f58c80890027e82658d410ee8f9231e91a8d49e0f16c3088a543ed0622d5f74fa802dd0c0067a2f5c6eb5c9a6a7c4a8f28a0be
-  data.tar.gz: 43fca0420a5969362844a6e64cab7080faa07c5372cd46ba780f5f3180dbedb7663df1b605ed58936203bb470cd595c2633224192a9b2a5955789ef00bea4f0c
+  metadata.gz: c9127c96f8379525029dc744a7111fde3dd418f0a68b7073b899f557e8743a59aaf923d61493940255de2e366b4d7d993fea15962790544c78fa227b0e50110d
+  data.tar.gz: e01757a23859a23e55cf1f7f82388ae1eeb4de3d670ec49bfbcabcffd750b7a68bf3ce871d3364a0ccdb70181cf3a6f61619bd9c5a7160d09586c4d2fd3f8407

data/lib/vx/service_connector/model.rb

@@ -45,8 +45,9 @@ module Vx
           end
 
           if restriction.is_a?(Hash)
-            branch_re = restriction[:branch]
-            pr        = restriction[:pull_request]
+            branch_re    = restriction[:branch]
+            pr_branch_re = restriction[:pull_requests_filter]
+            pr           = restriction[:pull_request]
 
             if !branch_re && internal_pull_request?
               return false
@@ -60,7 +61,11 @@ module Vx
             end
 
             if pr && pull_request?
-              return true
+              if !pr_branch_re.nil?
+                return !Regexp.new(pr_branch_re).match(branch).nil?
+              else
+                return true
+              end
             end
 
             return false

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.4.11"
+    VERSION = "0.4.12"
   end
 end

data/spec/lib/model_spec.rb

@@ -94,6 +94,35 @@ describe "(models)" do
         instance(
           params.merge(internal_pull_request?: true)
         ).to_not be_perform(pull_request: false)
+
+        # allow, pr, pr_branch eq filter
+        instance(
+          params.merge(
+            foreign_pull_request?: true,
+            branch: 'develop'
+          )
+        ).to be_perform(pull_requests_filter: "develop", pull_request: true)
+
+        # deny, pr, pr_branch not eq filter
+        instance(
+          params.merge(
+            foreign_pull_request?: true,
+            branch: 'develop'
+          )
+        ).to_not be_perform(pull_requests_filter: "test", pull_request: true)
+
+        # deny, push, pr_branch eq filter
+        instance(
+          params.merge(branch: 'develop')
+        ).to_not be_perform(pull_requests_filter: "develop", pull_request: true)
+
+        # deny, pr, pr_branch eq filter, but pr not checked
+        instance(
+          params.merge(
+            foreign_pull_request?: true,
+            branch: 'develop'
+          )
+        ).to_not be_perform(pull_requests_filter: "test", pull_request: false)
       end
 
       it "unknown restriction" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit