git-process 1.1.4 → 2.0.0

data/lib/git-process/uncommitted_changes_error.rb

@@ -1,23 +0,0 @@
-# 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_process_error'
-
-module GitProc
-
-  class UncommittedChangesError < GitProcessError
-    def initialize
-      super("There are uncommitted changes.\nPlease either commit your changes, or use 'git stash' to set them aside.")
-    end
-  end
-
-end

data/lib/git-process/version.rb

@@ -1,22 +0,0 @@
-# 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.
-
-module GitProc
-  module Version
-    MAJOR = 1
-    MINOR = 1
-    PATCH = 4
-    BUILD = nil
-
-    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
-  end
-end

data/spec/FileHelpers.rb

@@ -1,19 +0,0 @@
-require 'tmpdir'
-include FileUtils
-
-module FileHelpers
-  TEST_DIR = File.dirname(__FILE__)
-
-
-  def dir_files(dir)
-    Dir.entries(dir).grep(/^[^.]/)
-  end
-
-
-  def compare_files(file1name, file2name)
-    str1 = IO.read(file1name)
-    str2 = IO.read(file2name)
-    str1.should == str2
-  end
-
-end

data/spec/GitRepoHelper.rb

@@ -1,123 +0,0 @@
-require 'tmpdir'
-require 'FileHelpers'
-require 'git-process/git_process'
-include GitProc
-
-module GitRepoHelper
-
-  def gitprocess
-    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 config
-    gitlib.config
-  end
-
-
-  def remote
-    gitlib.remote
-  end
-
-
-  def commit_count
-    gitlib.log_count
-  end
-
-
-  def log_level
-    Logger::ERROR
-  end
-
-
-  def logger
-    gitlib.logger
-  end
-
-
-  def create_files(file_names)
-    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|
-        gitlib.logger.debug { "Creating #{dir}/#{fn}" }
-        FileUtils.touch fn
-      end
-    end
-    gitlib.add(file_names)
-  end
-
-
-  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 = gitlib)
-    change_file(filename, contents, lib)
-    lib.add(filename)
-  end
-
-
-  def change_file_and_commit(filename, contents, lib = gitlib)
-    change_file_and_add(filename, contents, lib)
-    lib.commit("#{filename} - #{contents}")
-  end
-
-
-  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_repo(branch='master', remote_name = 'origin', &block)
-    td = Dir.mktmpdir
-
-    logger.debug { "Cloning '#{gitlib.workdir}' to '#{td}'" }
-
-    gl = create_gitlib(td, :log_level => logger.level)
-    gl.remote.add(remote_name, "file://#{gitlib.workdir}")
-    gl.fetch(remote_name)
-
-    if branch == 'master'
-      gl.reset("#{remote_name}/#{branch}", :hard => true)
-    else
-      gl.checkout(branch, :new_branch => "#{remote_name}/#{branch}")
-    end
-
-    if block_given?
-      begin
-        block.arity < 1 ? gl.instance_eval(&block) : block.call(gl)
-      ensure
-        rm_rf(gl.workdir)
-      end
-      nil
-    else
-      gl
-    end
-  end
-
-end

data/spec/changed_file_helper_spec.rb

@@ -1,127 +0,0 @@
-require 'git-process/sync'
-include GitProc
-
-describe ChangeFileHelper, :git_repo_helper do
-
-  def log_level
-    Logger::ERROR
-  end
-
-
-  #noinspection RubyUnusedLocalVariable
-  def create_process(dir, opts)
-    nil
-  end
-
-
-  describe 'uncommitted changes' do
-
-    it 'should fail when there are unmerged files' do
-      change_file_and_commit('modified file.txt', 'start')
-
-      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
-
-
-    def change_file_helper
-      @change_file_helper ||= ChangeFileHelper.new(gitlib)
-    end
-
-
-    describe "using 'unknown' file" do
-
-      before(:each) do
-        change_file('unknown file.txt', '')
-        change_file_helper.stub(:say)
-      end
-
-
-      it 'should then add it' do
-        ChangeFileHelper.stub(:ask_how_to_handle_unknown_files).and_return(:add)
-        change_file_helper.gitlib.should_receive(:add).with(['unknown file.txt'])
-
-        change_file_helper.offer_to_help_uncommitted_changes
-      end
-
-
-      it 'should ignore the file' do
-        ChangeFileHelper.stub(:ask_how_to_handle_unknown_files).and_return(:ignore)
-        change_file_helper.should_not_receive(:add)
-
-        change_file_helper.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('modified file4.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')
-        change_file_and_add('modified file4.txt', 'content')
-        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"
-        #  M "modified file.txt"
-        # MM "modified file2.txt"
-        # MD "modified file3.txt"
-        # M  "modified file4.txt"
-        #  D "removed file.txt"
-        # AD "removed file2.txt"
-
-        change_file_helper.stub(:say)
-      end
-
-
-      it 'should ask about modified files, then commit them' do
-        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)
-
-        change_file_helper.offer_to_help_uncommitted_changes
-      end
-
-
-      it 'should ask about modified files, then stash them' do
-        ChangeFileHelper.stub(:ask_how_to_handle_changed_files).and_return(:stash)
-
-        change_file_helper.offer_to_help_uncommitted_changes
-
-        gitlib.status.clean?.should be_true
-
-        gitlib.stash_pop
-
-        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"]
-      end
-
-    end
-
-  end
-
-end

data/spec/git_abstract_merge_error_builder_spec.rb

@@ -1,126 +0,0 @@
-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)
-      @lib.config.rerere_enabled = true
-      @lib.config.rerere_autoupdate = true
-      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 rerere.enabled false" do
-    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']
-    c = [
-        'git config --global rerere.enabled true',
-        'git mergetool a b\ c',
-        '# Verify \'a\' merged correctly.',
-        '# Verify \'b c\' merged correctly.',
-        'git add a b\ c',
-    ]
-    match_commands c
-  end
-
-
-  it "merged with rerere.enabled true and auto-handled AND autoupdated a file" do
-    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)
-    builder.unresolved_files.should == ['b c']
-    c = [
-        '# Verify that \'rerere\' did the right thing for \'a\'.',
-        'git mergetool b\ c',
-        '# Verify \'b c\' merged correctly.',
-        'git add b\ c',
-    ]
-    match_commands c
-  end
-
-
-  it "merged with rerere.enabled true and auto-handled and not autoupdated a file" do
-    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)
-    builder.unresolved_files.should == ['b c']
-    c = [
-        '# Verify that \'rerere\' did the right thing for \'a\'.',
-        'git add a',
-        'git mergetool b\ c',
-        '# Verify \'b c\' merged correctly.',
-        'git add b\ c',
-    ]
-    match_commands c
-  end
-
-
-  it "merged with a file added in both branches" do
-    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)
-    c = [
-        '# \'a\' was added in both branches; Fix the conflict.',
-        'git add a',
-    ]
-    match_commands c
-  end
-
-end