vx-service_connector 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3567c44011db3b375be8334b60e45419a7d9f668
-  data.tar.gz: ad89accadaf465803640afc400cc3bb7be20ac9d
+  metadata.gz: 3bc6a731bfafa1b7dc6d09d2755a25c9bc848d29
+  data.tar.gz: 5f7881e330772635665700529c0f948d2f2f0c42
 SHA512:
-  metadata.gz: 0dfb0cd5d8f3798f24fbd3005af60650444440bb2157544acd88654f9b4910252f16f11e2a8b2bd9efd00f727ecad6a4e47fe321621056b2835d830f8880d96a
-  data.tar.gz: c91c3d991b0bb990f9d3f9adb5216c8fcffc9c84183761fbce9263ac7fcf30089cb7746941a919a82800db0759eb81be31323037ea0d0f667175d61bfcb592ea
+  metadata.gz: 14070ff3e02e5041cddc243c74a15263cae466dad0ee645ff2b2102e2bb087b4db2e74acf7c6f77e300d31ea2c217b0ce2b38d08ecfdfa0b5f13350c74422281
+  data.tar.gz: e94e996542f12a2cab47e0bf7b56586f880a2a2ed97be8364379e91bcdf8ed0f5f87a657af2f2d6d5ad541bd93e67a215fd9e02e6201722c8beeba1ff964f359

data/lib/vx/service_connector/model.rb

@@ -41,7 +41,7 @@ module Vx
           if restriction.nil?
             # skip internal pr or tag
             # allow all pushes and foreign pr
-            return !tag?
+            return (!internal_pull_request? || !tag?)
           end
 
           if restriction.is_a?(Hash)
@@ -49,7 +49,10 @@ module Vx
             pr        = restriction[:pull_request]
 
             if branch_re && Regexp.new(branch_re).match(branch)
-              return true
+              # if branch name matches
+              # we're already building it,
+              # so we should ignore prs.
+              return !internal_pull_request?
             end
 
             if pr && pull_request?
@@ -65,11 +68,7 @@ module Vx
         end
 
         def ignore?
-          !!(
-              skip                   ||
-              internal_pull_request? ||
-              message.to_s =~ PAYLOAD_IGNORE_RE
-            )
+          !!(skip || message.to_s =~ PAYLOAD_IGNORE_RE)
         end
 
         def tag?

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.4.7"
+    VERSION = "0.4.8"
   end
 end

data/spec/lib/bitbucket_payload_spec.rb

@@ -27,6 +27,28 @@ describe Vx::ServiceConnector::Bitbucket::Payload do
     its(:web_url)             { should eq url }
   end
 
+
+  context 'create pull_request' do
+    let(:content) { read_json_fixture 'bitbucket/payload/created_pull_request' }
+    let(:url)     { 'https://bitbucket.org/121111foobar/vx-promo/pull-request/1' }
+    let(:sha)     { 'b14806535f5e' }
+
+    before do
+      mock_get_commit '121111foobar/vx-promo', sha
+    end
+
+    its(:ignore?)             { should be_false }
+    its(:pull_request?)       { should be_true }
+    its(:pull_request_number) { should eq 1 }
+    its(:branch)              { should eq 'test' }
+    its(:branch_label)        { should eq 'test' }
+    its(:sha)                 { should eq sha }
+    its(:message)             { should eq 'Fix all the bugs' }
+    its(:author)              { should eq 'login' }
+    its(:author_email)        { should eq 'example@gmail.com' }
+    its(:web_url)             { should eq url }
+  end
+
   context 'declined pull request' do
     let(:content) { read_json_fixture('bitbucket/payload/declined_pull_request') }
 
@@ -69,7 +91,7 @@ describe Vx::ServiceConnector::Bitbucket::Payload do
        mock_get_commit '121111foobar/vx-promo', 'b14806535f5e'
     end
 
-    its(:ignore?) { should be_true }
+    its(:ignore?) { should be_false }
   end
 
   context 'push with empty commits' do

data/spec/lib/github_payload_spec.rb

@@ -32,6 +32,29 @@ describe Vx::ServiceConnector::Github::Payload do
     its(:tag)                 { should be_nil }
   end
 
+  context "internal pull_request" do
+    let(:content) { read_json_fixture("github/payload/pull_request") }
+    let(:url)     { "https://github.com/evrone/cybergifts/pull/177" }
+    let(:sha)     { '84158c732ff1af3db9775a37a74ddc39f5c4078f' }
+
+    before do
+      mock_get_commit 'evrone/cybergifts', sha
+    end
+
+    its(:pull_request?)         { should be_true }
+    its(:foreign_pull_request?) { should be_false }
+    its(:internal_pull_request?){ should be_true }
+    its(:pull_request_number)   { should eq 177 }
+    its(:sha)                   { should eq sha }
+    its(:branch)                { should eq 'test' }
+    its(:branch_label)          { should eq 'dima-exe:test' }
+    its(:message)               { should eq 'Fix all the bugs' }
+    its(:author)                { should eq 'Monalisa Octocat' }
+    its(:author_email)          { should eq 'support@github.com' }
+    its(:web_url)               { should eq url }
+    its(:ignore?)               { should be_false }
+  end
+
   context "Octokit exceptions" do
     let(:content) { read_json_fixture("github/payload/pull_request") }
     let(:url)     { "https://github.com/evrone/cybergifts/pull/177" }

data/spec/lib/model_spec.rb

@@ -47,7 +47,7 @@ describe "(models)" do
         # deny, internal pr
         instance(
           params.merge(internal_pull_request?: true)
-        ).to_not be_perform(nil)
+        ).to be_perform(nil)
       end
 
       it "restriction is hash" do
@@ -69,7 +69,21 @@ describe "(models)" do
         # pass, pr allowed
         instance(
           params.merge(internal_pull_request?: true)
-        ).not_to be_perform(pull_request: true)
+        ).to be_perform(pull_request: true)
+
+        instance(
+          params.merge(
+            internal_pull_request?: true,
+            branch: '(develop)'
+          )
+        ).not_to be_perform(branch: '$\(dev')
+
+        instance(
+          params.merge(
+            internal_pull_request?: true,
+            branch: '(develop)'
+          )
+        ).to be_perform(branch: 'master', pull_request: true)
 
         # deny, pr not allowed
         instance(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit