git-process 0.9.1.pre3

data/lib/git-process/version.rb

@@ -0,0 +1,12 @@
+module Git
+  module Process
+    module Version
+      MAJOR = 0
+      MINOR = 9
+      PATCH = 1
+      BUILD = 'pre3'
+
+      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+    end
+  end
+end

data/spec/FileHelpers.rb

@@ -0,0 +1,18 @@
+require 'tmpdir'
+include FileUtils
+
+module FileHelpers
+  TEST_DIR = File.dirname(__FILE__)
+
+  def dir_files(dir)
+    Dir.entries(dir).grep(/^[^.]/)
+  end
+
+
+  def compare_files(file1name, file2name)
+    str1 = IO.read(file1name)
+    str2 = IO.read(file2name)
+    str1.should == str2
+  end
+
+end

data/spec/GitRepoHelper.rb

@@ -0,0 +1,86 @@
+require 'FileHelpers'
+require 'git-lib'
+
+module GitRepoHelper
+
+
+  def gitlib
+    @gitlib ||= Git::GitLib.new(tmpdir, :log_level => log_level)
+  end
+
+
+  def gitprocess
+    @gitprocess ||= Git::Process.new(nil, gitlib)
+  end
+
+
+  def tmpdir
+    @tmpdir ||= Dir.mktmpdir
+  end
+
+
+  def commit_count
+    gitlib.log_count
+  end
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  def logger
+    gitlib.logger
+  end
+
+
+  def create_files(file_names)
+    Dir.chdir(gitlib.workdir) do |dir|
+      file_names.each do |fn|
+        gitlib.logger.debug {"Creating #{dir}/#{fn}"}
+        FileUtils.touch fn
+      end
+    end
+    gitlib.add(file_names)
+  end
+
+
+  def change_file(filename, contents, lib = gitlib)
+    Dir.chdir(lib.workdir) do
+      File.open(filename, 'w') {|f| f.puts contents}
+    end
+  end
+
+
+  def change_file_and_add(filename, contents, lib = gitlib)
+    change_file(filename, contents, lib)
+    lib.add(filename)
+  end
+
+
+  def change_file_and_commit(filename, contents, lib = gitlib)
+    change_file_and_add(filename, contents, lib)
+    lib.commit("#{filename} - #{contents}")
+  end
+
+
+  def clone(branch='master', &block)
+    td = Dir.mktmpdir
+    gl = Git::GitLib.new(td, :log_level => log_level)
+    gl.add_remote('origin', "file://#{tmpdir}")
+    gl.fetch
+    gl.checkout(branch, :new_branch => "origin/#{branch}")
+    if block_given?
+      begin
+        block.arity < 1 ? gl.instance_eval(&block) : block.call(gl)
+      rescue => exp
+        rm_rf(gl.workdir)
+        raise exp
+      end
+      nil
+    else
+      gl
+    end
+  end
+
+end

data/spec/git-abstract-merge-error-builder_spec.rb

@@ -0,0 +1,113 @@
+require 'git-abstract-merge-error-builder'
+
+describe Git::AbstractMergeErrorBuilder do
+
+  def builder
+    unless @builder
+      @builder = Object.new
+      @builder.extend(Git::AbstractMergeErrorBuilder)
+      @builder.stub(:lib).and_return(lib)
+      @builder.stub(:continue_command).and_return(nil)
+      @builder.stub(:error_message).and_return('')
+    end
+    @builder
+  end
+
+
+  def lib
+    unless @lib
+      @lib = double('lib')
+      @lib.stub(:rerere_enabled?).and_return(true)
+      @lib.stub(:rerere_autoupdate?).and_return(true)
+      @lib.stub(:status).and_return(status)
+    end
+    @lib
+  end
+
+
+  def status
+    unless @status
+      @status = double('status')
+      @status.stub(:unmerged).and_return([])
+      @status.stub(:modified).and_return([])
+      @status.stub(:added).and_return([])
+    end
+    @status
+  end
+
+
+  def match_commands(expected)
+    commands = builder.commands
+    expected.each do |e|
+      commands.slice!(0).should == e
+    end
+    commands.should be_empty
+  end
+
+
+  it "merged with rerere.enabled false" do
+    lib.stub(:rerere_enabled?).and_return(false)
+    status.stub(:unmerged).and_return(['a', 'b c'])
+    status.stub(:modified).and_return(['a', 'b c'])
+
+    builder.resolved_files.should == []
+    builder.unresolved_files.should == ['a', 'b c']
+    match_commands [
+      'git config --global rerere.enabled true',
+      'git mergetool a b\ c',
+      '# Verify \'a\' merged correctly.',
+      '# Verify \'b c\' merged correctly.',
+      'git add a b\ c',
+    ]
+  end
+
+
+  it "merged with rerere.enabled true and auto-handled AND autoupdated a file" do
+    status.stub(:unmerged).and_return(['a', 'b c'])
+    status.stub(:modified).and_return(['a', 'b c'])
+    builder.stub(:error_message).and_return("\nResolved 'a' using previous resolution.\n")
+
+    builder.resolved_files.should == ['a']
+    builder.unresolved_files.should == ['b c']
+    match_commands [
+      '# Verify that \'rerere\' did the right thing for \'a\'.',
+      'git mergetool b\ c',
+      '# Verify \'b c\' merged correctly.',
+      'git add b\ c',
+    ]
+  end
+
+
+  it "merged with rerere.enabled true and auto-handled and not autoupdated a file" do
+    lib.stub(:rerere_autoupdate?).and_return(false)
+    status.stub(:unmerged).and_return(['a', 'b c'])
+    status.stub(:modified).and_return(['a', 'b c'])
+    builder.stub(:error_message).and_return("\nResolved 'a' using previous resolution.\n")
+
+    builder.resolved_files.should == ['a']
+    builder.unresolved_files.should == ['b c']
+    match_commands [
+      '# Verify that \'rerere\' did the right thing for \'a\'.',
+      'git add a',
+      'git mergetool b\ c',
+      '# Verify \'b c\' merged correctly.',
+      'git add b\ c',
+    ]
+  end
+
+
+  it "merged with a file added in both branches" do
+    lib.stub(:rerere_autoupdate?).and_return(false)
+    status.stub(:unmerged).and_return(['a'])
+    status.stub(:modified).and_return(['b'])
+    status.stub(:added).and_return(['a', 'c'])
+
+    builder.resolved_files.should == []
+    builder.unresolved_files.should == ['a']
+    match_commands [
+      '# \'a\' was added in both branches; Fix the conflict.',
+      'git add a',
+    ]
+  end
+
+end

data/spec/git-lib_spec.rb

@@ -0,0 +1,118 @@
+require 'git-lib'
+require 'GitRepoHelper'
+
+describe Git::GitLib do
+
+  describe "branches" do
+    include GitRepoHelper
+
+    it "list all the branches" do
+      create_files(['.gitignore'])
+      gitlib.commit('initial')
+
+      gitlib.branch('ba', :base_branch => 'master')
+      gitlib.branch('bb', :base_branch => 'master')
+      gitlib.branch('origin/master', :base_branch => 'master')
+
+      gitlib.branches.names.should == ['ba', 'bb', 'master', 'origin/master']
+    end
+
+  end
+
+
+  describe "branch" do
+    attr_reader :lib
+
+    before(:each) do
+      @lib = Git::GitLib.new(nil)
+    end
+
+
+    it "should create a branch with default base" do
+      lib.stub(:command).with(:branch, ['test_branch', 'master'])
+      lib.branch('test_branch')
+    end
+
+
+    it "should create a branch with explicit base" do
+      lib.stub(:command).with(:branch, ['test_branch', 'other_branch'])
+      lib.branch('test_branch', :base_branch => 'other_branch')
+    end
+
+
+    it "should delete a branch without force" do
+      lib.stub(:command).with(:branch, ['-d', 'test_branch'])
+      lib.branch('test_branch', :delete => true)
+    end
+
+
+    it "should delete a branch with force" do
+      lib.stub(:command).with(:branch, ['-D', 'test_branch'])
+      lib.branch('test_branch', :delete => true, :force => true)
+    end
+
+  end
+
+
+  describe "push" do
+    attr_reader :lib
+
+    before(:each) do
+      @lib = Git::GitLib.new(nil, :git => double('git'))
+    end
+
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should push local branch to remote" do
+      lib.should_receive(:command).with(:push, ['remote', 'local_branch:test_branch'])
+
+      lib.push('remote', 'local_branch', 'test_branch')
+    end
+
+
+    it "should push current branch to remote" do
+      lib.stub(:command).with(:branch, ['-a', '--no-color']).and_return("* my_branch\n")
+      lib.should_receive(:command).with(:push, ['remote', 'my_branch:my_branch'])
+
+      lib.push('remote', 'my_branch', nil)
+    end
+
+
+    it "should remove named branch on remote" do
+      lib.should_receive(:command).with(:push, ['remote', '--delete', 'my_branch'])
+
+      lib.push('remote', 'my_branch', nil, :delete => true)
+    end
+
+
+    it "should remove current branch on remote" do
+      lib.should_receive(:command).with(:push, ['remote', '--delete', 'my_branch'])
+
+      lib.push('remote', nil, nil, :delete => 'my_branch')
+    end
+
+
+    # it "should create a branch with explicit base" do
+    #   lib.stub(:command).with(:branch, ['test_branch', 'other_branch'])
+    #   lib.branch('test_branch', :base_branch => 'other_branch')
+    # end
+
+
+    # it "should delete a branch without force" do
+    #   lib.stub(:command).with(:branch, ['-d', 'test_branch'])
+    #   lib.branch('test_branch', :delete => true)
+    # end
+
+
+    # it "should delete a branch with force" do
+    #   lib.stub(:command).with(:branch, ['-D', 'test_branch'])
+    #   lib.branch('test_branch', :delete => true, :force => true)
+    # end
+
+  end
+
+end

data/spec/git-process_spec.rb

@@ -0,0 +1,328 @@
+require 'git-process'
+require 'GitRepoHelper'
+
+describe Git::Process do
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitlib.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  describe "rebase to master" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should work easily for a simple rebase" do
+      gitlib.checkout('fb', :new_branch => 'master')
+      change_file_and_commit('a', '')
+
+      commit_count.should == 2
+
+      gitlib.checkout('master')
+      change_file_and_commit('b', '')
+
+      gitlib.checkout('fb')
+
+      gitprocess.rebase_to_master
+
+      commit_count.should == 3
+    end
+
+
+    it "should work for a rebase after a rerere merge" do
+      # Make sure rerere is enabled
+      gitlib.rerere_enabled(true, false)
+      gitlib.rerere_autoupdate(false, false)
+
+      # Create the file to conflict on
+      change_file_and_commit('a', '')
+
+      # In the new branch, give it a new value
+      gitlib.checkout('fb', :new_branch => 'master') do
+        change_file_and_commit('a', 'hello')
+      end
+
+      # Change the value as well in the origional branch
+      gitlib.checkout('master') do
+        change_file_and_commit('a', 'goodbye')
+      end
+
+      # Merge in the new branch; don't error-out because will auto-fix.
+      gitlib.checkout('fb') do
+        gitlib.merge('master') rescue
+        change_file_and_commit('a', 'merged')
+      end
+
+      # Make another change on master
+      gitlib.checkout('master') do
+        change_file_and_commit('b', '')
+      end
+
+      # Go back to the branch and try to rebase
+      gitlib.checkout('fb')
+
+      begin
+        gitprocess.rebase_to_master
+        raise "Should have raised RebaseError"
+      rescue Git::Process::RebaseError => exp
+        exp.resolved_files.should == ['a']
+        exp.unresolved_files.should == []
+
+        exp.commands.length.should == 3
+        exp.commands[0].should match /^# Verify/
+        exp.commands[1].should == 'git add a'
+        exp.commands[2].should == 'git rebase --continue'
+      end
+    end
+
+  end
+
+
+  describe "remove current feature branch" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    describe "when handling the parking branch" do
+
+      it "should create it based on origin/master" do
+        gitlib.branch('fb', :base_branch => 'master')
+        clone('fb') do |gl|
+          gp = Git::Process.new(nil, gl)
+          gp.remove_feature_branch
+          gl.branches.current.name.should == '_parking_'
+        end
+      end
+
+
+      it "should move it to the new origin/master if it already exists and is clean" do
+        gitlib.branch('origin/master', :base_branch => 'master')
+        gitlib.branch('_parking_', :base_branch => 'origin/master')
+        change_file_and_commit('a', '')  # still on 'master'
+
+        gitlib.checkout('fb', :new_branch => 'origin/master')
+
+        gitprocess.remove_feature_branch
+
+        gitlib.branches.current.name.should == '_parking_'
+      end
+
+
+      it "should move it to the new origin/master if it already exists and changes are part of the current branch" do
+        gitlib.branch('origin/master', :base_branch => 'master')
+
+        gitlib.checkout('_parking_', :new_branch => 'origin/master') do
+          change_file_and_commit('a', '')
+        end
+
+        gitlib.branch('fb', :base_branch => '_parking_')
+
+        gitlib.checkout('origin/master') do
+          gitlib.merge('fb')
+        end
+
+        gitlib.checkout('fb')
+
+        gitprocess.remove_feature_branch
+        gitlib.branches.current.name.should == '_parking_'
+      end
+
+
+      it "should move it out of the way if it has unaccounted changes on it" do
+        gitlib.branch('origin/master', :base_branch => 'master')
+        gitlib.checkout('_parking_', :new_branch => 'origin/master')
+        change_file_and_commit('a', '')
+        gitlib.checkout('fb', :new_branch => 'origin/master')
+
+        gitlib.branches.include?('_parking_OLD_').should be_false
+        gitprocess.remove_feature_branch
+        gitlib.branches.include?('_parking_OLD_').should be_true
+        gitlib.branches.current.name.should == '_parking_'
+      end
+
+    end
+
+
+    it "should delete the old local branch when it has been merged into origin/master" do
+      gitlib.branch('origin/master', :base_branch => 'master')
+      change_file_and_commit('a', '')  # still on 'master'
+
+      gitlib.checkout('fb', :new_branch => 'origin/master')
+      gitlib.branches.include?('fb').should be_true
+      gitprocess.remove_feature_branch
+      gitlib.branches.include?('fb').should be_false
+      gitlib.branches.current.name.should == '_parking_'
+    end
+
+
+    it "should raise an error when the local branch has not been merged into origin/master" do
+      gitlib.branch('origin/master', :base_branch => 'master')
+      gitlib.checkout('fb', :new_branch => 'origin/master')
+      change_file_and_commit('a', '')  # on 'fb'
+
+      gitlib.branches.include?('fb').should be_true
+      expect {gitprocess.remove_feature_branch}.should raise_error Git::Process::GitProcessError
+    end
+
+
+    it "should delete the old remote branch" do
+      change_file_and_commit('a', '')
+
+      gitlib.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gl|
+        gl.branches.include?('origin/fb').should be_true
+        Git::Process.new(nil, gl).remove_feature_branch
+        gl.branches.include?('origin/fb').should be_false
+        gitlib.branches.include?('fb').should be_false
+        gl.branches.current.name.should == '_parking_'
+      end
+    end
+
+
+    describe "when used while on _parking_" do
+
+      it 'should fail #rebase_to_master' do
+        gitlib.checkout('_parking_', :new_branch => 'master')
+        change_file_and_commit('a', '')
+
+        expect {gitprocess.rebase_to_master}.should raise_error Git::Process::ParkedChangesError
+      end
+
+
+      it 'should fail #sync_with_server' do
+        gitlib.checkout('_parking_', :new_branch => 'master')
+        change_file_and_commit('a', '')
+
+        expect {gitprocess.sync_with_server(false, false)}.should raise_error Git::Process::ParkedChangesError
+      end
+
+    end
+
+  end
+
+
+  describe "#new_feature_branch" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should create the named branch against origin/master" do
+      gitlib.branch('origin/master', :base_branch => 'master')
+
+      new_branch = gitprocess.new_feature_branch('test_branch')
+
+      new_branch.name.should == 'test_branch'
+      new_branch.sha.should == gitlib.branches['origin/master'].sha
+    end
+
+
+    it "should bring committed changes on _parking_ over to the new branch" do
+      gitlib.branch('origin/master', :base_branch => 'master')
+      gitlib.checkout('_parking_', :new_branch => 'master')
+      change_file_and_commit('a', '')
+      change_file_and_commit('b', '')
+
+      new_branch = gitprocess.new_feature_branch('test_branch')
+
+      new_branch.name.should == 'test_branch'
+      Dir.chdir(gitlib.workdir) do |dir|
+        File.exists?('a').should be_true
+        File.exists?('b').should be_true
+      end
+
+      gitlib.branches.parking.should be_nil
+    end
+
+
+    it "should bring new/uncommitted changes on _parking_ over to the new branch" do
+      gitlib.branch('origin/master', :base_branch => 'master')
+      gitlib.checkout('_parking_', :new_branch => 'master')
+      change_file_and_commit('a', '')
+      change_file_and_add('b', '')
+      change_file('c', '')
+
+      new_branch = gitprocess.new_feature_branch('test_branch')
+
+      new_branch.name.should == 'test_branch'
+      Dir.chdir(gitlib.workdir) do |dir|
+        File.exists?('a').should be_true
+        File.exists?('b').should be_true
+        File.exists?('c').should be_true
+      end
+
+      gitlib.branches.parking.should be_nil
+    end
+
+  end
+
+
+  describe "#sync_with_server" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should work when pushing with fast-forward" do
+      change_file_and_commit('a', '')
+
+      gitlib.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gl|
+        change_file_and_commit('a', 'hello', gl)
+        gl.branches.include?('origin/fb').should be_true
+        Git::Process.new(nil, gl).sync_with_server(false, false)
+        gl.branches.include?('origin/fb').should be_true
+        gitlib.branches.include?('fb').should be_true
+      end
+    end
+
+
+    it "should fail when pushing with non-fast-forward and no force" do
+      change_file_and_commit('a', '')
+
+      gitlib.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gl|
+        gitlib.checkout('fb') do
+          change_file_and_commit('a', 'hello', gitlib)
+        end
+
+        expect {Git::Process.new(nil, gl).sync_with_server(false, false)}.should raise_error Git::GitExecuteError
+      end
+    end
+
+
+    it "should work when pushing with non-fast-forward and force" do
+      change_file_and_commit('a', '')
+
+      gitlib.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gl|
+        gitlib.checkout('fb') do
+          change_file_and_commit('a', 'hello', gitlib)
+        end
+
+        # expect {Git::Process.new(nil, gl).sync_with_server(false, true)}.should_not raise_error Git::GitExecuteError
+        Git::Process.new(nil, gl).sync_with_server(false, true)
+      end
+    end
+
+  end
+
+end