bitbucket_rest_api2 0.9.1 → 0.9.5

data/lib/bitbucket_rest_api/repos/sources.rb

@@ -14,7 +14,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       _validate_presence_of(sha, path)
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/src/#{sha}/#{path}")
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/src/#{sha}/#{path}")
     end
     alias :all :list
 
@@ -31,7 +31,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       _validate_presence_of(sha, path)
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/raw/#{sha}/#{path}")
+      get_request("/1.0/repositories/#{user}/#{repo.downcase}/raw/#{sha}/#{path}")
     end
     alias :find :get
 

data/lib/bitbucket_rest_api/repos/statuses.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+module BitBucket
+  class Repos::Statuses < API
+
+    # Add build status to commit
+    #
+    # = Parameters
+    #  <tt>:user_name</tt> - Required string. The account of the repository owner.
+    #  <tt>:repo_name</tt> - Required string. The repository name.
+    #  <tt>:sha</tt> - Requrired string. The SHA1 value for the commit where you want to add the build status.
+    #  <tt>:state</tt> - Required String. An indication of the status of the commit: (INPROGRESS, SUCCESSFUL, or FAILED)
+    #  <tt>:key</tt> - Required String. A key that the vendor or build system supplies to identify the submitted build status.
+    #  <tt>:url</tt> - Required String. The URL for the vendor or system that produces the build.
+    #  <tt>:options</tt> Optional hash. Containing the following optional parameters:
+    #     * <tt>description</tt> - A user-defined description of the build. For example, 4 out of 128 tests passed.
+    #     * <tt>name<tt> - The name of the build. Your build system may provide the name, which will also appear in Bitbucket. For example, Unit Tests.
+    #
+    # = Examples
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.create_status(client.repos.statuses.create('homer',
+    #                          'monorail',
+    #                          'e14caad7c501e0ae52daef24b26aa2625b7534e6',
+    #                          'SUCCESSFUL',
+    #                          'BAMBOO-PROJECT-X',
+    #                          'https://example.com/path/to/build/info',
+    #                          'name' => 'this is covered by build_concurrency_spec',
+    #                          'description' => 'Changes by John Doe')
+    #
+    def create(user_name, repo_name, sha, state, key, url, options = {})
+       _update_user_repo_params(user_name, repo_name)
+       _validate_user_repo_params(user, repo) unless user? && repo?
+      _validate_presence_of(sha, state, key, url)
+
+      build_options = options.merge({
+        "state" => state,
+        "key" => key,
+        "url" => url
+      })
+
+      url = if BitBucket.options[:bitbucket_server]
+              "/rest/build-status/1.0/commits/#{sha}"
+            else
+              "/2.0/repositories/#{user}/#{sanitize_repository_name(repo)}/commit/#{sha}/statuses/build"
+            end
+
+      faraday_options = { headers: { "Content-Type" => "application/json" } }
+      post_request(url, build_options, faraday_options)
+    end
+  end # Repos::Statuses
+end # BitBucket

data/lib/bitbucket_rest_api/repos/webhooks.rb

@@ -17,11 +17,12 @@ module BitBucket
       'pullrequest:rejected',
       'pullrequest:comment_created',
       'pullrequest:comment_updated',
-      'pullrequest:comment_deleted'
+      'pullrequest:comment_deleted',
+      'repo:refs_changed'
     ]
 
-    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
       assert_required_keys(%w[description url active events], params)
@@ -33,23 +34,35 @@ module BitBucket
         'active',
         'events'
       )
+      options = { headers: { "Content-Type" => "application/json" } }
+      url = if BitBucket.options[:bitbucket_server]
+              "/1.0/projects/#{user_name_or_project_key}/repos/#{repo_name}/webhooks"
+            else
+              "/2.0/repositories/#{user_name_or_project_key}/#{repo_name}/hooks"
+            end
 
-      post_request("/2.0/repositories/#{user_name}/#{repo_name}/hooks", params)
+      post_request(url, params, options)
     end
 
-    def list(user_name, repo_name)
-      _update_user_repo_params(user_name, repo_name)
+    def list(user_name_or_project_key, repo_name)
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
 
-      get_request("/2.0/repositories/#{user_name}/#{repo_name}/hooks")
+      url = if BitBucket.options[:bitbucket_server]
+              "/1.0/projects/#{user_name_or_project_key}/repos/#{repo_name}/webhooks"
+            else
+              "/2.0/repositories/#{user_name_or_project_key}/#{repo_name}/hooks?pagelen=100"
+            end
+
+      get_request(url)
     end
 
-    def get(user_name, repo_name, hook_uuid)
-      _update_user_repo_params(user_name, repo_name)
+    def get(user_name_or_project_key, repo_name, hook_uuid)
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
 
       get_request(
-        "/2.0/repositories/#{user_name}/#{repo_name}/hooks/#{hook_uuid}"
+        "/2.0/repositories/#{user_name_or_project_key}/#{repo_name}/hooks/#{hook_uuid}"
       )
     end
 
@@ -67,19 +80,25 @@ module BitBucket
         'events'
       )
 
+      options = { headers: { "Content-Type" => "application/json" } }
       put_request(
         "/2.0/repositories/#{user_name}/#{repo_name}/hooks/#{hook_uuid}",
-        params
+        params,
+        options
       )
     end
 
-    def delete(user_name, repo_name, hook_uuid)
-      _update_user_repo_params(user_name, repo_name)
+    def delete(user_name_or_project_key, repo_name, hook_uuid)
+      _update_user_repo_params(user_name_or_project_key, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
 
-      delete_request(
-        "/2.0/repositories/#{user_name}/#{repo_name}/hooks/#{hook_uuid}"
-      )
+      url = if BitBucket.options[:bitbucket_server]
+              "/1.0/projects/#{user_name_or_project_key}/repos/#{repo_name}/webhooks/#{hook_uuid}"
+            else
+              "/2.0/repositories/#{user_name_or_project_key}/#{repo_name}/hooks/#{hook_uuid}"
+            end
+
+      delete_request(url)
     end
 
     private

data/lib/bitbucket_rest_api/repos.rb

@@ -11,6 +11,7 @@ module BitBucket
                  :Services    => 'services',
                  :Following   => 'following',
                  :Sources     => 'sources',
+                 :Statuses    => 'statuses',
                  :Forks       => 'forks',
                  :Commits     => 'commits',
                  :Download    => 'download',
@@ -69,16 +70,27 @@ module BitBucket
     def services
       @services ||= ApiFactory.new 'Repos::Services'
     end
+
+    def statuses
+      @statuses ||= ApiFactory.new 'Repos::Statuses'
+    end
+
     def forks
       @forks ||= ApiFactory.new 'Repos::Forks'
     end
+
     def commits
       @commits ||=ApiFactory.new 'Repos::Commits'
     end
+
     def download
       @download ||=ApiFactory.new "Repos::Download"
     end
 
+    def webhooks
+      @webhooks ||= ApiFactory.new 'Repos::Webhooks'
+    end
+
     # Access to Repos::PullRequests API
     def pull_request
       @pull_request ||= ApiFactory.new 'Repos::PullRequest'
@@ -103,7 +115,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless (user? && repo?)
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/branches/", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/branches/", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -145,7 +157,7 @@ module BitBucket
       assert_required_keys(%w[ name ], params)
 
       # Requires authenticated user
-      post_request("/2.0/repositories/", DEFAULT_REPO_OPTIONS.merge(params))
+      post_request("/1.0/repositories/", DEFAULT_REPO_OPTIONS.merge(params))
     end
 
     # Edit a repository
@@ -175,7 +187,7 @@ module BitBucket
       normalize! params
       filter! VALID_REPO_OPTIONS, params
 
-      put_request("/2.0/repositories/#{user}/#{repo.downcase}/", DEFAULT_REPO_OPTIONS.merge(params))
+      put_request("/1.0/repositories/#{user}/#{repo.downcase}/", DEFAULT_REPO_OPTIONS.merge(params))
     end
 
     # Get a repository
@@ -189,7 +201,13 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}", params)
+      url = if BitBucket.options[:bitbucket_server]
+              "/1.0/projects/#{user}/repos/#{repo.downcase}"
+            else
+              "/1.0/repositories/#{user}/#{repo.downcase}"
+            end
+
+      get_request(url, params)
     end
 
     alias :find :get
@@ -205,7 +223,7 @@ module BitBucket
       _update_user_repo_params(user_name, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
 
-      delete_request("/2.0/repositories/#{user}/#{repo.downcase}")
+      delete_request("/1.0/repositories/#{user}/#{repo.downcase}")
     end
 
     # List repositories for the authenticated user
@@ -227,12 +245,17 @@ module BitBucket
       _merge_user_into_params!(params) unless params.has_key?('user')
       filter! %w[ user type ], params
 
-      response = #if (user_name = params.delete("user"))
-                 #  get_request("/2.0/users/#{user_name}", params)
-                 #else
-                   # For authenticated user
-                   get_request("/2.0/repositories", params)
-                 #end
+      url = if BitBucket.options[:bitbucket_server]
+              if params.has_key?('user')
+                "/1.0/users/#{params['user']}/repos"
+              else
+                '/1.0/repos'
+              end
+            else
+              '/1.0/user/repositories'
+            end
+      response = get_request(url, params)
+
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -251,7 +274,7 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
       normalize! params
 
-      response = get_request("/2.0/repositories/#{user}/#{repo.downcase}/tags/", params)
+      response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/tags/", params)
       return response unless block_given?
       response.each { |el| yield el }
     end

data/lib/bitbucket_rest_api/request.rb

@@ -28,6 +28,20 @@ module BitBucket
       request(:delete, path, params, options)
     end
 
+    def retry_token_refresh_errors
+      count = 0
+      begin
+        yield
+      rescue BitBucket::Error::RefreshToken
+        count += 1
+        if count <= 3
+          sleep 0.3 * count
+          retry
+        end
+        raise
+      end
+    end
+
     def request(method, path, params, options={})
       if !METHODS.include?(method)
         raise ArgumentError, "unkown http method: #{method}"
@@ -36,29 +50,43 @@ module BitBucket
 
       puts "EXECUTED: #{method} - #{path} with #{params} and #{options}" if ENV['DEBUG']
 
-      conn = connection(options)
-      path = (conn.path_prefix + path).gsub(/\/\//,'/') if conn.path_prefix != '/'
-
-      response = conn.send(method) do |request|
-        request['Authorization'] = "Bearer #{new_access_token}" unless new_access_token.nil?
-        case method.to_sym
-        when *(METHODS - METHODS_WITH_BODIES)
-          request.body = params.delete('data') if params.has_key?('data')
-          request.url(path, params)
-        when *METHODS_WITH_BODIES
-          request.path = path
-          unless params.empty?
-            # data = extract_data_from_params(params)
-            # request.body = MultiJson.dump(data)
-            request.body = MultiJson.dump(params)
+      response = retry_token_refresh_errors do
+        conn = connection(options)
+        prefix = path_prefix(path, conn)
+        path = (prefix + path).gsub(/\/\//,'/') if conn.path_prefix != '/'
+
+        response = conn.send(method) do |request|
+          request['Authorization'] = "Bearer #{new_access_token}" unless new_access_token.nil?
+          case method.to_sym
+          when *(METHODS - METHODS_WITH_BODIES)
+            request.body = params.delete('data') if params.has_key?('data')
+            request.url(path, params)
+          when *METHODS_WITH_BODIES
+            request.path = path
+            unless params.empty?
+              # data = extract_data_from_params(params)
+              # request.body = MultiJson.dump(data)
+              request.body = MultiJson.dump(params)
+            end
           end
         end
       end
+
       response.body
     end
 
     private
 
+    def path_prefix(path, conn)
+      if path.include?('/ssh') && BitBucket.options[:bitbucket_server]
+        '/rest/keys'
+      elsif path.include?('/build-status') && BitBucket.options[:bitbucket_server]
+        ''
+      else
+        conn.path_prefix
+      end
+    end
+
     # def extract_data_from_params(params) # :nodoc:
     #   if params.has_key?('data') and !params['data'].nil?
     #     params['data']

data/lib/bitbucket_rest_api/response/raise_error.rb

@@ -3,6 +3,8 @@
 require 'faraday'
 require 'bitbucket_rest_api/error'
 
+REFRESH_TOKEN = %r{Access token expired. Use your refresh token to obtain a new access token.}
+
 module BitBucket
   class Response::RaiseError < Faraday::Response::Middleware
 
@@ -11,6 +13,9 @@ module BitBucket
       when 400
         raise BitBucket::Error::BadRequest.new(env)
       when 401
+        if env[:body] =~ REFRESH_TOKEN
+          raise BitBucket::Error::RefreshToken.new(env)
+        end
         raise BitBucket::Error::Unauthorized.new(env)
       when 403
         raise BitBucket::Error::Forbidden.new(env)

data/lib/bitbucket_rest_api/user.rb

@@ -26,7 +26,7 @@ module BitBucket
     #  bitbucket.user_api.profile
     #
     def profile
-      get_request("/2.0/user")
+      get_request("/1.0/user")
     end
 
 
@@ -48,14 +48,14 @@ module BitBucket
       normalize! params
       filter! DEFAULT_USER_OPTIONS, params
 
-      put_request("/2.0/user", DEFAULT_USER_OPTIONS.merge(params))
+      put_request("/1.0/user", DEFAULT_USER_OPTIONS.merge(params))
 
     end
 
 
     # GET a list of user privileges
     def privileges
-      get_request("/2.0/user/privileges")
+      get_request("/1.0/user/privileges")
     end
 
 
@@ -66,7 +66,7 @@ module BitBucket
     # if the repository is a fork of another repository.
     # An account always "follows" its own repositories.
     def follows
-      get_request("/2.0/user/follows")
+      get_request("/1.0/user/follows")
     end
 
 
@@ -75,7 +75,7 @@ module BitBucket
     # or has at least read access to.
     # Use this if you're looking for a full list of all of the repositories associated with a user.
     def repositories
-      get_request("/2.0/repositories/#{self.user}")
+      get_request("/1.0/user/repositories")
     end
 
     alias :repos :repositories
@@ -86,7 +86,7 @@ module BitBucket
     # Gets a list of the repositories the account follows.
     # This is the same list that appears on the Following tab on your account dashboard.
     def overview
-      get_request("/2.0/repositories/overview")
+      get_request("/1.0/user/repositories/overview")
     end
 
 
@@ -94,7 +94,7 @@ module BitBucket
     # GET the list of repositories on the dashboard
     # Gets the repositories list from the account's dashboard.
     def dashboard
-      get_request("/2.0/repositories/dashboard")
+      get_request("/1.0/user/repositories/dashboard")
     end
 
   end # User

data/lib/bitbucket_rest_api/users/account.rb

@@ -11,43 +11,43 @@ module BitBucket
     # GET the account profile
     # 
     def profile(accountname)
-      response = get_request("/2.0/users/#{accountname}")
+      response = get_request("/1.0/users/#{accountname}")
     end
 
     # GET the account plan
     def plan(accountname)
-      response = get_request("/2.0/users/#{accountname}/plan")
+      response = get_request("/1.0/users/#{accountname}/plan")
     end
 
     # GET the emails
     def emails(accountname)
-      response = get_request("/2.0/users/#{accountname}/emails")
+      response = get_request("/1.0/users/#{accountname}/emails")
     end
 
     # GET the followers
     def followers(accountname)
-      response = get_request("/2.0/users/#{accountname}/followers")
+      response = get_request("/1.0/users/#{accountname}/followers")
     end
 
     # GET the events
     def events(accountname)
-      response = get_request("/2.0/users/#{accountname}/events")
+      response = get_request("/1.0/users/#{accountname}/events")
     end
 
     #GET the keys
     def keys(accountname)
-      response = get_request("/2.0/users/#{accountname}/ssh-keys")
+      response = get_request("/1.0/users/#{accountname}/ssh-keys")
     end
 
     #POST a new key
     # params should be in format {key: "", label:""}
     def new_key(accountname, params)
-      response = post_request("/2.0/users/#{accountname}/ssh-keys/", params)
+      response = post_request("/1.0/users/#{accountname}/ssh-keys/", params)
     end
 
     #DELETE a key
     def delete_key(accountname, key_id)
-      response = delete_request("/2.0/users/#{accountname}/ssh-keys/#{key_id}")
+      response = delete_request("/1.0/users/#{accountname}/ssh-keys/#{key_id}")
     end
   end # Users::Account
 end # BitBucket

data/lib/bitbucket_rest_api/version.rb

@@ -4,7 +4,7 @@ module BitBucket
   module VERSION
     MAJOR = 0
     MINOR = 9
-    PATCH = 1
+    PATCH = 5
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/bitbucket_rest_api.rb

@@ -6,35 +6,11 @@ require 'bitbucket_rest_api/constants'
 require 'bitbucket_rest_api/utils/url'
 require 'bitbucket_rest_api/connection'
 require 'bitbucket_rest_api/deprecation'
+require 'bitbucket_rest_api/helpers/repository_helper'
 
 module BitBucket
   extend Configuration
 
-  class << self
-
-    # Handle for the client instance
-    attr_accessor :api_client
-
-    # Alias for BitBucket::Client.new
-    #
-    # @return [BitBucket::Client]
-    def new(options = { }, &block)
-      @api_client = BitBucket::Client.new(options, &block)
-    end
-
-    # Delegate to BitBucket::Client
-    #
-    def method_missing(method, *args, &block)
-      return super unless new.respond_to?(method)
-      new.send(method, *args, &block)
-    end
-
-    def respond_to?(method, include_private = false)
-      new.respond_to?(method, include_private) || super(method, include_private)
-    end
-
-  end
-
   module AutoloadHelper
 
     def autoload_all(prefix, options)

data/spec/bitbucket_rest_api/core_ext/hash_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Hash do
 
   before do
-    BitBucket.new
+    BitBucket::Client.new
     @hash = { :a => 1, :b => 2, :c => 'e'}
     @serialized = "a=1&b=2&c=e"
     @nested_hash = { 'a' => { 'b' => {'c' => 1 } } }

data/spec/bitbucket_rest_api/helpers/repository_helper_spec.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+require 'bitbucket_rest_api'
+
+describe "RepositoryHelper" do
+  context "#sanitize_repository_name" do
+    include BitBucket::Helpers::RepositoryHelper
+
+    it "filters special characters" do
+      expect(sanitize_repository_name("Funnü ChAraxt%")).to eq("funn-charaxt")
+    end
+
+    it "filters special characters" do
+      expect(sanitize_repository_name(nil)).to eq(nil)
+    end
+
+    it "replaces slashes by dashes" do
+      expect(sanitize_repository_name("my/repo")).to eq("my-repo")
+    end
+
+    it "doesn't put more than one dash in a row" do
+      expect(sanitize_repository_name("my - repo")).to eq("my-repo")
+    end
+
+    it "does not change a valid repo name" do
+      ["bit.bucket", "bitbucket", "bit-bucket", "bit_bucket"].each do |repo_name|
+        expect(sanitize_repository_name(repo_name)).to eq(repo_name)
+      end
+    end
+  end
+end

data/spec/bitbucket_rest_api/invitations_spec.rb

@@ -7,7 +7,7 @@ describe BitBucket::Invitations do
     before do
       expect(subject).to receive(:request).with(
         :post,
-        "/2.0/invitations/mock_username/mock_repo/mock_email_address",
+        "/1.0/invitations/mock_username/mock_repo/mock_email_address",
         { :permission => 'read' },
         {}
       )

data/spec/bitbucket_rest_api/issues/comments_spec.rb

@@ -7,7 +7,7 @@ describe BitBucket::Issues::Comments do
     before do
       expect(comments).to receive(:request).with(
         :get,
-        '/2.0/repositories/mock_username/mock_repo/issues/mock_issue_id/comments/',
+        '/1.0/repositories/mock_username/mock_repo/issues/mock_issue_id/comments/',
         {},
         {}
       ).and_return(['comment1', 'comment2', 'comment3'])
@@ -30,7 +30,7 @@ describe BitBucket::Issues::Comments do
     before do
       expect(comments).to receive(:request).with(
         :get,
-        '/2.0/repositories/mock_username/mock_repo/issues/comments/mock_comment_id',
+        '/1.0/repositories/mock_username/mock_repo/issues/comments/mock_comment_id',
         {},
         {}
       )
@@ -45,7 +45,7 @@ describe BitBucket::Issues::Comments do
     before do
       expect(comments).to receive(:request).with(
         :post,
-        '/2.0/repositories/mock_username/mock_repo/issues/mock_issue_id/comments/',
+        '/1.0/repositories/mock_username/mock_repo/issues/mock_issue_id/comments/',
         {'content' => 'mock_comment'},
         {}
       )
@@ -60,7 +60,7 @@ describe BitBucket::Issues::Comments do
     before do
       expect(comments).to receive(:request).with(
         :put,
-        '/2.0/repositories/mock_username/mock_repo/issues/comments/mock_comment_id',
+        '/1.0/repositories/mock_username/mock_repo/issues/comments/mock_comment_id',
         {'content' => 'new_mock_comment'},
         {}
       )
@@ -75,7 +75,7 @@ describe BitBucket::Issues::Comments do
     before do
       expect(comments).to receive(:request).with(
         :delete,
-        '/2.0/repositories/mock_username/mock_repo/issues/comments/mock_comment_id',
+        '/1.0/repositories/mock_username/mock_repo/issues/comments/mock_comment_id',
         {},
         {}
       )