@@ -24,14 +24,14 @@ class LighthouseBranch end end - def ticket(id) + def self.ticket(id) Lighthouse::Ticket.find(id, :params => { :project_id => @project.id }) end - def self.branch_name + def self.branch_name(args) unless @branch_name if(Float(args.first) rescue false) - ticket_id = args.shift + ticket_id = args.shift.to_i @branch_name = "#{ticket_id}-#{ticket(ticket_id).title.gsub(/[^\w ]/, '').gsub(/[^a-z0-9]+/i, '-').downcase}" else @branch_name = repo.head.name @@ -46,17 +46,19 @@ class LighthouseBranch command = :default if Command::Base.command_regexes.select{ |command| args.first =~ command }.empty? - ticket_id = branch_name.to_i + branch = branch_name(args) + ticket_id = branch.to_i if ticket_id == 0 usage exit end else command = args.shift - ticket_id = branch_name.to_i + branch = branch_name(args) + ticket_id = branch.to_i end - Command::Base.invoke(command, branch_name, ticket_id, args) + Command::Base.invoke(command, branch, ticket_id, args) end def self.usage lib/lighthouse_branch.rb @@ -36,7 +36,7 @@ module Command if number_of_arguments.is_a?(Range) correct_arguments = number_of_arguments.member?(args.size) elsif number_of_arguments.is_a?(Fixnum) - correct_arguments = number_of_arguments == args.size + correct_arguments = (number_of_arguments == args.size) end if correct_arguments lib/lighthouse_branch/command/base.rb d656b150fd3d21cb69a9d1ae2c84cc2752a467c3 Matt Pruitt guitsaru@gmail.com http://github.com/guitsaru/lighthouse_branch/commit/c80d9c2a8855506bd0695e9a8d65c0c77b20860c c80d9c2a8855506bd0695e9a8d65c0c77b20860c 2009-06-23T19:28:48-07:00 2009-06-23T19:26:31-07:00 Fixed commands with ticket_id. [#2 tagged:'branch:2-create-command-classes'] 92818e9337959750fd7d8d499450e238db51555a Matt Pruitt guitsaru@gmail.com