git-process-lib 2.0.0

data/spec/git_process_spec.rb

@@ -0,0 +1,208 @@
+require 'git-process/git_process'
+require 'GitRepoHelper'
+require 'fileutils'
+
+describe GitProc::Process do
+  include GitRepoHelper
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  before(:each) do
+    create_files(%w(.gitignore))
+    gitlib.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(gitlib.workdir)
+  end
+
+
+  describe 'run lifecycle' do
+
+    it 'should call the standard hooks' do
+      proc = GitProc::Process.new(gitlib)
+      proc.should_receive(:verify_preconditions)
+      proc.should_receive(:runner)
+      proc.should_receive(:cleanup)
+      proc.should_not_receive(:exit)
+
+      proc.run
+    end
+
+
+    it "should call 'cleanup' even if there's an error" do
+      proc = GitProc::Process.new(gitlib)
+      proc.should_receive(:verify_preconditions)
+      proc.should_receive(:runner).and_raise(GitProc::GitProcessError.new("Error!"))
+      proc.should_receive(:cleanup)
+      proc.should_receive(:exit)
+      proc.should_receive(:puts).with("Error!")
+
+      proc.run
+    end
+
+  end
+
+
+  describe "validate local integration branch" do
+
+    it "should use remove the int-branch if not on it and not blocked" do
+      clone_repo('master') do |gl|
+        gl.checkout('fb', :new_branch => 'master')
+
+        gp = GitProc::Process.new(gl)
+        gp.stub(:ask_about_removing_master).and_return(true)
+
+        gp.verify_preconditions
+
+        gl.branches.include?('master').should be_false
+      end
+    end
+
+
+    it "should ask use remove the int-branch if not on it and not blocked" do
+      clone_repo('master') do |gl|
+        gl.checkout('fb', :new_branch => 'master')
+
+        gp = GitProc::Process.new(gl)
+        gp.should_receive(:ask_about_removing_master).and_return(true)
+
+        gp.verify_preconditions
+
+        gl.branches.include?('master').should be_false
+      end
+    end
+
+
+    it "should ask use remove the int-branch if not on it and not blocked and not remove if answered no" do
+      clone_repo('master') do |gl|
+        gl.checkout('fb', :new_branch => 'master')
+
+        gp = GitProc::Process.new(gl)
+        gp.should_receive(:ask_about_removing_master).and_return(false)
+
+        gp.verify_preconditions
+
+        gl.branches.include?('master').should be_true
+      end
+    end
+
+
+    it "should not remove the int-branch if on it" do
+      clone_repo('master') do |gl|
+        gp = GitProc::Process.new(gl)
+        gp.verify_preconditions
+
+        gl.branches.include?('master').should be_true
+      end
+    end
+
+
+    it "should not remove the int-branch if blocked" do
+      clone_repo('master') do |gl|
+        gl.config['gitProcess.keepLocalIntegrationBranch'] = 'true'
+        gl.checkout('fb', :new_branch => 'master')
+
+        gp = GitProc::Process.new(gl)
+        gp.verify_preconditions
+
+        gl.branches.include?('master').should be_true
+      end
+    end
+
+
+    describe "local vs remote branch status" do
+
+      before(:each) do
+        change_file_and_commit('a.txt', 'a content', gitlib)
+        change_file_and_commit('b.txt', 'b content', gitlib)
+      end
+
+
+      it "should not remove if both have changes" do
+        clone_repo('master') do |gl|
+          change_file_and_commit('c.txt', 'c on origin/master', gitlib)
+          change_file_and_commit('d.txt', 'd on master', gl)
+
+          gl.checkout('fb', :new_branch => 'master')
+
+          gl.fetch
+
+          gp = GitProc::Process.new(gl)
+          gp.verify_preconditions
+
+          gl.branches.include?('master').should be_true
+        end
+      end
+
+
+      it "should remove if server changed but not local" do
+        clone_repo('master') do |gl|
+          gp = GitProc::Process.new(gl)
+          gp.stub(:ask_about_removing_master).and_return(true)
+
+          change_file_and_commit('c.txt', 'c on origin/master', gitlib)
+
+          gl.checkout('fb', :new_branch => 'master')
+
+          gl.fetch
+
+          gp.verify_preconditions
+
+          gl.branches.include?('master').should be_false
+        end
+      end
+
+
+      it "should not remove if server did not change but local did" do
+        clone_repo('master') do |gl|
+          change_file_and_commit('c.txt', 'c on master', gl)
+
+          gl.checkout('fb', :new_branch => 'master')
+
+          gl.fetch
+
+          gp = GitProc::Process.new(gl)
+          gp.verify_preconditions
+
+          gl.branches.include?('master').should be_true
+        end
+      end
+
+
+      it "should remove if server and local are the same" do
+        change_file_and_commit('c.txt', 'c on origin/master', gitlib)
+
+        clone_repo('master') do |gl|
+          gl.checkout('fb', :new_branch => 'master')
+          gp = GitProc::Process.new(gl)
+          gp.stub(:ask_about_removing_master).and_return(true)
+
+          gl.fetch
+          gp.verify_preconditions
+
+          gl.branches.include?('master').should be_false
+        end
+      end
+
+    end
+
+
+    it "should not remove the int-branch if not a clone" do
+      gitlib.config['gitProcess.keepLocalIntegrationBranch'] = 'false'
+      gitlib.checkout('fb', :new_branch => 'master')
+
+      gitprocess = GitProc::Process.new(gitlib)
+      gitprocess.verify_preconditions
+
+      gitlib.branches.include?('master').should be_true
+    end
+
+  end
+
+end

data/spec/git_remote_spec.rb

@@ -0,0 +1,227 @@
+require 'git-process/git_remote'
+require 'GitRepoHelper'
+include GitProc
+
+describe GitRemote do
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  describe '#name' do
+    include GitRepoHelper
+
+    it 'should work with origin' do
+      change_file_and_commit('a', '')
+
+      clone_repo('master', 'origin') do |gl|
+        gl.remote.name.should == 'origin'
+        gl.branches.include?('origin/master').should be_true
+      end
+    end
+
+
+    it 'should work with a different remote name' do
+      change_file_and_commit('a', '')
+
+      clone_repo('master', 'a_remote') do |gl|
+        gl.remote.name.should == 'a_remote'
+        gl.branches.include?('a_remote/master').should be_true
+      end
+    end
+
+
+    it 'should work with an overridden remote name' do
+      change_file_and_commit('a', '')
+
+      clone_repo('master', 'a_remote') do |gl|
+        gl.config['gitProcess.remoteName'] = 'something_else'
+
+        gl.remote.name.should == 'something_else'
+      end
+    end
+
+  end
+
+
+  describe "#expanded_url" do
+    include GitRepoHelper
+
+    it "should work for an ssh address" do
+      remote.add('torigin', 'tuser@github.myco.com:jdigger/git-process.git')
+
+      remote.expanded_url('torigin').should == 'ssh://tuser@github.myco.com/jdigger/git-process.git'
+    end
+
+
+    it 'should work for an http address' do
+      remote.add('torigin', 'http://github.myco.com:8080/jdigger/git-process.git')
+
+      remote.expanded_url('torigin').should == 'http://github.myco.com:8080/jdigger/git-process.git'
+    end
+
+
+    it "should work for an https address" do
+      remote.add('torigin', 'https://github.myco.com/jdigger/git-process.git')
+
+      remote.expanded_url('torigin').should == 'https://github.myco.com/jdigger/git-process.git'
+    end
+
+
+    it "should work for an ssh-configured url address" do
+      remote.add('origin', 'mygithub:jdigger/git-process.git')
+
+      content = "\nHost mygithub\n"+
+          "  User tuser\n"+
+          "  HostName github.myco.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        remote.expanded_url('origin', nil, :ssh_config_file => file.path).should == 'ssh://tuser@github.myco.com/jdigger/git-process.git'
+      end
+    end
+
+  end
+
+
+  describe "#repo_name" do
+    include GitRepoHelper
+
+    it "should work for an ssh address" do
+      remote.add('torigin', 'tuser@github.myco.com:jdigger/git-process.git')
+
+      remote.repo_name.should == 'jdigger/git-process'
+    end
+
+
+    it 'should work for an http address' do
+      remote.add('torigin', 'http://github.myco.com:8080/jdigger/git-process.git')
+
+      remote.repo_name.should == 'jdigger/git-process'
+    end
+
+
+    it "should work for an https address" do
+      remote.add('torigin', 'https://github.myco.com/jdigger/git-process.git')
+
+      remote.repo_name.should == 'jdigger/git-process'
+    end
+
+
+    it "should work for an ssh-configured url address" do
+      remote.add('origin', 'mygithub:jdigger/git-process.git')
+
+      content = "\nHost mygithub\n"+
+          "  User tuser\n"+
+          "  HostName github.myco.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        remote.repo_name.should == 'jdigger/git-process'
+      end
+    end
+
+  end
+
+
+  describe "#hostname_and_user_from_ssh_config" do
+    include GitRepoHelper
+
+    it "should find in a single entry" do
+      content = "\nHost mygithub\n"+
+          "  User git\n"+
+          "  HostName github.myco.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub', file.path).should == %w(github.myco.com git)
+      end
+    end
+
+
+    it "should find in multiple entries" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  User gitty\n"+
+          "  HostName github.myco.com\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub2', file.path).should == %w(github.myco.com gitty)
+      end
+    end
+
+
+    it "should return nil when no file" do
+      GitRemote.hostname_and_user_from_ssh_config('mygithub', '/bogus_file').should == nil
+    end
+
+
+    it "should return nil when given an unknown host" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  User gitty\n"+
+          "  HostName github.myco.com\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('UNKNOWNZ', file.path).should == nil
+      end
+    end
+
+
+    it "should return nil when no hostname for an existing host" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  User gitty\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub2', file.path).should == nil
+      end
+    end
+
+
+    it "should return hostname but no username when no user for an existing host" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  HostName github.myco.com\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub2', file.path).should == ['github.myco.com', nil]
+      end
+    end
+
+  end
+
+end
+
+
+def in_tempfile(filename, content, &block)
+  file = Tempfile.new(filename)
+  file.puts content
+  file.flush
+
+  begin
+    block.call(file)
+  ensure
+    file.close
+    file.unlink
+  end
+end
+

data/spec/git_status_spec.rb

@@ -0,0 +1,122 @@
+require 'git-process/git_status'
+require 'GitRepoHelper'
+require 'fileutils'
+
+describe GitProc::GitStatus do
+  include GitRepoHelper
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  before(:each) do
+    create_files(%w(.gitignore))
+    gitlib.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(gitlib.workdir)
+  end
+
+
+  it 'should handle added files' do
+    create_files(['a', 'b file.txt', 'c'])
+
+    gitlib.status.added.should == ['a', 'b file.txt', 'c']
+  end
+
+
+  it 'should handle a modification on both sides' do
+    change_file_and_commit('a', '')
+
+    gitlib.checkout('fb', :new_branch => 'master')
+    change_file_and_commit('a', 'hello')
+
+    gitlib.checkout('master')
+    change_file_and_commit('a', 'goodbye')
+
+    gitlib.merge('fb') rescue ''
+
+    status = gitlib.status
+    status.unmerged.should == %w(a)
+    status.modified.should == %w(a)
+  end
+
+
+  it "should handle an addition on both sides" do
+    gitlib.checkout('fb', :new_branch => 'master')
+    change_file_and_commit('a', 'hello')
+
+    gitlib.checkout('master')
+    change_file_and_commit('a', 'goodbye')
+
+    gitlib.merge('fb') rescue ''
+
+    status = gitlib.status
+    status.unmerged.should == %w(a)
+    status.added.should == %w(a)
+  end
+
+
+  it "should handle a merge deletion on fb" do
+    change_file_and_commit('a', '')
+
+    gitlib.checkout('fb', :new_branch => 'master')
+    gitlib.remove('a', :force => true)
+    gitlib.commit('removed a')
+
+    gitlib.checkout('master')
+    change_file_and_commit('a', 'goodbye')
+
+    gitlib.merge('fb') rescue ''
+
+    status = gitlib.status
+    status.unmerged.should == %w(a)
+    status.deleted.should == %w(a)
+  end
+
+
+  it "should handle a merge deletion on master" do
+    change_file_and_commit('a', '')
+
+    gitlib.checkout('fb', :new_branch => 'master')
+    change_file_and_commit('a', 'hello')
+
+    gitlib.checkout('master')
+    gitlib.remove('a', :force => true)
+    gitlib.commit('removed a')
+
+    gitlib.merge('fb') rescue ''
+
+    status = gitlib.status
+    status.unmerged.should == %w(a)
+    status.deleted.should == %w(a)
+  end
+
+
+  it "should handle a move/rename" do
+    FileUtils.cp __FILE__, File.join(gitlib.workdir, 'a file.txt')
+    gitlib.add('a file.txt')
+    gitlib.commit('a with content')
+
+    FileUtils.cp __FILE__, File.join(gitlib.workdir, 'b file.txt')
+    gitlib.remove 'a file.txt'
+    gitlib.add 'b file.txt'
+
+    status = gitlib.status
+    status.deleted.should == ['a file.txt']
+    status.added.should == ['b file.txt']
+  end
+
+
+  it "should return an empty result" do
+    gitlib.status.added.should == []
+    gitlib.status.deleted.should == []
+    gitlib.status.modified.should == []
+    gitlib.status.unmerged.should == []
+  end
+
+end