-
Notifications
You must be signed in to change notification settings - Fork 10
/
gitcycle.rb
828 lines (683 loc) · 21.8 KB
/
gitcycle.rb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
require 'rubygems'
require 'fileutils'
require 'open-uri'
require 'uri'
require 'yaml'
gem 'launchy', '= 2.0.5'
require 'launchy'
gem 'yajl-ruby', '= 1.1.0'
require 'yajl'
$:.unshift File.dirname(__FILE__)
require "ext/string"
class Gitcycle
API =
if ENV['ENV'] == 'development'
"http://127.0.0.1:8080/api"
else
"http://gitcycle.bleacherreport.com/api"
end
def initialize(args=nil)
$remotes = {}
if ENV['CONFIG']
@config_path = File.expand_path(ENV['CONFIG'])
else
@config_path = File.expand_path("~/.gitcycle.yml")
end
load_config
load_git
start(args) if args
end
def branch(*args)
url = args.detect { |arg| arg =~ /^https?:\/\// }
title = args.detect { |arg| arg =~ /\s/ }
exec_git(:branch, args) unless url || title
require_git && require_configs
params = {
'branch[source]' => branches(:current => true)
}
if url && url.include?('lighthouseapp.com/')
params.merge!('branch[lighthouse_url]' => url)
elsif url && url.include?('github.com/')
params.merge!('branch[issue_url]' => url)
elsif url
puts "Gitcycle only supports Lighthouse or Github Issue URLs.".red
exit
elsif title
params.merge!(
'branch[name]' => title,
'branch[title]' => title
)
else
exec_git(:branch, args)
end
puts "\nRetrieving branch information from gitcycle.\n".green
branch = get('branch', params)
name = branch['name']
begin
owner, repo = branch['repo'].split(':')
branch['home'] = @git_login
unless yes?("\nYour work will eventually merge into '#{branch['source']}'. Is this correct?")
branch['source'] = q("What branch would you like to eventually merge into?")
end
if branch['source'].include?('/')
branch['home'], branch['source'] = branch['source'].split('/')
end
unless yes?("Would you like to name your branch '#{name}'?")
name = q("\nWhat would you like to name your branch?")
name = name.gsub(/[\s\W]/, '-')
end
checkout_remote_branch(
:owner => owner,
:repo => repo,
:branch => branch['source'],
:target => name
)
rescue SystemExit, Interrupt
puts "\nDeleting branch from gitcycle.\n".green
branch = get('branch',
'branch[name]' => branch['name'],
'create' => 0,
'reset' => 1
)
end
puts "Sending branch information to gitcycle.".green
get('branch',
'branch[home]' => branch['home'],
'branch[name]' => branch['name'],
'branch[rename]' => name != branch['name'] ? name : nil,
'branch[source]' => branch['source']
)
puts "\n"
end
def checkout(*args)
if args.length > 2 || options?(args)
exec_git(:checkout, args)
end
require_git && require_config
if args.length == 1 && args[0] =~ /^https?:\/\//
puts "\nRetrieving branch information from gitcycle.\n".green
branch = get('branch', 'branch[lighthouse_url]' => args[0])
checkout_or_track(:name => branch['name'], :remote => 'origin')
else
remote, branch = args
remote, branch = nil, remote if branch.nil?
unless branches(:match => branch)
collab = branch && remote
unless collab
puts "\nRetrieving repo information from gitcycle.\n".green
repo = get('repo')
remote = repo['owner']
end
add_remote_and_fetch(
:owner => remote,
:repo => @git_repo
)
puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
run("git branch --no-track #{branch} #{remote}/#{branch}")
if collab
puts "Sending branch information to gitcycle.".green
get('branch',
'branch[home]' => remote,
'branch[name]' => branch,
'create' => 1
)
end
end
puts "Checking out '#{branch}'.\n".green
run("git checkout -q #{branch}")
end
end
alias :co :checkout
def commit(*args)
msg = nil
if args.empty?
require_git && require_config
puts "\nRetrieving branch information from gitcycle.\n".green
branch = get('branch',
'branch[name]' => branches(:current => true),
'create' => 0
)
id = branch["lighthouse_url"].match(/tickets\/(\d+)/)[1] rescue nil
if branch && id
msg = "[##{id}]"
msg += " #{branch["title"]}" if branch["title"]
end
end
cmd = "git add . && git add . -u && git commit -a"
if msg
run(cmd + "m #{msg.dump}")
Kernel.exec("git commit --amend")
elsif args.empty?
run(cmd)
else
exec_git(:commit, args)
end
end
alias :ci :commit
def discuss(*issues)
require_git && require_config
if issues.empty?
branch = create_pull_request
if branch == false
puts "Branch not found.\n".red
elsif branch['issue_url']
puts "\nLabeling issue as 'Discuss'.\n".green
get('label',
'branch[name]' => branch['name'],
'labels' => [ 'Discuss' ]
)
puts "Opening issue: #{branch['issue_url']}\n".green
Launchy.open(branch['issue_url'])
else
puts "You must push code before opening a pull request.\n".red
end
else
puts "\nRetrieving branch information from gitcycle.\n".green
get('branch', 'issues' => issues, 'scope' => 'repo').each do |branch|
if branch['issue_url']
puts "Opening issue: #{branch['issue_url']}\n".green
Launchy.open(branch['issue_url'])
end
end
end
end
def pull(*args)
exec_git(:pull, args) if args.length > 0
require_git && require_config
current_branch = branches(:current => true)
puts "\nRetrieving branch information from gitcycle.\n".green
branch = get('branch',
'branch[name]' => current_branch,
'include' => [ 'repo' ],
'create' => 0
)
if collab?(branch)
# Merge from collab
merge_remote_branch(
:owner => branch['home'],
:repo => branch['repo']['name'],
:branch => branch['name']
)
elsif branch
# Merge from upstream source branch
merge_remote_branch(
:owner => branch['repo']['owner'],
:repo => branch['repo']['name'],
:branch => branch['source']
)
else
puts "\nRetrieving repo information from gitcycle.\n".green
repo = get('repo')
# Merge from upstream branch with same name
merge_remote_branch(
:owner => repo['owner'],
:repo => repo['name'],
:branch => current_branch
)
end
unless collab?(branch)
# Merge from origin
merge_remote_branch(
:owner => @git_login,
:repo => @git_repo,
:branch => current_branch
)
end
branch
end
def push(*args)
exec_git(:push, args) if args.length > 0
require_git && require_config
pull
branch = branches(:current => true)
puts "\nPushing branch 'origin/#{branch}'.\n".green
run("git push origin #{branch} -q")
end
def qa(*issues)
require_git && require_config
if issues.empty?
puts "\n"
get('qa_branch').each do |branches|
puts "qa_#{branches['source']}_#{branches['user']}".green
branches['branches'].each do |branch|
puts " #{"issue ##{branch['issue']}".yellow}\t#{branch['user']}/#{branch['branch']}"
end
puts "\n"
end
elsif issues.first == 'fail' || issues.first == 'pass'
branch = branches(:current => true)
label = issues.first.capitalize
if branch =~ /^qa_/
puts "\nRetrieving branch information from gitcycle.\n".green
qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
pass_fail = issues.first
issues = issues[1..-1]
if pass_fail == 'pass'
checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
end
if issues.empty?
branches = qa_branch['branches']
else
branches = qa_branch['branches'].select do |b|
issues.include?(b['issue'])
end
end
branches.each do |branch|
if pass_fail == 'pass'
merge_remote_branch(
:owner => branch['home'],
:repo => branch['repo'].split(':')[1],
:branch => branch['branch'],
:issue => branch['issue'],
:issues => qa_branch['branches'].collect { |b| b['issue'] },
:type => :from_qa
)
end
unless issues.empty?
puts "\nLabeling issue #{branch['issue']} as '#{label}'.\n".green
get('label',
'qa_branch[source]' => qa_branch['source'],
'issue' => branch['issue'],
'labels' => [ label ]
)
end
end
if issues.empty?
puts "\nLabeling all issues as '#{label}'.\n".green
get('label',
'qa_branch[source]' => qa_branch['source'],
'labels' => [ label ]
)
end
else
puts "\nYou are not in a QA branch.\n".red
end
elsif issues.first == 'resolved'
branch = branches(:current => true)
if branch =~ /^qa_/
puts "\nRetrieving branch information from gitcycle.\n".green
qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
branches = qa_branch['branches']
conflict = branches.detect { |branch| branch['conflict'] }
if qa_branch && conflict
puts "Committing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
run("git add . && git add . -u && git commit -a -F .git/MERGE_MSG")
puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
run("git push origin qa_#{qa_branch['source']}_#{qa_branch['user']} -q")
puts "\nDe-conflicting on gitcycle.\n".green
get('qa_branch',
'issues' => branches.collect { |branch| branch['issue'] }
)
create_qa_branch(
:preserve => true,
:range => (branches.index(conflict)+1..-1),
:qa_branch => qa_branch
)
else
puts "Couldn't find record of a conflicted merge.\n".red
end
else
puts "\nYou aren't on a QA branch.\n".red
end
else
create_qa_branch(:issues => issues)
end
end
def ready(*issues)
require_git && require_config
branch = pull
branch = create_pull_request(branch)
if branch == false
puts "Branch not found.\n".red
elsif branch['name'].include?('/')
remote, branch = branch['name'].split('/')
puts "\nPushing branch '#{remote}/#{branch}'.\n".green
run("git push #{remote} #{branch} -q")
elsif branch['issue_url']
puts "\nLabeling issue as 'Pending Review'.\n".green
get('label',
'branch[name]' => branch['name'],
'labels' => [ 'Pending Review' ]
)
puts "Opening issue: #{branch['issue_url']}\n".green
Launchy.open(branch['issue_url'])
else
puts "You have not pushed any commits to '#{branch['name']}'.\n".red
end
end
def review(pass_fail, *issues)
require_git && require_config
if pass_fail == 'fail'
label = 'Fail'
else
label = 'Pending QA'
end
if issues.empty?
puts "\nLabeling issue as '#{label}'.\n".green
get('label',
'branch[name]' => branches(:current => true),
'labels' => [ label ]
)
else
puts "\nLabeling issues as '#{label}'.\n".green
get('label',
'issues' => issues,
'labels' => [ label ],
'scope' => 'repo'
)
end
end
def setup(login, repo, token)
repo = "#{login}/#{repo}" unless repo.include?('/')
@config[repo] = [ login, token ]
save_config
puts "\nConfiguration saved.\n".green
end
def start(args=[])
command = args.shift
`git --help`.scan(/\s{3}(\w+)\s{3}/).flatten.each do |cmd|
if command == cmd && !self.respond_to?(command)
exec_git(cmd, args)
end
end
if command.nil?
puts "\nNo command specified\n".red
elsif command =~ /^-/
command_not_recognized
elsif self.respond_to?(command)
send(command, *args)
else
command_not_recognized
end
end
private
def add_remote_and_fetch(options={})
owner = options[:owner]
repo = options[:repo]
unless $remotes[owner]
$remotes[owner] = true
puts "Adding remote repo '#{owner}/#{repo}'.\n".green
run("git remote rm #{owner}") if remotes(:match => owner)
run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
puts "Fetching remote '#{owner}'.\n".green
run("git fetch -q #{owner}")
end
end
def branches(options={})
b = `git branch#{" -a" if options[:all]}#{" -r" if options[:remote]}`
if options[:current]
b.match(/\*\s+(.+)/)[1]
elsif options[:match]
b.match(/([\s]+|origin\/)(#{options[:match]})$/)[2] rescue nil
else
b
end
end
def checkout_or_track(options={})
name = options[:name]
remote = options[:remote]
if branches(:match => name)
puts "Checking out branch '#{name}'.\n".green
run("git checkout #{name} -q")
else
puts "Tracking branch '#{remote}/#{name}'.\n".green
run("git fetch -q #{remote}")
run("git checkout -q -b #{name} #{remote}/#{name}")
end
run("git pull #{remote} #{name} -q")
end
def checkout_remote_branch(options={})
owner = options[:owner]
repo = options[:repo]
branch = options[:branch]
target = options[:target] || branch
if branches(:match => target)
if yes?("You already have a branch called '#{target}'. Overwrite?")
run("git push origin :#{target} -q")
run("git checkout master -q")
run("branch -D #{target}")
else
run("git checkout #{target} -q")
run("git pull origin #{target} -q")
return
end
end
add_remote_and_fetch(options)
puts "Checking out remote branch '#{target}' from '#{owner}/#{repo}/#{branch}'.\n".green
run("git checkout -q -b #{target} #{owner}/#{branch}")
puts "Fetching remote 'origin'.\n".green
run("git fetch -q origin")
if branches(:remote => true, :match => "origin/#{target}")
puts "Pulling 'origin/#{target}'.\n".green
run("git pull origin #{target} -q")
end
puts "Pushing 'origin/#{target}'.\n".green
run("git push origin #{target} -q")
end
def collab?(branch)
branch &&
branch['home'] != branch['user'] &&
branch['home'] != branch['repo'].split(':')[0]
end
def command_not_recognized
readme = "https://github.com/winton/gitcycle/blob/master/README.md"
puts "\nCommand not recognized.".red
puts "\nOpening #{readme}\n".green
Launchy.open(readme)
end
def create_pull_request(branch=nil)
unless branch
puts "\nRetrieving branch information from gitcycle.\n".green
branch = get('branch',
'branch[name]' => branches(:current => true),
'create' => 0
)
end
if branch && !branch['issue_url']
puts "Creating GitHub pull request.\n".green
branch = get('branch',
'branch[create_pull_request]' => true,
'branch[name]' => branch['name'],
'create' => 0
)
end
branch
end
def create_qa_branch(options)
issues = options[:issues]
range = options[:range] || (0..-1)
if (issues && !issues.empty?) || options[:qa_branch]
if options[:qa_branch]
qa_branch = options[:qa_branch]
else
source = branches(:current => true)
unless yes?("\nDo you want to create a QA branch from '#{source}'?")
source = q("What branch would you like to base this QA branch off of?")
end
puts "\nRetrieving branch information from gitcycle.\n".green
qa_branch = get('qa_branch', 'issues' => issues, 'source' => source)
end
source = qa_branch['source']
name = "qa_#{source}_#{qa_branch['user']}"
unless qa_branch['branches'].empty?
unless options[:preserve]
if branches(:match => name, :all => true)
puts "Deleting old QA branch '#{name}'.\n".green
if branches(:match => name)
run("git checkout master -q")
run("git branch -D #{name}")
end
run("git push origin :#{name} -q")
end
checkout_remote_branch(
:owner => @git_login,
:repo => @git_repo,
:branch => source,
:target => name
)
puts "\n"
end
warnings = {}
qa_branch['branches'][range].each do |branch|
issue = branch['issue']
owner, repo = branch['repo'].split(':')
home = branch['home']
if source != branch['source']
warnings[branch['source']] ||= []
warnings[branch['source']] << branch['issue']
end
output = merge_remote_branch(
:owner => home,
:repo => repo,
:branch => branch['branch'],
:issue => issue,
:issues => qa_branch['branches'].collect { |b| b['issue'] },
:type => :to_qa
)
end
puts "\nType '".yellow + "gitc qa pass".green + "' to approve all issues in this branch.\n".yellow
puts "Type '".yellow + "gitc qa fail".red + "' to reject all issues in this branch.\n".yellow
unless warnings.empty?
puts "\n#{"WARNING:".red} If you pass this QA branch, the following branches will merge into '#{source.yellow}':\n"
warnings.each do |(branch, issues)|
issues.collect! { |issue| "##{issue}" }
puts " #{branch.yellow} (#{issues.join(', ')})"
end
puts "\nBe sure this is correct!\n".yellow
end
end
end
end
def exec_git(command, args)
args.unshift("git", command)
Kernel.exec(*args.collect(&:to_s))
end
def fix_conflict(options)
owner = options[:owner]
repo = options[:repo]
branch = options[:branch]
issue = options[:issue]
issues = options[:issues]
type = options[:type]
if $? != 0
puts "Conflict occurred when merging '#{branch}'#{" (issue ##{issue})" if issue}.\n".red
if type # from_qa or to_qa
puts "Please resolve this conflict with '#{owner}'.\n".yellow
puts "\nSending conflict information to gitcycle.\n".green
get('qa_branch', 'issues' => issues, "conflict_#{type}" => issue)
puts "Type 'gitc qa resolved' when finished resolving.\n".yellow
exit
end
elsif type # from_qa or to_qa
branch = branches(:current => true)
puts "Pushing branch '#{branch}'.\n".green
run("git push origin #{branch} -q")
end
end
def get(path, hash={})
hash.merge!(
:login => @login,
:token => @token
)
params = ''
hash[:session] = 0
hash.each do |k, v|
if v && v.is_a?(::Array)
params << "#{URI.escape(k.to_s)}=#{URI.escape(v.inspect)}&"
elsif v
params << "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}&"
end
end
params.chop! # trailing &
begin
json = open("#{API}/#{path}.json?#{params}").read
rescue Exception
puts "\nCould not connect to Gitcycle.".red
puts "\nPlease verify your Internet connection and try again later.\n".yellow
exit
end
match = json.match(/Gitcycle error reference code (\d+)/)
error = match && match[1]
if error
puts "\nSomething went wrong :(".red
puts "\nEmail error code #{error} to wwelsh@bleacherreport.com.".yellow
puts "\nInclude a gist of your terminal output if possible.\n".yellow
exit
else
Yajl::Parser.parse(json)
end
end
def load_config
if File.exists?(@config_path)
@config = YAML.load(File.read(@config_path))
else
@config = {}
end
end
def load_git
path = "#{Dir.pwd}/.git/config"
if File.exists?(path)
@git_url = File.read(path).match(/\[remote "origin"\][^\[]*url = ([^\n]+)/m)[1]
@git_repo = @git_url.match(/\/(.+)\./)[1]
@git_login = @git_url.match(/:(.+)\//)[1]
@login, @token = @config["#{@git_login}/#{@git_repo}"] rescue [ nil, nil ]
end
end
def merge_remote_branch(options={})
owner = options[:owner]
repo = options[:repo]
branch = options[:branch]
add_remote_and_fetch(options)
if branches(:remote => true, :match => "#{owner}/#{branch}")
puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
run("git merge #{owner}/#{branch} -q")
fix_conflict(options)
end
end
def options?(args)
args.any? { |arg| arg =~ /^-/ }
end
def remotes(options={})
b = `git remote`
if options[:match]
b.match(/^(#{options[:match]})$/)[1] rescue nil
else
b
end
end
def require_config
unless @login && @token
puts "\nGitcycle configuration not found.".red
puts "Are you in the right repository?".yellow
puts "Have you set up this repository at http://gitcycle.com?\n".yellow
exit
end
end
def require_git
unless @git_url && @git_repo && @git_login
puts "\norigin entry within '.git/config' not found!".red
puts "Are you sure you are in a git repository?\n".yellow
exit
end
end
def save_config
FileUtils.mkdir_p(File.dirname(@config_path))
File.open(@config_path, 'w') do |f|
f.write(YAML.dump(@config))
end
end
def q(question, extra='')
puts "#{question.yellow}#{extra}"
$input ? $input.shift : $stdin.gets.strip
end
def run(cmd)
if ENV['RUN'] == '0'
puts cmd
else
`#{cmd}`
end
end
def yes?(question)
q(question, " (#{"y".green}/#{"n".red})").downcase[0..0] == 'y'
end
end