FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Change pull commands to accept global options. · danieldeb/github_cli@1712ab5 · GitHub

/ github_cli Public
forked from piotrmurach/github_cli

Commit 1712ab5

Browse files
piotrmurach
committed
Change pull commands to accept global options.
1 parent deb9ad8 commit 1712ab5

3 files changed

Lines changed: 55 additions & 33 deletions

File tree

‎lib/github_cli/apis/pull_request.rb‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,51 @@ class PullRequest < API
55

66
class << self
77

8-
def list(user, repo, params, format)
9-
output format do
10-
github_api.pull_requests.list user, repo, params
8+
def list(user, repo, params, options)
9+
output options[:format], options[:quiet] do
10+
github_api(options).pull_requests.list user, repo, params
1111
end
1212
end
1313

14-
def get(user, repo, number, params, format)
15-
output format do
16-
github_api.pull_requests.get user, repo, number, params
14+
def get(user, repo, number, params, options)
15+
output options[:format], options[:quiet] do
16+
github_api(options).pull_requests.get user, repo, number, params
1717
end
1818
end
1919

20-
def create(user, repo, params, format)
21-
output format do
22-
github_api.pull_requests.create user, repo, params
20+
def create(user, repo, params, options)
21+
output options[:format], options[:quiet] do
22+
github_api(options).pull_requests.create user, repo, params
2323
end
2424
end
2525

26-
def update(user, repo, number, params, format)
27-
output format do
28-
github_api.pull_requests.update user, repo, number, params
26+
def update(user, repo, number, params, options)
27+
output options[:format], options[:quiet] do
28+
github_api(options).pull_requests.update user, repo, number, params
2929
end
3030
end
3131

32-
def commits(user, repo, number, params, format)
33-
output format do
34-
github_api.pull_requests.commits user, repo, number, params
32+
def commits(user, repo, number, params, options)
33+
output options[:format], options[:quiet] do
34+
github_api(options).pull_requests.commits user, repo, number, params
3535
end
3636
end
3737

38-
def files(user, repo, number, params, format)
39-
output format do
40-
github_api.pull_requests.files user, repo, number, params
38+
def files(user, repo, number, params, options)
39+
output options[:format], options[:quiet] do
40+
github_api(options).pull_requests.files user, repo, number, params
4141
end
4242
end
4343

44-
def merged(user, repo, number, params, format)
45-
output format do
46-
github_api.pull_requests.merged? user, repo, number, params
44+
def merged(user, repo, number, params, options)
45+
output options[:format], options[:quiet] do
46+
github_api(options).pull_requests.merged? user, repo, number, params
4747
end
4848
end
4949

50-
def merge(user, repo, number, params, format)
51-
output format do
52-
github_api.pull_requests.merge user, repo, number, params
50+
def merge(user, repo, number, params, options)
51+
output options[:format], options[:quiet] do
52+
github_api(options).pull_requests.merge user, repo, number, params
5353
end
5454
end
5555
end

‎lib/github_cli/commands/pull_requests.rb‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,18 @@ class Commands::PullRequests < Command
77

88
desc 'list <user> <repo>', 'List all Pull Requests'
99
def list(user, repo)
10-
PullRequest.list user, repo, options[:params], options[:format]
10+
global_options = options.dup
11+
params = options[:params].dup
12+
Util.hash_without!(global_options, params.keys + ['params'])
13+
PullRequest.list user, repo, params, global_options
1114
end
1215

1316
desc 'get <user> <repo> <number>', 'Get a Pull Request'
1417
def get(user, repo, number)
15-
PullRequest.get user, repo, number, options[:params], options[:format]
18+
global_options = options.dup
19+
params = options[:params].dup
20+
Util.hash_without!(global_options, params.keys + ['params'])
21+
PullRequest.get user, repo, number, params, global_options
1622
end
1723

1824
desc 'create <user> <repo>', 'Create a new Pull Request'
@@ -25,13 +31,15 @@ def get(user, repo, number)
2531
option :issue, :type => :string,
2632
:desc => "Issue number in this repository to turn into a Pull Request"
2733
def create(user, repo)
34+
global_options = options.dup
2835
params = options[:params].dup
2936
params['title'] = options[:title] if options[:title]
3037
params['body'] = options[:body] if options[:body]
3138
params['base'] = options[:base] if options[:base]
3239
params['head'] = options[:head] if options[:head]
3340
params['issue'] = options[:issue] if options[:issue]
34-
PullRequest.create user, repo, params, options[:format]
41+
Util.hash_without!(global_options, params.keys + ['params'])
42+
PullRequest.create user, repo, params, global_options
3543
end
3644

3745
desc 'update <user> <repo> <number>', 'Update a Pull Request'
@@ -40,31 +48,45 @@ def create(user, repo)
4048
option :state, :type => :string,
4149
:desc => "State of this Pull Request. Valid values are open and closed"
4250
def update(user, repo, number)
51+
global_options = options.dup
4352
params = options[:params].dup
4453
params['title'] = options[:title] if options[:title]
4554
params['body'] = options[:body] if options[:body]
4655
params['state'] = options[:state] if options[:state]
47-
PullRequest.update user, repo, number, params, options[:format]
56+
Util.hash_without!(global_options, params.keys + ['params'])
57+
PullRequest.update user, repo, number, params, global_options
4858
end
4959

5060
desc 'commits <user> <repo> <number>', 'List commits on a Pull Request'
5161
def commits(user, repo, number)
52-
PullRequest.commits user, repo, number, options[:params], options[:format]
62+
global_options = options.dup
63+
params = options[:params].dup
64+
Util.hash_without!(global_options, params.keys + ['params'])
65+
PullRequest.commits user, repo, number, params, global_options
5366
end
5467

5568
desc 'files <user> <repo> <number>', 'List Pull Requests Files'
5669
def files(user, repo, number)
57-
PullRequest.files user, repo, number, options[:params], options[:format]
70+
global_options = options.dup
71+
params = options[:params].dup
72+
Util.hash_without!(global_options, params.keys + ['params'])
73+
PullRequest.files user, repo, number, params, global_options
5874
end
5975

6076
desc 'merged <user> <repo> <number>', 'Get if a pull request has been merged'
6177
def merged(user, repo, number)
62-
PullRequest.merged user, repo, number, options[:params], options[:format]
78+
global_options = options.dup
79+
params = options[:params].dup
80+
Util.hash_without!(global_options, params.keys + ['params'])
81+
PullRequest.merged user, repo, number, params, global_options
6382
end
6483

6584
desc 'merge <user> <repo> <number>', 'Merge a pull request'
6685
def merge(user, repo, number)
67-
PullRequest.merge user, repo, number, options[:params], options[:format]
86+
global_options = options.dup
87+
params = options[:params].dup
88+
Util.hash_without!(global_options, params.keys + ['params'])
89+
PullRequest.merge user, repo, number, params, global_options
6890
end
6991

7092
end # PullRequests

‎spec/github_cli/commands/pull_requests_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper'
44

55
describe GithubCLI::Commands::PullRequests do
6-
let(:format) { 'table' }
6+
let(:format) { {'format' => 'table'} }
77
let(:user) { 'peter-murach' }
88
let(:repo) { 'github_cli' }
99
let(:number) { 1 }

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL