git-process-lib 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c814fd9a301f2ab6362a357479c92690a65b4501
-  data.tar.gz: 503cbe342c78a16654e9f29b37a29500e885530f
+  metadata.gz: 1fbc5f2b542847e36c2f9d502cd55c9ec7cc3878
+  data.tar.gz: 9bc5ec75d04f2d53404b153988a513946456d6ae
 SHA512:
-  metadata.gz: 02e94090e1bd1a620e4d6dd670c02fa166b04146644fe1ff197c9f2f0b05eb9dab03f0a6ccc6506b7892f337a227b3f6867dae7f118c9de6a7e7841fae76b546
-  data.tar.gz: 779f8617a4eb111c4f9a0acac64ed4c5b2c321cedc58e46a36dca8811bf7d0dd951a3dfa33f06aae75ca3377b5bca205acf931e1ddfebde265428bc6ba937032
+  metadata.gz: e9905d6be43b5ed017ccbcaeda06a28e2c13b192daecb949872ae7256197647a2e137100e4d2b305dff40bd0901f454d0a62d9ab0e0321dc7d457a33c239181c
+  data.tar.gz: 6b88cd2ab99672bc7a5dbcf76b57dddf2071eed441e51833efe76822e4a3a9e421a8e4c498520187b6ba28ad7d55831f2d771af25c4b13e8e67e4b9402b727a5

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# CHANGELOG - 3.0.0 #
+# CHANGELOG - 3.0.1 #
+
+### Since 3.0.0 ###
+
+* Fixed "ambiguous arguments" problem ([GH-145](https://github.com/jdigger/git-process/issues/145))
 
 ### Since 2.0.5 ###
 

data/lib/git-process/git_process.rb

@@ -114,7 +114,7 @@ module GitProc
       includes_master_branch = my_branches.include?(config.master_branch)
       current_branch_is_not_master = my_branches.current.name != config.master_branch
       do_not_keep_integration_branch = !keep_local_integration_branch?
-      integration_branch_contains_all_of_master = my_branches[config.integration_branch].contains_all_of(config.master_branch)
+      integration_branch_contains_all_of_master = includes_master_branch and my_branches[config.integration_branch].contains_all_of(config.master_branch)
 
       return (has_a_remote and
           includes_master_branch and

data/lib/git-process/version.rb

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

data/local-build.rb

@@ -3,10 +3,8 @@ require File.expand_path('../lib/git-process/version', __FILE__)
 
 gems = %w(git-process-lib git-sync git-to-master git-new-fb git-pull-req git-process)
 
-puts "rake manpage"
 %x[rake manpage 2>&1]
 
-puts "uninstall"
 for gem in gems.reverse
   %x[gem uninstall #{gem} -x -v #{GitProc::Version::STRING} 2>&1]
 end
@@ -15,14 +13,12 @@ for gem in gems
   # puts %x(a2x -f manpage -D man docs/#{gem}.1.adoc)
   # SystemExit.new($?) if $?.exitstatus
 
-  puts "gem build #{gem}"
   %x[gem build #{gem}.gemspec]
   SystemExit.new($?) if $?.exitstatus
 
-  # puts %x(gem install ./#{gem}-#{GitProc::Version::STRING}.gem -l -u)
-  # SystemExit.new($?) if $?.exitstatus
+  puts %x(gem install ./#{gem}-#{GitProc::Version::STRING}.gem -l -u)
+  SystemExit.new($?) if $?.exitstatus
 
-  puts "gem push #{gem}"
   puts %x(gem push ./#{gem}-#{GitProc::Version::STRING}.gem)
   SystemExit.new($?) if $?.exitstatus
 end

data/spec/git_process_spec.rb

@@ -142,6 +142,7 @@ describe GitProc::Process do
           gl.fetch
 
           gp = GitProc::Process.new(gl)
+          gp.stub(:ask_about_removing_master).and_return(false)
           gp.verify_preconditions
 
           gl.branches.include?('master').should be true
@@ -176,6 +177,7 @@ describe GitProc::Process do
           gl.fetch
 
           gp = GitProc::Process.new(gl)
+          gp.stub(:ask_about_removing_master).and_return(false)
           gp.verify_preconditions
 
           gl.branches.include?('master').should be true

data/spec/sync_spec.rb

@@ -219,6 +219,35 @@ describe Sync do
           expect { when_sync_is_run }.to raise_error(RebaseError, /'a' was modified in both branches/)
         end
 
+
+        #         i
+        #        /
+        # - A - C - B1
+        #           /
+        #         l,r
+        it 'should work with no local master branch (GH-145)' do
+          Given do
+            rcreate_commit_on_new_branch :origin, 'fb', 'master', :b
+            rfetch local_repo, 'origin'
+            local_repo.create_branch('fb', 'origin/fb')
+            @local.checkout('fb')
+            Rugged::Branch.lookup(local_repo, 'master').delete!
+            @local.config['gitProcess.keepLocalIntegrationBranch'] = true
+            @local.write_sync_control_file('fb')
+            rcreate_commit :origin, 'master', :c
+          end
+
+          sync = create_process(@local)
+          sync.verify_preconditions
+          sync.runner
+
+          Then do
+            local_and_remote_are_same
+            parent(l_sha).should == @c_sha
+            check_file_content :b
+          end
+        end
+
       end
 
       #         i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-process-lib
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Jim Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit