git-process 1.0.11 → 1.1.0

data/lib/git-process/parked_changes_error.rb

@@ -28,7 +28,7 @@ module GitProc
 
 
     def human_message
-      "You made your changes on the the '_parking_' branch instead of a feature branch.\n"+"Please rename the branch to be a feature branch."
+      "You made your changes on the the '_parking_' branch instead of a feature branch.\n"+'Please rename the branch to be a feature branch.'
     end
 
 

data/lib/git-process/pull_request.rb

@@ -12,36 +12,123 @@
 
 require 'git-process/git_process'
 require 'git-process/github_pull_request'
+require 'git-process/pull_request_error'
 require 'highline/import'
 
 
 module GitProc
 
   class PullRequest < Process
-    include GitLib
-
 
     def initialize(dir, opts)
       super
-      current_branch = branches.current.name
+      @base_branch = opts[:base_branch]
+      @head_branch = opts[:head_branch]
+      @_repo_name = opts[:repo_name]
+      @_remote_name = opts[:server]
+      @pr_number = opts[:prNumber]
       @title = opts[:title]
-      @base_branch = opts[:base_branch] || master_branch
-      @head_branch = opts[:head_branch] || current_branch
-      @repo_name = opts[:repo_name] || repo_name()
-      @title = opts[:title] || current_branch
-      @description = opts[:description] || ''
+      @description = opts[:description]
       @user = opts[:user]
       @password = opts[:password]
     end
 
 
     def runner
-      current_branch = branches.current
-      push(server_name, current_branch, current_branch, :force => false)
-      pr = GitHub::PullRequest.new(self, @repo_name, {:user => @user, :password => @password})
-      pr.create(@base_branch, @head_branch, @title, @description)
+      if @pr_number.nil? or @pr_number.empty?
+        pr = create_pull_request
+        logger.info { "Created pull request at #{pr.html_url}" }
+      else
+        checkout_pull_request
+      end
     end
 
-  end
 
+    def create_pull_request_client(remote_name, repo_name)
+      PullRequest.create_pull_request_client(self, remote_name, repo_name, @user, @password)
+    end
+
+
+    def create_pull_request
+      current_branch = gitlib.branches.current.name
+      base_branch = @base_branch || config.master_branch
+      head_branch = @head_branch || current_branch
+      title = @title || current_branch
+      description = @description || ''
+
+      PullRequest.create_pull_request(gitlib, remote.name, remote.name, remote.repo_name, current_branch, base_branch, head_branch, title, description, logger, @user, @password)
+    end
+
+
+    def checkout_pull_request
+      PullRequest.checkout_pull_request(gitlib, @pr_number, remote.name, remote.repo_name, @user, @password, logger)
+    end
+
+
+    class << self
+
+      def create_pull_request_client(lib, remote_name, repo_name, username, password)
+        GitHub::PullRequest.new(lib, remote_name, repo_name, {:user => username, :password => password})
+      end
+
+
+      def create_pull_request(lib, server_name, remote_name, repo_name, current_branch, base_branch, head_branch, title, description, logger, username, password)
+        if base_branch == head_branch
+          raise PullRequestError.new("Can not create a pull request where the base branch and head branch are the same: #{base_branch}")
+        end
+
+        lib.push(server_name, current_branch, current_branch, :force => false)
+        pr = create_pull_request_client(lib, remote_name, repo_name, username, password)
+        pr.create(base_branch, head_branch, title, description)
+      end
+
+
+      def checkout_pull_request(lib, pr_number, remote_name, repo_name, username, password, logger)
+        logger.info { 'Getting #pr_number' }
+
+        lib.fetch(remote_name)
+
+        pr = create_pull_request_client(lib, remote_name, repo_name, username, password)
+        json = pr.pull_request(pr_number)
+        head_branch_name = json.head.ref
+        base_branch_name = json.base.ref
+
+        remote_head_server_name = match_remote_to_pr_remote(lib, json.head.repo.ssh_url)
+        remote_base_server_name = match_remote_to_pr_remote(lib, json.base.repo.ssh_url)
+        lib.checkout(head_branch_name, :new_branch => "#{remote_head_server_name}/#{head_branch_name}")
+        lib.branch(head_branch_name, :upstream => "#{remote_base_server_name}/#{base_branch_name}")
+        #logger.info(json.to_hash)
+
+        lib.fetch(remote_base_server_name) if remote_head_server_name != remote_base_server_name
+      end
+
+
+      def match_remote_to_pr_remote(lib, pr_remote)
+        pr_url = lib.remote.expanded_url(nil, pr_remote)
+        servers = lib.remote.remote_names
+        server_urls = servers.collect { |s| {:server_name => s, :url => lib.remote.expanded_url(s)} }
+
+        pair = server_urls.find do |su|
+          url = su[:url]
+          uri = URI.parse(url)
+          host = uri.host
+          path = uri.path
+
+          pr_uri = URI.parse(lib.remote.expanded_url(nil, pr_url))
+          pr_host = pr_uri.host
+          pr_path = pr_uri.path
+
+          pr_host == host and pr_path == path
+        end
+
+        if pair.nil?
+          raise GitHubService::NoRemoteRepository.new("Could not match pull request url (#{pr_url}) to any of the registered remote urls: #{server_urls.map {|s| '{' + s[:server_name] + ': ' + s[:url] + '}'}.join(', ')}")
+        end
+
+        pair[:server_name]
+      end
+
+    end
+
+  end
 end

data/lib/git-process/pull_request_error.rb

@@ -0,0 +1,25 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'git-process/git_process_error'
+
+module GitProc
+
+  class PullRequestError < GitProcessError
+
+    def initialize(msg)
+      super(msg)
+    end
+
+  end
+
+end

data/lib/git-process/rebase_to_master.rb

@@ -16,6 +16,7 @@ require 'git-process/git_process_error'
 require 'git-process/parked_changes_error'
 require 'git-process/uncommitted_changes_error'
 require 'git-process/github_pull_request'
+require 'git-process/pull_request'
 
 
 module GitProc
@@ -25,6 +26,9 @@ module GitProc
     def initialize(dir, opts)
       @keep = opts[:keep]
       @interactive = opts[:interactive]
+      @pr_number = opts[:prNumber]
+      @user = opts[:user]
+      @password = opts[:password]
       super
     end
 
@@ -32,37 +36,48 @@ module GitProc
     def verify_preconditions
       super
 
-      raise UncommittedChangesError.new unless status.clean?
-      raise ParkedChangesError.new(self) if is_parked?
+      raise UncommittedChangesError.new unless gitlib.status.clean?
+      raise ParkedChangesError.new(gitlib) if is_parked?
     end
 
 
     def runner
-      if has_a_remote?
-        fetch(server_name)
-        proc_rebase(integration_branch)
-        proc_rebase(integration_branch, :interactive => true) if @interactive
-        push(server_name, branches.current, master_branch)
+      if remote.exists?
+        gitlib.fetch(remote.name)
+
+        unless @pr_number.nil? or @pr_number.empty?
+          checkout_pull_request
+        end
+
+        proc_rebase(config.integration_branch)
+        proc_rebase(config.integration_branch, :interactive => true) if @interactive
+        current = gitlib.branches.current.name
+        gitlib.push(remote.name, current, config.master_branch)
 
         unless @keep
           close_pull_request
           remove_feature_branch
         end
       else
-        proc_rebase(integration_branch)
+        proc_rebase(config.integration_branch)
       end
     end
 
 
+    def checkout_pull_request
+      PullRequest.checkout_pull_request(gitlib, @pr_number, remote.name, remote.repo_name, @user, @password, logger)
+    end
+
+
     def remove_feature_branch
-      mybranches = branches
+      mybranches = gitlib.branches
 
-      remote_master = mybranches[remote_master_branch]
+      remote_master = mybranches[remote.master_branch_name]
       current_branch = mybranches.current
       logger.debug { "Removing feature branch (#{current_branch})" }
 
       unless remote_master.contains_all_of(current_branch.name)
-        raise GitProcessError.new("Branch '#{current_branch.name}' has not been merged into '#{remote_master_branch}'")
+        raise GitProcessError.new("Branch '#{current_branch.name}' has not been merged into '#{remote.master_branch_name}'")
       end
 
       parking_branch = mybranches['_parking_']
@@ -80,32 +95,36 @@ module GitProc
       remote_master.checkout_to_new('_parking_', :no_track => true)
 
       current_branch.delete!(true)
-      if mybranches["#{server_name}/#{current_branch.name}"]
-        push(server_name, nil, nil, :delete => current_branch.name)
+      if mybranches["#{remote.name}/#{current_branch.name}"]
+        gitlib.push(remote.name, nil, nil, :delete => current_branch.name)
       end
     end
 
 
     def close_pull_request
-      pr = GitHub::PullRequest.new(self, repo_name)
+      pr = GitHub::PullRequest.new(gitlib, remote.name, remote.repo_name)
 
       # Assume that if we haven't done something that would create the
       # GitHub auth token, then this likely isn't a GitHub-based repo.
       # (Or at least the user isn't using pull requests)
-      if pr.config_auth_token
+      if pr.configuration.get_config_auth_token
         begin
-          mybranches = branches()
-          pull = pr.find_pull_request(master_branch, mybranches.current.name)
-          if pull
-            pr.close(pull[:number])
+          if @pr_number
+            pr.close(@pr_number)
           else
-            logger.debug { "There is no pull request for #{mybranches.current.name} against #{master_branch}" }
+            mybranches = gitlib.branches()
+            pull = pr.find_pull_request(config.master_branch, mybranches.current.name)
+            if pull
+              pr.close(pull[:number])
+            else
+              logger.debug { "There is no pull request for #{mybranches.current.name} against #{config.master_branch}" }
+            end
           end
         rescue GitHubService::NoRemoteRepository => exp
           logger.debug exp.to_s
         end
       else
-        logger.debug "There is no GitHub auth token defined, so not trying to close a pull request."
+        logger.debug 'There is no GitHub auth token defined, so not trying to close a pull request.'
       end
     end
 
@@ -115,12 +134,13 @@ module GitProc
 
     def bad_parking_branch_msg
       hl = HighLine.new
-      hl.color("\n***********************************************************************************************\n\n"+
-                   "There is an old '_parking_' branch with unacounted changes in it.\n"+
-                   "It has been renamed to '_parking_OLD_'.\n"+
-                   "Please rename the branch to what the changes are about (`git branch -m _parking_OLD_ my_fb_name`),\n"+
-                   " or remove it altogher (`git branch -D _parking_OLD_`).\n\n"+
-                   "***********************************************************************************************\n", :red, :bold)
+      hl.color(
+          "\n***********************************************************************************************\n\n"+
+              "There is an old '_parking_' branch with unacounted changes in it.\n"+
+              "It has been renamed to '_parking_OLD_'.\n"+
+              "Please rename the branch to what the changes are about (`git branch -m _parking_OLD_ my_fb_name`),\n"+
+              " or remove it altogher (`git branch -D _parking_OLD_`).\n\n"+
+              "***********************************************************************************************\n", :red, :bold)
     end
 
   end

data/lib/git-process/sync.rb

@@ -20,20 +20,22 @@ require 'git-process/changed_file_helper'
 module GitProc
 
   class Sync < Process
-    include ChangeFileHelper
 
-
-    def initialize(dir, opts)
+    def initialize(base, opts)
       if !opts[:merge].nil? and opts[:merge] == opts[:rebase]
         raise ArgumentError.new(":merge = #{opts[:merge]} and :rebase = #{opts[:rebase]}")
       end
 
-      raise ArgumentError.new(":rebase is not set") if opts[:rebase].nil?
+      raise ArgumentError.new(':rebase is not set') if opts[:rebase].nil?
 
       @do_rebase = opts[:rebase]
       @force = opts[:force]
       @local = opts[:local]
+
       super
+
+      @change_file_helper = ChangeFileHelper.new(gitlib)
+      self
     end
 
 
@@ -41,8 +43,8 @@ module GitProc
     def verify_preconditions
       super
 
-      if not status.clean?
-        offer_to_help_uncommitted_changes
+      if not gitlib.status.clean?
+        @change_file_helper.offer_to_help_uncommitted_changes
       end
 
       raise ParkedChangesError.new(self) if is_parked?
@@ -50,37 +52,35 @@ module GitProc
 
 
     def cleanup
-      stash_pop if @stash_pushed
+      gitlib.stash_pop if @stash_pushed
     end
 
 
-    def remote_has_changed
-      old_sha = rev_parse(@remote_branch) rescue ''
-      fetch(server_name) if has_a_remote?
-      new_sha = rev_parse(@remote_branch) rescue ''
+    def remote_branch_sha
+      gitlib.rev_parse(@remote_branch) rescue ''
+    end
 
-      old_sha != new_sha
+
+    def current_branch
+      @current_branch ||= gitlib.branches.current
     end
 
 
     def runner
-      @current_branch ||= branches.current
-      @remote_branch ||= "#{server_name}/#@current_branch"
+      @remote_branch ||= "#{remote.name}/#{current_branch}"
 
       # if the remote branch has changed, merge those changes in before
       #   doing anything with the integration branch
-      if remote_has_changed
+      if remote_has_changed?
         logger.info('There have been changes on this remote branch, so will merge them in.')
         proc_merge(@remote_branch)
       end
 
-      @do_rebase ||= config('gitProcess.defaultRebaseSync').to_boolean
-
-      if @do_rebase
+      if do_rebase?
         @force = true
-        proc_rebase(integration_branch)
+        proc_rebase(config.integration_branch)
       else
-        proc_merge(integration_branch)
+        proc_merge(config.integration_branch)
       end
 
       push_to_server
@@ -89,28 +89,43 @@ module GitProc
 
     private
 
+
+    def remote_has_changed?
+      old_sha = remote_branch_sha
+      fetch_remote_changes
+      new_sha = remote_branch_sha
+
+      old_sha != new_sha
+    end
+
+
+    def do_rebase?
+      @do_rebase ||= config['gitProcess.defaultRebaseSync'].to_boolean
+    end
+
+
     def push_to_server
       if @local
-        logger.debug("Not pushing to the server because the user selected local-only.")
-      elsif not has_a_remote?
-        logger.debug("Not pushing to the server because there is no remote.")
-      elsif @current_branch == master_branch
-        logger.warn("Not pushing to the server because the current branch is the mainline branch.")
+        logger.debug('Not pushing to the server because the user selected local-only.')
+      elsif not gitlib.has_a_remote?
+        logger.debug('Not pushing to the server because there is no remote.')
+      elsif @current_branch == config.master_branch
+        logger.warn('Not pushing to the server because the current branch is the mainline branch.')
       else
-        old_sha = rev_parse(@remote_branch) rescue ''
+        handle_remote_changed
 
-        handle_remote_changed(old_sha)
-
-        push(server_name, @current_branch, @current_branch, :force => @force)
+        gitlib.push(remote.name, @current_branch, @current_branch, :force => @force)
       end
     end
 
 
-    def handle_remote_changed(old_sha)
-      fetch(server_name)
-      new_sha = rev_parse(@remote_branch) rescue ''
+    def handle_remote_changed
+      old_sha = remote_branch_sha
+      fetch_remote_changes
+      new_sha = remote_branch_sha
+
       unless old_sha == new_sha
-        logger.warn("'#@current_branch' changed on '#{server_name}'"+
+        logger.warn("'#{@current_branch}' changed on '#{config.server_name}'"+
                         " [#{old_sha[0..5]}->#{new_sha[0..5]}]; trying sync again.")
         runner # try again
       end