vx-service_connector 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d71cae077981d1705c726931668bf9b2340cb9
-  data.tar.gz: c0dea00e6d39a55757f96b6bd6bc6cb9e4428182
+  metadata.gz: ee74c22f7e23a99b63146371054be5de0129c869
+  data.tar.gz: e6ccec32fb14ac0ed95f2908dd656c9f57d24506
 SHA512:
-  metadata.gz: bbb12a18dd04bb71320c037805d831f1e809fbe32b0d91055dfdcbd4287b6fd395dacb32fc67df1509f4654c0b19af8910f02b3bfc323f79910d4affc54d82da
-  data.tar.gz: 07315c7f4b03f472551857bbda073f7a8c934dce4fe324b15730194243fc5dd4d7de0fcf72089c08bf3ba34dca0e97d6ee9d7f9f2a33f2f8ee5339bb293a5fce
+  metadata.gz: 54a71ec3abedd40bbf6b7688fac5c5ff8e2499dc9a49dd3336c6f4052a38b3b596c2c6232a125a8c923f0d969a95f88c1cfec39238868afe6c844e3f1208942c
+  data.tar.gz: 57b7f8fc37b4848270a20a053e92ddeacda64465649a6e81909321982e8c3caf73c2e1143e1e9e3e69c6a4eef45a3ad0ca0998c84d5f94854b2f527b796338a3

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

@@ -24,7 +24,7 @@ module Vx
               name,
               name,
               repo['is_private'],
-              "git@#{session.endpoint.host}/#{name}.git",
+              "git@#{session.endpoint.host}:#{name}.git",
               "#{session.endpoint}/#{name}",
               repo['description']
             )
@@ -33,7 +33,8 @@ module Vx
           def team_admin
             @team_admin ||= begin
               values = session.get("api/1.0/user/privileges")['teams']
-              values.select{|k,v| v == 'admin' }.keys
+              values = values.select{|k,v| v == 'admin' }.keys
+              values
             end
           end
 
@@ -46,7 +47,7 @@ module Vx
           end
 
           def repo_access?(repo_owner)
-            repo_owner == login ||
+            (repo_owner == login) ||
               team_admin.include?(repo_owner)
           end
 

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

@@ -55,7 +55,7 @@ module Vx
 
           def response!(res)
             if (200..204).include?(res.code.to_i)
-              if res.header['Content-Type'].include?("application/json")
+              if res.header['Content-Type'].to_s.include?("application/json")
                 ::JSON.parse(res.body)
               else
                 res.body

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.2.13"
+    VERSION = "0.2.14"
   end
 end

data/spec/fixtures/bitbucket/changesets.json

@@ -0,0 +1,28 @@
+{
+  "count": 116,
+  "start": null,
+  "limit": 1,
+  "changesets": [
+    {
+      "node": "5bf6aff99e83",
+      "files": [
+        {
+          "type": "modified",
+          "file": "robots.txt"
+        }
+      ],
+      "raw_author": "Dmitry Galinsky <dima.exe@gmail.com>",
+      "utctimestamp": "2014-10-22 20:40:03+00:00",
+      "author": "dmexe",
+      "timestamp": "2014-10-22 22:40:03",
+      "raw_node": "5bf6aff99e8350c493ecce2016c50d977de88d6f",
+      "parents": [
+        "b14806535f5e"
+      ],
+      "branch": "test",
+      "message": "test\n",
+      "revision": null,
+      "size": -1
+    }
+  ]
+}

data/spec/fixtures/bitbucket/user_privileges.json

@@ -1,6 +1,6 @@
 {
   "teams": {
     "team1": "admin",
-    "team2": "admin"
+    "121111foobar": "admin"
   }
-}
+}

data/spec/lib/bitbucket_spec.rb

@@ -4,7 +4,7 @@ describe Vx::ServiceConnector::Bitbucket do
 
   include BitbucketWebMocks
 
-  let(:login)     { 'login' }
+  let(:login)     { 'dmexe' }
   let(:token)     { 'token' }
   let(:repo)      { create :repo }
   let(:bitbucket) {
@@ -22,15 +22,15 @@ describe Vx::ServiceConnector::Bitbucket do
       mock_get_last_commit repo.full_name
       c = commits.last
       expect(c).to be
-      expect(c.message).to eq "Fix all the bugs"
+      expect(c.message).to eq "test\n"
       expect(c.skip).to be_false
       expect(c.pull_request?).to be_false
-      expect(c.branch).to eq 'master'
-      expect(c.branch_label).to eq 'master'
-      expect(c.sha).to eq '0a1fb3a24b8ceb48a16fb09a5759cd6f8a930463'
-      expect(c.author).to eq 'login'
-      expect(c.author_email).to eq 'example@gmail.com'
-      expect(c.web_url).to eq 'https://bitbucket.org/login/api-test/commits/0a1fb3a24b8ceb48a16fb09a5759cd6f8a930463'
+      expect(c.branch).to eq 'test'
+      expect(c.branch_label).to eq 'test'
+      expect(c.sha).to eq '5bf6aff99e8350c493ecce2016c50d977de88d6f'
+      expect(c.author).to eq 'Dmitry Galinsky'
+      expect(c.author_email).to eq 'dima.exe@gmail.com'
+      expect(c.web_url).to eq 'https://bitbucket.org/full/name/commits/5bf6aff99e8350c493ecce2016c50d977de88d6f'
     end
   end
 
@@ -45,22 +45,32 @@ describe Vx::ServiceConnector::Bitbucket do
       mock_user_privileges
     end
 
-    it { should have(2).item }
+    it { should have(3).item }
 
     context "values" do
       subject { bitbucket.repos.map(&:values) }
 
       it { should eq(
-        [["{b890dc44-b05d-4e0b-a0a4-6b5946e31603}",
-          "login/res", false,
-          "ssh://git@bitbucket.org/login/res.git",
-          "https://bitbucket.org/login/res",
-          "This your first repo!"],
-         ["{7f4500f2-d3a7-4757-9f92-709d5976720c}",
-          "login/api-test", false,
-          "ssh://git@bitbucket.org/login/api-test.git",
-          "https://bitbucket.org/login/api-test",
-          "repo for test api"]]
+
+        [
+          ["121111foobar/vx-promo",
+           "121111foobar/vx-promo",
+           false,
+           "git@bitbucket.org/121111foobar/vx-promo.git",
+           "https://bitbucket.org/121111foobar/vx-promo",
+           ""],
+         ["dmexe/demo",
+          "dmexe/demo",
+          true,
+          "git@bitbucket.org/dmexe/demo.git",
+          "https://bitbucket.org/dmexe/demo",
+          ""],
+         ["dmexe/vx-binutils",
+          "dmexe/vx-binutils",
+          false,
+          "git@bitbucket.org/dmexe/vx-binutils.git",
+          "https://bitbucket.org/dmexe/vx-binutils",
+          ""]]
       ) }
 
     end

data/spec/support/bitbucket_web_mocks.rb

@@ -1,7 +1,7 @@
 module BitbucketWebMocks
 
   def mock_get_last_commit(repo_name)
-    mock_get "https://bitbucket.org/api/1.0/repositories/#{repo.full_name}/changesets/?limit=1", 'commits'
+    mock_get "https://bitbucket.org/api/1.0/repositories/#{repo.full_name}/changesets/?limit=1", 'changesets'
   end
 
   def mock_get_commit(repo_name, sha)
@@ -13,7 +13,7 @@ module BitbucketWebMocks
   end
 
   def mock_user_repos
-    mock_get "https://bitbucket.org/api/1.0/user/repositories", "user_repos"
+    mock_get "https://bitbucket.org/api/1.0/user/repositories", "repos"
   end
 
   def mock_user_privileges
@@ -31,7 +31,7 @@ module BitbucketWebMocks
 
   def mock_add_deploy_key
     mock_post "https://bitbucket.org/api/1.0/repositories/full/name/deploy-keys",
-              "{\"label\":\"octocat@octomac\",\"key\":\"public key\"}",
+              {"key"=>"public key", "label"=>"octocat@octomac"},
               "add_deploy_key"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -169,6 +169,7 @@ files:
 - lib/vx/service_connector/model.rb
 - lib/vx/service_connector/version.rb
 - spec/fixtures/bitbucket/add_deploy_key.json
+- spec/fixtures/bitbucket/changesets.json
 - spec/fixtures/bitbucket/commit.json
 - spec/fixtures/bitbucket/create_hook.json
 - spec/fixtures/bitbucket/deploy_keys.json
@@ -256,6 +257,7 @@ specification_version: 4
 summary: vx-service_connector
 test_files:
 - spec/fixtures/bitbucket/add_deploy_key.json
+- spec/fixtures/bitbucket/changesets.json
 - spec/fixtures/bitbucket/commit.json
 - spec/fixtures/bitbucket/create_hook.json
 - spec/fixtures/bitbucket/deploy_keys.json