vx-service_connector 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b29bb50c4760278782ac338ebb324aa59b8b703
-  data.tar.gz: 2d57da49c1545e966b01e4cbcf8f442d3d70a0b5
+  metadata.gz: 4fe7297908d5f6f62244ac09397f3ee2572ad017
+  data.tar.gz: 517726f7dfdd075141cb82e4b8c7883e4ddef0a6
 SHA512:
-  metadata.gz: fdca12195da6fb696117464e28fd4694452c2cc7ca12f72f11471daf7412094f807cd7013137c19a25f07c6da976bd3e93372b32bfb7fd8c1605789cd01a37c5
-  data.tar.gz: 67b699e32a94ea31093d8e75b54d20a4eefd9e187f642c19f14fe32758f38eeae4425fbe18b4c1b23ad97834bd5427e297f5ceadb6ff6399fa364aa4c9ec7c5e
+  metadata.gz: 5aac67c77fe3aac17f022ccaa6a34633bf5b59f8e7d018dafa40a312e2c16e89f06f13e68364221cfe4e4dbc76ce9fa70ad7ceccd7fb1b813751b2fa4323311b
+  data.tar.gz: 360693cf3463286d3989c36d6db6a511c663abb60cea3df138d91ed08808f08d64f61d1b1254b6a77e1230122827e1352d84e441bb9639bc1eceb8abca7ca3d7

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

@@ -6,12 +6,14 @@ module Vx
       Commits = Struct.new(:session, :repo) do
         def last(options = {})
           begin
-            commit = session.commit(repo.full_name, 'HEAD')
+            project = session.repository(repo.full_name)
+            branch  = project.default_branch || 'master'
+            commit  = session.commit(repo.full_name, branch)
             Model::Payload.from_hash(
               skip:          false,
               pull_request?: false,
-              branch:        'HEAD',
-              branch_label:  'HEAD',
+              branch:        branch,
+              branch_label:  branch,
               sha:           commit.sha,
               message:       commit.commit.message,
               author:        commit.commit.author.name,

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

@@ -5,12 +5,14 @@ module Vx
 
         def last(options = {})
           begin
-            commit = session.get "/projects/#{repo.id}/repository/commits/HEAD"
+            project = session.get "/projects/#{repo.id}"
+            branch  = project.default_branch || "master"
+            commit  = session.get "/projects/#{repo.id}/repository/commits/#{branch}"
             Model::Payload.from_hash(
               skip:          false,
               pull_request?: false,
-              branch:        'HEAD',
-              branch_label:  'HEAD',
+              branch:        branch,
+              branch_label:  branch,
               sha:           commit.id,
               message:       commit.title,
               author:        commit.author_name,

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.2.9"
+    VERSION = "0.2.10"
   end
 end

data/spec/fixtures/github/user_repo.json

@@ -0,0 +1,48 @@
+{
+  "id": 1296269,
+  "owner": {
+    "login": "octocat",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "somehexcode",
+    "url": "https://api.github.com/users/octocat",
+    "html_url": "https://github.com/octocat",
+    "followers_url": "https://api.github.com/users/octocat/followers",
+    "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+    "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+    "organizations_url": "https://api.github.com/users/octocat/orgs",
+    "repos_url": "https://api.github.com/users/octocat/repos",
+    "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/octocat/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "name": "Hello-World",
+  "full_name": "octocat/user",
+  "description": "This your first repo!",
+  "private": false,
+  "fork": true,
+  "url": "https://api.github.com/repos/octocat/Hello-World",
+  "html_url": "https://github.com/octocat/Hello-World",
+  "clone_url": "https://github.com/octocat/Hello-World.git",
+  "git_url": "git://github.com/octocat/Hello-World.git",
+  "ssh_url": "git@github.com:octocat/Hello-World.git",
+  "svn_url": "https://svn.github.com/octocat/Hello-World",
+  "mirror_url": "git://git.example.com/octocat/Hello-World",
+  "homepage": "https://github.com",
+  "language": null,
+  "forks_count": 9,
+  "stargazers_count": 80,
+  "watchers_count": 80,
+  "size": 108,
+  "default_branch": "master",
+  "master_branch": "master",
+  "open_issues_count": 0,
+  "pushed_at": "2011-01-26T19:06:43Z",
+  "created_at": "2011-01-26T19:01:12Z",
+  "updated_at": "2011-01-26T19:14:43Z",
+  "permissions": { "admin": true, "push": true, "pull": true}
+}
+

data/spec/lib/github_spec.rb

@@ -17,14 +17,15 @@ describe Vx::ServiceConnector::Github do
     let(:commits) { github.commits(repo) }
 
     it "should return payload for last commit" do
-      mock_get_commit repo.full_name, 'HEAD'
+      mock_repo
+      mock_get_commit repo.full_name, 'master'
       c = commits.last
       expect(c).to be
       expect(c.message).to eq "Fix all the bugs"
       expect(c.skip).to be_false
       expect(c.pull_request?).to be_false
-      expect(c.branch).to eq 'HEAD'
-      expect(c.branch_label).to eq 'HEAD'
+      expect(c.branch).to eq 'master'
+      expect(c.branch_label).to eq 'master'
       expect(c.sha).to eq '6dcb09b5b57875f334f61aebed695e2e4193db5e'
       expect(c.author).to eq "Monalisa Octocat"
       expect(c.author_email).to eq "support@github.com"

data/spec/lib/gitlab_spec.rb

@@ -21,14 +21,15 @@ require 'spec_helper'
       let(:commits) { gitlab.commits(repo) }
 
       it "should return payload for last commit" do
-        mock_get_commit repo.id, 'HEAD'
+        mock_repo
+        mock_get_commit repo.id, 'master'
         c = commits.last
         expect(c).to be
         expect(c.message).to eq "Replace sanitize with escape once"
         expect(c.skip).to be_false
         expect(c.pull_request?).to be_false
-        expect(c.branch).to eq 'HEAD'
-        expect(c.branch_label).to eq 'HEAD'
+        expect(c.branch).to eq 'master'
+        expect(c.branch_label).to eq 'master'
         expect(c.sha).to eq '2dd0fdf94c7d0a74921e178b3b5229e60ce5d03e'
         expect(c.author).to eq "Dmitriy Zaporozhets"
         expect(c.author_email).to eq "dzaporozhets@sphereconsultinginc.com"

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ ActiveSupport::Notifications.subscribe "request.faraday" do |name, started, fini
     method:           payload[:method],
     url:              payload[:url].to_s,
     status:           payload[:status],
-    response_headers: payload[:response_headers].map{|k,v| "#{k}: #{v}" }.join("\n"),
+    response_headers: (payload[:response_headers] || []).map{|k,v| "#{k}: #{v}" }.join("\n"),
     request_headers:  payload[:request_headers].map{|k,v| "#{k}: #{v}" }.join("\n")
   }
   pp env

data/spec/support/github_web_mocks.rb

@@ -48,6 +48,10 @@ module GithubWebMocks
     mock_get "https://api.github.com/user/repos?per_page=100", "user_repos"
   end
 
+  def mock_repo
+    mock_get "https://api.github.com/repos/full/name", "user_repo"
+  end
+
   def mock_org_repos
     mock_get "https://api.github.com/orgs/github/repos?per_page=100", "org_repos"
   end

data/spec/support/gitlab_web_mocks.rb

@@ -4,6 +4,10 @@ module GitlabWebMocks
     mock_get "projects?per_page=30", 'projects'
   end
 
+  def mock_repo
+    mock_get "projects/1", 'project'
+  end
+
   def mock_deploy_keys
     mock_get "projects/1/keys", 'deploy_keys'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -158,6 +158,7 @@ files:
 - spec/fixtures/github/payload/pull_request.json
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
+- spec/fixtures/github/user_repo.json
 - spec/fixtures/github/user_repos.json
 - spec/fixtures/gitlab_v6/branch.json
 - spec/fixtures/gitlab_v6/commit.json
@@ -226,6 +227,7 @@ test_files:
 - spec/fixtures/github/payload/pull_request.json
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
+- spec/fixtures/github/user_repo.json
 - spec/fixtures/github/user_repos.json
 - spec/fixtures/gitlab_v6/branch.json
 - spec/fixtures/gitlab_v6/commit.json