vx-service_connector 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8dd689ce4de0b574983a85638a7394385052d5a
-  data.tar.gz: a301274c5db42cae5d92ad8c3d7004eaad84b7fd
+  metadata.gz: 3567c44011db3b375be8334b60e45419a7d9f668
+  data.tar.gz: ad89accadaf465803640afc400cc3bb7be20ac9d
 SHA512:
-  metadata.gz: 289257bfe1885e00d06a24ecb1d6f5939024f83cc82b5cc07a80844baccb09893820cf26fe0591ed34491e83c5f5130591b1f63f5ccf9dc0f19e989bad492395
-  data.tar.gz: 1375050a0621ce0196e2f5625601462d2f57b9263951dd0763eefe813cc75d879c27b76fcd203e60703635b5f5160b99290196856c64777a73a87ef3dc6de34d
+  metadata.gz: 0dfb0cd5d8f3798f24fbd3005af60650444440bb2157544acd88654f9b4910252f16f11e2a8b2bd9efd00f727ecad6a4e47fe321621056b2835d830f8880d96a
+  data.tar.gz: c91c3d991b0bb990f9d3f9adb5216c8fcffc9c84183761fbce9263ac7fcf30089cb7746941a919a82800db0759eb81be31323037ea0d0f667175d61bfcb592ea

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

@@ -20,6 +20,9 @@ module Vx
             tag:                    tag_name,
             skip:                   ignore?,
           )
+        rescue ::Octokit::NotFound, ::Octokit::Unauthorized => e
+          Rails.logger.warn "#{e.class}: #{e.message}" if defined?(Rails)
+          OpenStruct.new ignore?: true
         end
 
         private
@@ -133,14 +136,10 @@ module Vx
         end
 
         def commit_for_pull_request
-          @commit_for_pull_request ||=
-            begin
-              data = session.commit pull_request["base"]["repo"]["full_name"], sha
-              data.commit
-            rescue ::Octokit::NotFound => e
-              $stderr.puts "ERROR: #{e.inspect}"
-              OpenStruct.new
-            end
+          @commit_for_pull_request ||= begin
+            data = session.commit pull_request["base"]["repo"]["full_name"], sha
+            data.commit
+          end
         end
 
         def head_commit?

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 !(internal_pull_request? or tag?)
+            return !tag?
           end
 
           if restriction.is_a?(Hash)
@@ -65,7 +65,11 @@ module Vx
         end
 
         def ignore?
-          !!(skip || message.to_s =~ PAYLOAD_IGNORE_RE)
+          !!(
+              skip                   ||
+              internal_pull_request? ||
+              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.6"
+    VERSION = "0.4.7"
   end
 end

data/spec/lib/bitbucket_payload_spec.rb

@@ -27,27 +27,6 @@ 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') }
 
@@ -90,7 +69,7 @@ describe Vx::ServiceConnector::Bitbucket::Payload do
        mock_get_commit '121111foobar/vx-promo', 'b14806535f5e'
     end
 
-    its(:ignore?) { should be_false }
+    its(:ignore?) { should be_true }
   end
 
   context 'push with empty commits' do

data/spec/lib/github_payload_spec.rb

@@ -32,27 +32,26 @@ describe Vx::ServiceConnector::Github::Payload do
     its(:tag)                 { should be_nil }
   end
 
-  context "internal pull_request" do
+  context "Octokit exceptions" 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
+    context "not found" do
+      before do
+        mock_get_commit_not_found("evrone/cybergifts", sha)
+      end
+
+      it { should be_ignore }
     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 }
+    context "uanuthorized" do
+      before do
+        mock_get_commit_unauthorized("evrone/cybergifts", sha)
+      end
+
+      it { should be_ignore }
+    end
   end
 
   context "push tag" do

data/spec/lib/model_spec.rb

@@ -69,7 +69,7 @@ describe "(models)" do
         # pass, pr allowed
         instance(
           params.merge(internal_pull_request?: true)
-        ).to be_perform(pull_request: true)
+        ).not_to be_perform(pull_request: true)
 
         # deny, pr not allowed
         instance(

data/spec/support/github_web_mocks.rb

@@ -4,9 +4,14 @@ module GithubWebMocks
     mock_get "https://api.github.com/repos/#{repo_name}/commits/#{sha}", 'commit'
   end
 
-  def mock_get_commit_not_found
-    stub_request(:get, "https://api.github.com/repos/full/name/commits/sha").
-      to_return(:status => 404, :body => "")
+  def mock_get_commit_not_found(repo, sha)
+    stub_request(:get, "https://api.github.com/repos/#{repo}/commits/#{sha}")
+      .to_return(:status => 404, :body => "")
+  end
+
+  def mock_get_commit_unauthorized(repo, sha)
+    stub_request(:get, "https://api.github.com/repos/#{repo}/commits/#{sha}")
+      .to_return(:status => 401, :body => "")
   end
 
   def mock_create_notice(state)

metadata

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