gitx 2.13.5 → 2.13.6.ci.50.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +13 -5
  2. data/lib/gitx/cli/review_command.rb +2 -2
  3. data/lib/gitx/extensions/thor.rb +5 -2
  4. data/lib/gitx/github.rb +3 -5
  5. data/lib/gitx/version.rb +1 -1
  6. data/spec/gitx/cli/review_command_spec.rb +2 -2
  7. metadata +44 -45
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 8251d9f3152c6b2aa6c9efb738df49e43b8b2a98
4
- data.tar.gz: 9785543a124fdd64fdd61e036a209aac6771ba47
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ M2FiMGY5ZmVhZjZjNGVlOWU3ZGIyNWVjMmQwZTZhZWRlNjliMTlhOA==
5
+ data.tar.gz: !binary |-
6
+ NzliZDc3MzgzZWYzZDNjNTI5M2ZmYTE0ZjUzZDUxMzRiMjY1ZDFiYw==
5
7
  SHA512:
6
- metadata.gz: 52bfdb22efcd7d8f97b7eb358c29f9967435add6b557d6a63f74f6e5bf83bcc5c764261c4a671e906ebb4f243630a64189f74ecbf392c97eddabfbf6037a5d7f
7
- data.tar.gz: 88d28bf9d34f4afb9693cbf6ab45a646aa48a89388a581d79a1ea272dcf7a2f6bfc739d62c1c70ae1c72f14b2a8dca1f3466ebf8f890bf4c0ffd53818ec43a41
8
+ metadata.gz: !binary |-
9
+ YmM5Y2M1OTcwMmQyMTgwNmE0MDlmN2NlOTU1NWQyZWE3MTRjNTZmNDhjNDIw
10
+ MmNiNDc5Zjg3NGM3MDJkMzYyZGVjMzMwNjU4MGRmM2VkZjA4ZDkyMGZmNDdj
11
+ OTg4YjU4OGMxNjYzOWMyOTQwNGQzOWU1OGUyMzUzNzQ5YTllODE=
12
+ data.tar.gz: !binary |-
13
+ Y2EwNzc0M2Y0MGE2NTg1YjYwN2I1ODYzMDFjYWM5NGRiODc4NDYzNzdmZGRi
14
+ Njg1N2M4ZmUwMTU5Y2M3OGFmMTAxMjg2Nzk5ZjUwZmRmM2IzM2YwNzNmN2Y5
15
+ MmUzZGFlODQ0MmU0MWM1NDRiMTMwMTYzYzBiMDM2YThiYjBmYTE=
data/lib/gitx/cli/review_command.rb CHANGED
@@ -83,9 +83,9 @@ module Gitx
83
83
  end
84
84
 
85
85
  def comment_from_template(pull_request, prefix, footer)
86
- text = ask_editor("\n\n#{footer}", repo.config['core.editor'])
86
+ text = ask_editor('', editor: repo.config['core.editor'], footer: footer)
87
87
  comment = [prefix, text].join("\n\n")
88
- comment = comment.gsub(footer, '').chomp.strip
88
+ comment = comment.chomp.strip
89
89
  github_client.add_comment(github_slug, pull_request.number, comment)
90
90
  end
91
91
  end
data/lib/gitx/extensions/thor.rb CHANGED
@@ -16,9 +16,10 @@ class Thor
16
16
  # see http://osdir.com/ml/ruby-talk/2010-06/msg01424.html
17
17
  # see https://gist.github.com/rkumar/456809
18
18
  # see http://rdoc.info/github/visionmedia/commander/master/Commander/UI.ask_editor
19
- def ask_editor(initial_text = '', editor = nil)
19
+ def ask_editor(initial_text = '', editor: nil, footer: nil)
20
20
  editor ||= ENV['EDITOR'] || 'vi'
21
- Tempfile.open('comment.md') do |f|
21
+ text += "\n\n#{footer}" if footer
22
+ text = Tempfile.open('text.md') do |f|
22
23
  f << initial_text
23
24
  f.flush
24
25
 
@@ -34,6 +35,8 @@ class Thor
34
35
  Process.waitpid(pid)
35
36
  File.read(f.path)
36
37
  end
38
+ text = text.gsub(footer, '') if footer
39
+ text.chomp.strip
37
40
  end
38
41
  end
39
42
  end
data/lib/gitx/github.rb CHANGED
@@ -78,12 +78,10 @@ module Gitx
78
78
  description_template << "#{description}\n" if description
79
79
  description_template << '### What changed?'
80
80
  description_template << changelog
81
- description_template << '### What was fixed?'
82
- description_template << '### What needs to be done?'
83
- description_template << PULL_REQUEST_FOOTER
81
+ description_template << "### What was fixed?\n"
82
+ description_template << "### What else needs to be done?"
84
83
 
85
- body = ask_editor(description_template.join("\n"), repo.config['core.editor'])
86
- body.gsub(PULL_REQUEST_FOOTER, '').chomp.strip
84
+ body = ask_editor(description_template.join("\n"), editor: repo.config['core.editor'], footer: PULL_REQUEST_FOOTER)
87
85
  end
88
86
 
89
87
  # authorization token used for github API calls
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.13.5'
2
+ VERSION = '2.13.6'
3
3
  end
data/spec/gitx/cli/review_command_spec.rb CHANGED
@@ -46,7 +46,7 @@ describe Gitx::Cli::ReviewCommand do
46
46
  allow(cli).to receive(:authorization_token).and_return(authorization_token)
47
47
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
48
48
  expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return(changelog).ordered
49
- expect(cli).to receive(:ask_editor).with("### What changed?\n#{changelog}\n### What was fixed?\n### What needs to be done?\n#{Gitx::Github::PULL_REQUEST_FOOTER}", anything).and_return('description')
49
+ expect(cli).to receive(:ask_editor).with("### What changed?\n#{changelog}\n### What was fixed?\n\n### What else needs to be done?", hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return('description')
50
50
 
51
51
  stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
52
52
 
@@ -82,7 +82,7 @@ describe Gitx::Cli::ReviewCommand do
82
82
  allow(cli).to receive(:authorization_token).and_return(authorization_token)
83
83
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
84
84
  expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return(changelog).ordered
85
- expect(cli).to receive(:ask_editor).with("### What changed?\n#{changelog}\n### What was fixed?\n### What needs to be done?\n#{Gitx::Github::PULL_REQUEST_FOOTER}", anything).and_return('description')
85
+ expect(cli).to receive(:ask_editor).with("### What changed?\n#{changelog}\n### What was fixed?\n\n### What else needs to be done?", hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return('description')
86
86
 
87
87
  stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
88
88
 
metadata CHANGED
@@ -1,237 +1,237 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitx
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.13.5
4
+ version: 2.13.6.ci.50.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-06 00:00:00.000000000 Z
11
+ date: 2015-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rugged
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.21.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.21.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: octokit
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '3.0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '3.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - ! '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - ! '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: webmock
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - ! '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: timecop
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - ! '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - ! '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: vcr
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - ! '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - ! '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: guard
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - ! '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - ! '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: guard-rspec
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - ! '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: coveralls
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - ! '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - ! '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: terminal-notifier
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - ! '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - ! '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: terminal-notifier-guard
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - ! '>='
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - ! '>='
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rubocop
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ">="
227
+ - - ! '>='
228
228
  - !ruby/object:Gem::Version
229
229
  version: '0'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ">="
234
+ - - ! '>='
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  description: Git eXtensions for improved development workflows
@@ -251,12 +251,12 @@ executables:
251
251
  extensions: []
252
252
  extra_rdoc_files: []
253
253
  files:
254
- - ".gitignore"
255
- - ".hound.yml"
256
- - ".rspec"
257
- - ".rubocop.yml"
258
- - ".ruby-version"
259
- - ".travis.yml"
254
+ - .gitignore
255
+ - .hound.yml
256
+ - .rspec
257
+ - .rubocop.yml
258
+ - .ruby-version
259
+ - .travis.yml
260
260
  - CONTRIBUTING.md
261
261
  - Gemfile
262
262
  - Guardfile
@@ -324,17 +324,17 @@ require_paths:
324
324
  - lib
325
325
  required_ruby_version: !ruby/object:Gem::Requirement
326
326
  requirements:
327
- - - ">="
327
+ - - ! '>='
328
328
  - !ruby/object:Gem::Version
329
329
  version: '0'
330
330
  required_rubygems_version: !ruby/object:Gem::Requirement
331
331
  requirements:
332
- - - ">="
332
+ - - ! '>'
333
333
  - !ruby/object:Gem::Version
334
- version: '0'
334
+ version: 1.3.1
335
335
  requirements: []
336
336
  rubyforge_project:
337
- rubygems_version: 2.4.6
337
+ rubygems_version: 2.4.5
338
338
  signing_key:
339
339
  specification_version: 4
340
340
  summary: Utility scripts for Git to increase productivity for common operations
@@ -362,4 +362,3 @@ test_files:
362
362
  - spec/support/timecop.rb
363
363
  - spec/support/vcr.rb
364
364
  - spec/support/webmock.rb
365
- has_rdoc: