Merge branch 'master' into teams

Author: cltweedie

.gitignore

@@ -15,3 +15,5 @@ TAGS
 .tags_sorted_by_file
 coverage
 tags
+/.idea
+.ruby-gemset

LICENSE.txt

@@ -1,43 +1,7 @@
-Copyright (c) 2013 James M Cochran
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Original github_api project:
-Copyright (c) 2011 Piotr Murach
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bitbucket_rest_api.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'simple_oauth'
 
   gem.add_development_dependency 'rspec', '>= 0'
+  gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'webmock', '~> 1.8.0'
   gem.add_development_dependency 'vcr', '~> 2.2.0'
   gem.add_development_dependency 'simplecov', '~> 0.6.1'

lib/bitbucket_rest_api/api.rb

@@ -6,7 +6,6 @@
 require 'bitbucket_rest_api/request'
 require 'bitbucket_rest_api/core_ext/hash'
 require 'bitbucket_rest_api/core_ext/array'
-require 'bitbucket_rest_api/compatibility'
 require 'bitbucket_rest_api/api/actions'
 require 'bitbucket_rest_api/api_factory'
 
@@ -80,6 +79,11 @@ def method_missing(method, *args, &block) # :nodoc:
       end
     end
 
+    def update_and_validate_user_repo_params(user_name, repo_name=nil)
+      _update_user_repo_params(user_name, repo_name)
+      _validate_user_repo_params(user, repo) unless user? && repo?
+    end
+
     def _update_user_repo_params(user_name, repo_name=nil) # :nodoc:
       self.user = user_name || self.user
       self.repo = repo_name || self.repo

lib/bitbucket_rest_api/api/actions.rb

@@ -31,17 +31,5 @@ def api_methods_in(klass)
       methods
     end
 
-    def append_arguments(method)
-      _method = self.method(method)
-      if _method.arity == 0
-        args = "()"
-      elsif _method.arity > 0
-        args = "(few)"
-      else
-        args = "(else)"
-      end
-      args
-    end
-
   end # API
 end # BitBucket

lib/bitbucket_rest_api/client.rb

@@ -16,8 +16,7 @@ def issues(options = {})
 
     # An API for users to manage their own tokens.
     def oauth(options = {})
-      raise "Unimpletmented"
-      #@oauth ||= ApiFactory.new 'Authorizations', options
+      @oauth ||= ApiFactory.new 'Request::OAuth', options
     end
     alias :authorizations :oauth
 
@@ -26,8 +25,7 @@ def teams(options = {})
     end
 
     def pull_requests(options = {})
-      raise "Unimplemented"
-      #@pull_requests ||= ApiFactory.new 'PullRequests', options
+      @pull_requests ||= ApiFactory.new 'Repos::PullRequest', options
     end
 
     def repos(options = {})

lib/bitbucket_rest_api/compatibility.rb

@@ -15,7 +15,8 @@ class Repos < API
                  :Commits     => 'commits',
                  :Download    => 'download',
                  :Webhooks    => 'webhooks',
-                 :PullRequest => 'pull_request'
+                 :PullRequest => 'pull_request',
+                 :DefaultReviewers => 'default_reviewers'
 
     DEFAULT_REPO_OPTIONS = {
         "website"         => "",
@@ -69,20 +70,24 @@ def services
       @services ||= ApiFactory.new 'Repos::Services'
     end
     def forks
-      @services ||= ApiFactory.new 'Repos::Forks'
+      @forks ||= ApiFactory.new 'Repos::Forks'
     end
     def commits
-      @services ||=ApiFactory.new 'Repos::Commits'
+      @commits ||=ApiFactory.new 'Repos::Commits'
     end
     def download
-      @services ||=ApiFactory.new "Repos::Download"
+      @download ||=ApiFactory.new "Repos::Download"
     end
 
     # Access to Repos::PullRequests API
     def pull_request
       @pull_request ||= ApiFactory.new 'Repos::PullRequest'
     end
 
+    def default_reviewers
+      @default_reviewers ||= ApiFactory.new 'Repos::DefaultReviewers'
+    end
+
     # List branches
     #
     # = Examples

lib/bitbucket_rest_api/repos.rb

@@ -3,12 +3,38 @@
 module BitBucket
   class Repos::Commits < API
 
-    def get(user_name, repo_name)
+    VALID_KEY_PARAM_NAMES = %w(include exclude).freeze
+
+    # Gets the commit information associated with a repository. By default, this
+    # call returns all the commits across all branches, bookmarks, and tags. The
+    # newest commit is first.
+    #
+    # = Parameters
+    # *<tt>include</tt> - The SHA, branch, bookmark, or tag to include, for example, v10 or master. You can repeat the parameter multiple times.
+    # *<tt>exclude</tt> - The SHA, branch, bookmark, or tag to exclude, for example, v10 or master . You can repeat the parameter multiple times.
+    #
+    # = Examples
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.commits.list 'user-name', 'repo-name'
+    #  bitbucket.repos.commits.list 'user-name', 'repo-name', 'master'
+    #  bitbucket.repos.commits.list 'user-name', 'repo-name' { |key| ... }
+    #  bitbucket.repos.commits.list 'user-name', 'repo-name', nil,
+    #    "include" => "feature-branch",
+    #    "exclude" =>  "master"
+    #
+    def list(user_name, repo_name, branchortag=nil, params={})
       _update_user_repo_params(user_name, repo_name)
       _validate_user_repo_params(user, repo) unless user? && repo?
-      get_request("/2.0/repositories/#{user}/#{repo.downcase}/commits")
-    end
+      normalize! params
+      filter! VALID_KEY_PARAM_NAMES, params
 
+      path = "/2.0/repositories/#{user}/#{repo.downcase}/commits"
+      path << "/#{branchortag}" if branchortag
+      response = get_request(path, params)
+      return response unless block_given?
+      response.each { |el| yield el }
+    end
+    alias :all :list
 
-  end # Repos::Keys
+  end # Repos::Commits
 end # BitBucket

lib/bitbucket_rest_api/repos/commits.rb

@@ -0,0 +1,59 @@
+module BitBucket
+  class Repos::DefaultReviewers < API
+
+    # List default reviewers
+    #
+    # = Examples
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.default_reviewers.list 'user-name', 'repo-name'
+    #  bitbucket.repos.default_reviewers.list 'user-name', 'repo-name' { |reviewer| ... }
+    #
+    def list(user_name, repo_name, params={})
+      update_and_validate_user_repo_params(user_name, repo_name)
+      normalize! params
+
+      response = get_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers", params)
+      return response unless block_given?
+      response.each { |el| yield el }
+    end
+    alias :all :list
+
+    # Get a default reviewer's info
+    #
+    # = Examples
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.default_reviewers.get 'user-name', 'repo-name', 'reviewer-username'
+    #
+    def get(user_name, repo_name, reviewer_username, params={})
+      update_and_validate_user_repo_params(user_name, repo_name)
+      normalize! params
+
+      get_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers/#{reviewer_username}", params)
+    end
+
+    # Add a user to the default-reviewers list for the repo
+    #
+    # = Examples
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.default_reviewers.add 'user-name', 'repo-name', 'reviewer-username'
+    #
+    def add(user_name, repo_name, reviewer_username, params={})
+      update_and_validate_user_repo_params(user_name, repo_name)
+      normalize! params
+
+      put_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers/#{reviewer_username}", params)
+    end
+
+    # Remove a user from the default-reviewers list for the repo
+    #
+    # = Examples
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.default_reviewers.remove 'user-name', 'repo-name', 'reviewer-username'
+    #
+    def remove(user_name, repo_name, reviewer_username, params={})
+      update_and_validate_user_repo_params(user_name, repo_name)
+      normalize! params
+      delete_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers/#{reviewer_username}", params)
+    end
+  end
+end