git-process 1.0.11 → 1.1.0

data/lib/git-process/uncommitted_changes_error.rb

@@ -15,7 +15,7 @@ require 'git-process/git_process_error'
 module GitProc
 
   class UncommittedChangesError < GitProcessError
-    def initialize()
+    def initialize
       super("There are uncommitted changes.\nPlease either commit your changes, or use 'git stash' to set them aside.")
     end
   end

data/lib/git-process/version.rb

@@ -13,8 +13,8 @@
 module GitProc
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 11
+    MINOR = 1
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/GitRepoHelper.rb

@@ -1,23 +1,42 @@
+require 'tmpdir'
 require 'FileHelpers'
 require 'git-process/git_process'
+include GitProc
 
 module GitRepoHelper
 
   def gitprocess
-    opts = {}
-    opts[:quiet] = true if log_level == Logger::ERROR
-    opts[:verbose] = true if log_level == Logger::DEBUG
-    @gitprocess ||= create_process(tmpdir, opts)
+    if @gitprocess.nil? and respond_to?(:create_process)
+      @gitprocess = create_process(gitlib, :log_level => log_level)
+    end
+    @gitprocess
+  end
+
+
+  def gitlib
+    if @gitlib.nil?
+      if @gitprocess.nil?
+        @gitlib = create_gitlib(Dir.mktmpdir, :log_level => log_level)
+      else
+        @gitlib = gitprocess.gitlib
+      end
+    end
+    @gitlib
   end
 
 
-  def tmpdir
-    @tmpdir ||= Dir.mktmpdir
+  def config
+    gitlib.config
+  end
+
+
+  def remote
+    gitlib.remote
   end
 
 
   def commit_count
-    gitprocess.log_count
+    gitlib.log_count
   end
 
 
@@ -27,55 +46,60 @@ module GitRepoHelper
 
 
   def logger
-    gitprocess.logger
+    gitlib.logger
   end
 
 
   def create_files(file_names)
-    Dir.chdir(gitprocess.workdir) do |dir|
+    GitRepoHelper.create_files gitlib, file_names
+  end
+
+
+  def self.create_files(gitlib, file_names)
+    Dir.chdir(gitlib.workdir) do |dir|
       file_names.each do |fn|
-        gitprocess.logger.debug { "Creating #{dir}/#{fn}" }
+        gitlib.logger.debug { "Creating #{dir}/#{fn}" }
         FileUtils.touch fn
       end
     end
-    gitprocess.add(file_names)
+    gitlib.add(file_names)
   end
 
 
-  def change_file(filename, contents, lib = gitprocess)
+  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 = gitprocess)
+  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 = gitprocess)
+  def change_file_and_commit(filename, contents, lib = gitlib)
     change_file_and_add(filename, contents, lib)
     lib.commit("#{filename} - #{contents}")
   end
 
 
-  def create_process(dir, opts)
-    GitProc::Process.new(dir, opts)
+  def create_gitlib(dir, opts)
+    git_lib = GitLib.new(dir, opts)
+    git_lib.config['user.email'] = 'test.user@test.com'
+    git_lib.config['user.name'] = 'test user'
+    git_lib
   end
 
 
-  def clone(branch='master', remote_name = 'origin', &block)
+  def clone_repo(branch='master', remote_name = 'origin', &block)
     td = Dir.mktmpdir
 
-    logger.debug { "Cloning '#{tmpdir}' to '#{td}'" }
+    logger.debug { "Cloning '#{gitlib.workdir}' to '#{td}'" }
 
-    opts = {}
-    opts[:quiet] = true if log_level == Logger::ERROR
-    opts[:verbose] = true if log_level == Logger::DEBUG
-    gl = create_process(td, opts)
-    gl.add_remote(remote_name, "file://#{tmpdir}")
+    gl = create_gitlib(td, :log_level => logger.level)
+    gl.remote.add(remote_name, "file://#{gitlib.workdir}")
     gl.fetch(remote_name)
 
     if branch == 'master'
@@ -87,9 +111,8 @@ module GitRepoHelper
     if block_given?
       begin
         block.arity < 1 ? gl.instance_eval(&block) : block.call(gl)
-      rescue => exp
+      ensure
         rm_rf(gl.workdir)
-        raise exp
       end
       nil
     else

data/spec/changed_file_helper_spec.rb

@@ -1,58 +1,39 @@
 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(%w(.gitignore))
-    gitprocess.commit('initial')
-  end
-
-
-  after(:each) do
-    rm_rf(tmpdir)
-  end
+include GitProc
 
+describe ChangeFileHelper, :git_repo_helper do
 
   def log_level
     Logger::ERROR
   end
 
 
+  #noinspection RubyUnusedLocalVariable
   def create_process(dir, opts)
-    GitProc::CFHStub.new(dir, opts)
+    nil
   end
 
 
-  describe "uncommitted changes" do
+  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
+      clone_repo do |gl|
+        change_file_and_commit('modified file.txt', 'changed', gl)
+        change_file_and_commit('modified file.txt', 'conflict', gitlib)
+        gl.fetch
+
+        gl.merge('origin/master') rescue ''
+
+        change_file_helper = ChangeFileHelper.new(gl)
+        expect { change_file_helper.offer_to_help_uncommitted_changes }.to raise_error GitProc::UncommittedChangesError
+      end
+    end
 
-      gp.merge('origin/master') rescue ''
 
-      expect { gp.offer_to_help_uncommitted_changes }.should raise_error GitProc::UncommittedChangesError
+    def change_file_helper
+      @change_file_helper ||= ChangeFileHelper.new(gitlib)
     end
 
 
@@ -60,23 +41,23 @@ describe GitProc::ChangeFileHelper do
 
       before(:each) do
         change_file('unknown file.txt', '')
-        gitprocess.stub(:say)
+        change_file_helper.stub(:say)
       end
 
 
       it 'should then add it' do
-        gitprocess.stub(:ask).and_return('a')
-        gitprocess.should_receive(:add).with(['unknown file.txt'])
+        ChangeFileHelper.stub(:ask_how_to_handle_unknown_files).and_return(:add)
+        change_file_helper.gitlib.should_receive(:add).with(['unknown file.txt'])
 
-        gitprocess.offer_to_help_uncommitted_changes
+        change_file_helper.offer_to_help_uncommitted_changes
       end
 
 
       it 'should ignore the file' do
-        gitprocess.stub(:ask).and_return('i')
-        gitprocess.should_not_receive(:add)
+        ChangeFileHelper.stub(:ask_how_to_handle_unknown_files).and_return(:ignore)
+        change_file_helper.should_not_receive(:add)
 
-        gitprocess.offer_to_help_uncommitted_changes
+        change_file_helper.offer_to_help_uncommitted_changes
       end
 
     end
@@ -97,9 +78,9 @@ describe GitProc::ChangeFileHelper do
         change_file('modified file2.txt', 'modified again')
         change_file_and_add('removed file2.txt', 'content')
         change_file_and_add('modified file4.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'))
+        File.delete(File.join(gitlib.workdir, 'removed file.txt'))
+        File.delete(File.join(gitlib.workdir, 'removed file2.txt'))
+        File.delete(File.join(gitlib.workdir, 'modified file3.txt'))
 
         # End state of the above is:
         # A  "added file.txt"
@@ -110,30 +91,30 @@ describe GitProc::ChangeFileHelper do
         #  D "removed file.txt"
         # AD "removed file2.txt"
 
-        gitprocess.stub(:say)
+        change_file_helper.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", "modified file4.txt"])
-        gitprocess.should_receive(:remove).with(["modified file3.txt", "removed file.txt", "removed file2.txt"])
-        gitprocess.should_receive(:commit).with(nil)
+        ChangeFileHelper.stub(:ask_how_to_handle_changed_files).and_return(:commit)
+        gitlib.should_receive(:add).with(["added file.txt", "modified file.txt", "modified file2.txt", "modified file4.txt"])
+        gitlib.should_receive(:remove).with(["modified file3.txt", "removed file.txt", "removed file2.txt"])
+        gitlib.should_receive(:commit).with(nil)
 
-        gitprocess.offer_to_help_uncommitted_changes
+        change_file_helper.offer_to_help_uncommitted_changes
       end
 
 
       it 'should ask about modified files, then stash them' do
-        gitprocess.stub(:ask).and_return('s')
+        ChangeFileHelper.stub(:ask_how_to_handle_changed_files).and_return(:stash)
 
-        gitprocess.offer_to_help_uncommitted_changes
+        change_file_helper.offer_to_help_uncommitted_changes
 
-        gitprocess.status.clean?.should be_true
+        gitlib.status.clean?.should be_true
 
-        gitprocess.cleanup
+        gitlib.stash_pop
 
-        stat = gitprocess.status
+        stat = gitlib.status
         stat.added.should == ["added file.txt", "removed file2.txt"]
         stat.modified.should == ["modified file.txt", "modified file2.txt", "modified file4.txt"]
         stat.deleted.should == ["modified file3.txt", "removed file.txt"]

data/spec/git_abstract_merge_error_builder_spec.rb

@@ -1,38 +1,42 @@
 require 'git-process/git_abstract_merge_error_builder'
+require 'git-process/git_lib'
+require 'FileHelpers'
 
 describe GitProc::AbstractMergeErrorBuilder do
 
   def builder
-    unless @builder
-      @builder = Object.new
-      @builder.extend(GitProc::AbstractMergeErrorBuilder)
-      @builder.stub(:lib).and_return(lib)
-      @builder.stub(:continue_command).and_return(nil)
-      @builder.stub(:error_message).and_return('')
-    end
-    @builder
+    @builder ||= GitProc::AbstractMergeErrorBuilder.new(gitlib, '', nil)
+  end
+
+
+  after(:each) do
+    rm_rf(gitlib.workdir)
   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)
+  def gitlib
+    if @lib.nil?
+      @lib = GitProc::GitLib.new(Dir.mktmpdir, :log_level => Logger::ERROR)
+      @lib.config.rerere_enabled = true
+      @lib.config.rerere_autoupdate = true
+      mock_status(@lib)
     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([])
+  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
-    @status
   end
 
 
@@ -46,9 +50,10 @@ describe GitProc::AbstractMergeErrorBuilder do
 
 
   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'])
+    gitlib.config.rerere_enabled = false
+    gitlib.status.stub(:unmerged).and_return(['a', 'b c'])
+    gitlib.status.stub(:modified).and_return(['a', 'b c'])
+    gitlib.status.stub(:added).and_return([])
 
     builder.resolved_files.should == []
     builder.unresolved_files.should == ['a', 'b c']
@@ -64,8 +69,11 @@ describe GitProc::AbstractMergeErrorBuilder do
 
 
   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'])
+    gitlib.config.rerere_enabled = true
+    gitlib.config.rerere_autoupdate = true
+    gitlib.status.stub(:unmerged).and_return(['a', 'b c'])
+    gitlib.status.stub(:modified).and_return(['a', 'b c'])
+    gitlib.status.stub(:added).and_return([])
     builder.stub(:error_message).and_return("\nResolved 'a' using previous resolution.\n")
 
     builder.resolved_files.should == %w(a)
@@ -81,9 +89,10 @@ describe GitProc::AbstractMergeErrorBuilder do
 
 
   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'])
+    gitlib.config.rerere_autoupdate = false
+    gitlib.status.stub(:unmerged).and_return(['a', 'b c'])
+    gitlib.status.stub(:modified).and_return(['a', 'b c'])
+    gitlib.status.stub(:added).and_return([])
     builder.stub(:error_message).and_return("\nResolved 'a' using previous resolution.\n")
 
     builder.resolved_files.should == %w(a)
@@ -100,10 +109,10 @@ describe GitProc::AbstractMergeErrorBuilder do
 
 
   it "merged with a file added in both branches" do
-    lib.stub(:rerere_autoupdate?).and_return(false)
-    status.stub(:unmerged).and_return(%w(a))
-    status.stub(:modified).and_return(%w(b))
-    status.stub(:added).and_return(%w(a c))
+    gitlib.config.rerere_autoupdate = false
+    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)

data/spec/git_branch_spec.rb

@@ -12,28 +12,28 @@ describe GitProc::GitBranch 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 "contains_all_of" do
+  describe 'contains_all_of' do
 
-    it "should handle the trivial case" do
-      current = gitprocess.branches.current
+    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 = gitprocess.branches.current
+    it 'should handle new branch containing base branch that did not change' do
+      base_branch = gitlib.branches.current
 
-      gitprocess.checkout('fb', :new_branch => base_branch.name)
-      current = gitprocess.branches.current
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
 
       change_file_and_commit('a', 'hello')
 
@@ -42,27 +42,27 @@ describe GitProc::GitBranch do
 
 
     it "should handle new branch containing base branch that did change" do
-      base_branch = gitprocess.branches.current
+      base_branch = gitlib.branches.current
 
-      gitprocess.checkout('fb', :new_branch => base_branch.name)
-      current = gitprocess.branches.current
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
 
-      gitprocess.checkout(base_branch.name)
+      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 = gitprocess.branches.current
+    it 'should handle containing in both branches' do
+      base_branch = gitlib.branches.current
 
-      gitprocess.checkout('fb', :new_branch => base_branch.name)
-      current = gitprocess.branches.current
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
 
       change_file_and_commit('a', 'hello')
 
-      gitprocess.checkout(base_branch.name)
+      gitlib.checkout(base_branch.name)
       change_file_and_commit('a', 'goodbye')
 
       current.contains_all_of(base_branch.name).should == false
@@ -74,16 +74,16 @@ describe GitProc::GitBranch do
   describe "is_ahead_of" do
 
     it "should handle the trivial case" do
-      current = gitprocess.branches.current
+      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 = gitprocess.branches.current
+      base_branch = gitlib.branches.current
 
-      gitprocess.checkout('fb', :new_branch => base_branch.name)
-      current = gitprocess.branches.current
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
 
       change_file_and_commit('a', 'hello')
 
@@ -92,12 +92,12 @@ describe GitProc::GitBranch do
 
 
     it "should handle new branch containing base branch that did change" do
-      base_branch = gitprocess.branches.current
+      base_branch = gitlib.branches.current
 
-      gitprocess.checkout('fb', :new_branch => base_branch.name)
-      current = gitprocess.branches.current
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
 
-      gitprocess.checkout(base_branch.name)
+      gitlib.checkout(base_branch.name)
       change_file_and_commit('a', 'goodbye')
 
       current.is_ahead_of(base_branch.name).should == false
@@ -105,14 +105,14 @@ describe GitProc::GitBranch do
 
 
     it "should handle containing in both branches" do
-      base_branch = gitprocess.branches.current
+      base_branch = gitlib.branches.current
 
-      gitprocess.checkout('fb', :new_branch => base_branch.name)
-      current = gitprocess.branches.current
+      gitlib.checkout('fb', :new_branch => base_branch.name)
+      current = gitlib.branches.current
 
       change_file_and_commit('a', 'hello')
 
-      gitprocess.checkout(base_branch.name)
+      gitlib.checkout(base_branch.name)
       change_file_and_commit('a', 'goodbye')
 
       current.is_ahead_of(base_branch.name).should == false