git-process-lib 2.0.0

data/spec/git_abstract_merge_error_builder_spec.rb

@@ -0,0 +1,64 @@
+require 'git-process/git_abstract_merge_error_builder'
+require 'git-process/git_lib'
+require 'FileHelpers'
+
+describe GitProc::AbstractMergeErrorBuilder do
+
+  def builder
+    @builder ||= GitProc::AbstractMergeErrorBuilder.new(gitlib, '', nil)
+  end
+
+
+  after(:each) do
+    rm_rf(gitlib.workdir)
+  end
+
+
+  def gitlib
+    if @lib.nil?
+      @lib = GitProc::GitLib.new(Dir.mktmpdir, :log_level => Logger::ERROR)
+      mock_status(@lib)
+    end
+    @lib
+  end
+
+
+  def metaclass(obj)
+    class << obj
+      self
+    end
+  end
+
+
+  def mock_status(lib)
+    spec = self
+    metaclass(lib).send(:define_method, :status) do
+      @status ||= spec.double('status')
+    end
+  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 a file added in both branches" do
+    gitlib.status.stub(:unmerged).and_return(%w(a))
+    gitlib.status.stub(:modified).and_return(%w(b))
+    gitlib.status.stub(:added).and_return(%w(a c))
+
+    builder.resolved_files.should == %w()
+    builder.unresolved_files.should == %w(a)
+    c = [
+        '# \'a\' was added in both branches; Fix the conflict.',
+        'git add a',
+    ]
+    match_commands c
+  end
+
+end

data/spec/git_branch_spec.rb

@@ -0,0 +1,123 @@
+require 'git-process/git_lib'
+require 'GitRepoHelper'
+
+describe GitProc::GitBranch 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 'contains_all_of' do
+
+    it 'should handle the trivial case' do
+      current = gitlib.branches.current
+      current.contains_all_of(current.name).should == true
+    end
+
+
+    it 'should handle new branch containing base branch that did not change' do
+      base_branch = gitlib.branches.current
+
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      current.contains_all_of(base_branch.name).should == true
+    end
+
+
+    it "should handle new branch containing base branch that did change" do
+      base_branch = gitlib.branches.current
+
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
+
+      gitlib.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.contains_all_of(base_branch.name).should == false
+    end
+
+
+    it 'should handle containing in both branches' do
+      base_branch = gitlib.branches.current
+
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      gitlib.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.contains_all_of(base_branch.name).should == false
+    end
+
+  end
+
+
+  describe "is_ahead_of" do
+
+    it "should handle the trivial case" do
+      current = gitlib.branches.current
+      current.is_ahead_of(current.name).should == false # same is not "ahead of"
+    end
+
+
+    it "should handle new branch containing base branch that did not change" do
+      base_branch = gitlib.branches.current
+
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      current.is_ahead_of(base_branch.name).should == true
+    end
+
+
+    it "should handle new branch containing base branch that did change" do
+      base_branch = gitlib.branches.current
+
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
+
+      gitlib.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.is_ahead_of(base_branch.name).should == false
+    end
+
+
+    it "should handle containing in both branches" do
+      base_branch = gitlib.branches.current
+
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      gitlib.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.is_ahead_of(base_branch.name).should == false
+    end
+
+  end
+
+end

data/spec/git_config_spec.rb

@@ -0,0 +1,45 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'FileHelpers'
+require 'git-process/git_lib'
+require 'git-process/git_config'
+include GitProc
+
+describe GitConfig do
+
+  def tmpdir
+    @tmpdir ||= Dir.mktmpdir
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  it 'should retrieve values by []' do
+    lib = GitLib.new(tmpdir, :log_level => Logger::ERROR)
+    lib.command(:config, %w(somevalue.subvalue here))
+    config = GitConfig.new(lib)
+    config['somevalue.subvalue'].should == 'here'
+  end
+
+
+  it "should set values by []" do
+    lib = GitLib.new(tmpdir, :log_level => Logger::ERROR)
+    config = GitConfig.new(lib)
+    config['somevalue.subvalue'] = 'there'
+    lib.command(:config, %w(--get somevalue.subvalue)).should == 'there'
+  end
+
+end

data/spec/git_lib_spec.rb

@@ -0,0 +1,176 @@
+require 'git-process/git_lib'
+require 'GitRepoHelper'
+include GitProc
+
+
+describe GitLib, :git_repo_helper do
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  describe 'workdir' do
+
+    it 'should use the passed in directory when the top level is a git workdir' do
+      dir = Dir.mktmpdir
+      mkdir_p "#{dir}/.git"
+      gitlib = GitLib.new(dir, :log_level => Logger::ERROR)
+      gitlib.workdir.should == dir
+    end
+
+
+    it "should find the parent git workdir" do
+      topdir = Dir.mktmpdir
+      mkdir_p "#{topdir}/.git"
+      dir = "#{topdir}/a/b/c/d/e/f/g"
+      mkdir_p dir
+      gitlib = GitLib.new(dir, :log_level => Logger::ERROR)
+      gitlib.workdir.should == topdir
+    end
+
+  end
+
+
+  describe 'branches' do
+
+    it 'list all the branches' do
+      gitlib.branch('ba', :base_branch => 'master')
+      gitlib.branch('bb', :base_branch => 'master')
+      gitlib.branch('origin/master', :base_branch => 'master')
+
+      gitlib.branches.names.should == %w(ba bb master origin/master)
+    end
+
+  end
+
+
+  describe 'fetch' do
+
+    it 'parse the list of changes' do
+      output = '''
+remote: Counting objects: 1028, done.
+remote: Compressing objects: 100% (301/301), done.
+remote: Total 699 (delta 306), reused 654 (delta 273)
+Receiving objects: 100% (699/699), 600.68 KiB | 686 KiB/s, done.
+Resolving deltas: 100% (306/306), completed with 84 local objects.
+From remote.system.com:tuser/test-proj
+   8e667e0..19ecc91  SITE_TOUR_MODAL -> origin/SITE_TOUR_MODAL
+ + cea75d7...d656188 WEBCMS-2014 -> origin/WEBCMS-2014  (forced update)
+ * [new branch]      WEBCMS-2047 -> origin/WEBCMS-2047
+   ca9e80e..d383005  WEBCMS-2157 -> origin/WEBCMS-2157
+   77b5d5c..f485c7f  WEBCMS-2159 -> origin/WEBCMS-2159
+ * [new branch]      WEBCMS-2166 -> origin/WEBCMS-2166
+   c648f2a..86ee15e  WEBCMS-2167 -> origin/WEBCMS-2167
+ * [new tag]         RELEASE_1.0.1.53 -> RELEASE_1.0.1.53
+ * [new tag]         RELEASE_1.0.1.54 -> RELEASE_1.0.1.54
+ x [deleted]         (none)     -> origin/WEBCMS-4650-resi-breadcrumbs
+ * [new branch]      WEBCMS-2169 -> origin/WEBCMS-2169
+ * [new branch]      base-carousel -> origin/base-carousel
+   1de9c437..7546667 develop    -> origin/develop
+   90e8d75..23ae7d1  new-ui-smoketest -> origin/new-ui-smoketest
+ * [new branch]      webcms-2023 -> origin/webcms-2023
+   b9797f8..dd24a9f  webcms-2135 -> origin/webcms-2135
+ * [new branch]      webcms-831-faq-web-service -> origin/webcms-831-faq-web-service
+ x [deleted]         (none)     -> origin/webcms-1315-masthead
+'''
+      changes = gitlib.fetch_changes(output)
+
+      changes[:new_branch].size().should == 6
+      changes[:new_tag].size().should == 2
+      changes[:deleted].size().should == 2
+      changes[:force_updated].size().should == 1
+      changes[:updated].size().should == 7
+
+      empty_changes = gitlib.fetch_changes('')
+
+      empty_changes[:new_branch].size().should == 0
+      empty_changes[:new_tag].size().should == 0
+      empty_changes[:deleted].size().should == 0
+      empty_changes[:force_updated].size().should == 0
+      empty_changes[:updated].size().should == 0
+    end
+
+  end
+
+
+  describe "branch" do
+
+    it "should create a branch with default base" do
+      gitlib.stub(:command).with(:branch, %w(test_branch master))
+      gitlib.branch('test_branch')
+    end
+
+
+    it "should create a branch with explicit base" do
+      gitlib.should_receive(:command).with(:branch, %w(test_branch other_branch))
+      gitlib.branch('test_branch', :base_branch => 'other_branch')
+    end
+
+
+    it 'should delete a branch without force' do
+      gitlib.should_receive(:command).with(:branch, %w(-d test_branch))
+      gitlib.branch('test_branch', :delete => true)
+    end
+
+
+    it 'should delete a branch with force' do
+      gitlib.should_receive(:command).with(:branch, %w(-D test_branch))
+      gitlib.branch('test_branch', :delete => true, :force => true)
+    end
+
+
+    it "should rename a branch" do
+      gitlib.should_receive(:command).with(:branch, %w(-m test_branch new_branch))
+      gitlib.branch('test_branch', :rename => 'new_branch')
+    end
+
+  end
+
+
+  describe "push" do
+
+    it "should push local branch to remote" do
+      gitlib.should_receive(:command).with(:push, %w(remote local_branch:test_branch))
+
+      gitlib.push('remote', 'local_branch', 'test_branch')
+    end
+
+
+    it "should push current branch to remote" do
+      gitlib.stub(:command).with(:branch, %w(-a --no-color)).and_return("* my_branch\n")
+      gitlib.should_receive(:command).with(:push, %w(remote my_branch:my_branch))
+
+      gitlib.push('remote', 'my_branch', nil)
+    end
+
+
+    it "should remove named branch on remote" do
+      gitlib.remote.stub(:name).and_return('remote_server')
+      gitlib.config.stub(:master_branch).and_return('master')
+      gitlib.should_receive(:command).with(:push, %w(remote_server --delete my_branch))
+
+      gitlib.push('remote_server', 'my_branch', nil, :delete => true)
+    end
+
+
+    it "should remove current branch on remote" do
+      gitlib.remote.stub(:name).and_return('remote_server')
+      gitlib.config.stub(:master_branch).and_return('master')
+      gitlib.should_receive(:command).with(:push, %w(remote_server --delete my_branch))
+
+      gitlib.push('remote_server', nil, nil, :delete => 'my_branch')
+    end
+
+
+    it "should not remove integration branch on remote" do
+      gitlib.remote.stub(:name).and_return('remote_server')
+      gitlib.config.stub(:master_branch).and_return('master')
+
+      expect { gitlib.push('remote_server', nil, nil, :delete => 'master') }.to raise_error GitProcessError
+    end
+
+  end
+
+end

data/spec/git_logger_spec.rb

@@ -0,0 +1,66 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'git-process/git_logger'
+include GitProc
+
+describe GitLogger do
+
+  it 'should log info blocks' do
+    val = false
+    GitLogger.new(GitLogger::INFO, nil).info { val = true }
+    val.should == true
+  end
+
+
+  it 'should not log info blocks by default' do
+    val = false
+    GitLogger.new(nil, nil).info { val = true }
+    val.should == false
+  end
+
+
+  it 'should log warn blocks' do
+    val = false
+    GitLogger.new(GitLogger::WARN, nil).warn { val = true }
+    val.should == true
+  end
+
+
+  it "should log warn blocks by default" do
+    val = false
+    GitLogger.new(nil, nil).warn { val = true }
+    val.should == true
+  end
+
+
+  it "should log error blocks" do
+    val = false
+    GitLogger.new(GitLogger::ERROR, nil).error { val = true }
+    val.should == true
+  end
+
+
+  it "should log error blocks by default" do
+    val = false
+    GitLogger.new.error { val = true }
+    val.should == true
+  end
+
+
+  it 'should log debug blocks' do
+    val = false
+    GitLogger.new(GitLogger::DEBUG, nil).debug { val = true }
+    val.should == true
+  end
+
+end