cherrybase 0.0.2 → 0.0.3

data/README.rdoc

@@ -11,6 +11,14 @@ This will attempt to cherry-pick from the <first-commit> all the way to <last-co
 
 	cherrybase <branch> <first-commit>..<last-commit>
 	
+This will attempt to cherry-pick from the commit just after the last svn commit from the <branch>
+
+	cherrybase <branch> svn
+	
+This will attempt to cherry-pick from the commit just after the last svn commit all the way to the <last-commit> from the <branch>
+
+	cherrybase <branch> svn..<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'.
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/cherrybase.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cherrybase}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["born2snipe"]
-  s.date = %q{2009-12-13}
+  s.date = %q{2009-12-14}
   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}
@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/cherrybase",
      "cherrybase.gemspec",
+     "fixtures/cherrybase-inprogress/git_dir/cherrybase",
+     "fixtures/project/git_dir/some_git_file",
+     "fixtures/project/module/some_module_file",
      "lib/args.rb",
      "lib/baser.rb",
      "lib/cmd.rb",

data/fixtures/cherrybase-inprogress/git_dir/cherrybase

@@ -0,0 +1,6 @@
+--- 
+starting_commit: starting-commit
+commits: 
+- commit1
+- commit2
+next_cherrypick: next-commit

data/lib/baser.rb

@@ -10,13 +10,20 @@ module Cherrybase
     end
     
     def init(branch_name, starting_commit, ending_commit)
+      use_svn_commit = starting_commit && starting_commit.upcase == 'SVN'
+      
       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 START hash (#{starting_commit}) in the Git repository history" if !use_svn_commit && !@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 (use_svn_commit)
+        first_commit = @git.last_svn_commit(branch_name)
+      else
+        first_commit = @git.resolve_commit(branch_name, starting_commit)
+      end
+      
       if (ending_commit)
         last_commit = @git.resolve_commit(branch_name, ending_commit)
       else
@@ -24,7 +31,12 @@ module Cherrybase
       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)
+      
+      if (use_svn_commit)
+        commits.delete_at(0)
+      end
+      
+      @file_util.write_temp_file(@git.last_commit(@git.current_branch), commits[0], commits)
     end
     
     def continue(commit_previous_hash = false)

data/lib/file_util.rb

@@ -2,13 +2,18 @@ require 'yaml'
 
 module Cherrybase
   class FileUtil
+    
+    def initialize(git_directory_name = '.git')
+      @git_dir_name = git_directory_name
+    end
+    
     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'))
+      while !File.exists?(File.join(current_directory, @git_dir_name))
         current_directory = File.dirname(current_directory)
       end
       current_directory
@@ -19,7 +24,7 @@ module Cherrybase
     end
     
     def temp_file(directory = File.expand_path('.'))
-      File.join(File.join(git_root_dir(directory), '.git'), 'cherrybase')
+      File.join(File.join(git_root_dir(directory), @git_dir_name), 'cherrybase')
     end
     
     def delete_temp_file(directory = File.expand_path('.'))

data/lib/git.rb

@@ -100,10 +100,10 @@ module Cherrybase
      commits.reverse
     end
     
-    def last_svn_commit()
+    def last_svn_commit(branch_name)
       last_commit_hash = nil
       svn_commit_found = false
-      @cmd.run("git log").each do |line|
+      @cmd.run("git log #{branch_name}").each do |line|
         if line.include?("git-svn-id")
           svn_commit_found = true
           break

data/spec/baser_spec.rb

@@ -7,6 +7,37 @@ describe Cherrybase::Baser do
     @git = mock("git")
     @file_util = mock("file_util")
     @baser = Cherrybase::Baser.new(@git, @file_util)
+    
+    @first_commit = "commit1"
+    @commits = ["commit1", "commit2"]
+  end
+  
+  it "should not care about case of the SVN 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(:last_svn_commit).with(BRANCH).and_return('svn_commit')
+    @git.should_receive(:last_commit).with(BRANCH).and_return('last_commit')
+    @git.should_receive(:commits_to_cherrypick).with(BRANCH, 'svn_commit', 'last_commit').and_return(['svn', 'commit1', 'commit2'])
+    @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)
+    
+    @baser.init(BRANCH, "SvN", nil)
+  end
+  
+  it "should find the commit after the last svn commit and use it as the starting 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_svn_commit).with(BRANCH).and_return('svn_commit')
+    @git.should_receive(:last_commit).with(BRANCH).and_return('last_commit')
+    @git.should_receive(:commits_to_cherrypick).with(BRANCH, 'svn_commit', 'last_commit').and_return(['svn', 'commit1', 'commit2'])
+    @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)
+    
+    @baser.init(BRANCH, "svn", nil)
   end
   
   it "should raise an error if your try to continue with changes that are unstaged" do
@@ -42,10 +73,10 @@ describe Cherrybase::Baser do
     @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.should_receive(:commits_to_cherrypick).with(BRANCH, @first_commit, 'last_commit').and_return(@commits)
+    @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'])
+    @file_util.should_receive(:write_temp_file).with('last_original_commit', @first_commit, @commits)
     @git.stub!(:current_branch).and_return("current")
     @git.stub!(:last_commit).with("current").and_return("last_original_commit")
     
@@ -193,11 +224,11 @@ describe Cherrybase::Baser do
     @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.should_receive(:commits_to_cherrypick).with(BRANCH, @first_commit, 'last-commit').and_return(@commits)
+    @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'])
+    @file_util.should_receive(:write_temp_file).with('last_original_commit', @first_commit, @commits)
     @baser.init(BRANCH, 'starting-commit', nil)
   end
   

data/spec/file_util_spec.rb

@@ -5,7 +5,8 @@ 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
+    @git_dir_name = 'git_dir'
+    @file_util = Cherrybase::FileUtil.new(@git_dir_name)
   end
   
   it "should delete the temp file" do
@@ -27,14 +28,14 @@ describe Cherrybase::FileUtil do
   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')
+    expected_tempfile = File.join(File.join(@project, @git_dir_name), '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')
+    expected_tempfile = File.join(File.join(test_project, @git_dir_name), 'cherrybase')
     @file_util.temp_file?(test_project).should == true
   end
 

data/spec/git_spec.rb

@@ -133,9 +133,9 @@ describe Cherrybase::Git do
       ""
     ]
     
-    @cmd.stub!(:run).and_return(log_lines)
+    @cmd.stub!(:run).with("git log branch").and_return(log_lines)
     
-    @git.last_svn_commit.should == nil
+    @git.last_svn_commit("branch").should == nil
   end
   
   it "should find the last svn commit hash" do
@@ -156,9 +156,9 @@ describe Cherrybase::Git do
       ""
     ]
     
-    @cmd.stub!(:run).and_return(log_lines)
+    @cmd.stub!(:run).with("git log branch").and_return(log_lines)
     
-    @git.last_svn_commit.should == "hash2"
+    @git.last_svn_commit("branch").should == "hash2"
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cherrybase
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - born2snipe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -06:00
+date: 2009-12-14 00:00:00 -06:00
 default_executable: cherrybase
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,9 @@ files:
 - VERSION
 - bin/cherrybase
 - cherrybase.gemspec
+- fixtures/cherrybase-inprogress/git_dir/cherrybase
+- fixtures/project/git_dir/some_git_file
+- fixtures/project/module/some_module_file
 - lib/args.rb
 - lib/baser.rb
 - lib/cmd.rb