git-process-lib 2.0.3 → 2.0.4

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-# CHANGELOG - 2.0.2 #
+# CHANGELOG - 2.0.4 #
+
+### Since 2.0.3 ###
+
+* Fixed incompatibility with git 1.7 ([GH-128](https://github.com/jdigger/git-process/issues/128))
+
+### Since 2.0.2 ###
+
+* Locked down dependencies due to a change in the "faraday" packages.
 
 ### Since 2.0.1 ###
 

data/lib/git-process/git_lib.rb

@@ -558,6 +558,29 @@ module GitProc
     end
 
 
+    def set_upstream_branch(branch_name, upstream)
+      logger.info { "Setting upstream/tracking for branch '#{branch_name}' to '#{upstream}'." }
+
+      if has_a_remote?
+        parts = upstream.split(/\//)
+        if parts.length() > 1
+          potential_remote = parts.shift
+          if remote.remote_names.include?(potential_remote)
+            config["branch.#{branch_name}.remote"] = potential_remote
+            config["branch.#{branch_name}.merge"] = "refs/heads/#{parts.join('/')}"
+          end
+        else
+          config["branch.#{branch_name}.merge"] = "refs/heads/#{upstream}"
+        end
+      else
+        config["branch.#{branch_name}.merge"] = "refs/heads/#{upstream}"
+      end
+
+      # The preferred way assuming using git 1.8 cli
+      #command(:branch, ['--set-upstream-to', upstream, branch_name])
+    end
+
+
     private
 
 
@@ -642,13 +665,6 @@ module GitProc
     end
 
 
-    def set_upstream_branch(branch_name, upstream)
-      logger.info { "Setting upstream/tracking for branch '#{branch_name}' to '#{upstream}'." }
-
-      command(:branch, ['--set-upstream-to', upstream, branch_name])
-    end
-
-
     def sync_control_filename(branch_name)
       File.join(File.join(workdir, '.git'), "gitprocess-sync-#{remote.name}--#{branch_name}")
     end

data/lib/git-process/version.rb

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

data/local-build.rb

@@ -15,10 +15,10 @@ for gem in gems
 
   %x[gem build #{gem}.gemspec]
   SystemExit.new($?) if $?.exitstatus
-end
 
-puts %x(gem install ./git-process-#{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 %x(gem push ./git-process-#{GitProc::Version::STRING}.gem)
-#SystemExit.new($?) if $?.exitstatus
+  puts %x(gem push ./#{gem}-#{GitProc::Version::STRING}.gem)
+  SystemExit.new($?) if $?.exitstatus
+end

data/spec/git_lib_spec.rb

@@ -46,6 +46,43 @@ describe GitLib, :git_repo_helper do
   end
 
 
+  describe 'set_upstream_branch' do
+    include GitRepoHelper
+
+    it 'updates for remote branch' do
+        gitlib.branch('ba/bb', :base_branch => 'master')
+        clone_repo do |gl|
+           gl.checkout('new_branch', :new_branch => 'origin/master')
+           gl.set_upstream_branch('new_branch', 'origin/ba/bb')
+
+           gl.config['branch.new_branch.remote'].should == 'origin'
+           gl.config['branch.new_branch.merge'].should == 'refs/heads/ba/bb'
+        end
+    end
+
+
+    it 'updates for local branch' do
+      gitlib.branch('ba', :base_branch => 'master')
+      gitlib.checkout('new_branch', :new_branch => 'master')
+      gitlib.set_upstream_branch('new_branch', 'ba')
+
+      gitlib.config['branch.new_branch.remote'].should == nil
+      gitlib.config['branch.new_branch.merge'].should == 'refs/heads/ba'
+    end
+
+
+    it 'updates for local branch that looks remote' do
+      gitlib.branch('other/ba', :base_branch => 'master')
+      gitlib.checkout('new_branch', :new_branch => 'master')
+      gitlib.set_upstream_branch('new_branch', 'other/ba')
+
+      gitlib.config['branch.new_branch.remote'].should == nil
+      gitlib.config['branch.new_branch.merge'].should == 'refs/heads/other/ba'
+    end
+
+  end
+
+
   describe 'fetch' do
 
     it 'parse the list of changes' do

data/spec/sync_spec.rb

@@ -1108,7 +1108,7 @@ describe Sync do
 
           it 'should fail if it is not subsumed by the remote' do
             Given do
-              @local.command(:remote, ['remove', 'origin'])
+              @local.command(:remote, ['rm', 'origin'])
             end
 
             expect { when_sync_is_run(false) }.to raise_error(GitProcessError, /Specifying 'no_remote' does not make sense without a remote/)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process-lib
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Jim Moore