git-process 1.0.11 → 1.1.0

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

@@ -1,56 +1,41 @@
 require 'git-process/git_lib'
 require 'GitRepoHelper'
+include GitProc
 
-describe GitProc::GitLib do
-
-  class GLStub
-    include GitProc::GitLib
-
-
-    def initialize(workdir, log_level)
-      @logger = Logger.new(STDOUT)
-      @logger.level = log_level || Logger::WARN
-      @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-      f = Logger::Formatter.new
-      @logger.formatter = proc do |_, _, _, msg|
-        "#{msg}\n"
-      end
-
-      @workdir = workdir
-      if workdir
-        if File.directory?(File.join(workdir, '.git'))
-          logger.debug { "Opening existing repository at #{workdir}" }
-        else
-          logger.info { "Initializing new repository at #{workdir}" }
-          command(:init)
-        end
-      end
-    end
 
+describe GitLib, :git_repo_helper do
+
+
+  def log_level
+    Logger::ERROR
+  end
 
-    def workdir
-      @workdir
-    end
 
+  describe 'workdir' do
 
-    def logger
-      @logger
+    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
-  end
 
 
-  def gitlib
-    gitprocess
-  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
-    include GitRepoHelper
 
-    it "list all the branches" do
-      create_files(%w(.gitignore))
-      gitlib.commit('initial')
+  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')
@@ -61,133 +46,129 @@ describe GitProc::GitLib do
   end
 
 
-  describe "branch" do
-    attr_reader :lib
-
-    before(:each) do
-      @lib = GLStub.new(nil, nil)
+  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
-      lib.stub(:command).with(:branch, %w(test_branch master))
-      lib.branch('test_branch')
+      gitlib.stub(:command).with(:branch, %w(test_branch master))
+      gitlib.branch('test_branch')
     end
 
 
     it "should create a branch with explicit base" do
-      lib.stub(:command).with(:branch, %w(test_branch other_branch))
-      lib.branch('test_branch', :base_branch => 'other_branch')
+      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
-      lib.stub(:command).with(:branch, %w(-d test_branch))
-      lib.branch('test_branch', :delete => true)
+    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
-      lib.stub(:command).with(:branch, %w(-D test_branch))
-      lib.branch('test_branch', :delete => true, :force => true)
+    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
 
-  end
-
-
-  describe "push" do
-    attr_reader :lib
 
-    before(:each) do
-      @lib = GLStub.new(nil, nil)
+    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
 
-    def log_level
-      Logger::ERROR
-    end
 
+  describe "push" do
 
     it "should push local branch to remote" do
-      lib.should_receive(:command).with(:push, %w(remote local_branch:test_branch))
+      gitlib.should_receive(:command).with(:push, %w(remote local_branch:test_branch))
 
-      lib.push('remote', 'local_branch', 'test_branch')
+      gitlib.push('remote', 'local_branch', 'test_branch')
     end
 
 
     it "should push current branch to remote" do
-      lib.stub(:command).with(:branch, %w(-a --no-color)).and_return("* my_branch\n")
-      lib.should_receive(:command).with(:push, %w(remote my_branch:my_branch))
+      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))
 
-      lib.push('remote', 'my_branch', nil)
+      gitlib.push('remote', 'my_branch', nil)
     end
 
 
     it "should remove named branch on remote" do
-      lib.stub(:remote_name).and_return('remote')
-      lib.stub(:config).and_return('master')
-      lib.should_receive(:command).with(:push, %w(remote --delete my_branch))
+      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))
 
-      lib.push('remote', 'my_branch', nil, :delete => true)
+      gitlib.push('remote_server', 'my_branch', nil, :delete => true)
     end
 
 
     it "should remove current branch on remote" do
-      lib.stub(:remote_name).and_return('remote')
-      lib.stub(:config).and_return('master')
-      lib.should_receive(:command).with(:push, %w(remote --delete my_branch))
+      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))
 
-      lib.push('remote', nil, nil, :delete => 'my_branch')
+      gitlib.push('remote_server', nil, nil, :delete => 'my_branch')
     end
 
 
     it "should not remove integration branch on remote" do
-      lib.stub(:remote_name).and_return('remote')
-      lib.stub(:config).and_return('master')
-
-      expect { lib.push('remote', nil, nil, :delete => 'master') }.should raise_error GitProc::GitProcessError
-    end
-
-  end
-
-
-  describe "#remote_name" do
-    include GitRepoHelper
-
-
-    def log_level
-      Logger::ERROR
-    end
-
-
-    it "should work with origin" do
-      change_file_and_commit('a', '')
-
-      clone('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('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('master', 'a_remote') do |gl|
-        gl.config('gitProcess.remoteName', 'something_else')
+      gitlib.remote.stub(:name).and_return('remote_server')
+      gitlib.config.stub(:master_branch).and_return('master')
 
-        gl.remote_name.should == 'something_else'
-      end
+      expect { gitlib.push('remote_server', nil, nil, :delete => 'master') }.to raise_error GitProcessError
     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

data/spec/git_process_spec.rb

@@ -13,37 +13,19 @@ describe GitProc::Process do
 
   before(:each) do
     create_files(%w(.gitignore))
-    gitprocess.commit('initial')
+    gitlib.commit('initial')
   end
 
 
   after(:each) do
-    rm_rf(tmpdir)
+    rm_rf(gitlib.workdir)
   end
 
 
-  describe "workdir" do
+  describe 'run lifecycle' do
 
-    it "should use the passed in directory when the top level is a git workdir" do
-      proc = GitProc::Process.new(tmpdir)
-      proc.workdir.should == tmpdir
-    end
-
-
-    it "should find the parent git workdir" do
-      dir = "#{tmpdir}/a/b/c/d/e/f/g"
-      mkdir_p dir
-      proc = GitProc::Process.new(dir)
-      proc.workdir.should == tmpdir
-    end
-
-  end
-
-
-  describe "run lifecycle" do
-
-    it "should call the standard hooks" do
-      proc = GitProc::Process.new(tmpdir)
+    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)
@@ -54,7 +36,7 @@ describe GitProc::Process do
 
 
     it "should call 'cleanup' even if there's an error" do
-      proc = GitProc::Process.new(tmpdir)
+      proc = GitProc::Process.new(gitlib)
       proc.should_receive(:verify_preconditions)
       proc.should_receive(:runner).and_raise(GitProc::GitProcessError.new("Error!"))
       proc.should_receive(:cleanup)
@@ -70,137 +52,155 @@ describe GitProc::Process do
   describe "validate local integration branch" do
 
     it "should use remove the int-branch if not on it and not blocked" do
-      gp = clone('master')
-      gp.checkout('fb', :new_branch => 'master')
+      clone_repo('master') do |gl|
+        gl.checkout('fb', :new_branch => 'master')
 
-      gp.stub(:ask_about_removing_master).and_return(true)
+        gp = GitProc::Process.new(gl)
+        gp.stub(:ask_about_removing_master).and_return(true)
 
-      gp.verify_preconditions
+        gp.verify_preconditions
 
-      gp.branches.include?('master').should be_false
+        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
-      gp = clone('master')
-      gp.checkout('fb', :new_branch => 'master')
+      clone_repo('master') do |gl|
+        gl.checkout('fb', :new_branch => 'master')
 
-      gp.should_receive(:ask_about_removing_master).and_return(true)
+        gp = GitProc::Process.new(gl)
+        gp.should_receive(:ask_about_removing_master).and_return(true)
 
-      gp.verify_preconditions
+        gp.verify_preconditions
 
-      gp.branches.include?('master').should be_false
+        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
-      gp = clone('master')
-      gp.checkout('fb', :new_branch => 'master')
+      clone_repo('master') do |gl|
+        gl.checkout('fb', :new_branch => 'master')
 
-      gp.should_receive(:ask_about_removing_master).and_return(false)
+        gp = GitProc::Process.new(gl)
+        gp.should_receive(:ask_about_removing_master).and_return(false)
 
-      gp.verify_preconditions
+        gp.verify_preconditions
 
-      gp.branches.include?('master').should be_true
+        gl.branches.include?('master').should be_true
+      end
     end
 
 
     it "should not remove the int-branch if on it" do
-      gp = clone('master')
-
-      gp.verify_preconditions
+      clone_repo('master') do |gl|
+        gp = GitProc::Process.new(gl)
+        gp.verify_preconditions
 
-      gp.branches.include?('master').should be_true
+        gl.branches.include?('master').should be_true
+      end
     end
 
 
     it "should not remove the int-branch if blocked" do
-      gp = clone('master')
-      gp.config('gitProcess.keepLocalIntegrationBranch', 'true')
-      gp.checkout('fb', :new_branch => 'master')
+      clone_repo('master') do |gl|
+        gl.config['gitProcess.keepLocalIntegrationBranch'] = 'true'
+        gl.checkout('fb', :new_branch => 'master')
 
-      gp.verify_preconditions
+        gp = GitProc::Process.new(gl)
+        gp.verify_preconditions
 
-      gp.branches.include?('master').should be_true
+        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', gitprocess)
-        change_file_and_commit('b.txt', 'b content', gitprocess)
+        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
-        gp = clone('master')
+        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)
 
-        change_file_and_commit('c.txt', 'c on origin/master', gitprocess)
-        change_file_and_commit('d.txt', 'd on master', gp)
+          gl.checkout('fb', :new_branch => 'master')
 
-        gp.checkout('fb', :new_branch => 'master')
+          gl.fetch
 
-        gp.fetch
-        gp.verify_preconditions
+          gp = GitProc::Process.new(gl)
+          gp.verify_preconditions
 
-        gp.branches.include?('master').should be_true
+          gl.branches.include?('master').should be_true
+        end
       end
 
 
       it "should remove if server changed but not local" do
-        gp = clone('master')
-        gp.stub(:ask_about_removing_master).and_return(true)
+        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', gitprocess)
+          change_file_and_commit('c.txt', 'c on origin/master', gitlib)
 
-        gp.checkout('fb', :new_branch => 'master')
+          gl.checkout('fb', :new_branch => 'master')
 
-        gp.fetch
-        gp.verify_preconditions
+          gl.fetch
 
-        gp.branches.include?('master').should be_false
+          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
-        gp = clone('master')
+        clone_repo('master') do |gl|
+          change_file_and_commit('c.txt', 'c on master', gl)
 
-        change_file_and_commit('c.txt', 'c on master', gp)
+          gl.checkout('fb', :new_branch => 'master')
 
-        gp.checkout('fb', :new_branch => 'master')
+          gl.fetch
 
-        gp.fetch
-        gp.verify_preconditions
+          gp = GitProc::Process.new(gl)
+          gp.verify_preconditions
 
-        gp.branches.include?('master').should be_true
+          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', gitprocess)
+        change_file_and_commit('c.txt', 'c on origin/master', gitlib)
 
-        gp = clone('master')
+        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.checkout('fb', :new_branch => 'master')
-        gp.stub(:ask_about_removing_master).and_return(true)
-
-        gp.fetch
-        gp.verify_preconditions
+          gl.fetch
+          gp.verify_preconditions
 
-        gp.branches.include?('master').should be_false
+          gl.branches.include?('master').should be_false
+        end
       end
 
     end
 
 
     it "should not remove the int-branch if not a clone" do
-      gitprocess.config('gitProcess.keepLocalIntegrationBranch', 'false')
-      gitprocess.checkout('fb', :new_branch => 'master')
+      gitlib.config['gitProcess.keepLocalIntegrationBranch'] = 'false'
+      gitlib.checkout('fb', :new_branch => 'master')
 
+      gitprocess = GitProc::Process.new(gitlib)
       gitprocess.verify_preconditions
 
-      gitprocess.branches.include?('master').should be_true
+      gitlib.branches.include?('master').should be_true
     end
 
   end