Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Repositories v2 API #93

Merged
merged 2 commits into from
Jul 30, 2019
Merged

Use Repositories v2 API #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7028a6d
Use the 2.0 version of the Bitbucket API for repository lists - this…
twoism-dev Jul 7, 2016
6c725f4
Don't downcase the repo name, as we might be passing a URI encoded UU…
twoism-dev Jul 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions lib/bitbucket_rest_api/repos.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,19 @@ def delete(user_name, repo_name)
#
# = Examples
# bitbucket = BitBucket.new
# bitbucket.repos.list :user => 'user-name'
# bitbucket.repos.list :user => 'user-name', :role => 'owner'
# bitbucket.repos.list :user => 'user-name', { |repo| ... }
def list(*args)
params = args.extract_options!
normalize! params
_merge_user_into_params!(params) unless params.has_key?('user')
filter! %w[ user type ], params

response = #if (user_name = params.delete("user"))
# get_request("/1.0/users/#{user_name}", params)
#else
# For authenticated user
get_request("/1.0/user/repositories", params)
#end
params.merge!('pagelen' => 100) unless params.has_key?('pagelen')

filter! %w[ user role pagelen ], params

response = get_request("/2.0/repositories", params)

response = response[:values]
return response unless block_given?
response.each { |el| yield el }
end
Expand Down
8 changes: 4 additions & 4 deletions lib/bitbucket_rest_api/repos/keys.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def list(user_name, repo_name, params={})
_validate_user_repo_params(user, repo) unless user? && repo?
normalize! params

response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/deploy-keys/", params)
response = get_request("/1.0/repositories/#{user}/#{repo}/deploy-keys/", params)
return response unless block_given?
response.each { |el| yield el }
end
Expand All @@ -43,7 +43,7 @@ def create(user_name, repo_name, params={})
assert_required_keys(VALID_KEY_PARAM_NAMES, params)

options = { headers: { "Content-Type" => "application/json" } }
post_request("/1.0/repositories/#{user}/#{repo.downcase}/deploy-keys/", params, options)
post_request("/1.0/repositories/#{user}/#{repo}/deploy-keys/", params, options)
end

# Edit a key
Expand All @@ -66,7 +66,7 @@ def edit(user_name, repo_name, key_id, params={})
normalize! params
filter! VALID_KEY_PARAM_NAMES, params

put_request("/1.0/repositories/#{user}/#{repo.downcase}/deploy-keys/#{key_id}", params)
put_request("/1.0/repositories/#{user}/#{repo}/deploy-keys/#{key_id}", params)
end

# Delete key
Expand All @@ -81,7 +81,7 @@ def delete(user_name, repo_name, key_id, params={})
_validate_presence_of key_id
normalize! params

delete_request("/1.0/repositories/#{user}/#{repo.downcase}/deploy-keys/#{key_id}", params)
delete_request("/1.0/repositories/#{user}/#{repo}/deploy-keys/#{key_id}", params)
end

end # Repos::Keys
Expand Down
6 changes: 3 additions & 3 deletions spec/bitbucket_rest_api/repos_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@
before do
expect(repo).to receive(:request).with(
:get,
'/1.0/user/repositories',
{},
'/2.0/repositories',
{"pagelen" => 100},
{}
).and_return(['repo1', 'repo2' ,'repo3'])
).and_return(values: ['repo1', 'repo2' ,'repo3'])
end

# FIXME: this method belongs in the User class!
Expand Down