vx-service_connector 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa4fdc2f34f10b5e4c9dfff4b3a817edf3982e9c
-  data.tar.gz: 1c5601478f3bd460168bff00671d8e567e96da6a
+  metadata.gz: b5fc671f16c38849ff4dff07c11ced37c0c6ef64
+  data.tar.gz: d74297ae8b5ebdeea4049bb06b660125f800873e
 SHA512:
-  metadata.gz: 6fef92824d5a332769cbd641986c11b48a29726e31b8291a47868d1e0ae0d5fd4705117e9e3be7c11bc8a014b01dcf683fbdde79534bc4d303a9288336637bba
-  data.tar.gz: 5fb73350161baf06087e4f1caeb93f4cc250b7c8d7aabf24765ffdb025e2992c643551ff6dadd75c498b922cc69c45ad281325a1f478d37b6aab4b58ce03eaae
+  metadata.gz: df104c9393213f487f5e5689c1a625827ad4f777b2ee14dac502fc9812ab4d7b31174b361dcb3f45a6a9ccf8301c8f35fe3e3caf4be497c1fc6ce140fe449c9b
+  data.tar.gz: 65c3cff69aa04dd2487a71506e1bdbec7b93d6b79af782c6352f8bebb03206a5a54b59639c86148594039d55d8731bff8145005322249e4b258d49ba3d2cea53

data/lib/vx/service_connector/model.rb

@@ -32,19 +32,36 @@ module Vx
           to_h
         end
 
-        def master?
-          branch_label == "master"
-        end
+        def perform?(restriction = nil)
+          if ignore?
+            # skip build
+            return false
+          end
+
+          if restriction.nil?
+            # skip internal pr or tag
+            # allow all pushes and foreign pr
+            return !(internal_pull_request? or tag?)
+          end
+
+          if restriction.is_a?(Hash)
+            branch_re = restriction[:branch]
+            pr        = restriction[:pull_request]
 
-        def perform?(strategy = nil)
-          return false if ignore?
+            if branch_re && Regexp.new(branch_re).match(branch)
+              return true
+            end
+
+            if pr && pull_request?
+              return true
+            end
 
-          case strategy
-          when "master_or_pr"
-            master? or pull_request?
-          else # build all
-            not (internal_pull_request? or tag?)
+            return false
           end
+
+          # unknown restriction
+          # denied
+          return false
         end
 
         def ignore?
@@ -68,6 +85,7 @@ module Vx
             payload
           end
         end
+
       end
 
       extend self

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/spec/lib/model_spec.rb

@@ -24,5 +24,72 @@ describe "(models)" do
       expect(payload).to_not be_perform
     end
 
+    context "perform?" do
+
+      it "message contains [ci skip]" do
+        params.merge!(message: "me [ci skip]")
+
+        # always skip
+        instance(params).to_not be_perform(nil)
+      end
+
+      it "restriction is null" do
+        # pass, push to master
+        instance(params).to be_perform(nil)
+
+        # pass, foreign pr
+        instance(
+          params.merge(foreign_pull_request?: true)
+        ).to be_perform(nil)
+
+        # deny, internal pr
+        instance(
+          params.merge(internal_pull_request?: true)
+        ).to_not be_perform(nil)
+      end
+
+      it "restriction is hash" do
+        # pass, branch matched
+        instance(
+          params.merge(branch: "master")
+        ).to be_perform(branch: "(master)" )
+
+        # deny, branch not matched
+        instance(
+          params.merge(branch: "master")
+        ).to_not be_perform(branch: "(develop)" )
+
+        # pass, pr allowed
+        instance(
+          params.merge(foreign_pull_request?: true)
+        ).to be_perform(pull_request: true)
+
+        # pass, pr allowed
+        instance(
+          params.merge(internal_pull_request?: true)
+        ).to be_perform(pull_request: true)
+
+        # deny, pr not allowed
+        instance(
+          params.merge(foreign_pull_request?: true)
+        ).to_not be_perform(pull_request: false)
+
+        # deny, pr not allowed
+        instance(
+          params.merge(internal_pull_request?: true)
+        ).to_not be_perform(pull_request: false)
+      end
+
+      it "unknown restriction" do
+        # deny always
+        instance(params).to_not be_perform('string')
+        instance(params).to_not be_perform(['array'])
+      end
+
+      def instance(payload)
+        expect(described_class.from_hash(payload))
+      end
+
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit