Merge pull request #18 from codeship/SHIP-988-use-2.0-endpoints

Use 2.0 endpoints

Author: mauromorales

README.md

@@ -4,7 +4,7 @@
 
 [Wiki](https://github.com/vongrippen/bitbucket/wiki) | [RDocs](http://rubydoc.info/github/vongrippen/bitbucket/master/frames)
 
-[ ![Codeship Status for codeship/bitbucket](https://www.codeship.io/projects/88f3e870-c528-0130-f653-22e3e5b4ad67/status?branch=master)](https://www.codeship.io/projects/4690)
+**Warning: not every endpoint in this project is maintained. Use at your own risk.**
 
 A Ruby wrapper for the BitBucket REST API.
 

bitbucket_rest_api.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'pry-byebug'
-  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'mocha', '~> 1.4.0'
 end

lib/bitbucket_rest_api/repos.rb

@@ -204,7 +204,7 @@ def get(user_name, repo_name, params={ })
       url = if BitBucket.options[:bitbucket_server]
               "/1.0/projects/#{user}/repos/#{repo.downcase}"
             else
-              "/1.0/repositories/#{user}/#{repo.downcase}"
+              "/2.0/repositories/#{user}/#{repo.downcase}"
             end
 
       get_request(url, params)
@@ -252,7 +252,7 @@ def list(*args)
                 '/1.0/repos'
               end
             else
-              '/1.0/user/repositories'
+              '/2.0/repositories'
             end
       response = get_request(url, params)
 

lib/bitbucket_rest_api/repos/keys.rb

@@ -18,9 +18,12 @@ def list(user_name_or_project_key, repo_name, params={})
       normalize! params
 
       url = if BitBucket.options[:bitbucket_server]
+              # Endpoint is not referenced in the docs
+              # https://docs.atlassian.com/bitbucket-server/rest/6.0.0/bitbucket-rest.html
+              # but has been tested
               "/1.0/projects/#{user_name_or_project_key}/repos/#{repo_name.downcase}/ssh"
             else
-              "/1.0/repositories/#{user_name_or_project_key}/#{repo.downcase}/deploy-keys/"
+              "/2.0/repositories/#{user_name_or_project_key}/#{repo.downcase}/deploy-keys"
             end
 
       response = get_request(url, params)
@@ -51,9 +54,12 @@ def create(user_name_or_project_key, repo_name, params={})
       options = { headers: { "Content-Type" => "application/json" } }
 
       url = if BitBucket.options[:bitbucket_server]
+              # Endpoint is not referenced in the docs
+              # https://docs.atlassian.com/bitbucket-server/rest/6.0.0/bitbucket-rest.html
+              # but has been tested
               "/1.0/projects/#{user_name_or_project_key}/repos/#{repo_name.downcase}/ssh"
             else
-              "/1.0/repositories/#{user_name_or_project_key}/#{repo.downcase}/deploy-keys/"
+              "/2.0/repositories/#{user_name_or_project_key}/#{repo.downcase}/deploy-keys"
             end
 
       post_request(url, params, options)
@@ -95,9 +101,12 @@ def delete(user_name_or_project_key, repo_name, key_id, params={})
       normalize! params
 
       url = if BitBucket.options[:bitbucket_server]
+              # Endpoint is not referenced in the docs
+              # https://docs.atlassian.com/bitbucket-server/rest/6.0.0/bitbucket-rest.html
+              # but has been tested
               "/1.0/projects/#{user_name_or_project_key}/repos/#{repo_name.downcase}/ssh/#{key_id}"
             else
-              "/1.0/repositories/#{user_name_or_project_key}/#{repo.downcase}/deploy-keys/#{key_id}"
+              "/2.0/repositories/#{user_name_or_project_key}/#{repo.downcase}/deploy-keys/#{key_id}"
             end
 
       delete_request(url, params)

lib/bitbucket_rest_api/repos/services.rb

@@ -39,6 +39,9 @@ def create(user_name, repo_name, sha, state, key, url, options = {})
       })
 
       url = if BitBucket.options[:bitbucket_server]
+              # Endpoint is not referenced in the docs
+              # https://docs.atlassian.com/bitbucket-server/rest/6.0.0/bitbucket-rest.html
+              # but has been tested
               "/rest/build-status/1.0/commits/#{sha}"
             else
               "/2.0/repositories/#{user}/#{sanitize_repository_name(repo)}/commit/#{sha}/statuses/build"

lib/bitbucket_rest_api/repos/statuses.rb

@@ -3,11 +3,14 @@
 require 'faraday'
 
 module BitBucket
-  class Response::Mashify < Response
-    dependency 'hashie/mash'
+  require 'hashie/mash'
+  class Mash < ::Hashie::Mash
+    disable_warnings
+  end
 
+  class Response::Mashify < Response
     define_parser do |body|
-      ::Hashie::Mash.new body
+      Mash.new body
     end
 
     def parse(body)

lib/bitbucket_rest_api/response/mashify.rb

@@ -6,7 +6,7 @@
     before do
       expect(deploy_keys).to receive(:request).with(
         :get,
-        '/1.0/repositories/mock_username/mock_repo/deploy-keys/',
+        '/2.0/repositories/mock_username/mock_repo/deploy-keys',
         {},
         {}
       ).and_return(['key1', 'key2', 'key3'])
@@ -29,7 +29,7 @@
     before do
       expect(deploy_keys).to receive(:request).with(
         :post,
-        '/1.0/repositories/mock_username/mock_repo/deploy-keys/',
+        '/2.0/repositories/mock_username/mock_repo/deploy-keys',
         { 'key' => 'mock_ssh_key', 'label' => 'mock_label' },
         { headers: { "Content-Type" => "application/json" } }
       )
@@ -59,7 +59,7 @@
     before do
       expect(deploy_keys).to receive(:request).with(
         :delete,
-        '/1.0/repositories/mock_username/mock_repo/deploy-keys/mock_id',
+        '/2.0/repositories/mock_username/mock_repo/deploy-keys/mock_id',
         { 'key' => 'mock_ssh_key', 'label' => 'mock_label' },
         {}
       )

spec/bitbucket_rest_api/repos/keys_spec.rb

@@ -85,7 +85,7 @@
     before do
       expect(repo).to receive(:request).with(
         :get,
-        '/1.0/repositories/mock_username/mock_repo',
+        '/2.0/repositories/mock_username/mock_repo',
         {},
         {}
       )
@@ -100,7 +100,7 @@
     before do
       expect(repo).to receive(:request).with(
         :get,
-        '/1.0/user/repositories',
+        '/2.0/repositories',
         {},
         {}
       ).and_return(['repo1', 'repo2' ,'repo3'])