vx-service_connector 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb54ddf9b4a35e3537d44d9e4a78ab1ff6f5e238
-  data.tar.gz: bee8b9b125abac40e996387f3da6bfab65ffa460
+  metadata.gz: bc937a5f342e9a450658d50b50c8b4bb9f46912a
+  data.tar.gz: b2a972208b17bfc6d4c60c8725c6ce49e3a2dbbd
 SHA512:
-  metadata.gz: 1d3256f9742c901bd636bfb62ce8893403982976276ea41642dc5e81624573e1205c2a637dc7e581b4f16e0f289c1faee62adce732b90bc9a6522325cd85e194
-  data.tar.gz: d4e2fcfeda4695fb2a48153f8cf1c2339dc3f185161f5cc9d2e9cb476a38afccf487381e5a78d0a376009ae9875c95d19b099c2b97a53162851c971e1aebf31c
+  metadata.gz: 56bdaf27fdd6d26f450204ed80c8e78011bb525166ea08b166576990c75e39094169c42a7794addab07fed6274c3a39508d54e4d4d3c81b8617f4892c1369c2e
+  data.tar.gz: 01055be7c7e3547e4c1e6cf589a94fdb4575bfc41df56c196df56dd8fbdd3eefa0ac70f62fe61bc626aa12a5ef03aee1af8185ec68ba042552dc3c4573d26e7e

data/lib/vx/service_connector.rb

@@ -1,12 +1,13 @@
 require File.expand_path("../service_connector/version", __FILE__)
+require File.expand_path("../service_connector/error",   __FILE__)
 
 module Vx
   module ServiceConnector
 
-    autoload :Base,     File.expand_path("../service_connector/base",      __FILE__)
-    autoload :Github,   File.expand_path("../service_connector/github",    __FILE__)
-    autoload :GitlabV3, File.expand_path("../service_connector/gitlab_v3", __FILE__)
-    autoload :Model,    File.expand_path("../service_connector/model",     __FILE__)
+    autoload :Base,      File.expand_path("../service_connector/base",       __FILE__)
+    autoload :Github,    File.expand_path("../service_connector/github",     __FILE__)
+    autoload :GitlabV41, File.expand_path("../service_connector/gitlab_v41", __FILE__)
+    autoload :Model,     File.expand_path("../service_connector/model",      __FILE__)
 
     extend self
 
@@ -17,8 +18,8 @@ module Vx
       case name.to_sym
       when :github
         Github
-      when :gitlab_v3
-        GitlabV3
+      when :gitlab_v41
+        GitlabV41
       else
         raise ArgumentError, "Serivice for #{name.inspect} is not defined"
       end

data/lib/vx/service_connector/error.rb

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

data/lib/vx/service_connector/gitlab_v41.rb

@@ -0,0 +1,49 @@
+require 'gitlab'
+
+module Vx
+  module ServiceConnector
+    GitlabV41 = Struct.new(:endpoint, :private_token) do
+
+      include ServiceConnector::Base
+
+      def repos
+        @repos ||= GitlabV41::Repos.new(session).to_a
+      end
+
+      def organizations
+        []
+      end
+
+      def hooks(repo)
+        GitlabV41::Hooks.new(session, repo)
+      end
+
+      def deploy_keys(repo)
+        GitlabV41::DeployKeys.new(session, repo)
+      end
+
+      def notices(repo)
+        GitlabV41::Notices.new(session, repo)
+      end
+
+      def files(repo)
+        GitlabV41::Files.new(session, repo)
+      end
+
+      def commits(repo)
+        GitlabV41::Commits.new(session, repo)
+      end
+
+      private
+
+        def create_session
+          GitlabV41::Session.new(endpoint, private_token)
+        end
+
+    end
+  end
+end
+
+Dir[File.expand_path("../gitlab_v41/*.rb", __FILE__)].each do |f|
+  require f
+end

data/lib/vx/service_connector/gitlab_v41/commits.rb

@@ -0,0 +1,35 @@
+require 'base64'
+
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      Commits = Struct.new(:session, :repo) do
+
+        def get(sha)
+          begin
+            all_commits = session.get "/projects/#{repo.id}/repository/commits", ref_name: sha
+            commits_to_model all_commits
+          rescue RequestError => e
+            $stderr.puts "ERROR: #{e.inspect}"
+            nil
+          end
+        end
+
+        private
+
+          def commits_to_model(commits)
+            if commit = commits.first
+              Model::Commit.new(
+                commit.id,
+                commit.title,
+                commit.author_name,
+                commit.author_email,
+                nil
+              )
+            end
+          end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      DeployKeys = Struct.new(:session, :repo) do
+
+        def all
+          session.get "/user/keys"
+        end
+
+        def create(key_name, public_key)
+          key_name = compute_key_name(key_name)
+          session.post "/user/keys", title: key_name, key: public_key
+        end
+
+        def destroy(key_name)
+          key_name = compute_key_name(key_name)
+          all.select do |key|
+            key.title == key_name
+          end.map do |key|
+            session.delete "/user/keys/#{key.id}"
+          end
+        end
+
+        private
+          def compute_key_name(orig_name)
+            "(#{repo.full_name}) #{orig_name}"
+          end
+      end
+    end
+  end
+end
+

data/lib/vx/service_connector/gitlab_v41/files.rb

@@ -0,0 +1,20 @@
+require 'base64'
+
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      Files = Struct.new(:session, :repo) do
+
+        def get(sha, path)
+          begin
+            session.get("/projects/#{repo.id}/repository/commits/#{sha}/blob", filepath: path)
+          rescue RequestError => e
+            $stderr.puts "ERROR: #{e.inspect}"
+            nil
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vx/service_connector/gitlab_v41/hooks.rb

@@ -0,0 +1,32 @@
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      Hooks = Struct.new(:session, :repo) do
+
+        def all
+          session.get hooks_url
+        end
+
+        def create(url, token)
+          session.post hooks_url, url: url
+        end
+
+        def destroy(url_mask)
+          all.select do |hook|
+            hook.url =~ /#{Regexp.escape url_mask}/
+          end.map do |hook|
+            session.delete hooks_url, hook_id: hook.id
+          end
+        end
+
+        private
+
+          def hooks_url
+            "/projects/#{repo.id}/hooks"
+          end
+
+      end
+    end
+  end
+end
+

data/lib/vx/service_connector/gitlab_v41/notices.rb

@@ -0,0 +1,13 @@
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      Notices = Struct.new(:session, :repo) do
+
+        def create(build_sha, build_status, build_url, description)
+          :not_available
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,93 @@
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      class Payload
+
+        def initialize(params)
+          @params = params || {}
+        end
+
+        def pull_request?
+          false
+        end
+
+        def tag?
+          false
+        end
+
+        def pull_request_number
+          nil
+        end
+
+        def head
+          self["after"]
+        end
+
+        def base
+          self["before"]
+        end
+
+        def branch
+          self["ref"].to_s.split("refs/heads/").last
+        end
+
+        def branch_label
+          branch
+        end
+
+        def url
+          self["commits"] && self["commits"].first && self["commits"].first["url"]
+        end
+
+        def pull_request_head_repo_id
+          nil
+        end
+
+        def pull_request_base_repo_id
+          nil
+        end
+
+        def closed_pull_request?
+          false
+        end
+
+        def foreign_pull_request?
+          false
+        end
+
+        def ignore?
+          head == '0000000000000000000000000000000000000000'
+        end
+
+        def to_model
+          ServiceConnector::Model::Payload.new(
+            !!pull_request,
+            pull_request_number,
+            head,
+            base,
+            branch,
+            branch_label,
+            url,
+            !!ignore?
+          )
+        end
+
+        private
+
+          def pull_request
+            self["pull_request"]
+          end
+
+          def key?(name)
+            @params.key? name
+          end
+
+          def [](val)
+            @params[val]
+          end
+
+      end
+
+    end
+  end
+end

data/lib/vx/service_connector/gitlab_v41/repos.rb

@@ -0,0 +1,40 @@
+module Vx
+  module ServiceConnector
+    class GitlabV41
+      Repos = Struct.new(:session) do
+
+        def to_a
+          session.get("/projects").map do |proj|
+            proj_to_model proj
+          end
+        end
+
+        private
+
+          def proj_to_model(repo)
+            Model::Repo.new(
+              repo.id,
+              compute_name_with_namespace(repo),
+              repo.private,
+              compute_ssh_url(repo),
+              compute_web_url(repo),
+              repo.description
+            )
+          end
+
+          def compute_name_with_namespace(repo)
+            [session.uri.hostname, repo.name.downcase].join("/")
+          end
+
+          def compute_ssh_url(repo)
+            "git@#{session.uri.hostname}:#{repo.name.downcase}.git"
+          end
+
+          def compute_web_url(repo)
+            "#{session.uri.scheme}://#{session.uri.hostname}:#{session.uri.port}/#{repo.name.downcase}"
+          end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+require 'sawyer'
+require 'uri'
+
+module Vx
+  module ServiceConnector
+    class GitlabV41
+
+      Session = Struct.new(:endpoint, :private_token) do
+
+        def get(url, options = {})
+          res = agent.call :get, request_url(url), nil, query: options
+          response! res
+        end
+
+        def post(url, options = {})
+          res = agent.call :post, request_url(url), options, nil
+          response! res
+        end
+
+        def delete(url, options = {})
+          res = agent.call :delete, request_url(url), options
+          response! res
+        end
+
+        def uri
+          @uri ||= URI(endpoint)
+        end
+
+        private
+
+          def response!(res)
+            if (200..204).include?(res.status)
+              res.data
+            else
+              raise RequestError, res.data
+            end
+          end
+
+          def request_url(url)
+            "/api/v3/#{url}"
+          end
+
+          def api_endpoint
+            "#{endpoint}/api/v3"
+          end
+
+          def agent
+            @agent ||= Sawyer::Agent.new(api_endpoint) do |http|
+              http.headers['content-type']  = 'application/json'
+              http.headers['accept']        = 'application/json'
+              http.headers['PRIVATE-TOKEN'] = private_token
+            end
+          end
+      end
+
+    end
+  end
+end

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/fixtures/gitlab_v41/commits.json

@@ -0,0 +1,18 @@
+[
+  {
+    "id": "ed899a2f4b50b4370feeea94676502b42383c746",
+    "short_id": "ed899a2f4b5",
+    "title": "Replace sanitize with escape once",
+    "author_name": "Dmitriy Zaporozhets",
+    "author_email": "dzaporozhets@sphereconsultinginc.com",
+    "created_at": "2012-09-20T11:50:22+03:00"
+  },
+  {
+    "id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
+    "short_id": "6104942438c",
+    "title": "Sanitize for network graph",
+    "author_name": "randx",
+    "author_email": "dmitriy.zaporozhets@gmail.com",
+    "created_at": "2012-09-20T09:06:12+03:00"
+  }
+]

data/spec/fixtures/gitlab_v41/hooks.json

@@ -0,0 +1 @@
+[{"id":57,"url":"http://example.com/hook","created_at":"2014-01-28T14:04:22Z"}]

data/spec/fixtures/gitlab_v41/payload/push.json

@@ -0,0 +1,106 @@
+{
+  "before": "e9f2a24318cf0a08dc2d7b987b9d8484e8c89406",
+  "after": "a1dfcca6369dcbd19607c4cc0f932194d8bdf57d",
+  "ref": "refs/heads/master",
+  "user_id": 228,
+  "user_name": "User Name",
+  "repository": {
+    "name": "SQERP",
+    "url": "git@gitlab.example.com:sqerp.git",
+    "description": null,
+    "homepage": "https://gitlab.example.com/sqerp"
+  },
+  "commits": [
+    {
+      "id": "4b65377d80364713293df276d7756ff6253eedcd",
+      "message": "Merge branch '93537_hours_units_in_details' of gitlab.example.com:sqerp",
+      "timestamp": "2014-01-21T08:51:56+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/4b65377d80364713293df276d7756ff6253eedcd",
+      "author": {
+        "name": "User Name",
+        "email": "me@example.com"
+      }
+    },
+    {
+      "id": "17574ef138f188e5b51a1f036448c92296b674e7",
+      "message": "[97241] activities_controller specs",
+      "timestamp": "2014-01-21T18:26:16+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/17574ef138f188e5b51a1f036448c92296b674e7",
+      "author": {
+        "name": "User Name",
+        "email": "me@example.com"
+      }
+    },
+    {
+      "id": "ca71c5938c9c796cddf2d5a32c2689669998bb0d",
+      "message": "fixes #84078 Custom roles.",
+      "timestamp": "2014-01-22T11:20:10+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/ca71c5938c9c796cddf2d5a32c2689669998bb0d",
+      "author": {
+        "name": "Maxim Dorofienko",
+        "email": "dorofienko@gmail.com"
+      }
+    },
+    {
+      "id": "f27d4dca4e7094fbb2206cd61ecbf933d77f0897",
+      "message": "[96071] merge ad_campaing's table",
+      "timestamp": "2014-01-22T12:20:55+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/f27d4dca4e7094fbb2206cd61ecbf933d77f0897",
+      "author": {
+        "name": "Evgeny Li",
+        "email": "exaspark@gmail.com"
+      }
+    },
+    {
+      "id": "432ead814f28ec1701584b7ffe130eeb8ecd3e1f",
+      "message": "csv exporter fix",
+      "timestamp": "2014-01-23T13:25:38+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/432ead814f28ec1701584b7ffe130eeb8ecd3e1f",
+      "author": {
+        "name": "Dmitry Koprov",
+        "email": "dmitry.koprov@gmail.com"
+      }
+    },
+    {
+      "id": "780c2e4a26ebf10691d157a64e3d7259f369d48f",
+      "message": "Merge branch '97241_controller_tests' of gitlab.example.com:sqerp",
+      "timestamp": "2014-01-23T14:58:27+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/780c2e4a26ebf10691d157a64e3d7259f369d48f",
+      "author": {
+        "name": "User Name",
+        "email": "me@example.com"
+      }
+    },
+    {
+      "id": "e63d231b1c3e6286bea9ffbceebd6c12d87e3dc7",
+      "message": "[98386] env fix",
+      "timestamp": "2014-01-28T11:52:48+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/e63d231b1c3e6286bea9ffbceebd6c12d87e3dc7",
+      "author": {
+        "name": "User Name",
+        "email": "me@example.com"
+      }
+    },
+    {
+      "id": "09d62be9db7e476b01c9773b5e06e5fc6a550d3c",
+      "message": "Merge branch '98386_fix' of gitlab.example.com:sqerp",
+      "timestamp": "2014-01-28T11:54:49+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/09d62be9db7e476b01c9773b5e06e5fc6a550d3c",
+      "author": {
+        "name": "User Name",
+        "email": "me@example.com"
+      }
+    },
+    {
+      "id": "a1dfcca6369dcbd19607c4cc0f932194d8bdf57d",
+      "message": "Merge branch '96071_merge_ad_campaigns' of gitlab.example.com:sqerp",
+      "timestamp": "2014-01-28T12:10:16+04:00",
+      "url": "https://gitlab.example.com/sqerp/commit/a1dfcca6369dcbd19607c4cc0f932194d8bdf57d",
+      "author": {
+        "name": "User Name",
+        "email": "me@example.com"
+      }
+    }
+  ],
+  "total_commits_count": 9
+}

data/spec/fixtures/gitlab_v41/projects.json

@@ -0,0 +1 @@
+[{"id":9,"name":"SQERP","description":null,"default_branch":"master","owner":{"id":14,"username":null,"email":"me@example.com","name":"MyName","blocked":true,"created_at":"2012-06-21T07:47:41Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-06-21T08:02:09Z","namespace":null}]

data/spec/fixtures/gitlab_v41/user_keys.json

@@ -0,0 +1 @@
+[{"id":589,"title":"(full/name) me@example.com","key":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXnM3fhBisPY223C7poY7J7qsMPHHc1aJ4+rwUqzdGHANNWoP8tCUXXnhWvhy8fxEqImDUWdYMNLQI42MJ8RB7naQjvWJqBU/JUvXRznrGcldPjmdIpb25Jod29wQDmPEYC31S1HoEEgmqVeG1V+ypxeqm8XEy1USjsY/Cbx0cbGUOa560GRV89/8KB4GHzN8R82OUxIzUJotIGIcAvNhYwR+skrsI2/QnDMqty2O5SQU52bgzlotCfSQbeujOT9DU3uP9YeRUcY/Xouqx19Q5TSPNk8rkh5uIHNKQ9LipJlfVU9G+YI0r5oMRlvqEXyR2gUEUwwhzafp8JQ4O/YJ7 me@example.com","created_at":"2013-10-24T12:41:18Z"}]

data/spec/lib/gitlab_v41_payload_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Vx::ServiceConnector::GitlabV41::Payload do
+  let(:content) { read_json_fixture("gitlab_v41/payload/push") }
+  let(:payload) { described_class.new content }
+  subject { payload }
+
+  context "push" do
+    let(:url) { "https://gitlab.example.com/sqerp/commit/4b65377d80364713293df276d7756ff6253eedcd"  }
+
+    its(:pull_request?)       { should be_false }
+    its(:pull_request_number) { should be_nil }
+    its(:head)                { should eq 'a1dfcca6369dcbd19607c4cc0f932194d8bdf57d' }
+    its(:base)                { should eq 'e9f2a24318cf0a08dc2d7b987b9d8484e8c89406' }
+    its(:branch)              { should eq 'master' }
+    its(:branch_label)        { should eq 'master' }
+    its(:url)                 { should eq url }
+
+    its(:pull_request_head_repo_id){ should be_nil }
+    its(:pull_request_base_repo_id){ should be_nil }
+  end
+
+  context "pull_request" do
+  end
+
+  context "tag?" do
+  end
+
+  context "closed_pull_request?" do
+  end
+
+  context "foreign_pull_request?" do
+  end
+
+=begin
+  context "ignore?" do
+    subject { payload.ignore? }
+
+    context "when pull request" do
+      let(:content) { read_json_fixture("github/payload/foreign_pull_request") }
+      it {  should be_false}
+
+      context "and is closed" do
+        before do
+          expect(payload).to receive(:closed_pull_request?) { true }
+        end
+        it { should be_true }
+      end
+
+      context "and same repo" do
+        let(:content) { read_json_fixture("github/payload/pull_request") }
+        it { should be_true }
+      end
+    end
+
+    context "when regular commit" do
+      it { should be_false }
+
+      context "and deleted branch" do
+        before do
+          expect(payload).to receive(:head) { '0000000000000000000000000000000000000000'  }
+        end
+        it { should be_true }
+      end
+
+      context "and tag created" do
+        before do
+          expect(payload).to receive(:tag?) { true }
+        end
+        it { should be_true }
+      end
+    end
+  end
+=end
+
+  context "to_model" do
+    subject { payload.to_model }
+    it { should be_instance_of(Vx::ServiceConnector::Model::Payload) }
+
+    its(:values) { should eq(
+      [false,
+       nil,
+       "a1dfcca6369dcbd19607c4cc0f932194d8bdf57d",
+       "e9f2a24318cf0a08dc2d7b987b9d8484e8c89406",
+       "master",
+       "master",
+       "https://gitlab.example.com/sqerp/commit/4b65377d80364713293df276d7756ff6253eedcd",
+       false]
+    ) }
+  end
+
+end

data/spec/lib/gitlab_v41_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+describe Vx::ServiceConnector::GitlabV41 do
+
+  include GitlabV41WebMocks
+
+  let(:endpoint)  { 'http://example.com' }
+  let(:token)     { 'token' }
+  let(:repo)      { create :repo }
+  let(:gitlab)    { described_class.new endpoint, token }
+
+  subject { gitlab }
+
+  it { should be }
+
+  context "(notices)" do
+    let(:notices) { gitlab.notices(repo) }
+
+    context "create" do
+      subject { notices.create nil, nil, nil, nil }
+      it { should be :not_available }
+    end
+  end
+
+  context "(repos)" do
+    subject { gitlab.repos }
+
+    before do
+      mock_repos
+    end
+
+    it { should have(1).item }
+
+    context "values" do
+      subject { gitlab.repos.map(&:values) }
+      it { should eq(
+        [[9, "example.com/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil]]
+      ) }
+    end
+  end
+
+  context "(deploy_keys)" do
+    let(:key_name)    { 'me@example.com' }
+    let(:public_key)  { 'public key' }
+    let(:deploy_keys) { gitlab.deploy_keys(repo) }
+
+    context "all" do
+      subject { deploy_keys.all }
+      before { mock_user_keys }
+      it { should have(1).item }
+    end
+
+    context "create" do
+      subject { deploy_keys.create key_name, public_key }
+      before { mock_add_user_key }
+      it { should be }
+    end
+
+    context "destroy" do
+      subject { deploy_keys.destroy key_name }
+
+      before do
+        mock_user_keys
+        mock_delete_user_key
+      end
+
+      it { should have(1).item }
+    end
+  end
+
+  context "(hooks)" do
+    let(:url)   { 'url' }
+    let(:token) { 'token' }
+    let(:hooks) { gitlab.hooks(repo) }
+
+    context "all" do
+      subject { hooks.all }
+      before { mock_hooks }
+      it { should have(1).item }
+    end
+
+    context "create" do
+      subject { hooks.create url, token }
+      before { mock_add_hook }
+      it { should be }
+    end
+
+    context "destroy" do
+      let(:mask) { "http://example.com" }
+      subject { hooks.destroy mask }
+      before do
+        mock_hooks
+        mock_remove_hook
+      end
+      it { should have(1).item }
+    end
+  end
+
+  context "(files)" do
+    let(:sha)  { 'sha' }
+    let(:path) { 'path' }
+
+    context "get" do
+      subject { gitlab.files(repo).get sha, path }
+
+      context "success" do
+        before { mock_get_file  }
+        it { should eq 'content' }
+      end
+
+      context "not found" do
+        before { mock_get_file_not_found }
+        it { should be_nil }
+      end
+    end
+  end
+
+  context "(commits)" do
+    let(:sha)  { 'sha' }
+
+    context "get" do
+      subject { gitlab.commits(repo).get sha }
+
+      context "success" do
+        before { mock_get_commit  }
+        it { should be }
+        its(:sha)          { should eq 'ed899a2f4b50b4370feeea94676502b42383c746' }
+        its(:message)      { should eq 'Replace sanitize with escape once' }
+        its(:author)       { should eq 'Dmitriy Zaporozhets' }
+        its(:author_email) { should eq 'dzaporozhets@sphereconsultinginc.com' }
+        its(:http_url)     { should be_nil }
+      end
+
+      context "not found" do
+        before { mock_get_commit_not_found }
+        it { should be_nil }
+      end
+    end
+  end
+
+end

data/spec/lib/service_connector_spec.rb

@@ -21,8 +21,8 @@ describe Vx::ServiceConnector do
       it { should be }
     end
 
-    context ":gitlab_v3" do
-      let(:name) { :gitlab_v3 }
+    context ":gitlab_v41" do
+      let(:name) { :gitlab_v41 }
       it { should be }
     end
   end

data/spec/support/gitlab_v41_web_mocks.rb

@@ -0,0 +1,73 @@
+module GitlabV41WebMocks
+
+  def mock_repos
+    mock_get "projects", 'projects'
+  end
+
+  def mock_user_keys
+    mock_get "user/keys", 'user_keys'
+  end
+
+  def mock_add_user_key
+    mock_post "user/keys", "{\"title\":\"(full/name) me@example.com\",\"key\":\"public key\"}"
+  end
+
+  def mock_delete_user_key
+    mock_delete "user/keys/589", '{}'
+  end
+
+  def mock_add_hook
+    mock_post "projects/1/hooks", "{\"url\":\"url\"}"
+  end
+
+  def mock_remove_hook
+    mock_delete "projects/1/hooks", "{\"hook_id\":57}"
+  end
+
+  def mock_hooks
+    mock_get "projects/1/hooks", 'hooks'
+  end
+
+  def mock_get_file
+    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits/sha/blob?filepath=path").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
+      to_return(:status => 200, :body => "content")
+  end
+
+  def mock_get_file_not_found
+    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits/sha/blob?filepath=path").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
+      to_return(:status => 404, :body => "")
+  end
+
+  def mock_get_commit
+    mock_get "projects/1/repository/commits?ref_name=sha", 'commits'
+  end
+
+  def mock_get_commit_not_found
+    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits?ref_name=sha").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
+      to_return(:status => 404, :body => "")
+  end
+
+  def mock_get(url, fixture)
+    stub_request(:get, "http://example.com/api/v3/#{url}").
+      with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).
+      to_return(
+        :status => 200,
+        :body => read_fixture("gitlab_v41/#{fixture}.json"),
+        :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_post(url, body)
+    stub_request(:post, "http://example.com/api/v3/#{url}").
+      with(:headers => {'Accept'=>'application/json', }, body: body).
+      to_return(:status => 200, :body => "{}", :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_delete(url, body)
+    stub_request(:delete, "http://example.com/api/v3/#{url}").
+      with(:headers => {'Accept'=>'application/json', }, body: body).
+      to_return(:status => 200, :body => "{}", :headers => {'Content-Type' => 'application/json'})
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -110,6 +110,7 @@ files:
 - Rakefile
 - lib/vx/service_connector.rb
 - lib/vx/service_connector/base.rb
+- lib/vx/service_connector/error.rb
 - lib/vx/service_connector/github.rb
 - lib/vx/service_connector/github/commits.rb
 - lib/vx/service_connector/github/deploy_keys.rb
@@ -118,9 +119,15 @@ files:
 - lib/vx/service_connector/github/notices.rb
 - lib/vx/service_connector/github/payload.rb
 - lib/vx/service_connector/github/repos.rb
-- lib/vx/service_connector/gitlab_v3.rb
-- lib/vx/service_connector/gitlab_v3/deploy_keys.rb
-- lib/vx/service_connector/gitlab_v3/repos.rb
+- lib/vx/service_connector/gitlab_v41.rb
+- lib/vx/service_connector/gitlab_v41/commits.rb
+- lib/vx/service_connector/gitlab_v41/deploy_keys.rb
+- lib/vx/service_connector/gitlab_v41/files.rb
+- lib/vx/service_connector/gitlab_v41/hooks.rb
+- lib/vx/service_connector/gitlab_v41/notices.rb
+- lib/vx/service_connector/gitlab_v41/payload.rb
+- lib/vx/service_connector/gitlab_v41/repos.rb
+- lib/vx/service_connector/gitlab_v41/session.rb
 - lib/vx/service_connector/model.rb
 - lib/vx/service_connector/version.rb
 - spec/fixtures/github/add_deploy_key.json
@@ -137,17 +144,22 @@ files:
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
 - spec/fixtures/github/user_repos.json
-- spec/fixtures/gitlab_v3/deploy_keys.json
-- spec/fixtures/gitlab_v3/projects.json
+- spec/fixtures/gitlab_v41/commits.json
+- spec/fixtures/gitlab_v41/deploy_keys.json
+- spec/fixtures/gitlab_v41/hooks.json
+- spec/fixtures/gitlab_v41/payload/push.json
+- spec/fixtures/gitlab_v41/projects.json
+- spec/fixtures/gitlab_v41/user_keys.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v3_spec.rb
+- spec/lib/gitlab_v41_payload_spec.rb
+- spec/lib/gitlab_v41_spec.rb
 - spec/lib/model_spec.rb
 - spec/lib/service_connector_spec.rb
 - spec/spec_helper.rb
 - spec/support/create.rb
 - spec/support/github_web_mocks.rb
-- spec/support/gitlab_v3_mocks.rb
+- spec/support/gitlab_v41_web_mocks.rb
 - spec/support/read_fixture.rb
 - vx-service_connector.gemspec
 homepage: ''
@@ -189,15 +201,20 @@ test_files:
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
 - spec/fixtures/github/user_repos.json
-- spec/fixtures/gitlab_v3/deploy_keys.json
-- spec/fixtures/gitlab_v3/projects.json
+- spec/fixtures/gitlab_v41/commits.json
+- spec/fixtures/gitlab_v41/deploy_keys.json
+- spec/fixtures/gitlab_v41/hooks.json
+- spec/fixtures/gitlab_v41/payload/push.json
+- spec/fixtures/gitlab_v41/projects.json
+- spec/fixtures/gitlab_v41/user_keys.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v3_spec.rb
+- spec/lib/gitlab_v41_payload_spec.rb
+- spec/lib/gitlab_v41_spec.rb
 - spec/lib/model_spec.rb
 - spec/lib/service_connector_spec.rb
 - spec/spec_helper.rb
 - spec/support/create.rb
 - spec/support/github_web_mocks.rb
-- spec/support/gitlab_v3_mocks.rb
+- spec/support/gitlab_v41_web_mocks.rb
 - spec/support/read_fixture.rb

data/lib/vx/service_connector/gitlab_v3.rb

@@ -1,29 +0,0 @@
-require 'gitlab'
-
-module Vx
-  module ServiceConnector
-    GitlabV3 = Struct.new(:endpoint, :private_token) do
-
-      include ServiceConnector::Base
-
-      def repos
-        @repos ||= GitlabV3::Repos.new(session).to_a
-      end
-
-      def deploy_keys(repo)
-        GitlabV3::DeployKeys.new(session, repo)
-      end
-
-      private
-
-        def create_session
-          ::Gitlab.client(:endpoint => "#{endpoint}/api/v3", private_token: private_token)
-        end
-
-    end
-  end
-end
-
-%w{ repos deploy_keys }.each do |f|
-  require File.expand_path("../gitlab_v3/#{f}", __FILE__)
-end

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

@@ -1,20 +0,0 @@
-module Vx
-  module ServiceConnector
-    class GitlabV3
-      DeployKeys = Struct.new(:session, :repo) do
-
-        def all
-          session.deploy_keys(repo.id)
-        end
-
-        def add(key_name, public_key)
-          session.create_deploy_key(repo.id, key_name, public_key)
-        end
-
-        def remove(key_name)
-        end
-      end
-    end
-  end
-end
-

data/lib/vx/service_connector/gitlab_v3/repos.rb

@@ -1,28 +0,0 @@
-module Vx
-  module ServiceConnector
-    class GitlabV3
-      Repos = Struct.new(:session) do
-
-        def to_a
-          session.projects.map do |proj|
-            proj_to_model proj
-          end
-        end
-
-        private
-
-          def proj_to_model(repo)
-            Model::Repo.new(
-              repo.id,
-              repo.path_with_namespace,
-              true,
-              repo.ssh_url_to_repo,
-              repo.web_url,
-              repo.description
-            )
-          end
-
-      end
-    end
-  end
-end

data/spec/fixtures/gitlab_v3/projects.json

@@ -1,72 +0,0 @@
-[
-  {
-    "id": 4,
-    "description": "description",
-    "default_branch": "master",
-    "public": false,
-    "visibility_level": 0,
-    "ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git",
-    "http_url_to_repo": "http://example.com/diaspora/diaspora-client.git",
-    "web_url": "http://example.com/diaspora/diaspora-client",
-    "owner": {
-      "id": 3,
-      "name": "Diaspora",
-      "created_at": "2013-09-30T13: 46: 02Z"
-    },
-    "name": "Diaspora Client",
-    "name_with_namespace": "Diaspora / Diaspora Client",
-    "path": "diaspora-client",
-    "path_with_namespace": "diaspora/diaspora-client",
-    "issues_enabled": true,
-    "merge_requests_enabled": true,
-    "wall_enabled": false,
-    "wiki_enabled": true,
-    "snippets_enabled": false,
-    "created_at": "2013-09-30T13: 46: 02Z",
-    "last_activity_at": "2013-09-30T13: 46: 02Z",
-    "namespace": {
-      "created_at": "2013-09-30T13: 46: 02Z",
-      "description": "",
-      "id": 3,
-      "name": "Diaspora",
-      "owner_id": 1,
-      "path": "diaspora",
-      "updated_at": "2013-09-30T13: 46: 02Z"
-    }
-  },
-  {
-    "id": 6,
-    "description": "description",
-    "default_branch": "master",
-    "public": false,
-    "visibility_level": 0,
-    "ssh_url_to_repo": "git@example.com:brightbox/puppet.git",
-    "http_url_to_repo": "http://example.com/brightbox/puppet.git",
-    "web_url": "http://example.com/brightbox/puppet",
-    "owner":  {
-      "id": 4,
-      "name": "Brightbox",
-      "created_at": "2013-09-30T13:46:02Z"
-    },
-    "name": "Puppet",
-    "name_with_namespace": "Brightbox / Puppet",
-    "path": "puppet",
-    "path_with_namespace": "brightbox/puppet",
-    "issues_enabled": true,
-    "merge_requests_enabled": true,
-    "wall_enabled": false,
-    "wiki_enabled": true,
-    "snippets_enabled": false,
-    "created_at": "2013-09-30T13:46:02Z",
-    "last_activity_at": "2013-09-30T13:46:02Z",
-    "namespace":  {
-      "created_at": "2013-09-30T13:46:02Z",
-      "description": "",
-      "id": 4,
-      "name": "Brightbox",
-      "owner_id": 1,
-      "path": "brightbox",
-      "updated_at": "2013-09-30T13:46:02Z"
-    }
-  }
-]

data/spec/lib/gitlab_v3_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe Vx::ServiceConnector::GitlabV3 do
-
-  include GitlabV3Mocks
-
-  let(:endpoint) { 'http://example.com' }
-  let(:token)    { 'token' }
-  let(:repo)     { create :repo }
-  let(:gitlab)   { described_class.new endpoint, token }
-  subject { gitlab }
-
-  context "(repos)" do
-    subject { gitlab.repos }
-    before { mock_repos }
-    it { should have(2).item }
-    context "values" do
-      subject { gitlab.repos.map(&:values) }
-      it { should eq(
-        [[4, "diaspora/diaspora-client", true,
-          "git@example.com:diaspora/diaspora-client.git",
-          "http://example.com/diaspora/diaspora-client",
-          "description"],
-         [6, "brightbox/puppet", true,
-          "git@example.com:brightbox/puppet.git",
-          "http://example.com/brightbox/puppet",
-          "description"]]
-      ) }
-    end
-  end
-
-  context "(deploy_keys)" do
-    let(:key_name)    { 'key_name' }
-    let(:public_key)  { 'public_key' }
-    let(:deploy_keys) { gitlab.deploy_keys(repo) }
-
-    context "all" do
-      subject { deploy_keys.all }
-      before { mock_deploy_keys }
-      it { should have(2).item }
-    end
-
-  end
-end

data/spec/support/gitlab_v3_mocks.rb

@@ -1,29 +0,0 @@
-module GitlabV3Mocks
-
-  def mock_add_deploy_key
-    mock_post "http://example.com/api/v3/projects/1/keys", '{}'
-  end
-
-  def mock_deploy_keys
-    mock_get "http://example.com/api/v3/projects/1/keys", 'deploy_keys'
-  end
-
-  def mock_repos
-    mock_get "http://example.com/api/v3/projects", 'projects'
-  end
-
-  def mock_get(url, fixture)
-    stub_request(:get, "#{url}?private_token=token").
-      with(:headers => {'Accept'=>'application/json'}).
-      to_return(
-        :status => 200,
-        :body => read_fixture("gitlab_v3/#{fixture}.json"),
-        :headers => {'Content-Type' => 'application/json'})
-  end
-
-  def mock_post(url, body)
-    stub_request(:post, "#{url}?private_token=token").
-      with(:headers => {'Accept'=>'application/json'}, body: body).
-      to_return(:status => 200, :body => "{}", :headers => {'Content-Type' => 'application/json'})
-  end
-end