cherrybase 0.0.1

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 born2snipe
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,23 @@
+= cherrybase
+
+Git cherry-pick a range of commits from a another branch into your current branch
+
+== Example usages:
+This will attempt to cherry-pick from the <first-commit> all the way to the very last commit of the <branch>.
+
+	cherrybase <branch> <first-commit>
+	
+This will attempt to cherry-pick from the <first-commit> all the way to <last-commit> from the <branch>.
+
+	cherrybase <branch> <first-commit>..<last-commit>
+	
+
+If you encounter a merge conflict you should be able to handle this similar to how you would a 'git rebase'. You make the changes as needed and stage the changes for commit. You now have two choices just like with rebasing '--continue' or '--abort'.
+
+This will commit your changes using the authorship of the original commit. Then attempt to proceed with the cherry-picking.
+
+	cherrybase --continue
+
+This will reset your HEAD back to the original commit just before you started cherrybasing.
+
+	cherrybase --abort

data/Rakefile

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "cherrybase"
+    gem.summary = %Q{Ruby gem to cherry-pick a range of commits with similar rebase options}
+    gem.description = %Q{Ruby gem to cherry-pick a range of commits with similar rebase options}
+    gem.email = "born2snipe@gmail.com"
+    gem.homepage = "http://github.com/born2snipe/cherrybase"
+    gem.authors = ["born2snipe"]
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "cherrybase #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.1

data/bin/cherrybase

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'executor' 
+
+Cherrybase::Executor.new().execute([*ARGV])

data/cherrybase.gemspec

@@ -0,0 +1,71 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{cherrybase}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["born2snipe"]
+  s.date = %q{2009-12-12}
+  s.default_executable = %q{cherrybase}
+  s.description = %q{Ruby gem to cherry-pick a range of commits with similar rebase options}
+  s.email = %q{born2snipe@gmail.com}
+  s.executables = ["cherrybase"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/cherrybase",
+     "cherrybase.gemspec",
+     "lib/args.rb",
+     "lib/baser.rb",
+     "lib/cmd.rb",
+     "lib/executor.rb",
+     "lib/file_util.rb",
+     "lib/git.rb",
+     "spec/args_spec.rb",
+     "spec/baser_spec.rb",
+     "spec/executor_spec.rb",
+     "spec/file_util_spec.rb",
+     "spec/git_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/born2snipe/cherrybase}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby gem to cherry-pick a range of commits with similar rebase options}
+  s.test_files = [
+    "spec/args_spec.rb",
+     "spec/baser_spec.rb",
+     "spec/executor_spec.rb",
+     "spec/file_util_spec.rb",
+     "spec/git_spec.rb",
+     "spec/spec_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_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/lib/args.rb

@@ -0,0 +1,32 @@
+module Cherrybase
+  class Args
+    def parse(args)
+      if args.include?('--help')
+        return {'help' => true}
+      end
+      
+      result = {}
+      
+      if !args.include?('--continue') && !args.include?('--abort')
+        raise "You must supply at least the branch name and the starting commit hash to begin cherrybasing" if args.length != 2
+              
+        result['branch'] = args[0]
+        
+        if args[1] =~ /[0-9a-z]+\.\.[0-9a-z]+/
+          parts = args[1].split('..')
+          result['starting-commit'] = parts[0]
+          result['ending-commit'] = parts[1]
+        else
+          result['starting-commit'] = args[1]
+        end
+      else
+        result['continue'] = args.include?('--continue')
+        result['abort'] = args.include?('--abort')
+
+        raise "You supplied --abort and --continue, please pick one" if result['continue'] && result['abort']
+      end
+      
+      result
+    end
+  end
+end

data/lib/baser.rb

@@ -0,0 +1,78 @@
+require 'git'
+require 'file_util'
+
+module Cherrybase
+  class Baser
+    
+    def initialize(git = Cherrybase::Git.new, file_util = Cherrybase::FileUtil.new)
+      @git = git
+      @file_util = file_util
+    end
+    
+    def init(branch_name, starting_commit, ending_commit)
+      raise "Could not locate .git folder! Is this a Git repository?" if !@file_util.git_repo?
+      raise "Could not find branch (#{branch_name}) in the Git repository" if !@git.has_branch?(branch_name)
+      raise "It appears you are already in the middle of a cherrybase!?" if @file_util.temp_file?      
+      raise "Could not locate START hash (#{starting_commit}) in the Git repository history" if !@git.has_commit?(branch_name, starting_commit)
+      raise "Could not locate END hash (#{ending_commit}) in the Git repository history" if ending_commit != nil && !@git.has_commit?(branch_name, ending_commit)      
+      
+      first_commit = @git.resolve_commit(branch_name, starting_commit)
+      if (ending_commit)
+        last_commit = @git.resolve_commit(branch_name, ending_commit)
+      else
+        last_commit = @git.last_commit(branch_name)
+      end
+      
+      commits = @git.commits_to_cherrypick(branch_name, first_commit, last_commit)
+      @file_util.write_temp_file(@git.last_commit(@git.current_branch), first_commit, commits)
+    end
+    
+    def continue(commit_previous_hash = false)
+      raise "It appears you are not in the middle of a cherrybase!?" if !@file_util.temp_file?
+      
+      temp_data = @file_util.read_temp_file()
+      commits = temp_data['commits']
+      next_cherrypick = temp_data['next_cherrypick']
+      
+      if commit_previous_hash
+        @git.commit(commits[commits.index(next_cherrypick) - 1])
+      end
+      
+      conflicts_found = false
+      last_commit_applied = nil
+      i = commits.index(next_cherrypick)
+      
+      while i < commits.length
+        puts "Applying #{i+1} of #{commits.length} cherry-picks\r" 
+        last_commit_applied = commits[i]
+        @git.cherry_pick(last_commit_applied)
+        if @git.has_conflicts?
+          conflicts_found = true
+          break
+        end
+        i += 1
+      end
+      
+      if conflicts_found
+        puts "Conflict(s) Encountered!"
+        @git.status
+        if (last_commit_applied == commits.last)
+          @file_util.delete_temp_file()
+        else
+          @file_util.write_temp_file(temp_data['starting_commit'], commits.last, commits)
+        end
+      else
+        @file_util.delete_temp_file()
+      end
+      puts "Cherrybase completed!"
+    end
+    
+    def abort()
+      raise "It appears you are not in the middle of a cherrybase!?" if !@file_util.temp_file?
+      temp_data = @file_util.read_temp_file()
+      @git.reset(temp_data['starting_commit'])
+      @file_util.delete_temp_file()
+    end
+    
+  end
+end

data/lib/cmd.rb

@@ -0,0 +1,21 @@
+require 'open3'
+
+module Cherrybase
+  DEBUG = false
+
+  class Cmd
+    def run(command = '', show_lines = false)
+      if DEBUG
+        puts "[Cmd::run] #{command}"
+      end
+      lines = []
+      Open3.popen3(command) { |stdin, stdout, stderr| lines = stdout.readlines }
+      if DEBUG || show_lines
+        lines.each do |line|
+          puts line
+        end
+      end
+      lines
+    end
+  end
+end

data/lib/executor.rb

@@ -0,0 +1,47 @@
+require 'args'
+require 'baser'
+
+module Cherrybase
+  class Executor
+    def initialize(baser = Cherrybase::Baser.new)
+      @baser = baser
+    end
+    
+    def execute(args)
+      begin
+        input = Cherrybase::Args.new().parse(args)
+        if (input['continue'])
+          @baser.continue(true)
+        else
+          if (input['abort'])
+            @baser.abort
+          else
+            if input['help']
+              showHelp()
+            else
+              @baser.init(input['branch'], input['starting-commit'], input['ending-commit'])
+              @baser.continue
+            end
+          end
+        end
+      rescue RuntimeError => err
+        puts "\n#{err}\n\n" 
+        showUsage()
+      end
+    end
+    
+    def showUsage() 
+      puts "Usage: cherrybase [<branch> [<commit> | <commit>..<commit>]] | --continue | --abort"
+    end
+    
+    def showHelp()
+        puts "NAME"
+        puts "\tcherrybase - cherry-pick a range of commits from one branch to the current branch"
+        puts "SYNOPSIS"
+        puts "\tcherrybase [<branch> [<commit> | <commit>..<commit>]] | --continue | --abort"
+        puts "DESCRIPTION"
+        puts "\tThe idea is to cherry-pick across multiple commits and have similar functionality as the rebase command."
+    end
+    
+  end
+end

data/lib/file_util.rb

@@ -0,0 +1,45 @@
+require 'yaml'
+
+module Cherrybase
+  class FileUtil
+    def git_repo?(directory = File.expand_path('.'))
+      git_root_dir(directory) != nil
+    end
+    
+    def git_root_dir(directory = File.expand_path('.'))
+      current_directory = directory  
+      while !File.exists?(File.join(current_directory, '.git'))
+        current_directory = File.dirname(current_directory)
+      end
+      current_directory
+    end
+    
+    def temp_file?(directory = File.expand_path('.'))
+      File.exist?(temp_file(directory))
+    end
+    
+    def temp_file(directory = File.expand_path('.'))
+      File.join(File.join(git_root_dir(directory), '.git'), 'cherrybase')
+    end
+    
+    def delete_temp_file(directory = File.expand_path('.'))
+      File.delete(temp_file(directory))
+    end
+    
+    def read_temp_file(directory = File.expand_path('.'))
+      YAML::load_file( temp_file(directory) )
+    end
+    
+    def write_temp_file(starting_commit = nil, next_cherrypick = nil, commits = nil, directory = File.expand_path('.'))
+      data = {
+        "starting_commit" => starting_commit,
+        "next_cherrypick" => next_cherrypick,
+        "commits" => commits
+      }
+      filename = temp_file(directory)
+      File.open(filename, "w") do |f|
+          f.write(YAML::dump(data))
+      end
+    end
+  end
+end

data/lib/git.rb

@@ -0,0 +1,118 @@
+require 'cmd'
+
+module Cherrybase
+  class Git
+    def initialize(cmd = Cherrybase::Cmd.new)
+      @cmd = cmd
+    end
+    
+    def reset(commit_hash)
+      @cmd.run("git reset --hard #{commit_hash}")
+    end
+    
+    def has_commit?(branch_name, commit_hash)
+      resolve_commit(branch_name, commit_hash) != nil
+    end
+    
+    def resolve_commit(branch_name, commit_hash)
+      if commit_hash
+        raise "Please supply at least 5 characters for a commit hash" if commit_hash.length < 5
+        @cmd.run("git log #{branch_name} --pretty=oneline").each do |line|
+          if line == commit_hash || line.include?(commit_hash)
+            return line.split(' ')[0]
+          end
+        end
+      end
+      nil
+    end
+    
+    def last_commit(branch_name)
+      lines = @cmd.run("git log #{branch_name} --pretty=oneline")
+      if (lines.length > 0)
+        lines[0].split(' ')[0]
+      else
+        nil
+      end
+    end
+    
+    def cherry_pick(commit_hash)
+      @cmd.run("git cherry-pick #{commit_hash}")
+    end
+    
+    def has_conflicts?()
+      @cmd.run("git ls-files -tu").length > 0
+    end
+    
+    def commit(commit_hash)
+      @cmd.run("git commit -C #{commit_hash}")
+    end
+    
+    def status()
+      @cmd.run("git status", true)
+    end
+    
+    def current_branch()
+      @cmd.run("git branch").each do |line|
+        if line.index('*')
+          return line.gsub(/\*(.+)/, '\1').strip
+        end
+      end
+      nil
+    end
+    
+    def has_branch?(branch_name)
+      @cmd.run("git branch").each do |line|
+        if line.strip == branch_name
+          return true
+        end
+      end
+      false
+    end
+    
+    def commits_to_cherrypick(branch_name, first_commit = nil, last_commit = nil)
+      commits = []
+      @cmd.run("git log #{branch_name} --pretty=oneline").each do |line|
+        commit_hash = line.split(' ')[0]
+        if commit_hash == first_commit
+          commits << commit_hash
+          break
+        else
+          commits << commit_hash
+        end
+      end
+      
+      if last_commit
+        remove_commits = []
+        commits.each do |commit|
+          if  commit == last_commit
+             break
+          else
+             remove_commits << commit
+          end
+      end
+      commits = commits - remove_commits
+     end
+     
+     commits.reverse
+    end
+    
+    def last_svn_commit()
+      last_commit_hash = nil
+      svn_commit_found = false
+      @cmd.run("git log").each do |line|
+        if line.include?("git-svn-id")
+          svn_commit_found = true
+          break
+        else
+          if line =~ /commit [a-z0-9]+$/
+            last_commit_hash = line[7,line.length]
+          end
+        end
+      end
+      if (!svn_commit_found)
+        last_commit_hash = nil
+      end
+      last_commit_hash
+    end
+  end
+end

data/spec/args_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Cherrybase::Args do
+  
+  before(:each) do
+    @args = Cherrybase::Args.new
+  end
+  
+  it "should show help" do
+    @args.parse(['--help']).should == {'help' => true}
+  end
+  
+  it "should break up a range of commits and set the starting and the last commit" do
+    @args.parse(['branch', 'start..end']).should == {'branch'=>'branch', 'starting-commit' => 'start', 'ending-commit' => 'end'}
+  end
+  
+  it "should raise an error if a branch name is given without a commit hash" do
+    lambda {
+      @args.parse(['branch-name'])
+    }.should raise_error(RuntimeError, 'You must supply at least the branch name and the starting commit hash to begin cherrybasing')
+  end
+  
+  it "should set the branch name and the commit hash given" do
+    @args.parse(['branch-name', 'commit-hash']).should == {'branch' => 'branch-name', 'starting-commit' => 'commit-hash'}
+  end
+  
+  it "should raise an error if a commit hash is not given" do
+    lambda {
+      @args.parse([])
+    }.should raise_error(RuntimeError, 'You must supply at least the branch name and the starting commit hash to begin cherrybasing')
+  end
+  
+  it "should raise an error if both --abort and --continue are given" do
+    lambda {
+      @args.parse(['--abort', '--continue'])
+    }.should raise_error(RuntimeError, "You supplied --abort and --continue, please pick one")
+  end
+  
+  it "should set abort to true if --abort is given" do
+    @args.parse(['--abort']).should == {'abort' => true, 'continue' => false}
+  end
+  
+  it "should set continue to true if --continue is given" do
+    @args.parse(['--continue']).should == {'continue' => true, 'abort' => false}
+  end
+  
+end

data/spec/baser_spec.rb

@@ -0,0 +1,201 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Cherrybase::Baser do
+  BRANCH = 'branch-name'
+  
+  before(:each) do
+    @git = mock("git")
+    @file_util = mock("file_util")
+    @baser = Cherrybase::Baser.new(@git, @file_util)
+  end
+  
+  it "should reset HEAD back to the last original commit before any cherry-picks" do
+    @file_util.stub!(:temp_file?).and_return(true)
+    @file_util.stub!(:read_temp_file).and_return({"starting_commit" => "start"})
+    @file_util.should_receive(:delete_temp_file)
+    @git.should_receive(:reset).with("start")
+    
+    @baser.abort
+  end
+  
+  it "should raise an error if you try to abort while not in a cherrybase" do
+    @file_util.should_receive(:temp_file?).and_return(false)
+    
+    lambda {
+      @baser.abort
+    }.should raise_error(RuntimeError, "It appears you are not in the middle of a cherrybase!?")
+  end
+  
+  it "should use the end commit if given" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @git.should_receive(:has_commit?).with(BRANCH, 'starting-commit').and_return(true)
+    @git.should_receive(:has_commit?).with(BRANCH, 'end-commit').and_return(true)
+    @git.should_receive(:commits_to_cherrypick).with(BRANCH, 'first_commit', 'last_commit').and_return(['commits-to-cherrypick'])
+    @git.stub!(:resolve_commit).with(BRANCH, "starting-commit").and_return("first_commit")
+    @git.stub!(:resolve_commit).with(BRANCH, "end-commit").and_return("last_commit")
+    @file_util.should_receive(:write_temp_file).with('last_original_commit', 'first_commit', ['commits-to-cherrypick'])
+    @git.stub!(:current_branch).and_return("current")
+    @git.stub!(:last_commit).with("current").and_return("last_original_commit")
+    
+    @baser.init(BRANCH, 'starting-commit', "end-commit")
+  end
+  
+  it "should raise an error if the end commit could not be located in the history" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @git.should_receive(:has_commit?).with(BRANCH, "start").and_return(true)
+    @git.should_receive(:has_commit?).with(BRANCH, "end").and_return(false)
+    lambda {
+      @baser.init(BRANCH, "start", "end")
+    }.should raise_error(RuntimeError, "Could not locate END hash (end) in the Git repository history")
+  end
+  
+  it "should raise an error if the start commit could not be located in the history" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    lambda {
+      @git.should_receive(:has_commit?).with(BRANCH, "doesNotExist").and_return(false)
+      @baser.init(BRANCH, "doesNotExist", nil)
+    }.should raise_error(RuntimeError, "Could not locate START hash (doesNotExist) in the Git repository history")
+  end
+  
+  it "should commit staged merge resolution" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => "commit1",
+      "commits" => ["start", "commit1"]
+    })
+    @git.should_receive(:commit).with("start")
+    @git.should_receive(:cherry_pick).with("commit1")
+    @git.should_receive(:has_conflicts?).and_return(false)
+    @file_util.should_receive(:delete_temp_file)
+    
+    @baser.continue(true)
+  end
+  
+  it "should start apply commits based on the next_cherrypick" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => "commit1",
+      "commits" => ["start", "commit1"]
+    })
+    @git.should_receive(:cherry_pick).with("commit1")
+    @git.should_receive(:has_conflicts?).and_return(false)
+    @file_util.should_receive(:delete_temp_file)
+    
+    @baser.continue
+  end
+  
+  it "should cleanup the temp file if a conflict is encountered on the last commit" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => "start",
+      "commits" => ["start"]
+    })
+    @git.should_receive(:cherry_pick).with("start")
+    @git.should_receive(:has_conflicts?).and_return(true)
+    @git.should_receive(:status)
+    @file_util.should_receive(:delete_temp_file)
+    
+    @baser.continue
+  end
+  
+  it "should stop cherrypicking if a conflict is found" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => "start",
+      "commits" => ["start", "end"]
+    })
+    @git.should_receive(:cherry_pick).with("start")
+    @git.should_receive(:has_conflicts?).and_return(true)
+    @git.should_receive(:status)
+    @file_util.should_receive(:write_temp_file).with("start", "end", ["start", "end"])
+    
+    @baser.continue
+  end
+  
+
+  it "should attempt to cherry-pick all the commits left (two commits)" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => "start",
+      "commits" => ["start", "end"]
+    })
+    @git.should_receive(:cherry_pick).with("start")
+    @git.should_receive(:cherry_pick).with("end")
+    @git.should_receive(:has_conflicts?).and_return(false)
+    @git.should_receive(:has_conflicts?).and_return(false)
+    @file_util.should_receive(:delete_temp_file)
+    
+    @baser.continue
+  end
+  
+  it "should attempt to cherry-pick all the commits left (one commit)" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => "start",
+      "commits" => ["start"]
+    })
+    @git.should_receive(:cherry_pick).with("start")
+    @git.should_receive(:has_conflicts?).and_return(false)
+    @file_util.should_receive(:delete_temp_file)
+    
+    @baser.continue
+  end
+  
+  it "should throw an error if you are not in the middle of a cherrybase" do
+    @file_util.should_receive(:temp_file?).and_return(false)
+    lambda {
+      @baser.continue
+    }.should raise_error(RuntimeError, "It appears you are not in the middle of a cherrybase!?")
+  end
+  
+  it "should create the cherrybase temp file with the given branch's last commit" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @git.should_receive(:last_commit).with(BRANCH).and_return('last-commit')
+    @git.should_receive(:has_commit?).with(BRANCH, 'starting-commit').and_return(true)
+    @git.should_receive(:commits_to_cherrypick).with(BRANCH, 'first_commit', 'last-commit').and_return(['commits-to-cherrypick'])
+    @git.stub!(:resolve_commit).with(BRANCH, "starting-commit").and_return("first_commit")
+    @git.stub!(:current_branch).and_return("current")
+    @git.stub!(:last_commit).with("current").and_return("last_original_commit")
+    @file_util.should_receive(:write_temp_file).with('last_original_commit', 'first_commit', ['commits-to-cherrypick'])
+    @baser.init(BRANCH, 'starting-commit', nil)
+  end
+  
+  it "should throw an error if the given branch name does not exist in the repository" do
+    lambda {
+      @file_util.should_receive(:git_repo?).and_return(true)
+      @git.should_receive(:has_branch?).with(BRANCH).and_return(false)
+      @baser.init(BRANCH, nil, nil)
+    }.should raise_error(RuntimeError, "Could not find branch (branch-name) in the Git repository")
+  end
+  
+  it "should throw an exception if the git repo folder could not be discovered" do
+    lambda {
+      @file_util.should_receive(:git_repo?).and_return(false)
+      @baser.init(nil, nil, nil)
+    }.should raise_error(RuntimeError, "Could not locate .git folder! Is this a Git repository?")
+  end
+  
+  it "should throw an error if you already in the middle of a cherrybase" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    lambda {
+      @file_util.should_receive(:temp_file?).and_return(true)
+      @baser.init("branch-name", nil, nil)
+    }.should raise_error(RuntimeError, "It appears you are already in the middle of a cherrybase!?")
+  end
+  
+end

data/spec/executor_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Cherrybase::Executor do
+  
+  before(:each) do
+    @baser = mock('baser')
+    @executor = Cherrybase::Executor.new(@baser)
+  end
+  
+  it "should tell the baser to init with the appropriate branch name and range of commits" do
+    @baser.should_receive(:init).with('branch-name', 'starting-commit', 'ending-commit')
+    @baser.should_receive(:continue)
+    @executor.execute(['branch-name', 'starting-commit..ending-commit'])    
+  end
+  
+  it "should tell the baser to init with the appropriate branch and starting commit" do
+    @baser.should_receive(:init).with('branch-name', 'starting-commit', nil)
+    @baser.should_receive(:continue)
+    @executor.execute(['branch-name', 'starting-commit'])
+  end
+
+  it "should tell the baser to abort" do
+    @baser.should_receive(:abort)
+    @executor.execute(['--abort'])
+  end
+
+  it "should tell the baser to continue to the next commit" do
+    @baser.should_receive(:continue).with(true)
+    @executor.execute(['--continue'])
+  end
+  
+end

data/spec/file_util_spec.rb

@@ -0,0 +1,57 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Cherrybase::FileUtil do
+  
+  before(:each) do
+    @fixtures_dir = File.expand_path(File.join(File.join(__FILE__, ".."), ".."), "fixtures")
+    @project = File.join(File.join(@fixtures_dir, "project"))
+    @file_util = Cherrybase::FileUtil.new
+  end
+  
+  it "should delete the temp file" do
+    test_project = File.join(@fixtures_dir, 'cherrybase-inprogress')
+    @file_util.write_temp_file("starting-commit", "next-commit", ["commit1", "commit2"], test_project)
+    
+    @file_util.delete_temp_file(test_project)
+    @file_util.temp_file?(test_project).should == false
+  end
+  
+  it "should read the temp file" do
+    test_project = File.join(@fixtures_dir, 'cherrybase-inprogress')
+    @file_util.write_temp_file("starting-commit", "next-commit", ["commit1", "commit2"], test_project)
+    @file_util.read_temp_file(test_project).should == {
+      "starting_commit" => "starting-commit",
+      "next_cherrypick" => "next-commit",
+      "commits" => ["commit1", "commit2"]
+    }
+  end
+  
+  it "should return nil if the temp file does not exist in the .git folder" do
+    expected_tempfile = File.join(File.join(@project, '.git'), 'cherrybase')
+    @file_util.temp_file?(@project).should == false
+  end
+  
+  it "should find the temp file if it exists in the .git folder" do
+    test_project = File.join(@fixtures_dir, 'cherrybase-inprogress')
+    @file_util.write_temp_file("starting-commit", "next-commit", ["commit1", "commit2"], test_project)
+    expected_tempfile = File.join(File.join(test_project, '.git'), 'cherrybase')
+    @file_util.temp_file?(test_project).should == true
+  end
+
+  it "should recursively look up the directory tree and return the project directory" do
+    @file_util.git_root_dir(File.join(@project, "module")).should == @project
+  end
+  
+  it "should return the current directory if the current directory contains the .git folder" do
+    @file_util.git_root_dir(@project).should == @project
+  end
+
+  it "should recursively look up directory tree for a git repository" do
+    @file_util.git_repo?(File.join(@project, "module")).should == true
+  end
+
+  it "should find git repo if in the git main dir" do
+    @file_util.git_repo?(@project).should == true
+  end
+
+end

data/spec/git_spec.rb

@@ -0,0 +1,156 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Cherrybase::Git do
+  
+  before(:each) do
+    @cmd = mock("cmd")
+    @git = Cherrybase::Git.new(@cmd)
+  end
+  
+  it "should reset the HEAD to the given commit" do
+    @cmd.should_receive(:run).with("git reset --hard commit")
+    
+    @git.reset("commit")
+  end
+  
+  it "should raise an error if the commit hash given is not at least 5 characters" do
+    lambda {
+      @git.has_commit?("branch", "1234")
+    }.should raise_error(RuntimeError, "Please supply at least 5 characters for a commit hash")
+  end
+  
+  it "should return true if a partial match is found for the given hash" do
+    @cmd.should_receive(:run).with("git log branch --pretty=oneline").and_return(["commit1", "commit2-hash", "commit3"])
+    @git.has_commit?("branch", "-hash").should == true
+  end
+  
+  it "should return true if an exact match is found for the given hash" do
+    @cmd.should_receive(:run).with("git log branch --pretty=oneline").and_return(["commit"])
+    @git.has_commit?("branch", "commit").should == true
+  end
+  
+  it "should return false if a hash could not be found in the history of the given branch" do
+    @cmd.should_receive(:run).with("git log branch --pretty=oneline").and_return([])
+    @git.has_commit?("branch", "commit").should == false
+  end
+  
+  it "should return nil if there is no commit history" do
+    @cmd.should_receive(:run).with("git log branch --pretty=oneline").and_return([])
+    @git.last_commit('branch').should == nil
+  end
+  
+  it "should return the last commit of the given branch" do
+    pretty_log_lines = ["hash1 comment-1", "hash2 comment-2", "hash3 comment-3"]
+    @cmd.should_receive(:run).with("git log branch --pretty=oneline").and_return(pretty_log_lines)
+    @git.last_commit('branch').should == 'hash1'
+  end
+  
+  it "should return the current branch name" do
+    @cmd.should_receive(:run).with("git branch").and_return(["branch1", "* branch2"])
+    @git.current_branch().should == "branch2"
+  end
+  
+  it "should return false if the branch does not exist" do
+    @cmd.should_receive(:run).with("git branch").and_return(["branch1", "branch2"])
+    @git.has_branch?("doesNotExist").should == false
+  end
+  
+  it "should return true if the branch exists" do
+    @cmd.should_receive(:run).with("git branch").and_return([" branch1", " branch2"])
+    @git.has_branch?("branch2").should == true
+  end
+  
+  it "should cherry-pick the given commit hash" do
+    commit_hash = "commit hash"
+    @cmd.should_receive(:run).with("git cherry-pick #{commit_hash}")
+    @git.cherry_pick(commit_hash)
+  end
+  
+  it "should return false if no files are marked as unmerged" do
+    @cmd.should_receive(:run).with("git ls-files -tu").and_return([])
+    
+    @git.has_conflicts?().should == false
+  end
+  
+  it "should return true if files are marked as unmerged" do
+    log_lines = [
+      "M 100644 e01079f2c38b76cf43780a2899c3f5bd2f50b3a7 1	readme.txt",
+      "M 100644 f7b5ff223f06fb323463b81b08759cf13678fd27 2	readme.txt",
+      "M 100644 0ebe257230ddb66e12610ad9b304c7605b61dfeb 3	readme.txt"
+    ]
+    
+    @cmd.should_receive(:run).with("git ls-files -tu").and_return(log_lines)
+    
+    @git.has_conflicts?().should == true
+  end
+  
+  it "should shell out a commit" do
+    commit_hash = "commit hash"
+    
+    @cmd.should_receive(:run).with("git commit -C #{commit_hash}")
+    
+    @git.commit(commit_hash)
+  end
+  
+  it "should shell out a git status" do
+    @cmd.should_receive(:run).with("git status", true)
+    
+    @git.status
+  end
+  
+  it "should grab all commit hashes after the commit and the last commit given" do
+    pretty_log_lines = ["hash1 comment-1", "hash2 comment-2", "hash3 comment-3", "hash4 commit-4"]
+    
+    @cmd.stub!(:run).with("git log branch --pretty=oneline").and_return(pretty_log_lines)
+    
+    @git.commits_to_cherrypick("branch", "hash3", "hash2").should == ["hash3", "hash2"]
+  end
+  
+  it "should grab all commit hashes after the commit and the commit given" do
+    pretty_log_lines = ["hash1 comment-1", "hash2 comment-2", "hash3 comment-3"]
+    
+    @cmd.stub!(:run).with("git log branch --pretty=oneline").and_return(pretty_log_lines)
+    
+    @git.commits_to_cherrypick("branch", "hash2").should == ["hash2", "hash1"]
+  end
+
+  
+  it "should return nil if no svn commit was found" do
+    log_lines = [
+      "commit hash1",
+      "Author: author-1",
+      "Date: date-1",
+      "",
+      " comment-1",
+      ""
+    ]
+    
+    @cmd.stub!(:run).and_return(log_lines)
+    
+    @git.last_svn_commit.should == nil
+  end
+  
+  it "should find the last svn commit hash" do
+    log_lines = [
+      "commit hash1",
+      "Author: author-1",
+      "Date: date-1",
+      "",
+      " comment-1",
+      "",
+      "commit hash2",
+      "Author: author-2",
+      "Date: date-2",
+      "",
+      "comment-2",
+      "",
+      " git-svn-id: url",
+      ""
+    ]
+    
+    @cmd.stub!(:run).and_return(log_lines)
+    
+    @git.last_svn_commit.should == "hash2"
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'git'
+require 'baser'
+require 'file_util'
+require 'args'
+require 'executor'
+
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end
+
+module Kernel
+  if ENV.keys.find {|env_var| env_var.match(/^TM_/)}
+    def rputs(*args)
+      puts( *["<pre>", args.collect {|a| CGI.escapeHTML(a.to_s)}, "</pre>"])
+    end
+  else
+    alias_method :rputs, :puts
+  end
+end

metadata

@@ -0,0 +1,90 @@
+--- !ruby/object:Gem::Specification 
+name: cherrybase
+version: !ruby/object:Gem::Version 
+  version: 0.0.1
+platform: ruby
+authors: 
+- born2snipe
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-12-12 00:00:00 -06:00
+default_executable: cherrybase
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Ruby gem to cherry-pick a range of commits with similar rebase options
+email: born2snipe@gmail.com
+executables: 
+- cherrybase
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- .document
+- .gitignore
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- bin/cherrybase
+- cherrybase.gemspec
+- lib/args.rb
+- lib/baser.rb
+- lib/cmd.rb
+- lib/executor.rb
+- lib/file_util.rb
+- lib/git.rb
+- spec/args_spec.rb
+- spec/baser_spec.rb
+- spec/executor_spec.rb
+- spec/file_util_spec.rb
+- spec/git_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://github.com/born2snipe/cherrybase
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Ruby gem to cherry-pick a range of commits with similar rebase options
+test_files: 
+- spec/args_spec.rb
+- spec/baser_spec.rb
+- spec/executor_spec.rb
+- spec/file_util_spec.rb
+- spec/git_spec.rb
+- spec/spec_helper.rb