cherrybase 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cherrybase.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cherrybase}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   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.date = %q{2009-12-13}
   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}

data/lib/baser.rb

@@ -35,36 +35,39 @@ module Cherrybase
       next_cherrypick = temp_data['next_cherrypick']
       
       if commit_previous_hash
-        @git.commit(commits[commits.index(next_cherrypick) - 1])
+        raise "Please stage all your changes before trying to --continue" if @git.has_conflicts?
+        commit_hash = commits.last
+        if next_cherrypick
+          commit_hash = commits[commits.index(next_cherrypick) - 1]
+        end
+        @git.commit(commit_hash)
       end
       
-      conflicts_found = false
-      last_commit_applied = nil
-      i = commits.index(next_cherrypick)
+      if next_cherrypick
+        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
+        while i < commits.length
+          puts "Applying #{i+1} of #{commits.length} cherry-picks" 
+          last_commit_applied = commits[i]
+          @git.cherry_pick(last_commit_applied)
+          if @git.has_conflicts?
+            conflicts_found = true
+            break
+          end
+          i += 1
         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
+        @file_util.write_temp_file(temp_data['starting_commit'], commits[i+1], commits)
       else
         @file_util.delete_temp_file()
+        puts "Cherrybase completed!"
       end
-      puts "Cherrybase completed!"
     end
     
     def abort()

data/lib/git.rb

@@ -17,13 +17,17 @@ module Cherrybase
     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
+        match = nil
         @cmd.run("git log #{branch_name} --pretty=oneline").each do |line|
           if line == commit_hash || line.include?(commit_hash)
-            return line.split(' ')[0]
+            raise "Ambigous hash commit found! Please supply more of the commit hash (#{commit_hash})" if match
+            match = line.split(' ')[0]
           end
         end
+        match
+      else
+        nil
       end
-      nil
     end
     
     def last_commit(branch_name)

data/spec/baser_spec.rb

@@ -9,6 +9,16 @@ describe Cherrybase::Baser do
     @baser = Cherrybase::Baser.new(@git, @file_util)
   end
   
+  it "should raise an error if your try to continue with changes that are unstaged" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({})
+    @git.stub!(:has_conflicts?).and_return(true)
+    
+    lambda {
+      @baser.continue(true)
+    }.should raise_error(RuntimeError, "Please stage all your changes before trying to --continue")
+  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"})
@@ -57,6 +67,7 @@ describe Cherrybase::Baser 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)
@@ -74,6 +85,21 @@ describe Cherrybase::Baser do
     @git.should_receive(:cherry_pick).with("commit1")
     @git.should_receive(:has_conflicts?).and_return(false)
     @file_util.should_receive(:delete_temp_file)
+    @git.stub!(:has_conflicts?).and_return(false)
+    
+    @baser.continue(true)
+  end
+  
+  it "should handle if the last commit had a conflict and you continue with committing" do
+    @file_util.should_receive(:temp_file?).and_return(true)
+    @file_util.should_receive(:read_temp_file).and_return({
+      "starting_commit" => "start",
+      "next_cherrypick" => nil,
+      "commits" => ["start", "commit1"]
+    })
+    @git.should_receive(:has_conflicts?).and_return(false)
+    @git.should_receive(:commit).with("commit1")
+    @file_util.should_receive(:delete_temp_file)
     
     @baser.continue(true)
   end
@@ -92,22 +118,23 @@ describe Cherrybase::Baser do
     @baser.continue
   end
   
-  it "should cleanup the temp file if a conflict is encountered on the last commit" do
+  it "should stop cherrypicking if a conflict is found, with multiple commits left" 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"]
+      "commits" => ["start", "middle", "end"]
     })
     @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)
+    @file_util.should_receive(:write_temp_file).with("start", "middle", ["start", "middle", "end"])
     
     @baser.continue
   end
   
-  it "should stop cherrypicking if a conflict is found" do
+  
+  it "should stop cherrypicking if a conflict is found, only one commit left" do
     @file_util.should_receive(:temp_file?).and_return(true)
     @file_util.should_receive(:read_temp_file).and_return({
       "starting_commit" => "start",

data/spec/git_spec.rb

@@ -7,6 +7,14 @@ describe Cherrybase::Git do
     @git = Cherrybase::Git.new(@cmd)
   end
   
+  it "should raise an error if another commit is found with the given has while resolving the commit" do
+    @cmd.stub!(:run).with("git log branch --pretty=oneline").and_return(["1234567", "123456"])
+    
+    lambda {
+      @git.resolve_commit("branch", "12345")
+    }.should raise_error(RuntimeError, "Ambigous hash commit found! Please supply more of the commit hash (12345)")
+  end
+  
   it "should reset the HEAD to the given commit" do
     @cmd.should_receive(:run).with("git reset --hard commit")
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cherrybase
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - born2snipe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -06:00
+date: 2009-12-13 00:00:00 -06:00
 default_executable: cherrybase
 dependencies: 
 - !ruby/object:Gem::Dependency