vx-service_connector 0.2.20 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3cec4a635997e6ec7fbfe8ad9c030b8206f7a4
-  data.tar.gz: b8674641becff7494dcc92798e91acb0c1a21937
+  metadata.gz: ab0eff25caf5ee2ce030a75bdd20eccc1df4ef9f
+  data.tar.gz: 4f95803dbc9b67ca06e1a26f898a72ff342e4aea
 SHA512:
-  metadata.gz: aafa13cf97ffd8e1f17c109d514104c7c4f9fce3cba43b3c55c4d1694e6c25770831b991c2b3908ed072c264e3b89ec157a84bd6af2071fe8351461049e960c6
-  data.tar.gz: 29888d03c6b2a95b3b16d08932b429b1546a0498e3b41dfcc75afdab20934c3a49c929e7d3455d160fc84f189c9de8371cb15cd51e19c2431ce4715949143283
+  metadata.gz: 739a18f6ffd6516d9c4a4615f84c257b98adaf6fff86e64016abd8c0eb5c8df2cf314ee39127666b12c9d7f71fc4dc20e3abda5c928724ff5055e5035c3d3c02
+  data.tar.gz: 71e15770f7debb28f4582c55c025548a5ea8a478e9330d54fbe1cf3c88520e7509d1b32bf2fc00d0d4c041055188dfd02d41408d370745309307bae9ca458b25

data/lib/vx/service_connector/bitbucket/deploy_keys.rb

@@ -17,7 +17,6 @@ module Vx
 
         def destroy(key_name)
           all.select do |key|
-            puts [key_name, key['label']].inspect
             key['label'] == key_name
           end.map do |key|
             session.delete "api/1.0/repositories/#{repo.full_name}/deploy-keys/#{key['pk']}"

data/lib/vx/service_connector/bitbucket/payload.rb

@@ -4,22 +4,29 @@ module Vx
       Payload = Struct.new(:session, :params) do
 
         def build
-          ServiceConnector::Model::Payload.new(
-            !!ignore?,
-            pull_request?,
-            pull_request_number,
-            branch,
-            branch_label,
-            sha,
-            message,
-            author,
-            author_email,
-            web_url
+          ServiceConnector::Model::Payload.from_hash(
+            internal_pull_request?: (pull_request? && !foreign_pull_request?),
+            foreign_pull_request?:  foreign_pull_request?,
+            pull_request_number:    pull_request_number,
+            branch:                 branch,
+            branch_label:           branch_label,
+            sha:                    sha,
+            message:                message,
+            author:                 author,
+            author_email:           author_email,
+            web_url:                web_url,
+            tag:                    tag_name,
+            skip:                   ignore?,
           )
         end
 
         private
 
+        # TODO: implement
+        def tag_name
+          nil
+        end
+
         def pull_request?
           !(key? 'repository') && pull_request
         end
@@ -88,7 +95,7 @@ module Vx
           end
         end
 
-        def close_pull_request?
+        def closed_pull_request?
           %w(DECLINED MERGED).include?(pull_request_state)
         end
 
@@ -105,12 +112,14 @@ module Vx
         end
 
         def foreign_pull_request?
-          pull_request_head_repo_full_name != pull_request_base_repo_full_name
+          if pull_request?
+            pull_request_head_repo_full_name != pull_request_base_repo_full_name
+          end
         end
 
         def ignore?
           if pull_request?
-            close_pull_request? || !foreign_pull_request?
+            closed_pull_request?
           else
             sha == '0000000000000000000000000000000000000000' || !commits?
           end

data/lib/vx/service_connector/github/payload.rb

@@ -6,17 +6,19 @@ module Vx
       Payload = Struct.new(:session, :params) do
 
         def build
-          ServiceConnector::Model::Payload.new(
-            !!ignore?,
-            !!pull_request,
-            pull_request_number,
-            branch,
-            branch_label,
-            sha,
-            message,
-            author,
-            author_email,
-            web_url
+          ServiceConnector::Model::Payload.from_hash(
+            internal_pull_request?: (pull_request? && !foreign_pull_request?),
+            foreign_pull_request?:  foreign_pull_request?,
+            pull_request_number:    pull_request_number,
+            branch:                 branch,
+            branch_label:           branch_label,
+            sha:                    sha,
+            message:                message,
+            author:                 author,
+            author_email:           author_email,
+            web_url:                web_url,
+            tag:                    tag_name,
+            skip:                   ignore?,
           )
         end
 
@@ -26,6 +28,10 @@ module Vx
           key? "pull_request"
         end
 
+        def tag_name
+          tag? and self['ref'].split("/tags/").last
+        end
+
         def tag?
           !pull_request? && self['ref'] =~ /^#{Regexp.escape 'refs/tags/'}/
         end
@@ -118,11 +124,11 @@ module Vx
 
         def ignore?
           if pull_request?
-            closed_pull_request? || !foreign_pull_request?
+            closed_pull_request?
           elsif ping_request?
             true
           else
-            sha == '0000000000000000000000000000000000000000' || tag?
+            sha == '0000000000000000000000000000000000000000'
           end
         end
 

data/lib/vx/service_connector/gitlab_v6/payload.rb

@@ -17,6 +17,20 @@ module Vx
             author_email,
             web_url
           )
+          ServiceConnector::Model::Payload.from_hash(
+            internal_pull_request?: (pull_request? && !foreign_pull_request?),
+            foreign_pull_request?:  foreign_pull_request?,
+            pull_request_number:    pull_request_number,
+            branch:                 branch,
+            branch_label:           branch_label,
+            sha:                    sha,
+            message:                message,
+            author:                 author,
+            author_email:           author_email,
+            web_url:                web_url,
+            tag:                    tag_name,
+            skip:                   !valid?,
+          )
         end
 
         private
@@ -51,9 +65,9 @@ module Vx
 
         def ignore?
           if pull_request?
-            closed_pull_request? || !foreign_pull_request?
+            closed_pull_request?
           else
-            sha == '0000000000000000000000000000000000000000' || tag?
+            sha == '0000000000000000000000000000000000000000'
           end
         end
 
@@ -71,6 +85,10 @@ module Vx
           self["object_kind"] == "merge_request"
         end
 
+        def tag_name
+          tag? and self['ref'].split("/tags/").last
+        end
+
         def tag?
           !pull_request? && self["ref"].start_with?("refs/tags/")
         end

data/lib/vx/service_connector/model.rb

@@ -15,8 +15,8 @@ module Vx
       )
 
       Payload = Struct.new(
-        :skip,
-        :pull_request?,
+        :internal_pull_request?,
+        :foreign_pull_request?,
         :pull_request_number,
         :branch,
         :branch_label,
@@ -24,14 +24,41 @@ module Vx
         :message,
         :author,
         :author_email,
-        :web_url
+        :web_url,
+        :skip,
+        :tag,
       ) do
-        def to_hash ; to_h end
+        def to_hash
+          to_h
+        end
+
+        def master?
+          branch_label == "master"
+        end
+
+        def perform?(strategy = nil)
+          return false if ignore?
+
+          case strategy
+          when "master_or_pr"
+            master? or pull_request?
+          else # build all
+            not (internal_pull_request? or tag?)
+          end
+        end
 
         def ignore?
           !!(skip || message.to_s =~ /#{PAYLOAD_IGNORE_RE}/)
         end
 
+        def tag?
+          !!tag
+        end
+
+        def pull_request?
+          internal_pull_request? or foreign_pull_request?
+        end
+
         class << self
           def from_hash(params)
             payload = Payload.new
@@ -47,16 +74,18 @@ module Vx
 
       def test_payload_attributes(params = {})
         {
-          skip:                 false,
-          pull_request?:        false,
-          pull_request_number:  nil,
-          branch:               'master',
-          branch_label:         'master:label',
-          sha:                  "HEAD",
-          message:              'test commit',
-          author:               'User Name',
-          author_email:         'me@example.com',
-          web_url:              'http://example.com',
+          skip:                   false,
+          foreign_pull_request?:  false,
+          internal_pull_request?: false,
+          pull_request_number:    nil,
+          branch:                 'master',
+          branch_label:           'master:label',
+          sha:                    "HEAD",
+          message:                'test commit',
+          author:                 'User Name',
+          author_email:           'me@example.com',
+          web_url:                'http://example.com',
+          tag:                    nil
         }.merge(params)
       end
 

data/lib/vx/service_connector/payload_filter.rb

@@ -0,0 +1,48 @@
+module Vx
+  module ServiceConnector
+    class PayloadFilter
+
+      attr_reader :payload, :options
+
+      def initialize(payload, options = {})
+        @payload = payload
+        @options = options
+      end
+
+      def perform?
+        return false if payload.ignore?
+
+        if options.empty?
+          not (
+            payload.internal_pull_request? ||
+            payload.tag?
+          )
+        end
+      end
+
+      def pull_request?
+        options[:pull_request] and payload.pull_request?
+      end
+
+      def tag?
+        options[:tag] and payload.tag?
+      end
+
+      def branch?
+        @branch ||= Array(options[:branch]).map do |branch_name|
+          branch_name = branch_name.to_s
+          if branch_name[0] == "/" && branch_name[-1] == "/"
+            begin
+              Regexp.new(branch_name).match?(payload.branch)
+            rescue RegexpError
+              false
+            end
+          else
+            branch_name == payload.branch
+          end
+        end.any?
+      end
+
+    end
+  end
+end

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.2.20"
+    VERSION = "0.3.0"
   end
 end

data/spec/lib/bitbucket_payload_spec.rb

@@ -36,7 +36,7 @@ describe Vx::ServiceConnector::Bitbucket::Payload do
       mock_get_commit '121111foobar/vx-promo', sha
     end
 
-    its(:ignore?)             { should be_true }
+    its(:ignore?)             { should be_false }
     its(:pull_request?)       { should be_true }
     its(:pull_request_number) { should eq 1 }
     its(:branch)              { should eq 'test' }
@@ -65,7 +65,10 @@ describe Vx::ServiceConnector::Bitbucket::Payload do
       mock_get_commit 'other_login/api-test', 'b8aed32b8a30'
     end
 
-    its(:ignore?) { should be_false }
+    it { should_not be_ignore }
+    it { should be_pull_request }
+    it { should be_foreign_pull_request }
+    it { should_not be_internal_pull_request }
   end
 
   context 'pull request with same repo' do
@@ -76,7 +79,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

@@ -12,13 +12,14 @@ describe Vx::ServiceConnector::Github::Payload do
 
   context "ping" do
     let(:content) { read_json_fixture 'github/payload/ping'  }
-
-    its(:ignore?)             { should be_true }
+    it { should be_ignore }
   end
 
   context "push" do
     let(:url) { "https://github.com/evrone/ci-worker-test-repo/commit/687753389908e70801dd4ff5448be908642055c6"  }
 
+    it { should_not be_ignore }
+
     its(:pull_request?)       { should be_false }
     its(:pull_request_number) { should be_nil }
     its(:sha)                 { should eq '84158c732ff1af3db9775a37a74ddc39f5c4078f' }
@@ -28,10 +29,10 @@ describe Vx::ServiceConnector::Github::Payload do
     its(:author)              { should eq 'Dmitry Galinsky' }
     its(:author_email)        { should eq 'dima.exe@gmail.com' }
     its(:web_url)             { should eq url }
-    its(:ignore?)             { should be_false }
+    its(:tag)                 { should be_nil }
   end
 
-  context "pull_request" do
+  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' }
@@ -40,21 +41,26 @@ describe Vx::ServiceConnector::Github::Payload do
       mock_get_commit 'evrone/cybergifts', sha
     end
 
-    its(: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_true }
+    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 "push tag" do
     let(:content) { read_json_fixture("github/payload/push_tag") }
-    its(:ignore?) { should be_true }
+    it { should_not be_pull_request }
+    it { should_not be_ignore }
+    it { should be_tag }
+    its(:tag) { should eq 'v0.0.1' }
   end
 
   context "closed pull request" do
@@ -63,7 +69,7 @@ describe Vx::ServiceConnector::Github::Payload do
     before do
       mock_get_commit 'evrone/cybergifts', '84158c732ff1af3db9775a37a74ddc39f5c4078f'
     end
-
+    it { should be_pull_request }
     its(:ignore?) { should be_true }
   end
 
@@ -74,18 +80,10 @@ describe Vx::ServiceConnector::Github::Payload do
       mock_get_commit 'evrone/serverist-email-provider', 'f57c385116139082811442ad48cb6127c29eb351'
     end
 
-    its(:ignore?) { should be_false }
-  end
-
-  context "pull request with same repo" do
-
-    let(:content) { read_json_fixture("github/payload/pull_request") }
-
-    before do
-      mock_get_commit 'evrone/cybergifts', '84158c732ff1af3db9775a37a74ddc39f5c4078f'
-    end
-
-    its(:ignore?) { should be_true }
+    it { should be_pull_request }
+    it { should_not be_internal_pull_request }
+    it { should be_foreign_pull_request }
+    it { should_not be_ignore }
   end
 
 end

data/spec/lib/gitlab_v6_payload_spec.rb

@@ -10,7 +10,7 @@ describe Vx::ServiceConnector::GitlabV6::Payload do
   let(:payload) { gitlab.payload(repo, content) }
   subject { payload }
 
-  context "pull_request" do
+  context "foreign pull request" do
     let(:content) { read_json_fixture("gitlab_v6/payload/merge_request") }
     let(:sha)     { 'a7c31647c6449c3d98c4027d97e00b3048ac3bbf' }
 
@@ -20,7 +20,10 @@ describe Vx::ServiceConnector::GitlabV6::Payload do
       mock_project 1
     end
 
-    its(:pull_request?)       { should be_true }
+    it { should be_pull_request }
+    it { should be_foreign_pull_request }
+    it { should_not be_internal_pull_request }
+
     its(:pull_request_number) { should eq 5 }
     its(:sha)                 { should eq sha }
     its(:branch)              { should eq 'some-branch-name' }
@@ -39,7 +42,9 @@ describe Vx::ServiceConnector::GitlabV6::Payload do
     end
 
     let(:content) { read_json_fixture("gitlab_v6/payload/push_tag") }
-    its(:ignore?) { should be_true }
+    it { should_not be_ignore }
+    it { should be_tag }
+    its(:tag) { should eq 'v1' }
   end
 
   context "closed pull request" do
@@ -49,7 +54,8 @@ describe Vx::ServiceConnector::GitlabV6::Payload do
       mock_project 1
     end
 
-    its(:ignore?) { should be_true }
+    it { should be_pull_request }
+    it { should be_ignore }
   end
 
   context "merged pull request" do
@@ -59,7 +65,8 @@ describe Vx::ServiceConnector::GitlabV6::Payload do
       mock_project 1
     end
 
-    its(:ignore?) { should be_true }
+    it { should be_pull_request }
+    it { should be_ignore }
   end
 
   context "when identity is not authorized on push request" do

data/spec/lib/model_spec.rb

@@ -12,16 +12,16 @@ describe "(models)" do
     it "should knowns [ci skip]" do
       params[:skip] = false
       payload = described_class.from_hash(params)
-      expect(payload).to_not be_ignore
+      expect(payload).to be_perform
 
       params[:skip] = true
       payload = described_class.from_hash(params)
-      expect(payload).to be_ignore
+      expect(payload).to_not be_perform
 
       params[:skip] = false
       params[:message] = 'message [ci skip]'
       payload = described_class.from_hash(params)
-      expect(payload).to be_ignore
+      expect(payload).to_not be_perform
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -167,6 +167,7 @@ files:
 - lib/vx/service_connector/gitlab_v6/session.rb
 - lib/vx/service_connector/instrumentation.rb
 - lib/vx/service_connector/model.rb
+- lib/vx/service_connector/payload_filter.rb
 - lib/vx/service_connector/version.rb
 - spec/fixtures/bitbucket/add_deploy_key.json
 - spec/fixtures/bitbucket/changesets.json