v2gpti 1.2.7 → 1.2.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/git-pivotal-tracker-integration/command/deliver.rb +22 -17
  3. data/lib/git-pivotal-tracker-integration/command/finish.rb +1 -1
  4. metadata +73 -74
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fae06f154c2bdeb3ea2006eee82f728db7b5e999
4
- data.tar.gz: c834154ca3a257d86db0aec1c8c0ad8b13fa1404
3
+ metadata.gz: ef7dcb3492c1204c9bdd42a2c08150975ff21693
4
+ data.tar.gz: 0d3c14e123e1b2a67f853eef72dbc492e4fd8764
5
5
  SHA512:
6
- metadata.gz: d8ec2619db1c93d85d02428cf2dc6e9e9d5349a286743d8c5aca4b9415dabe4991c1aa0a76ec158b1f1748bb2620c3170768f3d9abe17324f6dcf299a3d283ed
7
- data.tar.gz: d9aba2e2aacf3d2ea5da7fff16c4abfaaa0aa67658e670f220d5423eeb0929e97e40ed915739b679a5a4e57cd6c1dd2d33f077d62828c76f110a413ef3cd9f0f
6
+ metadata.gz: f4b4b1feb735b76346d520044357d9fdffed0631e3e2e21065ee844e2d2c970f803fb768fd36385427c26be647269e6cf64fea97efc89936d56ad3b0a14d78b8
7
+ data.tar.gz: 72354d892fe903bff4346481faf26958cb16229ec7af19db474d2810d2485363db2c391849007a2c0a8c6bfba4483afe9e2a17ffbd04086aa423197bb4810749
data/lib/git-pivotal-tracker-integration/command/deliver.rb CHANGED
@@ -39,18 +39,25 @@ module GitPivotalTrackerIntegration
39
39
 
40
40
  current_branch = Util::Git.branch_name
41
41
 
42
- puts "Merging from orgin develop..."
43
- Util::Shell.exec "git pull"
44
-
45
- # checkout QA branch
46
- # Merge develop into QA
47
- Util::Shell.exec "git checkout QA"
48
- Util::Shell.exec "git reset --hard origin/QA"
49
- Util::Shell.exec "git pull"
50
- if (Util::Shell.exec "git merge -s recursive --strategy-option theirs develop")
51
- puts "Merged 'develop' in to 'QA'"
52
- else
53
- abort "FAILED to merge 'develop' in to 'QA'"
42
+ if current_branch == 'develop'
43
+ puts "Merging from orgin develop..."
44
+ Util::Shell.exec "git pull"
45
+
46
+ # checkout QA branch
47
+ # Merge develop into QA
48
+ Util::Shell.exec "git checkout QA"
49
+ Util::Shell.exec "git reset --hard origin/QA"
50
+ Util::Shell.exec "git pull"
51
+ if (Util::Shell.exec "git merge -s recursive --strategy-option theirs develop")
52
+ puts "Merged 'develop' in to 'QA'"
53
+ else
54
+ abort "FAILED to merge 'develop' in to 'QA'"
55
+ end
56
+ else # we might be on a feature branch. So create a seperate branch for qa.
57
+ qa_current_branch = "qa-#{current_branch}"
58
+ print "Creating and Checking out new qa branch #{qa_current_branch}"
59
+ Util::Shell.exec "git checkout --quiet -b #{qa_current_branch}"
60
+ Util::Shell.exec "git push -u origin #{qa_current_branch}"
54
61
  end
55
62
 
56
63
  # retrieve build number from story name
@@ -84,7 +91,7 @@ module GitPivotalTrackerIntegration
84
91
  # Create a new build commit, push to QA, checkout develop
85
92
  Util::Git.create_commit( "Update build number to #{build_number} for delivery to QA", story)
86
93
  puts Util::Shell.exec "git push"
87
- puts Util::Shell.exec "git checkout develop"
94
+ puts Util::Shell.exec "git checkout #{current_branch}"
88
95
 
89
96
  i_stories = included_stories @project, story
90
97
  deliver_stories i_stories, story
@@ -96,13 +103,11 @@ module GitPivotalTrackerIntegration
96
103
  suggested_branch = "develop"
97
104
 
98
105
  if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
99
- should_chage_branch = ask("Your currently checked out branch is '#{current_branch}'. You must be on the #{suggested_branch} branch to run this command.\n\n Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
100
- if should_chage_branch != "n"
106
+ should_change_branch = ask("Your currently checked out branch is '#{current_branch}'. \n\n Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
107
+ if should_change_branch != "n"
101
108
  print "Checking out branch '#{suggested_branch}'...\n\n"
102
109
  Util::Shell.exec "git checkout #{suggested_branch}"
103
110
  Util::Shell.exec 'git pull'
104
- else
105
- abort "You must be on the #{suggested_branch} branch to run this command."
106
111
  end
107
112
  end
108
113
  end
data/lib/git-pivotal-tracker-integration/command/finish.rb CHANGED
@@ -56,7 +56,7 @@ module GitPivotalTrackerIntegration
56
56
  Util::Git.merge(@configuration.story(@project), no_complete)
57
57
  Util::Git.push Util::Git.branch_name
58
58
 
59
- story.add_label('Need code review')
59
+ story.add_label('need code review')
60
60
  end
61
61
 
62
62
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: v2gpti
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.7
4
+ version: 1.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jeff Wolski
@@ -10,328 +10,328 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-09-15 00:00:00.000000000 Z
13
+ date: 2016-10-27 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: highline
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - ~>
19
+ - - "~>"
20
20
  - !ruby/object:Gem::Version
21
21
  version: '1.6'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - ~>
26
+ - - "~>"
27
27
  - !ruby/object:Gem::Version
28
28
  version: '1.6'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: parseconfig
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - ~>
33
+ - - "~>"
34
34
  - !ruby/object:Gem::Version
35
35
  version: 1.0.6
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - ~>
40
+ - - "~>"
41
41
  - !ruby/object:Gem::Version
42
42
  version: 1.0.6
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: faraday
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - ~>
47
+ - - "~>"
48
48
  - !ruby/object:Gem::Version
49
49
  version: 0.9.0
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - ~>
54
+ - - "~>"
55
55
  - !ruby/object:Gem::Version
56
56
  version: 0.9.0
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: awesome_print
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ~>
61
+ - - "~>"
62
62
  - !ruby/object:Gem::Version
63
63
  version: 1.1.0
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - ~>
68
+ - - "~>"
69
69
  - !ruby/object:Gem::Version
70
70
  version: 1.1.0
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: json
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - ~>
75
+ - - "~>"
76
76
  - !ruby/object:Gem::Version
77
77
  version: 1.8.0
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - ~>
82
+ - - "~>"
83
83
  - !ruby/object:Gem::Version
84
84
  version: 1.8.0
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: logger
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
- - - ~>
89
+ - - "~>"
90
90
  - !ruby/object:Gem::Version
91
91
  version: 1.2.8
92
92
  type: :runtime
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - ~>
96
+ - - "~>"
97
97
  - !ruby/object:Gem::Version
98
98
  version: 1.2.8
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: jazor
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
- - - ~>
103
+ - - "~>"
104
104
  - !ruby/object:Gem::Version
105
105
  version: 0.1.8
106
106
  type: :runtime
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
- - - ~>
110
+ - - "~>"
111
111
  - !ruby/object:Gem::Version
112
112
  version: 0.1.8
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: os
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - ~>
117
+ - - "~>"
118
118
  - !ruby/object:Gem::Version
119
119
  version: 0.9.6
120
120
  type: :runtime
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
- - - ~>
124
+ - - "~>"
125
125
  - !ruby/object:Gem::Version
126
126
  version: 0.9.6
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: addressable
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - '>='
131
+ - - ">="
132
132
  - !ruby/object:Gem::Version
133
133
  version: '0'
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - '>='
138
+ - - ">="
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: virtus
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
- - - '>='
145
+ - - ">="
146
146
  - !ruby/object:Gem::Version
147
147
  version: '0'
148
148
  type: :runtime
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
- - - '>='
152
+ - - ">="
153
153
  - !ruby/object:Gem::Version
154
154
  version: '0'
155
155
  - !ruby/object:Gem::Dependency
156
156
  name: faraday_middleware
157
157
  requirement: !ruby/object:Gem::Requirement
158
158
  requirements:
159
- - - '>='
159
+ - - ">="
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
162
  type: :runtime
163
163
  prerelease: false
164
164
  version_requirements: !ruby/object:Gem::Requirement
165
165
  requirements:
166
- - - '>='
166
+ - - ">="
167
167
  - !ruby/object:Gem::Version
168
168
  version: '0'
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: excon
171
171
  requirement: !ruby/object:Gem::Requirement
172
172
  requirements:
173
- - - '>='
173
+ - - ">="
174
174
  - !ruby/object:Gem::Version
175
175
  version: '0'
176
176
  type: :runtime
177
177
  prerelease: false
178
178
  version_requirements: !ruby/object:Gem::Requirement
179
179
  requirements:
180
- - - '>='
180
+ - - ">="
181
181
  - !ruby/object:Gem::Version
182
182
  version: '0'
183
183
  - !ruby/object:Gem::Dependency
184
184
  name: activesupport
185
185
  requirement: !ruby/object:Gem::Requirement
186
186
  requirements:
187
- - - ~>
187
+ - - "~>"
188
188
  - !ruby/object:Gem::Version
189
189
  version: 4.2.0
190
190
  type: :runtime
191
191
  prerelease: false
192
192
  version_requirements: !ruby/object:Gem::Requirement
193
193
  requirements:
194
- - - ~>
194
+ - - "~>"
195
195
  - !ruby/object:Gem::Version
196
196
  version: 4.2.0
197
197
  - !ruby/object:Gem::Dependency
198
198
  name: activemodel
199
199
  requirement: !ruby/object:Gem::Requirement
200
200
  requirements:
201
- - - '>='
201
+ - - ">="
202
202
  - !ruby/object:Gem::Version
203
203
  version: '0'
204
204
  type: :runtime
205
205
  prerelease: false
206
206
  version_requirements: !ruby/object:Gem::Requirement
207
207
  requirements:
208
- - - '>='
208
+ - - ">="
209
209
  - !ruby/object:Gem::Version
210
210
  version: '0'
211
211
  - !ruby/object:Gem::Dependency
212
212
  name: bundler
213
213
  requirement: !ruby/object:Gem::Requirement
214
214
  requirements:
215
- - - ~>
215
+ - - "~>"
216
216
  - !ruby/object:Gem::Version
217
217
  version: '1.3'
218
218
  type: :development
219
219
  prerelease: false
220
220
  version_requirements: !ruby/object:Gem::Requirement
221
221
  requirements:
222
- - - ~>
222
+ - - "~>"
223
223
  - !ruby/object:Gem::Version
224
224
  version: '1.3'
225
225
  - !ruby/object:Gem::Dependency
226
226
  name: rake
227
227
  requirement: !ruby/object:Gem::Requirement
228
228
  requirements:
229
- - - ~>
229
+ - - "~>"
230
230
  - !ruby/object:Gem::Version
231
231
  version: '10.0'
232
232
  type: :development
233
233
  prerelease: false
234
234
  version_requirements: !ruby/object:Gem::Requirement
235
235
  requirements:
236
- - - ~>
236
+ - - "~>"
237
237
  - !ruby/object:Gem::Version
238
238
  version: '10.0'
239
239
  - !ruby/object:Gem::Dependency
240
240
  name: redcarpet
241
241
  requirement: !ruby/object:Gem::Requirement
242
242
  requirements:
243
- - - ~>
243
+ - - "~>"
244
244
  - !ruby/object:Gem::Version
245
245
  version: '2.2'
246
246
  type: :development
247
247
  prerelease: false
248
248
  version_requirements: !ruby/object:Gem::Requirement
249
249
  requirements:
250
- - - ~>
250
+ - - "~>"
251
251
  - !ruby/object:Gem::Version
252
252
  version: '2.2'
253
253
  - !ruby/object:Gem::Dependency
254
254
  name: rspec
255
255
  requirement: !ruby/object:Gem::Requirement
256
256
  requirements:
257
- - - ~>
257
+ - - "~>"
258
258
  - !ruby/object:Gem::Version
259
259
  version: '2.13'
260
260
  type: :development
261
261
  prerelease: false
262
262
  version_requirements: !ruby/object:Gem::Requirement
263
263
  requirements:
264
- - - ~>
264
+ - - "~>"
265
265
  - !ruby/object:Gem::Version
266
266
  version: '2.13'
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: simplecov
269
269
  requirement: !ruby/object:Gem::Requirement
270
270
  requirements:
271
- - - ~>
271
+ - - "~>"
272
272
  - !ruby/object:Gem::Version
273
273
  version: '0.7'
274
274
  type: :development
275
275
  prerelease: false
276
276
  version_requirements: !ruby/object:Gem::Requirement
277
277
  requirements:
278
- - - ~>
278
+ - - "~>"
279
279
  - !ruby/object:Gem::Version
280
280
  version: '0.7'
281
281
  - !ruby/object:Gem::Dependency
282
282
  name: yard
283
283
  requirement: !ruby/object:Gem::Requirement
284
284
  requirements:
285
- - - ~>
285
+ - - "~>"
286
286
  - !ruby/object:Gem::Version
287
287
  version: '0.8'
288
288
  type: :development
289
289
  prerelease: false
290
290
  version_requirements: !ruby/object:Gem::Requirement
291
291
  requirements:
292
- - - ~>
292
+ - - "~>"
293
293
  - !ruby/object:Gem::Version
294
294
  version: '0.8'
295
295
  - !ruby/object:Gem::Dependency
296
296
  name: minitest
297
297
  requirement: !ruby/object:Gem::Requirement
298
298
  requirements:
299
- - - '>='
299
+ - - ">="
300
300
  - !ruby/object:Gem::Version
301
301
  version: '0'
302
302
  type: :development
303
303
  prerelease: false
304
304
  version_requirements: !ruby/object:Gem::Requirement
305
305
  requirements:
306
- - - '>='
306
+ - - ">="
307
307
  - !ruby/object:Gem::Version
308
308
  version: '0'
309
309
  - !ruby/object:Gem::Dependency
310
310
  name: vcr
311
311
  requirement: !ruby/object:Gem::Requirement
312
312
  requirements:
313
- - - '>='
313
+ - - ">="
314
314
  - !ruby/object:Gem::Version
315
315
  version: '0'
316
316
  type: :development
317
317
  prerelease: false
318
318
  version_requirements: !ruby/object:Gem::Requirement
319
319
  requirements:
320
- - - '>='
320
+ - - ">="
321
321
  - !ruby/object:Gem::Version
322
322
  version: '0'
323
323
  - !ruby/object:Gem::Dependency
324
324
  name: multi_json
325
325
  requirement: !ruby/object:Gem::Requirement
326
326
  requirements:
327
- - - '>='
327
+ - - ">="
328
328
  - !ruby/object:Gem::Version
329
329
  version: '0'
330
330
  type: :development
331
331
  prerelease: false
332
332
  version_requirements: !ruby/object:Gem::Requirement
333
333
  requirements:
334
- - - '>='
334
+ - - ">="
335
335
  - !ruby/object:Gem::Version
336
336
  version: '0'
337
337
  description: Provides a set of additional Git commands to help developers when working
@@ -353,13 +353,25 @@ files:
353
353
  - LICENSE
354
354
  - NOTICE
355
355
  - README.md
356
+ - bin/git-deliver
357
+ - bin/git-finish
358
+ - bin/git-newbug
359
+ - bin/git-newfeature
360
+ - bin/git-qa
361
+ - bin/git-release
362
+ - bin/git-report
363
+ - bin/git-start
364
+ - bin/git-uat
356
365
  - config_template
366
+ - lib/git-pivotal-tracker-integration.rb
357
367
  - lib/git-pivotal-tracker-integration/command/base.rb
358
368
  - lib/git-pivotal-tracker-integration/command/configuration.rb
359
369
  - lib/git-pivotal-tracker-integration/command/deliver.rb
360
370
  - lib/git-pivotal-tracker-integration/command/finish.rb
361
371
  - lib/git-pivotal-tracker-integration/command/newbug.rb
362
372
  - lib/git-pivotal-tracker-integration/command/newfeature.rb
373
+ - lib/git-pivotal-tracker-integration/command/prepare-commit-msg-win.sh
374
+ - lib/git-pivotal-tracker-integration/command/prepare-commit-msg.sh
363
375
  - lib/git-pivotal-tracker-integration/command/release.rb
364
376
  - lib/git-pivotal-tracker-integration/command/report.rb
365
377
  - lib/git-pivotal-tracker-integration/command/start.rb
@@ -368,18 +380,16 @@ files:
368
380
  - lib/git-pivotal-tracker-integration/util/story.rb
369
381
  - lib/git-pivotal-tracker-integration/util/togglV8.rb
370
382
  - lib/git-pivotal-tracker-integration/version-update/gradle.rb
371
- - lib/git-pivotal-tracker-integration.rb
372
- - lib/git-pivotal-tracker-integration/command/prepare-commit-msg-win.sh
373
- - lib/git-pivotal-tracker-integration/command/prepare-commit-msg.sh
374
- - bin/git-deliver
375
- - bin/git-finish
376
- - bin/git-newbug
377
- - bin/git-newfeature
378
- - bin/git-qa
379
- - bin/git-release
380
- - bin/git-report
381
- - bin/git-start
382
- - bin/git-uat
383
+ - spec/git-pivotal-tracker-integration/command/base_spec.rb
384
+ - spec/git-pivotal-tracker-integration/command/configuration_spec.rb
385
+ - spec/git-pivotal-tracker-integration/command/finish_spec.rb
386
+ - spec/git-pivotal-tracker-integration/command/release_spec.rb
387
+ - spec/git-pivotal-tracker-integration/command/start_spec.rb
388
+ - spec/git-pivotal-tracker-integration/util/git_spec.rb
389
+ - spec/git-pivotal-tracker-integration/util/shell_spec.rb
390
+ - spec/git-pivotal-tracker-integration/util/story_spec.rb
391
+ - spec/git-pivotal-tracker-integration/version-update/gradle_spec.rb
392
+ - tracker_api/lib/tracker_api.rb
383
393
  - tracker_api/lib/tracker_api/client.rb
384
394
  - tracker_api/lib/tracker_api/endpoints/activity.rb
385
395
  - tracker_api/lib/tracker_api/endpoints/comments.rb
@@ -417,16 +427,6 @@ files:
417
427
  - tracker_api/lib/tracker_api/resources/task.rb
418
428
  - tracker_api/lib/tracker_api/resources/time_zone.rb
419
429
  - tracker_api/lib/tracker_api/version.rb
420
- - tracker_api/lib/tracker_api.rb
421
- - spec/git-pivotal-tracker-integration/command/base_spec.rb
422
- - spec/git-pivotal-tracker-integration/command/configuration_spec.rb
423
- - spec/git-pivotal-tracker-integration/command/finish_spec.rb
424
- - spec/git-pivotal-tracker-integration/command/release_spec.rb
425
- - spec/git-pivotal-tracker-integration/command/start_spec.rb
426
- - spec/git-pivotal-tracker-integration/util/git_spec.rb
427
- - spec/git-pivotal-tracker-integration/util/shell_spec.rb
428
- - spec/git-pivotal-tracker-integration/util/story_spec.rb
429
- - spec/git-pivotal-tracker-integration/version-update/gradle_spec.rb
430
430
  homepage: https://github.com/v2dev/V2GPTI
431
431
  licenses:
432
432
  - Apache-2.0
@@ -437,17 +437,17 @@ require_paths:
437
437
  - lib
438
438
  required_ruby_version: !ruby/object:Gem::Requirement
439
439
  requirements:
440
- - - '>='
440
+ - - ">="
441
441
  - !ruby/object:Gem::Version
442
442
  version: '1.9'
443
443
  required_rubygems_version: !ruby/object:Gem::Requirement
444
444
  requirements:
445
- - - '>='
445
+ - - ">="
446
446
  - !ruby/object:Gem::Version
447
447
  version: '0'
448
448
  requirements: []
449
449
  rubyforge_project:
450
- rubygems_version: 2.0.14
450
+ rubygems_version: 2.5.1
451
451
  signing_key:
452
452
  specification_version: 4
453
453
  summary: Git commands for integration with Pivotal Tracker
@@ -461,4 +461,3 @@ test_files:
461
461
  - spec/git-pivotal-tracker-integration/util/shell_spec.rb
462
462
  - spec/git-pivotal-tracker-integration/util/story_spec.rb
463
463
  - spec/git-pivotal-tracker-integration/version-update/gradle_spec.rb
464
- has_rdoc: