git-process 1.0.11 → 1.1.0

data/spec/spec_helper.rb

@@ -1 +1,21 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
+
+require 'GitRepoHelper'
+require 'pull_request_helper'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.include GitRepoHelper, :git_repo_helper
+
+  config.before(:each, :git_repo_helper) do
+    create_files(%w(.gitignore))
+    gitlib.commit('initial')
+  end
+
+
+  config.after(:each, :git_repo_helper) do
+    rm_rf(gitlib.workdir)
+  end
+
+end

data/spec/sync_spec.rb

@@ -1,17 +1,17 @@
 require 'git-process/sync'
 require 'GitRepoHelper'
 
-describe GitProc::Sync do
+describe Sync do
   include GitRepoHelper
 
   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
 
 
@@ -20,59 +20,61 @@ describe GitProc::Sync do
   end
 
 
-  def create_process(dir, opts)
-    GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => false}))
+  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
+  it 'should work when pushing with fast-forward' do
     change_file_and_commit('a', '')
 
-    gitprocess.branch('fb', :base_branch => 'master')
+    gitlib.branch('fb', :base_branch => 'master')
 
-    gp = clone('fb')
-    change_file_and_commit('a', 'hello', gp)
-    gp.branches.include?('origin/fb').should be_true
-    GitProc::Sync.new(gp.workdir, {:rebase => false, :force => false, :log_level => log_level}).runner
-    gp.branches.include?('origin/fb').should be_true
-    gitprocess.branches.include?('fb').should be_true
+    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', '')
 
-    gitprocess.branch('fb', :base_branch => 'master')
+    gitlib.branch('fb', :base_branch => 'master')
 
-    gp = clone('fb', 'a_remote')
-    change_file_and_commit('a', 'hello', gp)
-    gp.branches.include?('a_remote/fb').should be_true
-    GitProc::Sync.new(gp.workdir, {:rebase => false, :force => false, :log_level => log_level}).runner
-    gp.branches.include?('a_remote/fb').should be_true
-    gitprocess.branches.include?('fb').should be_true
+    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
+  describe 'when forcing the push' do
 
-    def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => true}))
+    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', '')
 
-      gitprocess.branch('fb', :base_branch => 'master')
+      gitlib.branch('fb', :base_branch => 'master')
 
-      clone('fb') do |gp|
-        gitprocess.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitprocess)
+      clone_repo('fb') do |gl|
+        gitlib.checkout('fb') do
+          change_file_and_commit('a', 'hello', gitlib)
         end
 
         expect {
-          GitProc::Sync.new(gp.workdir, {:rebase => false, :force => true, :log_level => log_level}).runner
-        }.to_not raise_error GitProc::GitExecuteError
+          GitProc::Sync.new(gl, :rebase => false, :force => true, :log_level => log_level).runner
+        }.to_not raise_error GitExecuteError
       end
     end
 
@@ -81,25 +83,24 @@ describe GitProc::Sync do
 
   describe "when changes are made upstream" do
 
-    def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => false}))
+    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', '')
 
-      gitprocess.branch('fb', :base_branch => 'master')
+      gitlib.branch('fb', :base_branch => 'master')
 
-      clone('fb') do |gp|
-
-        gitprocess.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitprocess)
+      clone_repo('fb') do |gl|
+        gitlib.checkout('fb') do
+          change_file_and_commit('a', 'hello', gitlib)
         end
 
         expect {
-          gp.runner
-        }.to_not raise_error GitProc::GitExecuteError
+          create_process(gl).runner
+        }.to_not raise_error GitExecuteError
       end
     end
 
@@ -108,40 +109,42 @@ describe GitProc::Sync do
 
   describe "when rebasing" do
 
-    def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => true, :force => false}))
+    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', '')
 
-      gp = clone
-      gp.checkout('fb', :new_branch => 'master')
+      clone_repo do |gl|
+        gl.checkout('fb', :new_branch => 'master')
 
-      expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
+        expect { create_process(gl).runner }.to_not raise_error GitExecuteError
 
-      change_file_and_commit('a', 'hello', gitprocess)
+        change_file_and_commit('a', 'hello', gitlib)
 
-      expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
+        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', '')
 
-      gitprocess.checkout('fb', :new_branch => 'master')
+      gitlib.checkout('fb', :new_branch => 'master')
 
-      gp = clone
-      gp.checkout('fb', :new_branch => 'origin/master')
+      clone_repo do |gl|
+        gl.checkout('fb', :new_branch => 'origin/master')
 
-      change_file_and_commit('b', 'hello', gp)
-      change_file_and_commit('a', 'hello', gitprocess)
-      change_file_and_commit('b', 'goodbye', gp)
-      change_file_and_commit('a', 'goodbye', gitprocess)
-      gitprocess.checkout('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 { gp.runner }.to_not raise_error GitProc::GitExecuteError
+        expect { create_process(gl).runner }.to_not raise_error GitExecuteError
+      end
     end
 
   end
@@ -157,18 +160,18 @@ describe GitProc::Sync do
     it "should not try to push" do
       change_file_and_commit('a', '')
 
-      gitprocess.branch('fb', :base_branch => 'master')
+      gitlib.branch('fb', :base_branch => 'master')
 
-      gp = clone('fb')
-      gitprocess.checkout('fb') do
-        change_file_and_commit('a', 'hello', gitprocess)
-      end
+      clone_repo('fb') do |gl|
+        gitlib.checkout('fb')
+        change_file_and_commit('a', 'hello', gitlib)
 
-      sp = GitProc::Sync.new(gp.workdir, {:rebase => true, :force => false, :local => true, :log_level => log_level})
-      sp.should_receive(:fetch) # want to get remote changes
-      sp.should_not_receive(:push) # ...but not push any
+        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
+        sp.runner
+      end
     end
 
   end
@@ -176,19 +179,19 @@ describe GitProc::Sync do
 
   describe "when there is no remote" do
 
-    def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => true, :force => false, :local => false}))
+    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', '')
 
-      gitprocess.branch('fb', :base_branch => 'master')
+      gitlib.branch('fb', :base_branch => 'master')
 
-      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => true, :force => false, :local => true, :log_level => log_level})
-      sp.should_not_receive(:fetch)
-      sp.should_not_receive(:push)
+      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
@@ -198,75 +201,75 @@ describe GitProc::Sync do
 
   describe "when default rebase flag is used" do
 
-    def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => false, :local => false}))
+    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', '', gitprocess)
+      change_file_and_commit('a', '', gitlib)
 
-      gitprocess.branch('fb', :base_branch => 'master')
+      gitlib.branch('fb', :base_branch => 'master')
 
-      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => true, :force => false, :local => true, :log_level => log_level})
-      sp.should_receive(:rebase)
-      sp.should_not_receive(:merge)
+      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', '', gitprocess)
+      change_file_and_commit('a', '', gitlib)
 
-      gitprocess.branch('fb', :base_branch => 'master')
-      gitprocess.config('gitProcess.defaultRebaseSync', 'true')
+      gitlib.branch('fb', :base_branch => 'master')
+      gitlib.config['gitProcess.defaultRebaseSync'] = 'true'
 
-      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
-      sp.should_receive(:rebase)
-      sp.should_not_receive(:merge)
+      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', '', gitprocess)
+      change_file_and_commit('a', '', gitlib)
 
-      gitprocess.branch('fb', :base_branch => 'master')
-      gitprocess.config('gitProcess.defaultRebaseSync', 'false')
+      gitlib.branch('fb', :base_branch => 'master')
+      gitlib.config['gitProcess.defaultRebaseSync'] = 'false'
 
-      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
-      sp.should_not_receive(:rebase)
-      sp.should_receive(:merge)
+      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', '', gitprocess)
+      change_file_and_commit('a', '', gitlib)
 
-      gitprocess.branch('fb', :base_branch => 'master')
-      gitprocess.config('gitProcess.defaultRebaseSync', 'false')
+      gitlib.branch('fb', :base_branch => 'master')
+      gitlib.config['gitProcess.defaultRebaseSync'] = 'false'
 
-      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
-      sp.should_not_receive(:rebase)
-      sp.should_receive(:merge)
+      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', '', gitprocess)
+      change_file_and_commit('a', '', gitlib)
 
-      gitprocess.branch('fb', :base_branch => 'master')
-      gitprocess.config('gitProcess.defaultRebaseSync', 'true')
+      gitlib.branch('fb', :base_branch => 'master')
+      gitlib.config['gitProcess.defaultRebaseSync'] = 'true'
 
-      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
-      sp.should_receive(:rebase)
-      sp.should_not_receive(:merge)
+      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
@@ -277,22 +280,25 @@ describe GitProc::Sync do
   it "should work with a different remote server name than 'origin'" do
     change_file_and_commit('a', '')
 
-    gitprocess.branch('fb', :base_branch => 'master')
+    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
 
-    gp = clone('fb', 'a_remote')
-    change_file_and_commit('a', 'hello', gp)
-    gp.branches.include?('a_remote/fb').should be_true
-    GitProc::Sync.new(gp.workdir, {:rebase => false, :force => false, :log_level => log_level}).runner
-    gp.branches.include?('a_remote/fb').should be_true
-    gitprocess.branches.include?('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
-    gitprocess.checkout('_parking_', :new_branch => 'master')
+    gitlib.checkout('_parking_', :new_branch => 'master')
     change_file_and_commit('a', '')
 
-    expect { gitprocess.verify_preconditions }.to raise_error GitProc::ParkedChangesError
+    expect { gitprocess.verify_preconditions }.to raise_error ParkedChangesError
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 11
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jim Moore
@@ -15,27 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-04 00:00:00 Z
+date: 2013-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: octokit
+  prerelease: false
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 79
+        hash: 63
         segments: 
         - 1
-        - 22
-        - 0
-        version: 1.22.0
-  type: :runtime
+        - 24
+        version: "1.24"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: json
+  prerelease: false
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +47,11 @@ dependencies:
         - 7
         - 3
         version: 1.7.3
-  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: trollop
+  prerelease: false
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +63,11 @@ dependencies:
         - 16
         - 2
         version: 1.16.2
-  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: highline
+  prerelease: false
+  type: :runtime
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,7 +79,6 @@ dependencies:
         - 6
         - 13
         version: 1.6.13
-  type: :runtime
   requirement: *id004
 description: A set of scripts to make working with git easier and more consistent
 email: 
@@ -110,19 +109,22 @@ files:
 - lib/git-process/git_abstract_merge_error_builder.rb
 - lib/git-process/git_branch.rb
 - lib/git-process/git_branches.rb
+- lib/git-process/git_config.rb
 - lib/git-process/git_lib.rb
+- lib/git-process/git_logger.rb
 - lib/git-process/git_merge_error.rb
 - lib/git-process/git_process.rb
 - lib/git-process/git_process_error.rb
 - lib/git-process/git_process_options.rb
 - lib/git-process/git_rebase_error.rb
+- lib/git-process/git_remote.rb
 - lib/git-process/git_status.rb
-- lib/git-process/github_client.rb
+- lib/git-process/github_configuration.rb
 - lib/git-process/github_pull_request.rb
-- lib/git-process/github_service.rb
 - lib/git-process/new_fb.rb
 - lib/git-process/parked_changes_error.rb
 - lib/git-process/pull_request.rb
+- lib/git-process/pull_request_error.rb
 - lib/git-process/rebase_to_master.rb
 - lib/git-process/sync.rb
 - lib/git-process/uncommitted_changes_error.rb
@@ -132,12 +134,18 @@ files:
 - spec/changed_file_helper_spec.rb
 - spec/git_abstract_merge_error_builder_spec.rb
 - spec/git_branch_spec.rb
+- spec/git_config_spec.rb
 - spec/git_lib_spec.rb
+- spec/git_logger_spec.rb
 - spec/git_process_spec.rb
+- spec/git_remote_spec.rb
 - spec/git_status_spec.rb
+- spec/github_configuration_spec.rb
 - spec/github_pull_request_spec.rb
-- spec/github_service_spec.rb
+- spec/github_test_helper.rb
 - spec/new_fb_spec.rb
+- spec/pull_request_helper.rb
+- spec/pull_request_spec.rb
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
@@ -182,12 +190,18 @@ test_files:
 - spec/changed_file_helper_spec.rb
 - spec/git_abstract_merge_error_builder_spec.rb
 - spec/git_branch_spec.rb
+- spec/git_config_spec.rb
 - spec/git_lib_spec.rb
+- spec/git_logger_spec.rb
 - spec/git_process_spec.rb
+- spec/git_remote_spec.rb
 - spec/git_status_spec.rb
+- spec/github_configuration_spec.rb
 - spec/github_pull_request_spec.rb
-- spec/github_service_spec.rb
+- spec/github_test_helper.rb
 - spec/new_fb_spec.rb
+- spec/pull_request_helper.rb
+- spec/pull_request_spec.rb
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb