vx-service_connector 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee74c22f7e23a99b63146371054be5de0129c869
-  data.tar.gz: e6ccec32fb14ac0ed95f2908dd656c9f57d24506
+  metadata.gz: 86a632d66c5d9f2f20bbddfdc810967e1b4203d4
+  data.tar.gz: 7b937c903408680a96d698478e4a0a6fd3b5ee5b
 SHA512:
-  metadata.gz: 54a71ec3abedd40bbf6b7688fac5c5ff8e2499dc9a49dd3336c6f4052a38b3b596c2c6232a125a8c923f0d969a95f88c1cfec39238868afe6c844e3f1208942c
-  data.tar.gz: 57b7f8fc37b4848270a20a053e92ddeacda64465649a6e81909321982e8c3caf73c2e1143e1e9e3e69c6a4eef45a3ad0ca0998c84d5f94854b2f527b796338a3
+  metadata.gz: 54105f5953969ec3a4926be2e25ca41f781f3b7cc7391935802d6299c362d44fafbcf980e265bd7f61a7f7e703d67bf5e4498d52f9801e86c0abee0a88041b3b
+  data.tar.gz: 481c759b08c16574d4afa733bf42fddb2fec906b89dd7de66dea585d6826206162186504afd9101706a6baa63acf3b63534dade7a391063fe5730e30de979b28

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

@@ -17,6 +17,7 @@ module Vx
 
         def destroy(key_name)
           all.select do |key|
+            puts [key_name, key['label']].inspect
             key['label'] == key_name
           end.map do |key|
             session.delete "api/1.0/repositories/#{repo.full_name}/deploy-keys/#{key['pk']}"

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

@@ -26,7 +26,8 @@ module Vx
               repo['is_private'],
               "git@#{session.endpoint.host}:#{name}.git",
               "#{session.endpoint}/#{name}",
-              repo['description']
+              repo['description'],
+              repo_language(repo)
             )
           end
 
@@ -42,6 +43,10 @@ module Vx
             session.login
           end
 
+          def repo_language(repo)
+            repo['language'] == '' ? nil : repo['language']
+          end
+
           def git?(repo)
             repo['scm'] == 'git'
           end

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

@@ -37,7 +37,8 @@ module Vx
             repo.private,
             repo.rels[:ssh].href,
             repo.rels[:html].href,
-            repo.description
+            repo.description,
+            repo.language
           )
         end
 

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

@@ -22,7 +22,8 @@ module Vx
               compute_is_private(repo),
               compute_ssh_url(repo),
               compute_web_url(repo),
-              repo.description
+              repo.description,
+              nil
             )
           end
 

data/lib/vx/service_connector/model.rb

@@ -10,7 +10,8 @@ module Vx
         :is_private,
         :ssh_url,
         :html_url,
-        :description
+        :description,
+        :language
       )
 
       Payload = Struct.new(

data/lib/vx/service_connector/version.rb

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

data/spec/lib/bitbucket_spec.rb

@@ -56,28 +56,28 @@ describe Vx::ServiceConnector::Bitbucket do
           ["121111foobar/vx-promo",
            "121111foobar/vx-promo",
            false,
-           "git@bitbucket.org/121111foobar/vx-promo.git",
+           "git@bitbucket.org:121111foobar/vx-promo.git",
            "https://bitbucket.org/121111foobar/vx-promo",
-           ""],
+           "", nil],
          ["dmexe/demo",
           "dmexe/demo",
           true,
-          "git@bitbucket.org/dmexe/demo.git",
+          "git@bitbucket.org:dmexe/demo.git",
           "https://bitbucket.org/dmexe/demo",
-          ""],
+          "", nil],
          ["dmexe/vx-binutils",
           "dmexe/vx-binutils",
           false,
-          "git@bitbucket.org/dmexe/vx-binutils.git",
+          "git@bitbucket.org:dmexe/vx-binutils.git",
           "https://bitbucket.org/dmexe/vx-binutils",
-          ""]]
+          "", nil]]
       ) }
 
     end
   end
 
   context "(deploy_keys)" do
-    let(:key_name)    { 'octocat@octomac' }
+    let(:key_name)    { 'foo' }
     let(:public_key)  { 'public key' }
     let(:deploy_keys) { bitbucket.deploy_keys(repo) }
 
@@ -128,10 +128,11 @@ describe Vx::ServiceConnector::Bitbucket do
         mock_hooks
         mock_remove_hook
       end
-      it { should have(1).item }
+      it { should have(2).item }
     end
   end
 
+=begin
   context "(files)" do
     let(:sha)  { 'sha' }
     let(:path) { 'path' }
@@ -150,5 +151,6 @@ describe Vx::ServiceConnector::Bitbucket do
       end
     end
   end
+=end
 
 end

data/spec/lib/github_spec.rb

@@ -68,11 +68,11 @@ describe Vx::ServiceConnector::Github do
         [[1296269, "octocat/user", false,
           "git@github.com:octocat/Hello-World.git",
           "https://github.com/octocat/Hello-World",
-          "This your first repo!"],
+          "This your first repo!", nil],
          [1296269, "octocat/org", false,
           "git@github.com:octocat/Hello-World.git",
           "https://github.com/octocat/Hello-World",
-          "This your first repo!"]]
+          "This your first repo!", nil]]
       ) }
     end
   end

data/spec/support/bitbucket_web_mocks.rb

@@ -26,18 +26,21 @@ module BitbucketWebMocks
   end
 
   def mock_delete_deploy_key
-    mock_delete "https://bitbucket.org/api/1.0/repositories/full/name/deploy-keys/1", ""
+    mock_delete "https://bitbucket.org/api/1.0/repositories/full/name/deploy-keys/929688", ""
   end
 
   def mock_add_deploy_key
     mock_post "https://bitbucket.org/api/1.0/repositories/full/name/deploy-keys",
-              {"key"=>"public key", "label"=>"octocat@octomac"},
+              {"key"=>"public key", "label"=>"foo"},
               "add_deploy_key"
   end
 
   def mock_add_hook
     mock_post "https://bitbucket.org/api/1.0/repositories/full/name/services",
-              "{\"type\":\"POST\",\"URL\":\"https://example.com\"}",
+              {"type" => "POST", "URL" => "https://example.com"},
+              "create_hook"
+    mock_post "https://bitbucket.org/api/1.0/repositories/full/name/services",
+              {"URL"=>"https://example.com", "approve/unapprove"=>"off", "comments"=>"off", "create/edit/merge/decline"=>"on", "type"=>"Pull Request POST"},
               "create_hook"
   end
 
@@ -47,12 +50,12 @@ module BitbucketWebMocks
   end
 
   def mock_remove_hook
-    mock_delete  "https://bitbucket.org/api/1.0/repositories/full/name/services/1", ""
+    mock_delete  "https://bitbucket.org/api/1.0/repositories/full/name/services/4115444", ""
+    mock_delete  "https://bitbucket.org/api/1.0/repositories/full/name/services/4115443", ""
   end
 
   def mock_get_file
     stub_request(:get, "https://bitbucket.org/api/1.0/repositories/full/name/src/sha/path").
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Authorization'=>'token'}).
       to_return(:status => 200, :body => "content")
   end
 

data/spec/support/gitlab_v5_spec_helpers.rb

@@ -1,5 +1,5 @@
 module GitlabV5SpecHelpers
   def project_list
-    [[9, "example/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil]]
+    [[9, "example/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil, nil]]
   end
 end

data/spec/support/gitlab_v6_spec_helpers.rb

@@ -1,5 +1,5 @@
 module GitlabV6SpecHelpers
   def project_list
-    [[9, "example/sqerp", true, "git@example.com:example/sqerp.git", "http://example.com:80/example/sqerp", ""]]
+    [[9, "example/sqerp", true, "git@example.com:example/sqerp.git", "http://example.com:80/example/sqerp", "", nil]]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit