RubyGems - git-process - Versions diffs - 1.1.4 → 2.0.0 - Mend

git-process 1.1.4 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

data/CHANGELOG.md +14 -1
data/LICENSE +193 -22
data/README.md +212 -71
data/man/git-process.1 +371 -0
metadata +52 -140
data/Gemfile +0 -20
data/Gemfile.lock +0 -53
data/Rakefile +0 -16
data/bin/git-new-fb +0 -58
data/bin/git-pull-request +0 -107
data/bin/git-sync +0 -73
data/bin/git-to-master +0 -133
data/git-process.gemspec +0 -25
data/lib/git-process/abstract_error_builder.rb +0 -53
data/lib/git-process/changed_file_helper.rb +0 -115
data/lib/git-process/git_abstract_merge_error_builder.rb +0 -146
data/lib/git-process/git_branch.rb +0 -105
data/lib/git-process/git_branches.rb +0 -73
data/lib/git-process/git_config.rb +0 -153
data/lib/git-process/git_lib.rb +0 -512
data/lib/git-process/git_logger.rb +0 -84
data/lib/git-process/git_merge_error.rb +0 -28
data/lib/git-process/git_process.rb +0 -172
data/lib/git-process/git_process_error.rb +0 -18
data/lib/git-process/git_process_options.rb +0 -99
data/lib/git-process/git_rebase_error.rb +0 -30
data/lib/git-process/git_remote.rb +0 -256
data/lib/git-process/git_status.rb +0 -108
data/lib/git-process/github_configuration.rb +0 -298
data/lib/git-process/github_pull_request.rb +0 -151
data/lib/git-process/new_fb.rb +0 -50
data/lib/git-process/parked_changes_error.rb +0 -41
data/lib/git-process/pull_request.rb +0 -134
data/lib/git-process/pull_request_error.rb +0 -25
data/lib/git-process/rebase_to_master.rb +0 -148
data/lib/git-process/sync.rb +0 -136
data/lib/git-process/uncommitted_changes_error.rb +0 -23
data/lib/git-process/version.rb +0 -22
data/spec/FileHelpers.rb +0 -19
data/spec/GitRepoHelper.rb +0 -123
data/spec/changed_file_helper_spec.rb +0 -127
data/spec/git_abstract_merge_error_builder_spec.rb +0 -126
data/spec/git_branch_spec.rb +0 -123
data/spec/git_config_spec.rb +0 -45
data/spec/git_lib_spec.rb +0 -176
data/spec/git_logger_spec.rb +0 -66
data/spec/git_process_spec.rb +0 -208
data/spec/git_remote_spec.rb +0 -227
data/spec/git_status_spec.rb +0 -122
data/spec/github_configuration_spec.rb +0 -152
data/spec/github_pull_request_spec.rb +0 -96
data/spec/github_test_helper.rb +0 -49
data/spec/new_fb_spec.rb +0 -130
data/spec/pull_request_helper.rb +0 -94
data/spec/pull_request_spec.rb +0 -128
data/spec/rebase_to_master_spec.rb +0 -429
data/spec/spec_helper.rb +0 -21
data/spec/sync_spec.rb +0 -304

data/spec/sync_spec.rb DELETED Viewed

@@ -1,304 +0,0 @@
-require 'git-process/sync'
-require 'GitRepoHelper'
-describe Sync do
-  include GitRepoHelper
-  before(:each) do
-    create_files(%w(.gitignore))
-    gitlib.commit('initial')
-  end
-  after(:each) do
-    rm_rf(gitlib.workdir)
-  end
-  def log_level
-    Logger::ERROR
-  end
-  def create_process(base = gitlib, opts = {})
-    GitProc::Sync.new(base, opts.merge({:rebase => false, :force => false}))
-  end
-  it 'should work when pushing with fast-forward' do
-    change_file_and_commit('a', '')
-    gitlib.branch('fb', :base_branch => 'master')
-    clone_repo('fb') do |gl|
-      change_file_and_commit('a', 'hello', gl)
-      gl.branches.include?('origin/fb').should be_true
-      GitProc::Sync.new(gl, :rebase => false, :force => false, :log_level => log_level).runner
-      gl.branches.include?('origin/fb').should be_true
-      gitlib.branches.include?('fb').should be_true
-    end
-  end
-  it "should work with a different remote server name" do
-    change_file_and_commit('a', '')
-    gitlib.branch('fb', :base_branch => 'master')
-    clone_repo('fb', 'a_remote') do |gl|
-      change_file_and_commit('a', 'hello', gl)
-      gl.branches.include?('a_remote/fb').should be_true
-      GitProc::Sync.new(gl, :rebase => false, :force => false, :log_level => log_level).runner
-      gl.branches.include?('a_remote/fb').should be_true
-      gitlib.branches.include?('fb').should be_true
-    end
-  end
-  describe 'when forcing the push' do
-    def create_process(gitlib, opts)
-      GitProc::Sync.new(gitlib, opts.merge({:rebase => false, :force => true}))
-    end
-    it "should work when pushing with non-fast-forward" do
-      change_file_and_commit('a', '')
-      gitlib.branch('fb', :base_branch => 'master')
-      clone_repo('fb') do |gl|
-        gitlib.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitlib)
-        end
-        expect {
-          GitProc::Sync.new(gl, :rebase => false, :force => true, :log_level => log_level).runner
-        }.to_not raise_error GitExecuteError
-      end
-    end
-  end
-  describe "when changes are made upstream" do
-    def create_process(base, opts = {})
-      GitProc::Sync.new(base, opts.merge({:rebase => false, :force => false}))
-    end
-    it "should work when pushing with non-fast-forward by merging" do
-      change_file_and_commit('a', '')
-      gitlib.branch('fb', :base_branch => 'master')
-      clone_repo('fb') do |gl|
-        gitlib.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitlib)
-        end
-        expect {
-          create_process(gl).runner
-        }.to_not raise_error GitExecuteError
-      end
-    end
-  end
-  describe "when rebasing" do
-    def create_process(gitlib, opts = {})
-      GitProc::Sync.new(gitlib, opts.merge({:rebase => true, :force => false}))
-    end
-    it "should work when pushing (non-fast-forward)" do
-      change_file_and_commit('a', '')
-      clone_repo do |gl|
-        gl.checkout('fb', :new_branch => 'master')
-        expect { create_process(gl).runner }.to_not raise_error GitExecuteError
-        change_file_and_commit('a', 'hello', gitlib)
-        expect { create_process(gl).runner }.to_not raise_error GitExecuteError
-      end
-    end
-    it "should merge and then rebase if remote feature branch changed" do
-      change_file_and_commit('a', '')
-      gitlib.checkout('fb', :new_branch => 'master')
-      clone_repo do |gl|
-        gl.checkout('fb', :new_branch => 'origin/master')
-        change_file_and_commit('b', 'hello', gl)
-        change_file_and_commit('a', 'hello', gitlib)
-        change_file_and_commit('b', 'goodbye', gl)
-        change_file_and_commit('a', 'goodbye', gitlib)
-        gitlib.checkout('master')
-        expect { create_process(gl).runner }.to_not raise_error GitExecuteError
-      end
-    end
-  end
-  describe "when forcing local-only" do
-    def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => true, :force => false, :local => true}))
-    end
-    it "should not try to push" do
-      change_file_and_commit('a', '')
-      gitlib.branch('fb', :base_branch => 'master')
-      clone_repo('fb') do |gl|
-        gitlib.checkout('fb')
-        change_file_and_commit('a', 'hello', gitlib)
-        sp = GitProc::Sync.new(gl, :rebase => true, :force => false, :local => true, :log_level => log_level)
-        gl.should_receive(:fetch) # want to get remote changes
-        gl.should_not_receive(:push) # ...but not push any
-        sp.runner
-      end
-    end
-  end
-  describe "when there is no remote" do
-    def create_process(base, opts)
-      GitProc::Sync.new(base, opts.merge({:rebase => true, :force => false, :local => false}))
-    end
-    it "should not try to fetch or push" do
-      change_file_and_commit('a', '')
-      gitlib.branch('fb', :base_branch => 'master')
-      sp = GitProc::Sync.new(gitlib, :rebase => true, :force => false, :local => true, :log_level => log_level)
-      gitlib.should_not_receive(:fetch)
-      gitlib.should_not_receive(:push)
-      sp.runner
-    end
-  end
-  describe "when default rebase flag is used" do
-    def create_process(base = gitlib, opts = {})
-      GitProc::Sync.new(base, opts.merge({:rebase => false, :force => false, :local => false}))
-    end
-    it "should try to rebase by flag" do
-      change_file_and_commit('a', '', gitlib)
-      gitlib.branch('fb', :base_branch => 'master')
-      sp = GitProc::Sync.new(gitlib, :rebase => true, :force => false, :local => true, :log_level => log_level)
-      gitlib.should_receive(:rebase)
-      gitlib.should_not_receive(:merge)
-      sp.runner
-    end
-    it "should try to rebase by config" do
-      change_file_and_commit('a', '', gitlib)
-      gitlib.branch('fb', :base_branch => 'master')
-      gitlib.config['gitProcess.defaultRebaseSync'] = 'true'
-      sp = GitProc::Sync.new(gitlib, :rebase => false, :force => false, :local => true, :log_level => log_level)
-      gitlib.should_receive(:rebase)
-      gitlib.should_not_receive(:merge)
-      sp.runner
-    end
-    it "should not try to rebase by false config" do
-      change_file_and_commit('a', '', gitlib)
-      gitlib.branch('fb', :base_branch => 'master')
-      gitlib.config['gitProcess.defaultRebaseSync'] = 'false'
-      sp = GitProc::Sync.new(gitlib, :rebase => false, :force => false, :local => true, :log_level => log_level)
-      gitlib.should_not_receive(:rebase)
-      gitlib.should_receive(:merge)
-      sp.runner
-    end
-    it "should not try to rebase by false config" do
-      change_file_and_commit('a', '', gitlib)
-      gitlib.branch('fb', :base_branch => 'master')
-      gitlib.config['gitProcess.defaultRebaseSync'] = 'false'
-      sp = GitProc::Sync.new(gitlib, :rebase => false, :force => false, :local => true, :log_level => log_level)
-      gitlib.should_not_receive(:rebase)
-      gitlib.should_receive(:merge)
-      sp.runner
-    end
-    it "should try to rebase by true config" do
-      change_file_and_commit('a', '', gitlib)
-      gitlib.branch('fb', :base_branch => 'master')
-      gitlib.config['gitProcess.defaultRebaseSync'] = 'true'
-      sp = GitProc::Sync.new(gitlib, :rebase => false, :force => false, :local => true, :log_level => log_level)
-      gitlib.should_receive(:rebase)
-      gitlib.should_not_receive(:merge)
-      sp.runner
-    end
-  end
-  it "should work with a different remote server name than 'origin'" do
-    change_file_and_commit('a', '')
-    gitlib.branch('fb', :base_branch => 'master')
-    clone_repo('fb', 'a_remote') do |gl|
-      change_file_and_commit('a', 'hello', gl)
-      gl.branches.include?('a_remote/fb').should be_true
-      GitProc::Sync.new(gl, :rebase => false, :force => false, :log_level => log_level).runner
-      gl.branches.include?('a_remote/fb').should be_true
-      gitlib.branches.include?('fb').should be_true
-    end
-  end
-  it 'should fail when removing current feature while on _parking_' do
-    gitlib.checkout('_parking_', :new_branch => 'master')
-    change_file_and_commit('a', '')
-    expect { gitprocess.verify_preconditions }.to raise_error ParkedChangesError
-  end
-end