@@ -1,6 +1,7 @@ module GitLighthouse class Base + attr_reader :lh_url, :account, :projectId, :token, :email, :password def initialize(working_dir, options = {}) @git = Git.init(working_dir, options) lib/git-lighthouse/base.rb @@ -31,10 +31,12 @@ module GitLighthouse handle_ticket_show when 'checkout', 'co' handle_ticket_checkout - when 'comment' - handle_ticket_comment when 'apply' handle_ticket_apply + when 'attachment' + handle_ticket_attachment + when 'comment' + handle_ticket_comment when 'recent' handle_ticket_recent else @@ -135,16 +137,17 @@ module GitLighthouse # outputs actual patch file, include ID=XX # (and optionally NUMBER=XX if more than 1) - def show_attach - setup_env + def handle_ticket_attachment + tid = ARGV[1].chomp + attId = ARGV[1].chomp - if tic = get_ticket(ENV['ID']) - doc = Hpricot(open(get_url(tic))) + if tic = @lh.get_ticket(tid) + doc = Hpricot(open(@lh.get_url(tic))) urls = [] (doc/"ul.attachments"/:li/:ins/:h4/:a).each do |t| - urls << LH_URL + t['href'] + urls << @lh.lh_url + t['href'] end - idx = ((urls.size > 1) && (ENV['NUMBER'])) ? ENV['NUMBER'].to_i - 1 : 0 + idx = ((urls.size > 1) && (attId)) ? attId.to_i - 1 : 0 puts open(urls[idx]).read if urls[idx] end end @@ -239,8 +242,14 @@ module GitLighthouse def parse_options! #:nodoc: if args.empty? - warn "Please specify at least one action to execute." - puts " list state show new checkout comment tag assign " + warn "Please specify at least one action to execute:" + puts " list - list patch tickets in lighthouse" + puts " show (id) - show ticket detail " + puts " attachment (ticket_id) [attachment number] - output patch to stdout" + #puts " checkout (id) - create a new branch and apply ticket to it" + #puts " apply (id) - apply ticket to current branch" + #puts " push (id) - create new patch file and push to ticket" + #puts " comment (id) - add comment to ticket" exit end lib/git-lighthouse/cli.rb @@ -49,12 +49,19 @@ describe GitLighthouse::CLI do ob[0].should match(/this is a super cool ticket/) end end + + it "should be able to output a patch file to stdout" do + ARGV = ['attachment', '1'] + ob = output_buffer do + GitLighthouse::CLI.execute + end + ob[0].should match(/Subject: [PATCH] test patch/) + end it "should show a help message" it "should determine the difference between a format-patch and a diff patch" - it "should be able to output a patch file to stdout" it "should apply a patch file as a new branch" spec/cli_spec.rb lighthouse.rake bb3958ab1f78dd12b6930431e59ec8bf884e6bf3 Scott Chacon schacon@gmail.com http://github.com/schacon/git-lighthouse/commit/5ee25b3056b91e27f43efc8730dfa744a9cce900 5ee25b3056b91e27f43efc8730dfa744a9cce900 2008-05-27T10:48:45-07:00 2008-05-27T10:48:45-07:00 added attachment action 0ffca6a5d5c8a1c8c55ccc93773c1b6c185d23f2 Scott Chacon schacon@gmail.com