Skip to content

Commit bc2ba2f

Browse files
vongrippenvongrippen
committed
Merge pull request #38 from Menghongli/master
Add api call from bitbucket api version 2.0
2 parents 3c76671 + 8c9a9b4 commit bc2ba2f

File tree

17 files changed

+79
-62
lines changed

17 files changed

+79
-62
lines changed

‎lib/bitbucket_rest_api/configuration.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module Configuration
4545
DEFAULT_BASIC_AUTH = nil
4646

4747
# The endpoint used to connect to BitBucket if none is set, in the event that BitBucket is ever available on location
48-
DEFAULT_ENDPOINT = 'https://bitbucket.org/api/1.0'.freeze
48+
DEFAULT_ENDPOINT = 'https://bitbucket.org/api'.freeze
4949

5050
# The value sent in the http header for 'User-Agent' if none is set
5151
DEFAULT_USER_AGENT = "BitBucket Ruby Gem #{BitBucket::VERSION::STRING}".freeze

‎lib/bitbucket_rest_api/invitations.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def invite(user_name, repo_name, emailaddress, perm)
88
_validate_presence_of emailaddress
99
perm ||= "write"
1010

11-
post_request("/invitations/#{user}/#{repo.downcase}/#{emailaddress}",
11+
post_request("/1.0/invitations/#{user}/#{repo.downcase}/#{emailaddress}",
1212
permission: perm)
1313
end
1414
end

‎lib/bitbucket_rest_api/issues.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def list_repo(user_name, repo_name, params={ })
8282
# _merge_mime_type(:issue, params)
8383
assert_valid_values(VALID_ISSUE_PARAM_VALUES, params)
8484

85-
response = get_request("/repositories/#{user}/#{repo.downcase}/issues", params)
85+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues", params)
8686
return response.issues unless block_given?
8787
response.issues.each { |el| yield el }
8888
end
@@ -103,7 +103,7 @@ def get(user_name, repo_name, issue_id, params={ })
103103
normalize! params
104104
# _merge_mime_type(:issue, params)
105105

106-
get_request("/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}", params)
106+
get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}", params)
107107
end
108108

109109
alias :find :get
@@ -122,7 +122,7 @@ def delete(user_name, repo_name, issue_id, params={ })
122122
normalize! params
123123
# _merge_mime_type(:issue, params)
124124

125-
delete_request("/repositories/#{user}/#{repo}/issues/#{issue_id}", params)
125+
delete_request("/1.0/repositories/#{user}/#{repo}/issues/#{issue_id}", params)
126126
end
127127

128128
# Create an issue
@@ -173,7 +173,7 @@ def create(user_name, repo_name, params={ })
173173
filter! VALID_ISSUE_PARAM_NAMES, params
174174
assert_required_keys(%w[ title ], params)
175175

176-
post_request("/repositories/#{user}/#{repo.downcase}/issues/", params)
176+
post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/", params)
177177
end
178178

179179
# Edit an issue
@@ -223,7 +223,7 @@ def edit(user_name, repo_name, issue_id, params={ })
223223
# _merge_mime_type(:issue, params)
224224
filter! VALID_ISSUE_PARAM_NAMES, params
225225

226-
put_request("/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/", params)
226+
put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/", params)
227227
end
228228

229229
end # Issues

‎lib/bitbucket_rest_api/issues/comments.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def list(user_name, repo_name, issue_id, params={})
2727
normalize! params
2828
# _merge_mime_type(:issue_comment, params)
2929

30-
response = get_request("/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
30+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
3131
return response unless block_given?
3232
response.each { |el| yield el }
3333
end
@@ -47,7 +47,7 @@ def get(user_name, repo_name, comment_id, params={})
4747
normalize! params
4848
# _merge_mime_type(:issue_comment, params)
4949

50-
get_request("/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
50+
get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
5151
end
5252
alias :find :get
5353

@@ -71,7 +71,7 @@ def create(user_name, repo_name, issue_id, params={})
7171
filter! VALID_ISSUE_COMMENT_PARAM_NAME, params
7272
assert_required_keys(%w[ content ], params)
7373

74-
post_request("/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
74+
post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/#{issue_id}/comments/", params)
7575
end
7676

7777
# Edit a comment
@@ -94,7 +94,7 @@ def edit(user_name, repo_name, comment_id, params={})
9494
filter! VALID_ISSUE_COMMENT_PARAM_NAME, params
9595
assert_required_keys(%w[ content ], params)
9696

97-
put_request("/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}")
97+
put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}")
9898
end
9999

100100
# Delete a comment
@@ -111,7 +111,7 @@ def delete(user_name, repo_name, comment_id, params={})
111111
normalize! params
112112
# _merge_mime_type(:issue_comment, params)
113113

114-
delete_request("/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
114+
delete_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/comments/#{comment_id}", params)
115115
end
116116

117117
end # Issues::Comments

‎lib/bitbucket_rest_api/issues/components.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def list(user_name, repo_name, params={})
2121
_validate_user_repo_params(user, repo) unless user? && repo?
2222
normalize! params
2323

24-
response = get_request("/repositories/#{user}/#{repo.downcase}/issues/components", params)
24+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components", params)
2525
return response unless block_given?
2626
response.each { |el| yield el }
2727
end
@@ -39,7 +39,7 @@ def get(user_name, repo_name, component_id, params={})
3939
_validate_presence_of component_id
4040
normalize! params
4141

42-
get_request("/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
42+
get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
4343
end
4444
alias :find :get
4545

@@ -60,7 +60,7 @@ def create(user_name, repo_name, params={})
6060
filter! VALID_COMPONENT_INPUTS, params
6161
assert_required_keys(VALID_COMPONENT_INPUTS, params)
6262

63-
post_request("/repositories/#{user}/#{repo.downcase}/issues/components", params)
63+
post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components", params)
6464
end
6565

6666
# Update a component
@@ -82,7 +82,7 @@ def update(user_name, repo_name, component_id, params={})
8282
filter! VALID_COMPONENT_INPUTS, params
8383
assert_required_keys(VALID_COMPONENT_INPUTS, params)
8484

85-
put_request("/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
85+
put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/components/#{component_id}", params)
8686
end
8787
alias :edit :update
8888

@@ -99,7 +99,7 @@ def delete(user_name, repo_name, component_id, params={})
9999
_validate_presence_of component_id
100100
normalize! params
101101

102-
delete_request("/repositories/#{user}/#{repo.downcase}/labels/components/#{component_id}", params)
102+
delete_request("/1.0/repositories/#{user}/#{repo.downcase}/labels/components/#{component_id}", params)
103103
end
104104

105105
end # Issues::Components

‎lib/bitbucket_rest_api/issues/milestones.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def list(user_name, repo_name, params={})
2424

2525
normalize! params
2626

27-
response = get_request("/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
27+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
2828
return response unless block_given?
2929
response.each { |el| yield el }
3030
end
@@ -42,7 +42,7 @@ def get(user_name, repo_name, milestone_id, params={})
4242
_validate_presence_of milestone_id
4343
normalize! params
4444

45-
get_request("/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
45+
get_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
4646
end
4747
alias :find :get
4848

@@ -63,7 +63,7 @@ def create(user_name, repo_name, params={})
6363
filter! VALID_MILESTONE_INPUTS, params
6464
assert_required_keys(%w[ name ], params)
6565

66-
post_request("/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
66+
post_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones", params)
6767
end
6868

6969
# Update a milestone
@@ -85,7 +85,7 @@ def update(user_name, repo_name, milestone_id, params={})
8585
filter! VALID_MILESTONE_INPUTS, params
8686
assert_required_keys(%w[ name ], params)
8787

88-
put_request("/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
88+
put_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
8989
end
9090

9191
# Delete a milestone
@@ -100,7 +100,7 @@ def delete(user_name, repo_name, milestone_id, params={})
100100
_validate_presence_of milestone_id
101101
normalize! params
102102

103-
delete_request("/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
103+
delete_request("/1.0/repositories/#{user}/#{repo.downcase}/issues/milestones/#{milestone_id}", params)
104104
end
105105

106106
end # Issues::Milestones

‎lib/bitbucket_rest_api/repos.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def branches(user_name, repo_name, params={ })
9090
_validate_user_repo_params(user, repo) unless (user? && repo?)
9191
normalize! params
9292

93-
response = get_request("/repositories/#{user}/#{repo.downcase}/branches/", params)
93+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/branches/", params)
9494
return response unless block_given?
9595
response.each { |el| yield el }
9696
end
@@ -131,7 +131,7 @@ def create(*args)
131131
assert_required_keys(%w[ name ], params)
132132

133133
# Requires authenticated user
134-
post_request("/repositories/", DEFAULT_REPO_OPTIONS.merge(params))
134+
post_request("/1.0/repositories/", DEFAULT_REPO_OPTIONS.merge(params))
135135
end
136136

137137
# Edit a repository
@@ -161,7 +161,7 @@ def edit(user_name, repo_name, params={ })
161161
normalize! params
162162
filter! VALID_REPO_OPTIONS, params
163163

164-
put_request("/repositories/#{user}/#{repo.downcase}/", DEFAULT_REPO_OPTIONS.merge(params))
164+
put_request("/1.0/repositories/#{user}/#{repo.downcase}/", DEFAULT_REPO_OPTIONS.merge(params))
165165
end
166166

167167
# Get a repository
@@ -175,7 +175,7 @@ def get(user_name, repo_name, params={ })
175175
_validate_user_repo_params(user, repo) unless user? && repo?
176176
normalize! params
177177

178-
get_request("/repositories/#{user}/#{repo.downcase}", params)
178+
get_request("/1.0/repositories/#{user}/#{repo.downcase}", params)
179179
end
180180

181181
alias :find :get
@@ -190,7 +190,7 @@ def delete(user_name, repo_name)
190190
_update_user_repo_params(user_name, repo_name)
191191
_validate_user_repo_params(user, repo) unless user? && repo?
192192

193-
delete_request("/repositories/#{user}/#{repo.downcase}")
193+
delete_request("/1.0/repositories/#{user}/#{repo.downcase}")
194194
end
195195

196196
# List repositories for the authenticated user
@@ -213,10 +213,10 @@ def list(*args)
213213
filter! %w[ user type ], params
214214

215215
response = #if (user_name = params.delete("user"))
216-
# get_request("/users/#{user_name}", params)
216+
# get_request("/1.0/users/#{user_name}", params)
217217
#else
218218
# For authenticated user
219-
get_request("/user/repositories", params)
219+
get_request("/1.0/user/repositories", params)
220220
#end
221221
return response unless block_given?
222222
response.each { |el| yield el }
@@ -236,7 +236,7 @@ def tags(user_name, repo_name, params={ })
236236
_validate_user_repo_params(user, repo) unless user? && repo?
237237
normalize! params
238238

239-
response = get_request("/repositories/#{user}/#{repo.downcase}/tags/", params)
239+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/tags/", params)
240240
return response unless block_given?
241241
response.each { |el| yield el }
242242
end

‎lib/bitbucket_rest_api/repos/changesets.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def list(user_name, repo_name, params={})
2828
normalize! params
2929
filter! %w[ limit start], params
3030

31-
response = get_request("/repositories/#{user}/#{repo.downcase}/changesets", params)
31+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/changesets", params)
3232
return response unless block_given?
3333
response.each { |el| yield el }
3434
end
@@ -46,7 +46,7 @@ def get(user_name, repo_name, sha, params={})
4646
_validate_presence_of sha
4747
normalize! params
4848

49-
get_request("/repositories/#{user}/#{repo.downcase}/changesets/#{sha}", params)
49+
get_request("/1.0/repositories/#{user}/#{repo.downcase}/changesets/#{sha}", params)
5050
end
5151
alias :find :get
5252

‎lib/bitbucket_rest_api/repos/commits.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Repos::Commits < API
66
def get(user_name, repo_name)
77
_update_user_repo_params(user_name, repo_name)
88
_validate_user_repo_params(user, repo) unless user? && repo?
9-
get_request("/repositories/#{user}/#{repo.downcase}/commits")
9+
get_request("/1.0/repositories/#{user}/#{repo.downcase}/commits")
1010
end
1111

1212

‎lib/bitbucket_rest_api/repos/following.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def followers(user_name, repo_name, params={})
1515
_validate_user_repo_params(user, repo) unless user? && repo?
1616
normalize! params
1717

18-
response = get_request("/repositories/#{user}/#{repo.downcase}/followers/", params)
18+
response = get_request("/1.0/repositories/#{user}/#{repo.downcase}/followers/", params)
1919
return response unless block_given?
2020
response.each { |el| yield el }
2121
end
@@ -30,7 +30,7 @@ def followed(*args)
3030
params = args.extract_options!
3131
normalize! params
3232

33-
response = get_request("/user/follows", params)
33+
response = get_request("/1.0/user/follows", params)
3434
return response unless block_given?
3535
response.each { |el| yield el }
3636
end

0 commit comments

Comments
 (0)