git-process 0.9.5 → 0.9.6

data/lib/git-process/sync.rb

@@ -14,11 +14,13 @@ require 'git-process/git_lib'
 require 'git-process/git_process'
 require 'git-process/parked_changes_error'
 require 'git-process/uncommitted_changes_error'
+require 'git-process/changed_file_helper'
 
 
 module GitProc
 
   class Sync < Process
+    include ChangeFileHelper
 
     def initialize(dir, opts)
       opts[:force] = true if opts[:rebase]
@@ -36,19 +38,32 @@ module GitProc
     end
 
 
-    def runner
-      raise UncommittedChangesError.new unless status.clean?
+    def verify_preconditions
+      super
+
+      if not status.clean?
+        offer_to_help_uncommitted_changes
+      end
+
       raise ParkedChangesError.new(self) if is_parked?
+    end
 
+
+    def cleanup
+      stash_pop if @stash_pushed
+    end
+
+
+    def runner
       @current_branch ||= branches.current
       @remote_branch ||= "#{server_name}/#{@current_branch}"
 
       fetch(server_name)
 
       if @do_rebase
-        proc_rebase(remote_master_branch)
+        proc_rebase(integration_branch)
       else
-        proc_merge(remote_master_branch)
+        proc_merge(integration_branch)
       end
 
       if @local

data/lib/git-process/version.rb

@@ -14,7 +14,7 @@ module GitProc
   module Version
     MAJOR = 0
     MINOR = 9
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/changed_file_helper_spec.rb

@@ -0,0 +1,143 @@
+require 'git-process/sync'
+require 'GitRepoHelper'
+
+module GitProc
+
+  class CFHStub < Process
+    include ChangeFileHelper
+
+
+    def cleanup
+      stash_pop if @stash_pushed
+    end
+
+  end
+
+end
+
+
+describe GitProc::ChangeFileHelper do
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitprocess.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  def create_process(dir, opts)
+    GitProc::CFHStub.new(dir, opts)
+  end
+
+
+  describe "uncommitted changes" do
+
+    it 'should fail when there are unmerged files' do
+      change_file_and_commit('modified file.txt', 'start')
+
+      gp = clone
+      change_file_and_commit('modified file.txt', 'changed', gp)
+      change_file_and_commit('modified file.txt', 'conflict', gitprocess)
+      gp.fetch
+
+      gp.merge('origin/master') rescue ''
+
+      expect {gp.offer_to_help_uncommitted_changes}.should raise_error GitProc::UncommittedChangesError
+    end
+
+
+    describe "using 'unknown' file" do
+
+      before(:each) do
+        change_file('unknown file.txt', '')
+        gitprocess.stub(:say)
+      end
+
+
+      it 'should then add it' do
+        gitprocess.stub(:ask).and_return('a')
+        gitprocess.should_receive(:add).with(['unknown file.txt'])
+
+        gitprocess.offer_to_help_uncommitted_changes
+      end
+
+
+      it 'should ignore the file' do
+        gitprocess.stub(:ask).and_return('i')
+        gitprocess.should_not_receive(:add)
+
+        gitprocess.offer_to_help_uncommitted_changes
+      end
+
+    end
+
+
+    describe "using changed files" do
+
+      before(:each) do
+        change_file_and_commit('modified file.txt', 'start')
+        change_file_and_commit('modified file2.txt', 'start')
+        change_file_and_commit('modified file3.txt', 'start')
+        change_file_and_commit('removed file.txt', 'content')
+        change_file_and_add('added file.txt', '')
+        change_file('modified file.txt', 'modified')
+        change_file_and_add('modified file2.txt', 'modified')
+        change_file_and_add('modified file3.txt', 'modified')
+        change_file('modified file2.txt', 'modified again')
+        change_file_and_add('removed file2.txt', 'content')
+        File.delete(File.join(gitprocess.workdir, 'removed file.txt'))
+        File.delete(File.join(gitprocess.workdir, 'removed file2.txt'))
+        File.delete(File.join(gitprocess.workdir, 'modified file3.txt'))
+
+        # End state of the above is:
+        # A  "added file.txt"
+        #  M "modified file.txt"
+        # MM "modified file2.txt"
+        # MD "modified file3.txt"
+        #  D "removed file.txt"
+        # AD "removed file2.txt"
+
+        gitprocess.stub(:say)
+      end
+
+
+      it 'should ask about modified files, then commit them' do
+        gitprocess.stub(:ask).and_return('c')
+        gitprocess.should_receive(:add).with(["added file.txt", "modified file.txt", "modified file2.txt"])
+        gitprocess.should_receive(:remove).with(["modified file3.txt", "removed file.txt", "removed file2.txt"])
+        gitprocess.should_receive(:commit).with(nil)
+
+        gitprocess.offer_to_help_uncommitted_changes
+      end
+
+
+      it 'should ask about modified files, then stash them' do
+        gitprocess.stub(:ask).and_return('s')
+
+        gitprocess.offer_to_help_uncommitted_changes
+
+        gitprocess.status.clean?.should be_true
+
+        gitprocess.cleanup
+
+        stat = gitprocess.status
+        stat.added.should == ["added file.txt", "removed file2.txt"]
+        stat.modified.should == ["modified file.txt", "modified file2.txt"]
+        stat.deleted.should == ["modified file3.txt", "removed file.txt"]
+      end
+
+    end
+
+  end
+
+end

data/spec/git_process_spec.rb

@@ -5,6 +5,11 @@ require 'fileutils'
 describe GitProc::Process do
   include GitRepoHelper
 
+  def log_level
+    Logger::ERROR
+  end
+
+
   before(:each) do
     create_files(['.gitignore'])
     gitprocess.commit('initial')
@@ -33,4 +38,170 @@ describe GitProc::Process do
 
   end
 
+
+  describe "run lifecycle" do
+
+    it "should call the standard hooks" do
+      proc = GitProc::Process.new(tmpdir)
+      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(tmpdir)
+      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
+      gp = clone('master')
+      gp.checkout('fb', :new_branch => 'master')
+
+      gp.stub(:ask_about_removing_master).and_return(true)
+
+      gp.verify_preconditions
+
+      gp.branches.include?('master').should be_false
+    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')
+
+      gp.should_receive(:ask_about_removing_master).and_return(true)
+
+      gp.verify_preconditions
+
+      gp.branches.include?('master').should be_false
+    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')
+
+      gp.should_receive(:ask_about_removing_master).and_return(false)
+
+      gp.verify_preconditions
+
+      gp.branches.include?('master').should be_true
+    end
+
+
+    it "should not remove the int-branch if on it" do
+      gp = clone('master')
+
+      gp.verify_preconditions
+
+      gp.branches.include?('master').should be_true
+    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')
+
+      gp.verify_preconditions
+
+      gp.branches.include?('master').should be_true
+    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)
+      end
+
+
+      it "should not remove if both have changes" do
+        gp = clone('master')
+
+        change_file_and_commit('c.txt', 'c on origin/master', gitprocess)
+        change_file_and_commit('d.txt', 'd on master', gp)
+
+        gp.checkout('fb', :new_branch => 'master')
+
+        gp.fetch
+        gp.verify_preconditions
+
+        gp.branches.include?('master').should be_true
+      end
+
+
+      it "should remove if server changed but not local" do
+        gp = clone('master')
+        gp.stub(:ask_about_removing_master).and_return(true)
+
+        change_file_and_commit('c.txt', 'c on origin/master', gitprocess)
+
+        gp.checkout('fb', :new_branch => 'master')
+
+        gp.fetch
+        gp.verify_preconditions
+
+        gp.branches.include?('master').should be_false
+      end
+
+
+      it "should not remove if server did not change but local did" do
+        gp = clone('master')
+
+        change_file_and_commit('c.txt', 'c on master', gp)
+
+        gp.checkout('fb', :new_branch => 'master')
+
+        gp.fetch
+        gp.verify_preconditions
+
+        gp.branches.include?('master').should be_true
+      end
+
+
+      it "should remove if server and local are the same" do
+        change_file_and_commit('c.txt', 'c on origin/master', gitprocess)
+
+        gp = clone('master')
+
+        gp.checkout('fb', :new_branch => 'master')
+        gp.stub(:ask_about_removing_master).and_return(true)
+
+        gp.fetch
+        gp.verify_preconditions
+
+        gp.branches.include?('master').should be_false
+      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')
+
+      gitprocess.verify_preconditions
+
+      gitprocess.branches.include?('master').should be_true
+    end
+
+  end
+
 end

data/spec/git_status_spec.rb

@@ -1,9 +1,15 @@
 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(['.gitignore'])
     gitprocess.commit('initial')
@@ -16,9 +22,9 @@ describe GitProc::GitStatus do
 
 
   it "should handle added files" do
-    create_files(['a', 'b', 'c'])
+    create_files(['a', 'b file.txt', 'c'])
 
-    gitprocess.status.added.should == ['a', 'b', 'c']
+    gitprocess.status.added.should == ['a', 'b file.txt', 'c']
   end
 
 
@@ -90,6 +96,21 @@ describe GitProc::GitStatus do
   end
 
 
+  it "should handle a move/rename" do
+    FileUtils.cp __FILE__, File.join(gitprocess.workdir, 'a file.txt')
+    gitprocess.add('a file.txt')
+    gitprocess.commit('a with content')
+
+    FileUtils.cp __FILE__, File.join(gitprocess.workdir, 'b file.txt')
+    gitprocess.remove 'a file.txt'
+    gitprocess.add 'b file.txt'
+
+    status = gitprocess.status
+    status.deleted.should == ['a file.txt']
+    status.added.should == ['b file.txt']
+  end
+
+
   it "should return an empty result" do
     gitprocess.status.added.should == []
     gitprocess.status.deleted.should == []

data/spec/new_fb_spec.rb

@@ -30,7 +30,7 @@ describe GitProc::NewFeatureBranch do
 
     it "should create the named branch against origin/master" do
       clone do |gp|
-        new_branch = gp.run
+        new_branch = gp.runner
 
         new_branch.name.should == 'test_branch'
         new_branch.sha.should == gp.branches['origin/master'].sha
@@ -44,7 +44,7 @@ describe GitProc::NewFeatureBranch do
       change_file_and_commit('a', '')
       change_file_and_commit('b', '')
 
-      new_branch = gitprocess.run
+      new_branch = gitprocess.runner
 
       new_branch.name.should == 'test_branch'
       Dir.chdir(gitprocess.workdir) do |dir|
@@ -59,7 +59,7 @@ describe GitProc::NewFeatureBranch do
     it "should use 'integration_branch' instead of 'remote_master_branch'" do
       change_file_and_commit('a', '')
 
-      new_branch = gitprocess.run
+      new_branch = gitprocess.runner
 
       new_branch.name.should == 'test_branch'
     end
@@ -72,7 +72,7 @@ describe GitProc::NewFeatureBranch do
       change_file_and_add('b', '')
       change_file('c', '')
 
-      new_branch = gitprocess.run
+      new_branch = gitprocess.runner
 
       new_branch.name.should == 'test_branch'
       Dir.chdir(gitprocess.workdir) do |dir|

data/spec/rebase_to_master_spec.rb

@@ -6,6 +6,11 @@ require 'json'
 describe GitProc::RebaseToMaster do
   include GitRepoHelper
 
+  def log_level
+    Logger::ERROR
+  end
+
+
   before(:each) do
     create_files(['.gitignore'])
     gitprocess.commit('initial')
@@ -24,11 +29,6 @@ describe GitProc::RebaseToMaster do
 
   describe "rebase to master" do
 
-    def log_level
-      Logger::ERROR
-    end
-
-
     it "should work easily for a simple rebase" do
       gitprocess.checkout('fb', :new_branch => 'master')
       change_file_and_commit('a', '')
@@ -98,61 +98,58 @@ describe GitProc::RebaseToMaster do
         gitprocess.checkout('_parking_', :new_branch => 'master')
         change_file_and_commit('a', '')
 
-        expect {gitprocess.runner}.should raise_error GitProc::ParkedChangesError
+        expect {gitprocess.verify_preconditions}.should raise_error GitProc::ParkedChangesError
       end
     end
 
 
     describe "closing the pull request" do
 
-      def log_level
-        Logger::ERROR
-      end
-
-
       it "should work for an existing pull request" do
+        stub_request(:get, /test_repo\/pulls\?access_token=/).
+          to_return(:status => 200, :body => JSON([{:number => 987, :state => 'open', :html_url => 'test_url', :head => {:ref => 'fb'}, :base => {:ref => 'master'}}]))
+        stub_request(:patch, /test_repo\/pulls\/987\?access_token=/).
+          with(:body => JSON({:state => 'closed'})).
+          to_return(:status => 200, :body => JSON([{:number => 987, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'fb'}, :base => {:ref => 'master'}}]))
+
         gitprocess.branch('fb', :base_branch => 'master')
-        clone('fb') do |gp|
-          stub_request(:get, /test_repo\/pulls\?access_token=/).
-            to_return(:status => 200, :body => JSON([{:number => 987, :state => 'open', :html_url => 'test_url', :head => {:ref => 'fb'}, :base => {:ref => 'master'}}]))
-          stub_request(:patch, /test_repo\/pulls\/987\?access_token=/).
-            with(:body => JSON({:state => 'closed'})).
-            to_return(:status => 200, :body => JSON([{:number => 987, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'fb'}, :base => {:ref => 'master'}}]))
-          gp.config('gitProcess.github.authToken', 'test-token')
-          gp.config('remote.origin.url', 'git@github.com:test_repo.git')
-          gp.config('github.user', 'test_user')
-          gp.stub(:fetch)
-          gp.stub(:push)
-
-          gp.runner
-        end
+
+        gp = clone('fb')
+        gp.config('gitProcess.github.authToken', 'test-token')
+        gp.config('remote.origin.url', 'git@github.com:test_repo.git')
+        gp.config('github.user', 'test_user')
+
+        rtm = GitProc::RebaseToMaster.new(gp.workdir, {:log_level => log_level})
+        rtm.stub(:fetch)
+        rtm.stub(:push)
+        rtm.runner
       end
 
 
       it "should not try when there is no auth token" do
         gitprocess.branch('fb', :base_branch => 'master')
-        clone('fb') do |gp|
-          gp.config('gitProcess.github.authToken', '')
-          gp.config('remote.origin.url', 'git@github.com:test_repo.git')
-          gp.config('github.user', 'test_user')
-          gp.stub(:fetch)
-          gp.stub(:push)
-
-          gp.runner
-        end
+        gp = clone('fb')
+        gp.config('gitProcess.github.authToken', '')
+        gp.config('remote.origin.url', 'git@github.com:test_repo.git')
+        gp.config('github.user', 'test_user')
+
+        rtm = GitProc::RebaseToMaster.new(gp.workdir, {:log_level => log_level})
+        rtm.stub(:fetch)
+        rtm.stub(:push)
+        rtm.runner
       end
 
 
       it "should not try when there is a file:// origin url" do
         gitprocess.branch('fb', :base_branch => 'master')
-        clone('fb') do |gp|
-          gp.config('gitProcess.github.authToken', 'test-token')
-          gp.config('github.user', 'test_user')
-          gp.stub(:fetch)
-          gp.stub(:push)
-
-          gp.runner
-        end
+        gp = clone('fb')
+        gp.config('gitProcess.github.authToken', 'test-token')
+        gp.config('github.user', 'test_user')
+
+        rtm = GitProc::RebaseToMaster.new(gp.workdir, {:log_level => log_level})
+        rtm.stub(:fetch)
+        rtm.stub(:push)
+        rtm.runner
       end
 
     end
@@ -162,41 +159,35 @@ describe GitProc::RebaseToMaster do
 
   describe "custom integration branch" do
 
-    def log_level
-      Logger::ERROR
-    end
+    it "should use the 'gitProcess.integrationBranch' configuration" do
+      gitprocess.checkout('int-br', :new_branch => 'master')
+      change_file_and_commit('a', '')
 
+      gitprocess.checkout('fb', :new_branch => 'master')
+      change_file_and_commit('b', '')
 
-    it "should use the 'gitProcess.integrationBranch' configuration" do
-      gitprocess.checkout('int-br', :new_branch => 'master') do
-        change_file_and_commit('a', '')
-      end
-      gitprocess.checkout('fb', :new_branch => 'master') do
-        change_file_and_commit('b', '')
-      end
-      gitprocess.branches['master'].delete
+      gitprocess.branches['master'].delete!
 
-      clone('int-br') do |gl|
-        gl.config('gitProcess.integrationBranch', 'int-br')
+      gl = clone('int-br')
+      gl.config('gitProcess.integrationBranch', 'int-br')
 
-        gl.checkout('ab', :new_branch => 'origin/int-br')
+      gl.checkout('ab', :new_branch => 'origin/int-br')
 
-        branches = gl.branches
-        branches.include?('origin/master').should be_false
-        branches['ab'].sha.should == branches['origin/int-br'].sha
+      my_branches = gl.branches
+      my_branches.include?('origin/master').should be_false
+      my_branches['ab'].sha.should == my_branches['origin/int-br'].sha
 
-        gl.stub(:repo_name).and_return('test_repo')
+      gl.stub(:repo_name).and_return('test_repo')
 
-        change_file_and_commit('c', '', gl)
+      change_file_and_commit('c', '', gl)
 
-        branches = gl.branches
-        branches['ab'].sha.should_not == branches['origin/int-br'].sha
+      my_branches = gl.branches
+      my_branches['ab'].sha.should_not == my_branches['origin/int-br'].sha
 
-        gl.run
+      GitProc::RebaseToMaster.new(gl.workdir, {:log_level => log_level}).runner
 
-        branches = gl.branches
-        branches['HEAD'].sha.should == branches['origin/int-br'].sha
-      end
+      my_branches = gl.branches
+      my_branches['HEAD'].sha.should == my_branches['origin/int-br'].sha
     end
 
   end
@@ -204,11 +195,6 @@ describe GitProc::RebaseToMaster do
 
   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