@@ -31,10 +31,10 @@ lh-branch delete [ticket_id]: Deletes the ticket's branch. lh-branch delete_remote [ticket_id] [remote name]: Deletes the ticket's branch on the remote server. lh-branch delete_remote 1 origin #=> git push origin :1-ticket-title -lh-branch commit 1 [message]: Creates a commit that references the ticket +lh-branch commit [ticket_id] [message]: Creates a commit that references the ticket lh-branch commit 1 "Made some changes" #=> git commit -a -m "Made some changes\n\n[#1]" -lh-branch resolve 1 [message]: Creates a commit that will mark the ticket resolved. +lh-branch resolve [ticket_id] [message]: Creates a commit that will mark the ticket resolved. lh-branch resolve 1 "Fixed the bug." #=> git commit -a -m "Fixed the bug\n\n[#1 state:resolved]" == Copyright README.rdoc @@ -2,109 +2,5 @@ require 'rubygems' require File.join(File.dirname(__FILE__), '..', 'lib', 'lighthouse_branch') -require 'grit' -def get_command(args) - case args[0] - when nil - return nil - when /push/i - args.shift - return 'push' - when /pull/i - args.shift - return 'pull' - when /merge/i - args.shift - return 'merge' - when /checkout/i - args.shift - return 'checkout' - when /delete/i - args.shift - return 'delete' - when /resolve/i - args.shift - return 'resolve' - else return 'branch' - end -end - -def get_lighthouse_branch - repo = Grit::Repo.new(Dir.pwd) - - lighthouse_account = repo.config["lighthouse.account"] - lighthouse_token = repo.config["lighthouse.token"] - lighthouse_project = repo.config["lighthouse.project"] - - if lighthouse_account.nil? || lighthouse_token.nil? || lighthouse_project.nil? - puts "You must add your lighthouse account info to git config:" - puts "git config lighthouse.account [lighthouse account subdomain]" - puts "git config lighthouse.token [lighthouse API token]" - puts "git config lighthouse.project [lighthouse project id]" - exit - end - - return LighthouseBranch.new(lighthouse_account, lighthouse_token, lighthouse_project) -end - -args = ARGV - -command = get_command(args) -command = nil if ticket_id == 0 - -lighthouse_branch = get_lighthouse_branch - -case command -when nil - puts "Usage:" - puts "lh-branch [ticket_id]" - puts "lh-branch push [ticket_id] [remote name]" - puts "lh-branch pull [ticket_id] [remote name]" - puts "lh-branch merge [ticket_id]" - puts "lh-branch checkout [ticket_id]" - puts "lh-branch delete [ticket_id]" - puts "lh-branch resolve 1 [message]" -when 'branch' - if args.size != 0 - puts "Usage: lh-branch [ticket_id]" - exit - end - system("git checkout -b #{lighthouse_branch.branch_name(ticket_id)}") -when 'delete' - if args.size != 0 - puts "Usage: lh-branch delete [ticket_id]" - exit - end - system("git branch -d #{lighthouse_branch.branch_name(ticket_id)}") -when 'push' - if args.size != 1 - puts "Usage: lh-branch push [ticket_id] [remote name]" - exit - end - system("git push #{args.shift} #{lighthouse_branch.branch_name(ticket_id)}") -when 'pull' - if args.size != 1 - puts "Usage: lh-branch pull [ticket_id] [remote name]" - exit - end - system("git pull #{args.shift} #{lighthouse_branch.branch_name(ticket_id)}") -when 'checkout' - if args.size != 0 - puts "Usage: lh-branch checkout [ticket_id]" - exit - end - system("git checkout #{lighthouse_branch.branch_name(ticket_id)}") -when 'merge' - if args.size != 0 - puts "Usage: lh-branch merge [ticket_id]" - exit - end - system("git merge #{lighthouse_branch.branch_name(ticket_id)}") -when 'resolve' - if args.size != 1 - puts "Usage: lh-branch resolve 1 [message]" - exit - end - system("git commit -a -m \"#{args.shift}\n\n[##{ticket_id} state:resolved]\"") -end \ No newline at end of file +LighthouseBranch.invoke(ARGV) \ No newline at end of file bin/lh-branch @@ -54,7 +54,9 @@ class LighthouseBranch puts "lh-branch pull [ticket_id] [remote name]" puts "lh-branch merge [ticket_id]" puts "lh-branch checkout [ticket_id]" + puts "lh-branch commit [ticket_id] [message]" puts "lh-branch delete [ticket_id]" - puts "lh-branch resolve 1 [message]" + puts "lh-branch delete_remote [ticket_id] [remote name]" + puts "lh-branch resolve [ticket_id] [message]" end end \ No newline at end of file lib/lighthouse_branch.rb @@ -11,13 +11,25 @@ module Command @@commands.merge!(name => self) end + def self.number_of_arguments(arguments) + self.class_eval("@@number_of_arguments = #{arguments}") + end + + def self.usage(usage) + self.class_eval("@@usage = \"#{usage}\"") + end + def self.commands return @@commands end def self.run(lighthouse_branch, ticket, args) return unless defined?(:command_string) - system(self.command_string(lighthouse_branch, ticket, args)) + unless args.size == (self.class_eval("@@number_of_arguments") || 0) + puts self.class_eval("@@usage") and exit + else + system(self.command_string(lighthouse_branch, ticket, args)) + end end def self.command_regexes lib/lighthouse_branch/command/base.rb @@ -1,6 +1,9 @@ module Command class Branch < Command::Base default_command + number_of_arguments 0 + + usage "lh-branch [ticket_id]" def self.command_string(lighthouse_branch, ticket_id, args) "git checkout -b #{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/branch.rb @@ -1,6 +1,9 @@ module Command class Checkout < Command::Base command_name :checkout + number_of_arguments 0 + + usage "lh-branch checkout [ticket_id]" def self.command_string(lighthouse_branch, ticket_id, args) "git checkout #{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/checkout.rb @@ -1,6 +1,9 @@ module Command class Commit < Command::Base command_name :commit + number_of_arguments 1 + + usage "lh-branch commit [ticket_id] [message]" def self.command_string(lighthouse_branch, ticket_id, args) "git commit -a -m \"#{args.shift}\n\n[##{ticket_id}]\"" lib/lighthouse_branch/commands/commit.rb @@ -1,6 +1,9 @@ module Command class Delete < Command::Base command_name :delete + number_of_arguments 0 + + usage "lh-branch delete [ticket_id]" def self.command_string(lighthouse_branch, ticket_id, args) "git branch -d #{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/delete.rb @@ -1,6 +1,9 @@ module Command class DeleteRemote < Command::Base command_name :delete_remote + number_of_arguments 1 + + usage "lh-branch delete_remote [ticket_id] [remote name]" def self.command_string(lighthouse_branch, ticket_id, args) "git push #{args.shift} :#{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/delete_remote.rb @@ -1,6 +1,9 @@ module Command class Merge < Command::Base command_name :merge + number_of_arguments 0 + + usage "lh-branch merge [ticket_id]" def self.command_string(lighthouse_branch, ticket_id, args) "git merge #{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/merge.rb @@ -1,6 +1,9 @@ module Command class Pull < Command::Base command_name :pull + number_of_arguments 1 + + usage "lh-branch pull [ticket_id] [remote name]" def self.command_string(lighthouse_branch, ticket_id, args) "git pull #{args.shift} #{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/pull.rb @@ -1,6 +1,9 @@ module Command class Push < Command::Base command_name :push + number_of_arguments 1 + + usage "lh-branch push [ticket_id] [remote name]" def self.command_string(lighthouse_branch, ticket_id, args) "git push #{args.shift} #{lighthouse_branch.branch_name(ticket_id)}" lib/lighthouse_branch/commands/push.rb @@ -1,6 +1,8 @@ module Command class Resolve < Command::Base command_name :resolve + number_of_arguments 1 + usage "lh-branch resolve [ticket_id] [message]" def self.command_string(lighthouse_branch, ticket_id, args) "git commit -a -m \"#{args.shift}\n\n[##{ticket_id} state:resolved]\"" lib/lighthouse_branch/commands/resolve.rb ea7574c741b75678191528d942fcefaaf1b98bcd Matt Pruitt guitsaru@gmail.com http://github.com/guitsaru/lighthouse_branch/commit/7234f4f48037f7dfc3446788b23408a2cbb51f67 7234f4f48037f7dfc3446788b23408a2cbb51f67 2009-06-22T21:23:46-07:00 2009-06-22T21:23:46-07:00 Added usage to each command. [#2] 00927250ffff5e90ef6eb81198ba21903668e83f Matt Pruitt guitsaru@gmail.com