cherrybase 0.0.3 → 0.0.4

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+nbproject

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/cherrybase.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cherrybase}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["born2snipe"]
-  s.date = %q{2009-12-14}
+  s.date = %q{2010-01-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}
@@ -36,13 +36,15 @@ Gem::Specification.new do |s|
      "lib/executor.rb",
      "lib/file_util.rb",
      "lib/git.rb",
+     "lib/validator.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"
+     "spec/spec_helper.rb",
+     "spec/validator_spec.rb"
   ]
   s.homepage = %q{http://github.com/born2snipe/cherrybase}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -55,7 +57,8 @@ Gem::Specification.new do |s|
      "spec/executor_spec.rb",
      "spec/file_util_spec.rb",
      "spec/git_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/validator_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/baser.rb

@@ -1,22 +1,20 @@
 require 'git'
 require 'file_util'
+require 'validator'
 
 module Cherrybase
   class Baser
     
-    def initialize(git = Cherrybase::Git.new, file_util = Cherrybase::FileUtil.new)
+    def initialize(git = Cherrybase::Git.new, file_util = Cherrybase::FileUtil.new, validator = Cherrybase::Validator.new)
       @git = git
       @file_util = file_util
+      @validator = validator
     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 !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)      
+      @validator.validate_init(branch_name, starting_commit, ending_commit, use_svn_commit)
       
       if (use_svn_commit)
         first_commit = @git.last_svn_commit(branch_name)
@@ -29,7 +27,7 @@ module Cherrybase
       else
         last_commit = @git.last_commit(branch_name)
       end
-      
+
       commits = @git.commits_to_cherrypick(branch_name, first_commit, last_commit)
       
       if (use_svn_commit)

data/lib/executor.rb

@@ -31,14 +31,14 @@ module Cherrybase
     end
     
     def showUsage() 
-      puts "Usage: cherrybase [<branch> [<commit> | <commit>..<commit>]] | --continue | --abort"
+      puts "Usage: cherrybase [<branch> [<commit> | <commit>..<commit> | svn | svn..<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 "\tshowUsage()"
         puts "DESCRIPTION"
         puts "\tThe idea is to cherry-pick across multiple commits and have similar functionality as the rebase command."
     end

data/lib/git.rb

@@ -44,7 +44,12 @@ module Cherrybase
     end
     
     def has_conflicts?()
-      @cmd.run("git ls-files -tu").length > 0
+      @cmd.run("git status").each do |line|
+        if (line.include?("Unmerged paths:"))
+          return true
+        end
+      end
+      false
     end
     
     def commit(commit_hash)
@@ -109,7 +114,7 @@ module Cherrybase
           break
         else
           if line =~ /commit [a-z0-9]+$/
-            last_commit_hash = line[7,line.length]
+            last_commit_hash = line[7,line.length].strip
           end
         end
       end

data/lib/validator.rb

@@ -0,0 +1,19 @@
+module Cherrybase
+  class Validator
+
+    def initialize(git = Cherrybase::Git.new, file_util = Cherrybase::FileUtil.new)
+      @git = git
+      @file_util = file_util
+    end
+
+    def validate_init(branch_name, starting_commit, ending_commit, use_svn_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 !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)
+      raise "Could not locate the last SVN commit in branch (#{branch_name})" if use_svn_commit && !@git.last_svn_commit(branch_name)
+    end
+
+  end
+end

data/spec/baser_spec.rb

@@ -6,16 +6,15 @@ describe Cherrybase::Baser do
   before(:each) do
     @git = mock("git")
     @file_util = mock("file_util")
-    @baser = Cherrybase::Baser.new(@git, @file_util)
+    @validator = mock("validator")
+    @baser = Cherrybase::Baser.new(@git, @file_util, @validator)
     
     @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)
+    @validator.should_receive(:validate_init)
     @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'])
@@ -27,9 +26,7 @@ describe Cherrybase::Baser do
   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)
+    @validator.should_receive(:validate_init)
     @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'])
@@ -68,11 +65,7 @@ describe Cherrybase::Baser do
   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)
+    @validator.should_receive(:validate_init)
     @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")
@@ -83,28 +76,6 @@ describe Cherrybase::Baser do
     @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({
@@ -219,11 +190,8 @@ describe Cherrybase::Baser do
   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)
+    @validator.should_receive(:validate_init)
     @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)
     @git.stub!(:resolve_commit).with(BRANCH, "starting-commit").and_return(@first_commit)
     @git.stub!(:current_branch).and_return("current")
@@ -232,28 +200,4 @@ describe Cherrybase::Baser do
     @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/git_spec.rb

@@ -75,19 +75,18 @@ describe Cherrybase::Git do
   end
   
   it "should return false if no files are marked as unmerged" do
-    @cmd.should_receive(:run).with("git ls-files -tu").and_return([])
+    @cmd.should_receive(:run).with("git status").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"
+      "# On branch test",
+      "# Unmerged paths:"
     ]
     
-    @cmd.should_receive(:run).with("git ls-files -tu").and_return(log_lines)
+    @cmd.should_receive(:run).with("git status").and_return(log_lines)
     
     @git.has_conflicts?().should == true
   end
@@ -146,7 +145,7 @@ describe Cherrybase::Git do
       "",
       " comment-1",
       "",
-      "commit hash2",
+      "commit hash2\n",
       "Author: author-2",
       "Date: date-2",
       "",

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'baser'
 require 'file_util'
 require 'args'
 require 'executor'
+require 'validator'
 
 require 'spec'
 require 'spec/autorun'

data/spec/validator_spec.rb

@@ -0,0 +1,93 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Cherrybase::Validator do
+  BRANCH = "branch-name"
+
+  before(:each) do
+    @git = mock("git")
+    @file_util = mock("file_util")
+    @validator = Cherrybase::Validator.new(@git, @file_util)
+  end
+
+  it "should not raise any errors" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_commit?).with(BRANCH, "start-commit").and_return(true)
+    @git.should_receive(:has_commit?).with(BRANCH, "end-commit").and_return(true)
+
+    @validator.validate_init(BRANCH, "start-commit", "end-commit", nil)
+  end
+
+  it "should raise an error if the last SVN commit could not be found" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:last_svn_commit).with(BRANCH).and_return(nil)
+
+    lambda {
+      @validator.validate_init(BRANCH, nil, nil, true)
+    }.should raise_error(RuntimeError, "Could not locate the last SVN commit in branch (#{BRANCH})")
+  end
+
+  it "should raise an error if the given ending commit can not be found for the given branch" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_commit?).with(BRANCH, "start-commit").and_return(true)
+    @git.should_receive(:has_commit?).with(BRANCH, "end-commit").and_return(false)
+
+    lambda {
+      @validator.validate_init(BRANCH, "start-commit", "end-commit", nil)
+    }.should raise_error(RuntimeError, "Could not locate END hash (end-commit) in the Git repository history")
+  end
+
+
+  it "should not check for start commit hash if using the last SVN commit" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:last_svn_commit).with(BRANCH).and_return("last-svn-commit")
+
+    @validator.validate_init(BRANCH, nil, nil, true)
+  end
+
+  it "should raise an error if the given starting commit can not be found for the given branch" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(false)
+    @git.should_receive(:has_commit?).with(BRANCH, "start-commit").and_return(false)
+
+    lambda {
+      @validator.validate_init(BRANCH, "start-commit", nil, nil)
+    }.should raise_error(RuntimeError, "Could not locate START hash (start-commit) in the Git repository history")
+  end
+
+  it "should raise an error if you are currently in the middle of a cherrybase already" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(true)
+    @file_util.should_receive(:temp_file?).and_return(true)
+
+    lambda {
+      @validator.validate_init(BRANCH, nil, nil, nil)
+    }.should raise_error(RuntimeError, "It appears you are already in the middle of a cherrybase!?")
+  end
+
+  it "should raise an error if the branch given is NOT found in the repository" do
+    @file_util.should_receive(:git_repo?).and_return(true)
+    @git.should_receive(:has_branch?).with(BRANCH).and_return(false)
+
+    lambda {
+      @validator.validate_init(BRANCH, nil, nil, nil)
+    }.should raise_error(RuntimeError, "Could not find branch (#{BRANCH}) in the Git repository")
+  end
+
+  it "should raise an error if the current directory is NOT a git repository" do
+    @file_util.should_receive(:git_repo?).and_return(false)
+
+    lambda {
+      @validator.validate_init(nil, nil, nil, nil)
+    }.should raise_error(RuntimeError, "Could not locate .git folder! Is this a Git repository?")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cherrybase
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - born2snipe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -06:00
+date: 2010-01-12 00:00:00 -06:00
 default_executable: cherrybase
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - lib/executor.rb
 - lib/file_util.rb
 - lib/git.rb
+- lib/validator.rb
 - spec/args_spec.rb
 - spec/baser_spec.rb
 - spec/executor_spec.rb
@@ -56,6 +57,7 @@ files:
 - spec/git_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/validator_spec.rb
 has_rdoc: true
 homepage: http://github.com/born2snipe/cherrybase
 licenses: []
@@ -91,3 +93,4 @@ test_files:
 - spec/file_util_spec.rb
 - spec/git_spec.rb
 - spec/spec_helper.rb
+- spec/validator_spec.rb