gitx 2.13.4 → 2.13.5.ci.46.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +13 -5
  2. data/.ruby-version +1 -1
  3. data/.travis.yml +6 -4
  4. data/gitx.gemspec +10 -5
  5. data/lib/gitx/github.rb +4 -2
  6. data/lib/gitx/version.rb +1 -1
  7. data/spec/gitx/cli/integrate_command_spec.rb +1 -1
  8. data/spec/gitx/cli/release_command_spec.rb +1 -1
  9. data/spec/gitx/cli/review_command_spec.rb +6 -4
  10. metadata +48 -48
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 280f49dbf68e2f69a53bf212417de563f0d490fc
4
- data.tar.gz: 678a8225c8ca36042812ff68bd651c7482a686b1
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ NjgxYjcwOWJhY2U3NzAyNGE0NmJkN2UzZDcwNmIzMGYzNzEwMDMyMg==
5
+ data.tar.gz: !binary |-
6
+ YjIzNzY0MTlhNDZjYWY5ZTUzYWVkOGE4ODdhZTdmNjE4NDcxYWNjNQ==
5
7
  SHA512:
6
- metadata.gz: 1f2e6ca7866c6333fa97c226b0f4598c7a2fe84f03e32b5df14cf30f57c0f88369ec71b212a0f54bbfe375f1b450529cb37b497b70be75714c006973ed8ae898
7
- data.tar.gz: b8c03f5fa519aa99f8cb7b3d2e711e9da472db49aa558b1632857fbd43545d965ce7be459a86db9bd4765390118ef44efa4c09d1eac2e0b1f1dd8f61e974dc1d
8
+ metadata.gz: !binary |-
9
+ MTkzZjhkYTRjYjM0ODczM2Q5ODM3MTdlNGI3OTRlMTFjYjM1NWRhZDQyZTVh
10
+ ZGMwNDZmM2Y3YzQ5YmJlNzdmNzczMjhjNjQ0Njc3NTIwYjQ5NmFhZWEzYjYy
11
+ YWVkMGFkNGJlMmNjZmYyZGU1YmJhMmQ3NTllMDlhMzFjZDRkZmQ=
12
+ data.tar.gz: !binary |-
13
+ Zjg0NWY0ZGY1MTE1NjU0NzdlMmFjNjI1ZjI4MjFmZmU2ZDNmYWExMWUwZDM2
14
+ MDRhMjg5MDk2MzJhYzI4NzRlMmQwNjU0YjI1ZWQ5YjkyZjUwMGNlMmNjNThl
15
+ ZjUxZWIwMGM4ODY0MzRlZjdiNTYzMzc4NjhmYWQwMDc3MzcwYjc=
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.1.2
1
+ 2.2.0
data/.travis.yml CHANGED
@@ -1,6 +1,8 @@
1
1
  language: ruby
2
- rvm:
3
- - '2.1.2'
4
2
  before_install:
5
- - git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
6
- - git fetch
3
+ - git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
4
+ - git fetch
5
+ deploy:
6
+ provider: rubygems
7
+ api_key:
8
+ secure: RHedFaKxfm4yxqJzSEOPZr+OrcS5B1uiPwRjpIHau4hzPysDiTHzjIiFO78o1qrl7UeX9c5k0RQZJGp+9OB/H+WgbyfUzX2C2RbUuHRZubTvFaBvf8qe2D5+7fvj0FdzYS6xKZ23N1FW4vN17M6sViJYlCncB3fxzRA/BHxQlkL1LbQOn9zChI9eZ/gQrKrnziL1IvBSAMygBLHEEMq18lFf+mHiXFJDw/2dghbnPFZh5WYWCbfe/dS7trTJZWax+4xZDmXIqNi3cZiGn5dj2HhMUBX9xHRJORVtplxvP/9ZVuxqdY499DdtsEvemZKEmdggk/jYyxkfKFy+SQSkqRkUAcAS/LmsSn0wkJRiKXSqxTyvF063nct4DQCPjd+HGIFVkVG+4Vknwusg78TZ/BoMlOJnGS7TIuZRdcRujBsoAEqnz9imCz9sMk6IJmyc4XYuwQmPaxQtn0iODt0wAtr3chuPV2IC3j5CdXnXoU00iYS+zZXfVJgBcrdiCuuHnhxGzdKixzgXQ8fUnkniN/uWc0T2X9BvGnf3gyqJEZb7uIXOkozrXF6allXBiM6fXC9X0tL06qjdhaY/WKnmFGThcIBayxrS51GIDcKOGoVaSx/juVDpScwtof2jJplLz09w+36Rz7zMB67xo4yaGp/TPI+CbMc+0+my4+3B9lg=
data/gitx.gemspec CHANGED
@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
22
22
  spec.add_runtime_dependency 'thor'
23
23
  spec.add_runtime_dependency 'octokit'
24
24
 
25
- spec.add_development_dependency 'bundler', '~> 1.3'
25
+ spec.add_development_dependency 'bundler'
26
26
  spec.add_development_dependency 'rake'
27
- spec.add_development_dependency 'rspec', '~> 3.0'
28
- spec.add_development_dependency 'pry', '>= 0'
29
- spec.add_development_dependency 'webmock', '>= 0'
30
- spec.add_development_dependency 'timecop', '~> 0.7.0'
27
+ spec.add_development_dependency 'rspec', '>= 3.0'
28
+ spec.add_development_dependency 'pry'
29
+ spec.add_development_dependency 'webmock'
30
+ spec.add_development_dependency 'timecop'
31
31
  spec.add_development_dependency 'vcr'
32
32
  spec.add_development_dependency 'guard'
33
33
  spec.add_development_dependency 'guard-rspec'
@@ -35,4 +35,9 @@ Gem::Specification.new do |spec|
35
35
  spec.add_development_dependency 'terminal-notifier'
36
36
  spec.add_development_dependency 'terminal-notifier-guard'
37
37
  spec.add_development_dependency 'rubocop'
38
+
39
+ # configure gem version for continuous integration builds
40
+ if ENV['TRAVIS_JOB_NUMBER']
41
+ spec.version = "#{spec.version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}"
42
+ end
38
43
  end
data/lib/gitx/github.rb CHANGED
@@ -71,13 +71,15 @@ module Gitx
71
71
  end
72
72
 
73
73
  def pull_request_body(branch)
74
- changelog = run_cmd("git log #{Gitx::BASE_BRANCH}...#{branch} --reverse --no-merges --pretty=format:'* %s%n%b'")
74
+ changelog = run_cmd("git log #{Gitx::BASE_BRANCH}...#{branch} --reverse --no-merges --pretty=format:'* %B'")
75
75
  description = options[:description]
76
76
 
77
77
  description_template = []
78
78
  description_template << "#{description}\n" if description
79
- description_template << '### Changelog'
79
+ description_template << '### What changed?'
80
80
  description_template << changelog
81
+ description_template << '### What was fixed?'
82
+ description_template << '### What needs to be done?'
81
83
  description_template << PULL_REQUEST_FOOTER
82
84
 
83
85
  body = ask_editor(description_template.join("\n"), repo.config['core.editor'])
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.13.4'
2
+ VERSION = '2.13.5'
3
3
  end
data/spec/gitx/cli/integrate_command_spec.rb CHANGED
@@ -102,7 +102,7 @@ describe Gitx::Cli::IntegrateCommand do
102
102
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
103
103
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
104
104
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
105
- expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return('2013-01-01 did some stuff').ordered
105
+ expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
106
106
 
107
107
  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' })
108
108
  stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(status: 201)
data/spec/gitx/cli/release_command_spec.rb CHANGED
@@ -122,7 +122,7 @@ describe Gitx::Cli::ReleaseCommand do
122
122
 
123
123
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
124
124
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
125
- expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return('2013-01-01 did some stuff').ordered
125
+ expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
126
126
  expect(cli).to receive(:run_cmd).with('git checkout master').ordered
127
127
  expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
128
128
  expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
data/spec/gitx/cli/review_command_spec.rb CHANGED
@@ -39,13 +39,14 @@ describe Gitx::Cli::ReviewCommand do
39
39
  }
40
40
  }
41
41
  end
42
+ let(:changelog) { "* old commit\n\n* new commit" }
42
43
  before do
43
44
  expect(Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
44
45
 
45
46
  allow(cli).to receive(:authorization_token).and_return(authorization_token)
46
47
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
47
- expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("* old commit\n\n* new commit").ordered
48
- expect(cli).to receive(:ask_editor).with("### Changelog\n* old commit\n\n* new commit\n#{Gitx::Github::PULL_REQUEST_FOOTER}", anything).and_return('description')
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
50
 
50
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' })
51
52
 
@@ -74,13 +75,14 @@ describe Gitx::Cli::ReviewCommand do
74
75
  }
75
76
  }
76
77
  end
78
+ let(:changelog) { "* old commit\n\n* new commit" }
77
79
  before do
78
80
  expect(Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
79
81
 
80
82
  allow(cli).to receive(:authorization_token).and_return(authorization_token)
81
83
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
82
- expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("* old commit\n\n* new commit").ordered
83
- expect(cli).to receive(:ask_editor).with("### Changelog\n* old commit\n\n* new commit\n#{Gitx::Github::PULL_REQUEST_FOOTER}", anything).and_return('description')
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')
84
86
 
85
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' })
86
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.4
4
+ version: 2.13.5.ci.46.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-06-04 00:00:00.000000000 Z
11
+ date: 2015-07-06 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
- version: '1.3'
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
- version: '1.3'
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
- version: 0.7.0
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
- version: 0.7.0
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.2.2
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