git-process 0.9.5 → 0.9.6

data/spec/sync_spec.rb

@@ -30,13 +30,12 @@ describe GitProc::Sync do
 
     gitprocess.branch('fb', :base_branch => 'master')
 
-    clone('fb') do |gp|
-      change_file_and_commit('a', 'hello', gp)
-      gp.branches.include?('origin/fb').should be_true
-      gp.runner
-      gp.branches.include?('origin/fb').should be_true
-      gitprocess.branches.include?('fb').should be_true
-    end
+    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
   end
 
 
@@ -45,13 +44,12 @@ describe GitProc::Sync do
 
     gitprocess.branch('fb', :base_branch => 'master')
 
-    clone('fb', 'a_remote') do |gp|
-      change_file_and_commit('a', 'hello', gp)
-      gp.branches.include?('a_remote/fb').should be_true
-      gp.runner
-      gp.branches.include?('a_remote/fb').should be_true
-      gitprocess.branches.include?('fb').should be_true
-    end
+    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
   end
 
 
@@ -60,13 +58,14 @@ describe GitProc::Sync do
 
     gitprocess.branch('fb', :base_branch => 'master')
 
-    clone('fb') do |gp|
-      gitprocess.checkout('fb') do
-        change_file_and_commit('a', 'hello', gitprocess)
-      end
-
-      expect {gp.runner}.should raise_error GitProc::GitExecuteError
+    gp = clone('fb')
+    gitprocess.checkout('fb') do
+      change_file_and_commit('a', 'hello', gitprocess)
     end
+
+    expect {
+      GitProc::Sync.new(gp.workdir, {:rebase => false, :force => false, :log_level => log_level}).runner
+    }.should raise_error GitProc::GitExecuteError
   end
 
 
@@ -82,13 +81,14 @@ describe GitProc::Sync do
 
       gitprocess.branch('fb', :base_branch => 'master')
 
-      clone('fb') do |gp|
-        gitprocess.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitprocess)
-        end
-
-        expect {gp.runner}.should_not raise_error GitProc::GitExecuteError
+      gp = clone('fb')
+      gitprocess.checkout('fb') do
+        change_file_and_commit('a', 'hello', gitprocess)
       end
+
+      expect {
+        GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => true, :log_level => log_level})).runner
+      }.should_not raise_error GitProc::GitExecuteError
     end
 
   end
@@ -130,16 +130,16 @@ describe GitProc::Sync do
 
       gitprocess.branch('fb', :base_branch => 'master')
 
-      clone('fb') do |gp|
-        gitprocess.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitprocess)
-        end
+      gp = clone('fb')
+      gitprocess.checkout('fb') do
+        change_file_and_commit('a', 'hello', gitprocess)
+      end
 
-        gp.should_receive(:fetch) # want to get remote changes
-        gp.should_not_receive(:push) # ...but not push any
+      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
 
-        gp.runner
-      end
+      sp.runner
     end
 
   end
@@ -150,13 +150,12 @@ describe GitProc::Sync do
 
     gitprocess.branch('fb', :base_branch => 'master')
 
-    clone('fb', 'a_remote') do |gp|
-      change_file_and_commit('a', 'hello', gp)
-      gp.branches.include?('a_remote/fb').should be_true
-      gp.runner
-      gp.branches.include?('a_remote/fb').should be_true
-      gitprocess.branches.include?('fb').should be_true
-    end
+    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
   end
 
 
@@ -164,7 +163,7 @@ describe GitProc::Sync 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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Jim Moore
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 -06:00
+date: 2012-07-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,6 +211,7 @@ files:
 - bin/git-to-master
 - git-process.gemspec
 - lib/git-process/abstract_error_builder.rb
+- lib/git-process/changed_file_helper.rb
 - lib/git-process/git_abstract_merge_error_builder.rb
 - lib/git-process/git_branch.rb
 - lib/git-process/git_branches.rb
@@ -233,6 +234,7 @@ files:
 - lib/git-process/version.rb
 - spec/FileHelpers.rb
 - spec/GitRepoHelper.rb
+- spec/changed_file_helper_spec.rb
 - spec/git_abstract_merge_error_builder_spec.rb
 - spec/git_lib_spec.rb
 - spec/git_process_spec.rb
@@ -278,6 +280,7 @@ summary: A set of scripts for a good git process
 test_files: 
 - spec/FileHelpers.rb
 - spec/GitRepoHelper.rb
+- spec/changed_file_helper_spec.rb
 - spec/git_abstract_merge_error_builder_spec.rb
 - spec/git_lib_spec.rb
 - spec/git_process_spec.rb