vx-service_connector 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be805b8dc0033600d9ca1308a978662265511fe9
-  data.tar.gz: 20c8773267e79c9b8e67eca0db4d163bcd0297f0
+  metadata.gz: 52cbb6a0746f93f3d0a5cb115b40bea4ca1d3285
+  data.tar.gz: f26d4ff7f9c5b8a10d47d09128d18af8393a0ede
 SHA512:
-  metadata.gz: 796ea1027648f0a5bd4e2d9d7068cf273a062a2b4b94cc3234ea745128366e3470f540a1f7856db619262fd25f0539b2ee5271df16bd9638c055f6b64d7bf0de
-  data.tar.gz: 30b33ed4e562cba01b3b2fda3b61fbcf308a63122b5f312231326f1aba6f92c85c08a8908940ee12e77055524b15d3941d295aa2869dae1e6f4f115e7b0468b9
+  metadata.gz: fa0c48d29fe52fc515f4af58e35c669f035d4e1b9148f34a517dc0cdfafd6918a5c1a81ba5554e9025482d42026cd4bb805ff35bbec58ca6091f369938b20ec3
+  data.tar.gz: db8f3a59715a8fa358e2c179cdf2e68a4e94e7fd55e8b612f39d8f0638298daa1183c142fa2263e7426235cdcdb1a2198c379ed637f7cbc00316cc3f3704706a

data/lib/vx/service_connector/error.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    class RequestError < StandardError ; end
+    class RequestError < RuntimeError ; end
   end
 end

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

@@ -7,18 +7,24 @@ module Vx
       Session = Struct.new(:endpoint, :private_token) do
 
         def get(url, options = {})
-          res = agent.call :get, request_url(url), nil, query: options
-          response! res
+          wrap do
+            res = agent.call :get, request_url(url), nil, query: options
+            response! res
+          end
         end
 
         def post(url, options = {})
-          res = agent.call :post, request_url(url), options, nil
-          response! res
+          wrap do
+            res = agent.call :post, request_url(url), options, nil
+            response! res
+          end
         end
 
         def delete(url, options = {})
-          res = agent.call :delete, request_url(url), nil, query: options
-          response! res
+          wrap do
+            res = agent.call :delete, request_url(url), nil, query: options
+            response! res
+          end
         end
 
         def uri
@@ -27,6 +33,14 @@ module Vx
 
         private
 
+          def wrap
+            begin
+              yield
+            rescue Errno::ETIMEDOUT => e
+              raise RequestError, e
+            end
+          end
+
           def response!(res)
             if (200..204).include?(res.status)
               res.data

data/lib/vx/service_connector/instrumentation.rb

@@ -2,7 +2,6 @@ require 'active_support/notifications'
 require 'faraday'
 require 'octokit/default'
 
-
 Octokit::Default::MIDDLEWARE.insert 0, Faraday::Request::Instrumentation
 
 builder = Faraday::RackBuilder.new

data/lib/vx/service_connector/model.rb

@@ -2,6 +2,8 @@ module Vx
   module ServiceConnector
     module Model
 
+      PAYLOAD_IGNORE_RE = Regexp.escape("[ci skip]")
+
       Repo = Struct.new(
         :id,
         :full_name,
@@ -12,7 +14,7 @@ module Vx
       )
 
       Payload = Struct.new(
-        :ignore?,
+        :skip,
         :pull_request?,
         :pull_request_number,
         :branch,
@@ -25,6 +27,10 @@ module Vx
       ) do
         def to_hash ; to_h end
 
+        def ignore?
+          skip || message.to_s =~ /#{PAYLOAD_IGNORE_RE}/
+        end
+
         class << self
           def from_hash(params)
             payload = Payload.new
@@ -40,7 +46,7 @@ module Vx
 
       def test_payload_attributes(params = {})
         {
-          ignore?:              false,
+          skip:                 false,
           pull_request?:        false,
           pull_request_number:  nil,
           branch:               'master',

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/lib/model_spec.rb

@@ -2,11 +2,27 @@ require 'spec_helper'
 
 describe "(models)" do
   context Vx::ServiceConnector::Model::Payload do
+    let(:params) { Vx::ServiceConnector::Model.test_payload_attributes }
 
-    context ".from_hash" do
-      let(:params) { Vx::ServiceConnector::Model.test_payload_attributes }
-      subject { described_class.from_hash(params).to_hash }
-      it { should eq params }
+    it "should build from hash" do
+      payload = described_class.from_hash(params).to_hash
+      expect(payload).to eq params
     end
+
+    it "should knowns [ci skip]" do
+      params[:skip] = false
+      payload = described_class.from_hash(params)
+      expect(payload).to_not be_ignore
+
+      params[:skip] = true
+      payload = described_class.from_hash(params)
+      expect(payload).to be_ignore
+
+      params[:skip] = false
+      params[:message] = 'message [ci skip]'
+      payload = described_class.from_hash(params)
+      expect(payload).to be_ignore
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit