gitx 2.15.0 → 2.16.0.ci.89.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +13 -5
  2. data/lib/gitx/cli/release_command.rb +2 -2
  3. data/lib/gitx/defaults.yml +7 -0
  4. data/lib/gitx/version.rb +1 -1
  5. data/spec/gitx/cli/release_command_spec.rb +6 -6
  6. metadata +44 -45
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: dc0dd20953c6b79665014264677a76b7a7e10cdc
4
- data.tar.gz: eb558824e7d4891b2c699a6d3cfc143cf1f2fd1f
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MjE0OTJkMmVkYzc1ZmE3YzAyZmZjZjA2MzUyZjRmY2RjNDJlMmRlMg==
5
+ data.tar.gz: !binary |-
6
+ ZThiYjQ5OGY2YTM5NjA4OGIxOTI2Y2ZkNzY0NTE2YzNkNzhlNmMwZQ==
5
7
  SHA512:
6
- metadata.gz: 49a92c3dd8dde7842ef667ec8e11ec233a2296be6a0360bf1347ac46990d608d8b10bd85f0054330db5d8f41de0e35bce632a646ae9980464b87f138b495a8d0
7
- data.tar.gz: e19a054a3b4ff0f258ebca13171b0cb062987b336b8dbfbbb475e29b2ce7d81a60ba79fe2a66da14607d13357e0772e324c320d943ad3a38c322d08b9de6fa12
8
+ metadata.gz: !binary |-
9
+ MDY1NGU0MGViNGYxY2ZmZGVmMGU1NTIzY2IzYjQ1YmM1NzJkN2RlNzIwY2M5
10
+ YWYwM2E1YmE4MjY4MzAyYjliZGRjYzRhMjc0NjIzMTM2OGY4NDRkODc2YWQ4
11
+ MmU1NjBhZTcxNGM2ZjhjNDI5OTNhMmYxNTYyZjRmNDQyMzIwYTU=
12
+ data.tar.gz: !binary |-
13
+ OGE5OGYxYTA4N2ZjMGI1ZTRhMDc1MDAxYjM4MjM0NzYwYWJkMjVlNTNmNDU3
14
+ MzZjMDRmMjNmZDNhMDEzOThhZjEwNzViNzVjYzQwYzQ2MWRhZDFjNzE4ZTJm
15
+ MzhlYWRmZWYzN2VjZTQzNDQzNWNiNWNhMTdiOGJiYTRkM2RhMTU=
data/lib/gitx/cli/release_command.rb CHANGED
@@ -20,11 +20,12 @@ module Gitx
20
20
  checkout_branch(branch)
21
21
  execute_command(UpdateCommand, :update)
22
22
 
23
+ pull_request = find_or_create_pull_request(branch)
23
24
  return unless confirm_branch_status?(branch)
24
25
 
25
26
  checkout_branch Gitx::BASE_BRANCH
26
27
  run_cmd "git pull origin #{Gitx::BASE_BRANCH}"
27
- run_cmd "git merge --no-ff #{branch}"
28
+ run_cmd %Q(git merge --no-ff -m "[gitx] Releasing #{branch} to #{Gitx::BASE_BRANCH} (Pull request ##{pull_request.number})" #{branch})
28
29
  run_cmd 'git push origin HEAD'
29
30
 
30
31
  after_release
@@ -33,7 +34,6 @@ module Gitx
33
34
  private
34
35
 
35
36
  def confirm_branch_status?(branch)
36
- find_or_create_pull_request(branch)
37
37
  status = branch_status(branch)
38
38
  if status == 'success'
39
39
  true
data/lib/gitx/defaults.yml CHANGED
@@ -1,15 +1,22 @@
1
1
  ---
2
+ # list of branches eligable for integration
2
3
  aggregate_branches:
3
4
  - staging
4
5
  - prototype
6
+
7
+ # list of branches that should not be deleted when cleaning up
5
8
  reserved_branches:
6
9
  - HEAD
7
10
  - master
8
11
  - next_release
9
12
  - staging
10
13
  - prototype
14
+
15
+ # list of supported branches for generating buildtags
11
16
  taggable_branches:
12
17
  - master
13
18
  - staging
19
+
20
+ # list of commands to execute after releasing feature branch
14
21
  after_release:
15
22
  - git integrate
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.15.0'
2
+ VERSION = '2.16.0'
3
3
  end
data/spec/gitx/cli/release_command_spec.rb CHANGED
@@ -41,7 +41,7 @@ describe Gitx::Cli::ReleaseCommand do
41
41
 
42
42
  expect(cli).to_not receive(:run_cmd).with('git checkout master')
43
43
  expect(cli).to_not receive(:run_cmd).with('git pull origin master')
44
- expect(cli).to_not receive(:run_cmd).with('git merge --no-ff feature-branch')
44
+ expect(cli).to_not receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch')
45
45
  expect(cli).to_not receive(:run_cmd).with('git push origin HEAD')
46
46
 
47
47
  VCR.use_cassette('pull_request_does_exist_with_failure_status') do
@@ -64,7 +64,7 @@ describe Gitx::Cli::ReleaseCommand do
64
64
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
65
65
  expect(cli).to receive(:run_cmd).with('git checkout master').ordered
66
66
  expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
67
- expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
67
+ expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
68
68
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
69
69
  expect(cli).to receive(:run_cmd).with('git integrate').ordered
70
70
 
@@ -95,7 +95,7 @@ describe Gitx::Cli::ReleaseCommand do
95
95
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
96
96
  expect(cli).to receive(:run_cmd).with('git checkout master').ordered
97
97
  expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
98
- expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
98
+ expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
99
99
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
100
100
  expect(cli).to receive(:run_cmd).with('echo hello').ordered
101
101
 
@@ -118,7 +118,7 @@ describe Gitx::Cli::ReleaseCommand do
118
118
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
119
119
  expect(cli).to receive(:run_cmd).with('git checkout master').ordered
120
120
  expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
121
- expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
121
+ expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
122
122
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
123
123
  expect(cli).to receive(:run_cmd).with('git integrate').ordered
124
124
 
@@ -156,7 +156,7 @@ describe Gitx::Cli::ReleaseCommand do
156
156
  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
157
157
  expect(cli).to receive(:run_cmd).with('git checkout master').ordered
158
158
  expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
159
- expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
159
+ expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
160
160
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
161
161
  expect(cli).to receive(:run_cmd).with('git integrate').ordered
162
162
 
@@ -188,7 +188,7 @@ describe Gitx::Cli::ReleaseCommand do
188
188
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
189
189
  expect(cli).to receive(:run_cmd).with('git checkout master').ordered
190
190
  expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
191
- expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
191
+ expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
192
192
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
193
193
  expect(cli).to receive(:run_cmd).with('git integrate').ordered
194
194
  expect(cli).to receive(:run_cmd).with('git cleanup').ordered
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitx
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.15.0
4
+ version: 2.16.0.ci.89.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
@@ -14,224 +14,224 @@ dependencies:
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.23.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.23.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,13 +251,13 @@ executables:
251
251
  extensions: []
252
252
  extra_rdoc_files: []
253
253
  files:
254
- - ".gitignore"
255
- - ".gitx.yml"
256
- - ".hound.yml"
257
- - ".rspec"
258
- - ".rubocop.yml"
259
- - ".ruby-version"
260
- - ".travis.yml"
254
+ - .gitignore
255
+ - .gitx.yml
256
+ - .hound.yml
257
+ - .rspec
258
+ - .rubocop.yml
259
+ - .ruby-version
260
+ - .travis.yml
261
261
  - CONTRIBUTING.md
262
262
  - Gemfile
263
263
  - Guardfile
@@ -326,17 +326,17 @@ require_paths:
326
326
  - lib
327
327
  required_ruby_version: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - ">="
329
+ - - ! '>='
330
330
  - !ruby/object:Gem::Version
331
331
  version: '0'
332
332
  required_rubygems_version: !ruby/object:Gem::Requirement
333
333
  requirements:
334
- - - ">="
334
+ - - ! '>'
335
335
  - !ruby/object:Gem::Version
336
- version: '0'
336
+ version: 1.3.1
337
337
  requirements: []
338
338
  rubyforge_project:
339
- rubygems_version: 2.4.8
339
+ rubygems_version: 2.4.5
340
340
  signing_key:
341
341
  specification_version: 4
342
342
  summary: Utility scripts for Git to increase productivity for common operations
@@ -364,4 +364,3 @@ test_files:
364
364
  - spec/support/timecop.rb
365
365
  - spec/support/vcr.rb
366
366
  - spec/support/webmock.rb
367
- has_rdoc: