bitbucket_rest_api2 0.9.1 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 045be3f2ccc39c4e17be95cc0521de0dcff26357ea178904a4c7d52546b8bf16
-  data.tar.gz: 9693eab36c48f610da08d53497e024528ba636a394ac31fe4a73604d85f391b1
+  metadata.gz: 5e7fe03a821fac9f9d30b4cc8e1ff65625d45202553fcbf9b32434debfc21872
+  data.tar.gz: 04acd1fa3f3ad6853e8bb89148b1670ca9f49b58369b922d5ee3c8aeb2afd657
 SHA512:
-  metadata.gz: 3be4afc1904963bbb5eb5a20576ece90661dfc0c4b2e335101b12a2cf5b71f46cd0dcd43cdcaf78ba244cf1e472d161d5422f4ebc9648942505ff64c3571a2e4
-  data.tar.gz: 5d93b129e4e95f794ef3a197456afff8d60923729b9fb078acd3da179c4837563e88a3dbdbe58255273c93cf80699fc22ee8fbbee00e17ad9f84544d8525c1d3
+  metadata.gz: d9184b838b5c6908f3b468cb32e5e914c532861fdc10406902af750b6dbfd8bc8f3dc92b56621a9898b6e1e1acc9a549f73060a11a5fc8576841da82e5ce3e79
+  data.tar.gz: a0237065ac0b3dfcd1cd827fd20b9413c16bf5a675ce6ad73b1167fa9648cdec6506025ae6ad9cfe699ef66ea6d5ee52a9459d873ee8060c9465785805ad57bc

data/README.md

@@ -4,6 +4,8 @@
 
 [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)
+
 A Ruby wrapper for the BitBucket REST API.
 
 ## Installation
@@ -25,19 +27,19 @@ gem "bitbucket_rest_api"
 Create a new client instance
 
 ```ruby
-bitbucket = BitBucket.new
+bitbucket = BitBucket::Client.new
 ```
 
 At this stage you can also supply various configuration parameters, such as `:user`,`:repo`, `:oauth_token`, `:oauth_secret`, `:basic_auth` which are used throughout the API. These can be passed directly as hash options:
 
 ```ruby
-bitbucket = BitBucket.new oauth_token: 'request_token', oauth_secret: 'request_secret'
+bitbucket = BitBucket::Client.new oauth_token: 'request_token', oauth_secret: 'request_secret'
 ```
 
 Alternatively, you can configure the BitBucket settings by passing a block:
 
 ```ruby
-bitbucket = BitBucket.new do |config|
+bitbucket = BitBucket::Client.new do |config|
   config.oauth_token   = 'request_token'
   config.oauth_secret  = 'request_secret'
   config.client_id     = 'consumer_key'
@@ -49,16 +51,16 @@ end
 You can authenticate either using OAuth authentication or through basic authentication by passing your login and password credentials
 
 ```ruby
-bitbucket = BitBucket.new login:'vongrippen', password:'...'
+bitbucket = BitBucket::Client.new login:'vongrippen', password:'...'
 ```
 
 or use convenience method:
 
 ```ruby
-bitbucket = BitBucket.new basic_auth: 'login:password'
+bitbucket = BitBucket::Client.new basic_auth: 'login:password'
 ```
 
-You can interact with BitBucket interface, for example repositories, by issuing following calls that correspond directly to the BitBucket API hierarchy
+You can interact with BitBucket interface, for example repositories, by issuing the following calls that correspond directly to the BitBucket API hierarchy
 
 ```ruby
 bitbucket.repos.changesets.all  'user-name', 'repo-name'
@@ -84,19 +86,18 @@ end
 The `bitbucket_rest_api` gem will use the default middleware stack which is exposed by calling `stack` on client instance. However, this stack can be freely modified with methods such as `insert`, `insert_after`, `delete` and `swap`. For instance to add your `CustomMiddleware` do
 
 ```ruby
-bitbucket = BitBucket.new do |config|
-  config.stack.insert_after BitBucket::Response::Helpers, CustomMiddleware
+bitbucket = BitBucket::Client.new do |config|
+  config.stack.insert_after CustomMiddleware
 end
 ```
 
 Furthermore, you can build your entire custom stack and specify other connection options such as `adapter`
 
 ```ruby
-bitbucket = BitBucket.new do |config|
+bitbucket = BitBucket::Client.new do |config|
   config.adapter :excon
 
   config.stack do |builder|
-    builder.use BitBucket::Response::Helpers
     builder.use BitBucket::Response::Jsonize
   end
 end
@@ -155,8 +156,8 @@ end
 
 or
 
-BitBucket.new(:oauth_token => YOUR_OAUTH_REQUEST_TOKEN, :oauth_secret => YOUR_OAUTH_REQUEST_TOKEN_SECRET)
-BitBucket.new(:basic_auth => 'login:password')
+BitBucket::Client.new(:oauth_token => YOUR_OAUTH_REQUEST_TOKEN, :oauth_secret => YOUR_OAUTH_REQUEST_TOKEN_SECRET)
+BitBucket::Client.new(:basic_auth => 'login:password')
 ```
 
 ## Development

data/lib/bitbucket_rest_api/api.rb

@@ -19,6 +19,7 @@ module BitBucket
     include Validations
     include ParameterFilter
     include Normalizer
+    include Helpers::RepositoryHelper
 
     attr_reader *Configuration::VALID_OPTIONS_KEYS
 
@@ -38,7 +39,6 @@ module BitBucket
     def initialize(options={}, &block)
       super()
       setup options
-      set_api_client
 
       self.instance_eval(&block) if block_given?
     end
@@ -62,11 +62,6 @@ module BitBucket
       end
     end
 
-    # Assigns current api class
-    def set_api_client
-      BitBucket.api_client = self
-    end
-
     # Responds to attribute query or attribute clear
     def method_missing(method, *args, &block) # :nodoc:
       case method.to_s

data/lib/bitbucket_rest_api/api_factory.rb

@@ -15,7 +15,6 @@ module BitBucket
     def self.create_instance(klass, options)
       options.symbolize_keys!
       instance = convert_to_constant(klass.to_s).new options
-      BitBucket.api_client = instance
       instance
     end
 

data/lib/bitbucket_rest_api/configuration.rb

@@ -18,9 +18,13 @@ module BitBucket
         :user,
         :login,
         :password,
-        :basic_auth
+        :basic_auth,
+        :bitbucket_server
     ].freeze
 
+    # the URI schema is dependent on whether we are talking about BitBucket Cloud or Server
+    DEFAULT_BITBUCKET_SERVER   = false
+
     # Other adapters are :typhoeus, :patron, :em_synchrony, :excon, :test
     DEFAULT_ADAPTER            = :net_http
 
@@ -99,6 +103,8 @@ module BitBucket
       self.login              = DEFAULT_LOGIN
       self.password           = DEFAULT_PASSWORD
       self.basic_auth         = DEFAULT_BASIC_AUTH
+      self.bitbucket_server   = DEFAULT_BITBUCKET_SERVER
+
       self
     end
 

data/lib/bitbucket_rest_api/connection.rb

@@ -5,7 +5,6 @@ require 'faraday_middleware'
 require 'bitbucket_rest_api/response'
 require 'bitbucket_rest_api/response/mashify'
 require 'bitbucket_rest_api/response/jsonize'
-require 'bitbucket_rest_api/response/helpers'
 require 'bitbucket_rest_api/response/raise_error'
 require 'bitbucket_rest_api/request/oauth'
 require 'bitbucket_rest_api/request/basic_auth'
@@ -31,7 +30,8 @@ module BitBucket
           },
           :ssl => { :verify => false },
           :url => options.fetch(:endpoint) { BitBucket.endpoint }
-      }.merge(options)
+      }.merge(BitBucket.connection_options)
+      .merge(options)
     end
 
     # Default middleware stack that uses default adapter as specified at
@@ -42,12 +42,15 @@ module BitBucket
         #builder.use BitBucket::Request::Jsonize
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
-        builder.use FaradayMiddleware::OAuth, {:consumer_key => client_id, :consumer_secret => client_secret, :token => oauth_token, :token_secret => oauth_secret} if client_id? and client_secret?
+
+        if client_id? && client_secret?
+          builder.use FaradayMiddleware::OAuth, {consumer_key: client_id, consumer_secret: client_secret, token: oauth_token, token_secret: oauth_secret}
+        end
+
         builder.use BitBucket::Request::BasicAuth, authentication if basic_authed?
         builder.use FaradayMiddleware::EncodeJson
 
         builder.use Faraday::Response::Logger if ENV['DEBUG']
-        builder.use BitBucket::Response::Helpers
         unless options[:raw]
           builder.use BitBucket::Response::Mashify
           builder.use BitBucket::Response::Jsonize

data/lib/bitbucket_rest_api/error/refresh_token.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module BitBucket #:nodoc
+  # Raised when BitBucket receives a RefreshToken error
+  module Error
+    class RefreshToken < BitBucketError
+      def initialize(env)
+        super(env)
+      end
+    end
+  end # Error
+end # BitBucket

data/lib/bitbucket_rest_api/error.rb

@@ -33,6 +33,7 @@ end # BitBucket
   bad_events
   no_events
   blank_value
+  refresh_token
 ].each do |error|
   require "bitbucket_rest_api/error/#{error}"
 end

data/lib/bitbucket_rest_api/helpers/repository_helper.rb

@@ -0,0 +1,13 @@
+module BitBucket
+  module Helpers
+    module RepositoryHelper
+      def sanitize_repository_name(repository_name)
+        return nil if repository_name.nil?
+        repository_name.downcase
+          .gsub(/[^a-z0-9\_\-\.\/ ]/, '') # strip special characters
+          .gsub(/[ \/]/, '-')             # convert characters to dashes
+          .gsub(/-+/, '-')                # only allow one dash in a row
+      end
+    end
+  end
+end

data/lib/bitbucket_rest_api/invitations.rb

@@ -8,7 +8,7 @@ module BitBucket
       _validate_presence_of emailaddress
       perm ||= "write"
 
-      post_request("/2.0/invitations/#{user}/#{repo.downcase}/#{emailaddress}",
+      post_request("/1.0/invitations/#{user}/#{repo.downcase}/#{emailaddress}",
                    permission: perm)
     end
   end

data/lib/bitbucket_rest_api/issues/comments.rb

@@ -27,7 +27,7 @@ module BitBucket
       normalize! params
       # _merge_mime_type(:issue_comment, params)
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -47,7 +47,7 @@ module BitBucket
       normalize! params
       # _merge_mime_type(:issue_comment, params)
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
     end
     alias :find :get
 
@@ -71,7 +71,7 @@ module BitBucket
       filter! VALID_ISSUE_COMMENT_PARAM_NAME, params
       assert_required_keys(%w[ content ], params)
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
+      post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
     end
 
     # Edit a comment
@@ -94,7 +94,7 @@ module BitBucket
       filter! VALID_ISSUE_COMMENT_PARAM_NAME, params
       assert_required_keys(%w[ content ], params)
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
+      put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
     end
 
     # Delete a comment
@@ -111,7 +111,7 @@ module BitBucket
       normalize! params
       # _merge_mime_type(:issue_comment, params)
 
-      delete_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
+      delete_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
     end
 
   end # Issues::Comments

data/lib/bitbucket_rest_api/issues/components.rb

@@ -21,7 +21,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/components", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -39,7 +39,7 @@ module BitBucket
       _validate_presence_of component_id
       normalize! params
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
     end
     alias :find :get
 
@@ -60,7 +60,7 @@ module BitBucket
       filter! VALID_COMPONENT_INPUTS, params
       assert_required_keys(VALID_COMPONENT_INPUTS, params)
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/components", params)
+      post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components", params)
     end
 
     # Update a component
@@ -82,7 +82,7 @@ module BitBucket
       filter! VALID_COMPONENT_INPUTS, params
       assert_required_keys(VALID_COMPONENT_INPUTS, params)
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
+      put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
     end
     alias :edit :update
 
@@ -99,7 +99,7 @@ module BitBucket
       _validate_presence_of component_id
       normalize! params
 
-      delete_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
+      delete_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
     end
 
   end # Issues::Components

data/lib/bitbucket_rest_api/issues/milestones.rb

@@ -24,7 +24,7 @@ module BitBucket
 
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -42,7 +42,7 @@ module BitBucket
       _validate_presence_of milestone_id
       normalize! params
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
     end
     alias :find :get
 
@@ -63,7 +63,7 @@ module BitBucket
       filter! VALID_MILESTONE_INPUTS, params
       assert_required_keys(%w[ name ], params)
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
+      post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
     end
 
     # Update a milestone
@@ -85,7 +85,7 @@ module BitBucket
       filter! VALID_MILESTONE_INPUTS, params
       assert_required_keys(%w[ name ], params)
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
+      put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
     end
 
     # Delete a milestone
@@ -100,7 +100,7 @@ module BitBucket
       _validate_presence_of milestone_id
       normalize! params
 
-      delete_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
+      delete_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
     end
 
   end # Issues::Milestones

data/lib/bitbucket_rest_api/issues.rb

@@ -82,7 +82,7 @@ module BitBucket
       # _merge_mime_type(:issue, params)
       assert_valid_values(VALID_ISSUE_PARAM_VALUES, params)
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues", params)
       return response.issues unless block_given?
       response.issues.each { |el| yield el }
     end
@@ -103,7 +103,7 @@ module BitBucket
       normalize! params
       # _merge_mime_type(:issue, params)
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}", params)
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}", params)
     end
 
     alias :find :get
@@ -122,7 +122,7 @@ module BitBucket
       normalize! params
       # _merge_mime_type(:issue, params)
 
-      delete_request("/2.0/repositories/#{user}/#{repo}/issues/#{issue_id}", params)
+      delete_request("/1.0/repositories/#{user}/#{repo}/issues/#{issue_id}", params)
     end
 
     # Create an issue
@@ -173,7 +173,7 @@ module BitBucket
       filter! VALID_ISSUE_PARAM_NAMES, params
       assert_required_keys(%w[ title ], params)
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/", params)
+      post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/", params)
     end
 
     # Edit an issue
@@ -223,7 +223,7 @@ module BitBucket
       # _merge_mime_type(:issue, params)
       filter! VALID_ISSUE_PARAM_NAMES, params
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/", params)
+      put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/", params)
     end
 
   end # Issues

data/lib/bitbucket_rest_api/repos/changesets.rb

@@ -28,7 +28,7 @@ module BitBucket
       normalize! params
       filter! %w[ limit start], params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/changesets", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/changesets", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -46,7 +46,7 @@ module BitBucket
       _validate_presence_of sha
       normalize! params
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/changesets/#{sha}", params)
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/changesets/#{sha}", params)
     end
     alias :find :get
 

data/lib/bitbucket_rest_api/repos/commits.rb

@@ -3,7 +3,7 @@
 module BitBucket
   class Repos::Commits < API
 
-    VALID_KEY_PARAM_NAMES = %w(include exclude).freeze
+    VALID_KEY_PARAM_NAMES = %w(include exclude pagelen).freeze
 
     # Gets the commit information associated with a repository. By default, this
     # call returns all the commits across all branches, bookmarks, and tags. The
@@ -28,9 +28,15 @@ module BitBucket
       normalize! params
       filter! VALID_KEY_PARAM_NAMES, params
 
-      path = "/2.0/repositories/#{user}/#{repo.downcase}/commits"
+      path = if BitBucket.options[:bitbucket_server]
+               "/1.0/projects/#{user_name}/repos/#{repo_name}/commits"
+             else
+               "/2.0/repositories/#{user}/#{repo.downcase}/commits"
+             end
+
       path << "/#{branchortag}" if branchortag
       response = get_request(path, params)
+
       return response unless block_given?
       response.each { |el| yield el }
     end

data/lib/bitbucket_rest_api/repos/following.rb

@@ -15,7 +15,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/followers/", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/followers/", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -30,7 +30,7 @@ module BitBucket
       params = args.extract_options!
       normalize! params
 
-      response = get_request("/2.0/user/follows", params)
+      response = get_request("/1.0/user/follows", params)
       return response unless block_given?
       response.each { |el| yield el }
     end

data/lib/bitbucket_rest_api/repos/forks.rb

@@ -61,7 +61,7 @@ module BitBucket
       assert_required_keys(REQUIRED_KEY_PARAM_NAMES, params)
       filter! VALID_REPO_OPTIONS, params
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/fork", params)
+      post_request("/1.0/repositories/#{user}/#{repo.downcase}/fork", params)
     end
 
 

data/lib/bitbucket_rest_api/repos/keys.rb

@@ -3,7 +3,7 @@
 module BitBucket
   class Repos::Keys < API
 
-    VALID_KEY_PARAM_NAMES = %w[ label key ].freeze
+    VALID_KEY_PARAM_NAMES = %w[ label key text ].freeze
 
     # List deploy keys
     #
@@ -12,12 +12,19 @@ module BitBucket
     #  bitbucket.repos.keys.list 'user-name', 'repo-name'
     #  bitbucket.repos.keys.list 'user-name', 'repo-name' { |key| ... }
     #
-    def list(user_name, repo_name, params={})
-      _update_user_repo_params(user_name, repo_name)
+    def list(user_name_or_project_key, repo_name, params={})
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/deploy-keys/", params)
+      url = if BitBucket.options[:bitbucket_server]
+              "/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/"
+            end
+
+      response = get_request(url, params)
+
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -35,14 +42,21 @@ module BitBucket
     #    "label" => "octocat@octomac",
     #    "key" =>  "ssh-rsa AAA..."
     #
-    def create(user_name, repo_name, params={})
-      _update_user_repo_params(user_name, repo_name)
+    def create(user_name_or_project_key, repo_name, params={})
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
       filter! VALID_KEY_PARAM_NAMES, params
-      assert_required_keys(VALID_KEY_PARAM_NAMES, params)
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/deploy-keys/", params)
+      options = { headers: { "Content-Type" => "application/json" } }
+
+      url = if BitBucket.options[:bitbucket_server]
+              "/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/"
+            end
+
+      post_request(url, params, options)
     end
 
     # Edit a key
@@ -65,7 +79,7 @@ module BitBucket
       normalize! params
       filter! VALID_KEY_PARAM_NAMES, params
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/deploy-keys/#{key_id}", params)
+      put_request("/1.0/repositories/#{user}/#{sanitize_repository_name(repo)}/deploy-keys/#{key_id}", params)
     end
 
     # Delete key
@@ -74,13 +88,19 @@ module BitBucket
     #  @bitbucket = BitBucket.new
     #  @bitbucket.repos.keys.delete 'user-name', 'repo-name', 'key-id'
     #
-    def delete(user_name, repo_name, key_id, params={})
-      _update_user_repo_params(user_name, repo_name)
+    def delete(user_name_or_project_key, repo_name, key_id, params={})
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
       _validate_presence_of key_id
       normalize! params
 
-      delete_request("/2.0/repositories/#{user}/#{repo.downcase}/deploy-keys/#{key_id}", params)
+      url = if BitBucket.options[:bitbucket_server]
+              "/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}"
+            end
+
+      delete_request(url, params)
     end
 
   end # Repos::Keys

data/lib/bitbucket_rest_api/repos/pull_request.rb

@@ -33,7 +33,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/pullrequests/#{pull_request_id}/participants", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/pullrequests/#{pull_request_id}/participants", params)
       return response unless block_given?
       response.each { |el| yield el }
     end

data/lib/bitbucket_rest_api/repos/services.rb

@@ -12,12 +12,19 @@ module BitBucket
     #  bitbucket.repos.services.list 'user-name', 'repo-name'
     #  bitbucket.repos.services.list 'user-name', 'repo-name' { |service| ... }
     #
-    def list(user_name, repo_name, params={})
-      _update_user_repo_params(user_name, repo_name)
+    def list(user_name_or_project_key, repo_name, params={})
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/services", params)
+      url = if BitBucket.options[:bitbucket_server]
+              "/1.0/projects/#{user_name_or_project_key}/repos/#{repo.downcase}/settings/hooks"
+            else
+              "/1.0/repositories/#{user}/#{repo.downcase}/services"
+            end
+
+      response = get_request(url, params)
+
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -35,7 +42,7 @@ module BitBucket
       _validate_presence_of(service_id)
       normalize! params
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/services/#{service_id}", params)
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/services/#{service_id}", params)
     end
     alias :find :get
 
@@ -58,7 +65,7 @@ module BitBucket
       normalize! params
       assert_required_keys(REQUIRED_KEY_PARAM_NAMES, params)
 
-      post_request("/2.0/repositories/#{user}/#{repo.downcase}/services", params)
+      post_request("/1.0/repositories/#{user}/#{repo.downcase}/services", params)
     end
 
     # Edit a service
@@ -81,7 +88,7 @@ module BitBucket
 
       normalize! params
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/services/#{service_id}", params)
+      put_request("/1.0/repositories/#{user}/#{repo.downcase}/services/#{service_id}", params)
     end
 
     # Delete service
@@ -96,7 +103,7 @@ module BitBucket
       _validate_presence_of(service_id)
       normalize! params
 
-      delete_request("/2.0/repositories/#{user}/#{repo.downcase}/services/#{service_id}", params)
+      delete_request("/1.0/repositories/#{user}/#{repo.downcase}/services/#{service_id}", params)
     end
 
   end # Repos::Keys