guitsaru-lighthouse_branch 1.0.0 → 1.1.0

data/README.rdoc

@@ -1,5 +1,9 @@
 = lighthouse_branch
 
+= Installation
+
+    sudo gem install lighthouse_branch
+
 = Setup
 
 Add your Lighthouse project settings to your repo's git config.
@@ -10,13 +14,17 @@ Add your Lighthouse project settings to your repo's git config.
 
 = Usage
 
-lh-branch [ticket_id]: Creates a branch based on the ticket name.
+If ticket_id is not given, it will be determined by the current branch.
+This gem also comes with lhb, a shorter version of lh-branch
+
+lh-branch [ticket_id] ([remote_name]): Creates a branch based on the ticket name.
+If remote_name is given, the branch will be pushed to the remote.
     lh-branch 1 #=> git checkout -b 1-ticket-title
 
-lh-branch push [ticket_id] [remote name]: Pushes the ticket's branch to the named remote.
+lh-branch push [ticket_id] [remote_name]: Pushes the ticket's branch to the named remote.
     lh-branch 1 origin #=> git push origin 1-ticket-title
 
-lh-branch pull [ticket_id] [remote name]: Pulls the ticket's branch from the named remote.
+lh-branch pull [ticket_id] [remote_name]: Pulls the ticket's branch from the named remote.
     lh-branch 1 origin #=> git pull origin 1-ticket-title
 
 lh-branch merge [ticket_id]: Merges the ticket's branch with the current branch.
@@ -25,10 +33,15 @@ lh-branch merge [ticket_id]: Merges the ticket's branch with the current branch.
 lh-branch checkout [ticket_id]: Checks out the ticket's branch, making it the current branch.
     lh-branch checkout 1 #=> git checkout 1-ticket-title
 
-lh-branch delete [ticket_id]: Deletes the ticket's branch.
+lh-branch delete [ticket_id] ([remote_name]): Deletes the ticket's branch.
+If remote_name is given, the branch will also be deleted on remote.
     lh-branch delete 1 #=> git branch -d 1-ticket-title
 
-lh-branch resolve 1 [message]: Creates a commit that will mark the ticket resolved.
+lh-branch update [ticket_id] [message] ([extra]): Creates a commit that references the ticket
+Extra is any extra lighthouse commands
+    lh-branch update 1 "Made some changes" #=> git commit -a -m "Made some changes\n\n[#1 tagged:'branch:1-ticket-title']"
+
+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

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "guitsaru@gmail.com"
     gem.homepage = "http://github.com/guitsaru/lighthouse_branch"
     gem.authors = ["Matt Pruitt"]
-    gem.rubyforge_project = "lighthouse_branch"
+    gem.rubyforge_project = "lh-branch"
     gem.add_dependency('grit', '>= 1.1.1')
     gem.add_dependency('Caged-lighthouse-api', '>= 1.0.0')
   end
@@ -22,7 +22,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
@@ -30,7 +30,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
+    test.pattern = 'test/**/test_*.rb'
     test.verbose = true
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/lh-branch

@@ -2,110 +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)
-ticket_id = args.shift.to_i
-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
+LighthouseBranch.invoke(ARGV)

data/bin/lhb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'lighthouse_branch')
+
+LighthouseBranch.invoke(ARGV)

data/lib/lighthouse_branch.rb

@@ -1,17 +1,76 @@
 require 'lighthouse-api'
+require 'grit'
+require File.join(File.dirname(__FILE__), 'lighthouse_branch', 'command', 'base')
+
+Dir.glob(File.join(File.dirname(__FILE__), 'lighthouse_branch', 'commands', '**.rb')).each { |command| require command }
 
 class LighthouseBranch
-  def initialize(account, token, project_id)
-    Lighthouse.account = account
-    Lighthouse.token = token
-    @project = Lighthouse::Project.find(project_id)
+  def self.repo
+    @repo ||= Grit::Repo.new(Dir.pwd)
+  end
+  
+  def self.get_lighthouse_account
+    Lighthouse.account = repo.config["lighthouse.account"]
+    Lighthouse.token = repo.config["lighthouse.token"]
+    
+    begin
+      @project = Lighthouse::Project.find(repo.config["lighthouse.project"])
+    rescue
+      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
   end
   
-  def ticket(id)
+  def self.ticket(id)
     Lighthouse::Ticket.find(id, :params => { :project_id => @project.id })
   end
   
-  def branch_name(id)
-    "#{id}-#{ticket(id).title.gsub(/[^\w ]/, '').gsub(/[^a-z0-9]+/i, '-').downcase}"
+  def self.branch_name(args)
+    unless @branch_name
+      if(Float(args.first) rescue false)
+        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
+      end
+    end
+    
+    return @branch_name
+  end
+  
+  def self.invoke(args)
+    get_lighthouse_account
+    
+    command = :default
+    if Command::Base.command_regexes.select{ |command| args.first =~ command }.empty?
+      branch = branch_name(args)
+      ticket_id = branch.to_i
+      if ticket_id == 0
+        usage
+        exit
+      end
+    else
+      command = args.shift
+      branch = branch_name(args)
+      ticket_id = branch.to_i
+    end
+    
+    Command::Base.invoke(command, branch, ticket_id, args)
+  end
+  
+  def self.usage
+    puts "If ticket_id is not supplied, the ticket will be determined by the current branch name."
+    puts "lh-branch [ticket_id] ([remote_name])"
+    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 update [ticket_id] [message] ([extra])"
+    puts "lh-branch delete [ticket_id] ([remote_name])"
+    puts "lh-branch delete_remote [ticket_id] [remote_name]"
+    puts "lh-branch resolve [ticket_id] [message]"
   end
 end

data/lib/lighthouse_branch/command/base.rb

@@ -0,0 +1,63 @@
+module Command
+  class Base
+    @@commands = {}
+    
+    def self.default_command
+      @@commands.merge!(:default => self)
+    end
+    
+    def self.command_name(name)
+      name = name.to_s.downcase.to_sym
+      @@commands.merge!(name => self)
+    end
+    
+    def self.number_of_arguments(arguments)
+      self.class_eval("@@number_of_arguments = #{arguments}")
+    end
+    
+    def self.usage(usage=nil)
+      if usage
+        return self.class_eval("@@usage = \"#{usage}\"")
+      else
+        return self.class_eval("@@usage")
+      end
+    end
+    
+    def self.commands
+      return @@commands
+    end
+    
+    def self.run(lighthouse_branch, ticket, args)
+      return unless defined?(:command_string)
+      
+      number_of_arguments = (self.class_eval("@@number_of_arguments") || 0)
+      
+      correct_arguments = false
+      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)
+      end
+      
+      if correct_arguments
+        system(self.command_string(lighthouse_branch, ticket, args))
+      else
+        puts self.usage and exit
+      end
+    end
+    
+    def self.command_regexes
+      @@commands.keys.map { |k| /#{k}/i }
+    end
+    
+    def self.invoke(command, branch_name, ticket_id, args)
+      command = @@commands[command.to_s.downcase.to_sym]
+      if !command
+        command = @@commands[:default]
+      end
+      
+      return nil if ticket_id <= 0
+      command.run(branch_name, ticket_id, args)
+    end
+  end
+end

data/lib/lighthouse_branch/commands/branch.rb

@@ -0,0 +1,16 @@
+module Command
+  class Branch < Command::Base
+    default_command
+    number_of_arguments (0..1)
+    
+    usage "lh-branch [ticket_id]"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      command_string = "git checkout -b #{branch_name}"
+      if remote_name = args.shift
+        command_string += "; #{Command::Push.command_string(branch_name, ticket_id, remote_name.to_a)}"
+      end
+      return command_string
+    end
+  end
+end

data/lib/lighthouse_branch/commands/checkout.rb

@@ -0,0 +1,12 @@
+module Command
+  class Checkout < Command::Base
+    command_name :checkout
+    number_of_arguments 0
+    
+    usage "lh-branch checkout [ticket_id]"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      "git checkout #{branch_name}"
+    end
+  end
+end

data/lib/lighthouse_branch/commands/commit.rb

@@ -0,0 +1,12 @@
+module Command
+  class Commit < Command::Base
+    command_name :commit
+    number_of_arguments 1
+    
+    usage "lh-branch commit [ticket_id] [message]"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      "git commit -a -m \"#{args.shift}\n\n[##{ticket_id}]\""
+    end
+  end
+end

data/lib/lighthouse_branch/commands/delete.rb

@@ -0,0 +1,17 @@
+module Command
+  class Delete < Command::Base
+    command_name :delete
+    number_of_arguments (0..1)
+    
+    usage "lh-branch delete [ticket_id] ([remote_name])"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      command_string = "git branch -d #{branch_name}"
+      if !args.empty?
+        remote_name = args.shift
+        command_string +="; git push #{remote_name} :#{branch_name}"
+      end
+      return command_string
+    end
+  end
+end

data/lib/lighthouse_branch/commands/merge.rb

@@ -0,0 +1,12 @@
+module Command
+  class Merge < Command::Base
+    command_name :merge
+    number_of_arguments 0
+    
+    usage "lh-branch merge [ticket_id]"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      "git merge #{branch_name}"
+    end
+  end
+end

data/lib/lighthouse_branch/commands/pull.rb

@@ -0,0 +1,12 @@
+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(branch_name, ticket_id, args)
+      "git pull #{args.shift} #{branch_name}"
+    end
+  end
+end

data/lib/lighthouse_branch/commands/push.rb

@@ -0,0 +1,12 @@
+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(branch_name, ticket_id, args)
+      "git push #{args.shift} #{branch_name}"
+    end
+  end
+end

data/lib/lighthouse_branch/commands/resolve.rb

@@ -0,0 +1,11 @@
+module Command
+  class Resolve < Command::Base
+    command_name :resolve
+    number_of_arguments 1
+    usage "lh-branch resolve [ticket_id] [message]"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      "git commit -a -m \"#{args.shift}\n\n[##{ticket_id} state:resolved]\""
+    end
+  end
+end

data/lib/lighthouse_branch/commands/update.rb

@@ -0,0 +1,16 @@
+module Command
+  class Update < Command::Base
+    command_name :update
+    number_of_arguments (1..2)
+    
+    usage "lh-branch update [ticket_id] [message]"
+    
+    def self.command_string(branch_name, ticket_id, args)
+      msg = args.shift
+      extra = ""
+      extra = " #{args.shift}".rstrip unless args.empty?
+      
+      "git commit -a -m \"#{msg}\n\n[##{ticket_id} tagged:'branch:#{branch_name}'#{extra}]\""
+    end
+  end
+end

data/lighthouse_branch.gemspec

@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{lighthouse_branch}
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matt Pruitt"]
+  s.date = %q{2009-06-23}
+  s.email = %q{guitsaru@gmail.com}
+  s.executables = ["lh-branch", "lhb"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/lh-branch",
+     "bin/lhb",
+     "lib/lighthouse_branch.rb",
+     "lib/lighthouse_branch/command/base.rb",
+     "lib/lighthouse_branch/commands/branch.rb",
+     "lib/lighthouse_branch/commands/checkout.rb",
+     "lib/lighthouse_branch/commands/commit.rb",
+     "lib/lighthouse_branch/commands/delete.rb",
+     "lib/lighthouse_branch/commands/merge.rb",
+     "lib/lighthouse_branch/commands/pull.rb",
+     "lib/lighthouse_branch/commands/push.rb",
+     "lib/lighthouse_branch/commands/resolve.rb",
+     "lib/lighthouse_branch/commands/update.rb",
+     "lighthouse_branch.gemspec",
+     "test/command/test_base.rb",
+     "test/commands/test_branch.rb",
+     "test/commands/test_checkout.rb",
+     "test/commands/test_commit.rb",
+     "test/commands/test_delete.rb",
+     "test/commands/test_merge.rb",
+     "test/commands/test_pull.rb",
+     "test/commands/test_push.rb",
+     "test/commands/test_resolve.rb",
+     "test/commands/test_update.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/guitsaru/lighthouse_branch}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{lh-branch}
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Easily manage branches based off lighthouse tickets.}
+  s.test_files = [
+    "test/command/test_base.rb",
+     "test/commands/test_branch.rb",
+     "test/commands/test_checkout.rb",
+     "test/commands/test_commit.rb",
+     "test/commands/test_delete.rb",
+     "test/commands/test_merge.rb",
+     "test/commands/test_pull.rb",
+     "test/commands/test_push.rb",
+     "test/commands/test_resolve.rb",
+     "test/commands/test_update.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<grit>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<Caged-lighthouse-api>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<grit>, [">= 1.1.1"])
+      s.add_dependency(%q<Caged-lighthouse-api>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<grit>, [">= 1.1.1"])
+    s.add_dependency(%q<Caged-lighthouse-api>, [">= 1.0.0"])
+  end
+end

data/test/command/test_base.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+module Command
+  class Base
+    @@commands = {}
+  end
+end
+
+class DefaultCommand < Command::Base
+  default_command
+end
+
+class NamedCommand < Command::Base
+  command_name :named
+end
+
+class TestCommandBase < Test::Unit::TestCase
+  should "include a list of empty commands on initialization" do
+    assert(Command::Base.commands.is_a?(Hash), "Commands is not a hash.")
+  end
+  
+  should "add a default command" do
+    assert_equal(DefaultCommand, Command::Base.commands[:default])
+  end
+  
+  should "add a named command" do
+    assert_equal(NamedCommand, Command::Base.commands[:named])
+  end
+  
+  should "have a list of regexes to match" do
+    assert(Command::Base.command_regexes.include?(/named/i))
+    assert(Command::Base.command_regexes.include?(/default/i))
+  end
+end

data/test/commands/test_branch.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class TestBranchCommand < Test::Unit::TestCase
+  should "create the branch with no arguments" do
+    assert_equal("git checkout -b 1-test-ticket", \
+      Command::Branch.command_string('1-test-ticket', 1, []))
+  end
+  
+  should "create the branch and push to remote with an argument" do
+    assert_equal("git checkout -b 1-test-ticket; git push origin 1-test-ticket", 
+      Command::Branch.command_string('1-test-ticket', 1, ['origin']))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch [ticket_id]", Command::Branch.usage)
+  end
+end

data/test/commands/test_checkout.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class TestCheckoutCommand < Test::Unit::TestCase
+  should "check out the branch" do
+    assert_equal("git checkout 1-test-ticket", Command::Checkout.command_string('1-test-ticket', 1, []))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch checkout [ticket_id]", Command::Checkout.usage)
+  end
+end

data/test/commands/test_commit.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class TestBranchCommit < Test::Unit::TestCase
+  should "Commit the branch" do
+    assert_equal("git commit -a -m \"Message\n\n[#1]\"",
+      Command::Commit.command_string('1-test-ticket', 1, ['Message']))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch commit [ticket_id] [message]", Command::Commit.usage)
+  end
+end

data/test/commands/test_delete.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class TestDeleteCommand < Test::Unit::TestCase
+  should "delete the branch with no origin name" do
+    assert_equal("git branch -d 1-test-ticket", Command::Delete.command_string('1-test-ticket', 1, []))
+  end
+  
+  should "delete the branch with an origin name" do
+    assert_equal("git branch -d 1-test-ticket; git push origin :1-test-ticket", 
+      Command::Delete.command_string('1-test-ticket', 1, ['origin']))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch delete [ticket_id] ([remote_name])", Command::Delete.usage)
+  end
+end

data/test/commands/test_merge.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class TestMergeCommand < Test::Unit::TestCase
+  should "merge out the branch" do
+    assert_equal("git merge 1-test-ticket", Command::Merge.command_string('1-test-ticket', 1, []))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch merge [ticket_id]", Command::Merge.usage)
+  end
+end

data/test/commands/test_pull.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class TestPullCommand < Test::Unit::TestCase
+  should "pull out the branch" do
+    assert_equal("git pull origin 1-test-ticket", Command::Pull.command_string('1-test-ticket', 1, ['origin']))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch pull [ticket_id] [remote_name]", Command::Pull.usage)
+  end
+end

data/test/commands/test_push.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class TestPushCommand < Test::Unit::TestCase
+  should "pull out the branch" do
+    assert_equal("git push origin 1-test-ticket", Command::Push.command_string('1-test-ticket', 1, ['origin']))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch push [ticket_id] [remote_name]", Command::Push.usage)
+  end
+end

data/test/commands/test_resolve.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class TestResolveCommand < Test::Unit::TestCase
+  should "resolve the ticket" do
+    assert_equal("git commit -a -m \"Message.\n\n[#1 state:resolved]\"", 
+      Command::Resolve.command_string('1-test-ticket', 1, ['Message.']))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch resolve [ticket_id] [message]", Command::Resolve.usage)
+  end
+end

data/test/commands/test_update.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class TestBranchUpdate < Test::Unit::TestCase
+  should "Update the ticket" do
+    assert_equal("git commit -a -m \"Message.\n\n[#1 tagged:'branch:1-test-ticket']\"",
+      Command::Update.command_string('1-test-ticket', 1, ['Message.']))
+  end
+  
+  should "Update the ticket with extra" do
+    assert_equal("git commit -a -m \"Message.\n\n[#1 tagged:'branch:1-test-ticket' milestone:'next milestone']\"",
+      Command::Update.command_string('1-test-ticket', 1, ['Message.', "milestone:'next milestone'"]))
+  end
+  
+  should "have usage instructions" do
+    assert_equal("lh-branch update [ticket_id] [message]", Command::Update.usage)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: guitsaru-lighthouse_branch
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Matt Pruitt
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-20 00:00:00 -07:00
-default_executable: lh-branch
+date: 2009-06-23 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -36,6 +36,7 @@ description:
 email: guitsaru@gmail.com
 executables: 
 - lh-branch
+- lhb
 extensions: []
 
 extra_rdoc_files: 
@@ -49,9 +50,30 @@ files:
 - Rakefile
 - VERSION
 - bin/lh-branch
+- bin/lhb
 - lib/lighthouse_branch.rb
+- lib/lighthouse_branch/command/base.rb
+- lib/lighthouse_branch/commands/branch.rb
+- lib/lighthouse_branch/commands/checkout.rb
+- lib/lighthouse_branch/commands/commit.rb
+- lib/lighthouse_branch/commands/delete.rb
+- lib/lighthouse_branch/commands/merge.rb
+- lib/lighthouse_branch/commands/pull.rb
+- lib/lighthouse_branch/commands/push.rb
+- lib/lighthouse_branch/commands/resolve.rb
+- lib/lighthouse_branch/commands/update.rb
+- lighthouse_branch.gemspec
+- test/command/test_base.rb
+- test/commands/test_branch.rb
+- test/commands/test_checkout.rb
+- test/commands/test_commit.rb
+- test/commands/test_delete.rb
+- test/commands/test_merge.rb
+- test/commands/test_pull.rb
+- test/commands/test_push.rb
+- test/commands/test_resolve.rb
+- test/commands/test_update.rb
 - test/test_helper.rb
-- test/test_lighthouse_branch.rb
 has_rdoc: false
 homepage: http://github.com/guitsaru/lighthouse_branch
 post_install_message: 
@@ -73,11 +95,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: lighthouse_branch
+rubyforge_project: lh-branch
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Easily manage branches based off lighthouse tickets.
 test_files: 
+- test/command/test_base.rb
+- test/commands/test_branch.rb
+- test/commands/test_checkout.rb
+- test/commands/test_commit.rb
+- test/commands/test_delete.rb
+- test/commands/test_merge.rb
+- test/commands/test_pull.rb
+- test/commands/test_push.rb
+- test/commands/test_resolve.rb
+- test/commands/test_update.rb
 - test/test_helper.rb
-- test/test_lighthouse_branch.rb

data/test/test_lighthouse_branch.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-class TestLighthouseBranch < Test::Unit::TestCase
-  context "Tests" do
-    setup do
-      @lighthouse_branch = LighthouseBranch.new(
-                            LIGHTHOUSE_ACCOUNT["account"],
-                            LIGHTHOUSE_ACCOUNT["token"],
-                            LIGHTHOUSE_ACCOUNT["project"])
-      
-      @ticket_id = LIGHTHOUSE_ACCOUNT["ticket"]
-    end
-
-    should "initialize" do
-      assert_not_nil(@lighthouse_branch)
-    end
-    
-    should "return a ticket" do
-      assert_not_nil(@lighthouse_branch.ticket(@ticket_id))
-      assert_equal(Lighthouse::Ticket, @lighthouse_branch.ticket(@ticket_id).class)
-    end
-    
-    should "give a branch name for the ticket" do
-      assert_match(/#{LIGHTHOUSE_ACCOUNT["ticket"]}-[\w-]*/, @lighthouse_branch.branch_name(@ticket_id))
-    end
-  end
-end