git-process-lib 2.0.0

data/lib/git-process/new_fb.rb

@@ -0,0 +1,49 @@
+# 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'
+
+module GitProc
+
+  class NewFeatureBranch < Process
+
+    def initialize(dir, opts)
+      @branch_name = opts[:branch_name]
+      @local_only = opts[:local]
+      super
+    end
+
+
+    def runner
+      mybranches = gitlib.branches()
+      on_parking = (mybranches.parking == mybranches.current)
+
+      base_branch = if on_parking and not mybranches[config.integration_branch].contains_all_of(mybranches.parking.name)
+                      '_parking_'
+                    else
+                      config.integration_branch
+                    end
+
+      gitlib.fetch if gitlib.has_a_remote? and not @local_only
+
+      logger.info { "Creating #{@branch_name} off of #{base_branch}" }
+      new_branch = gitlib.checkout(@branch_name, :new_branch => base_branch)
+
+      branches = gitlib.branches()
+      branches[@branch_name].upstream(config.integration_branch)
+      branches.parking.delete! if on_parking
+      new_branch
+    end
+
+  end
+
+end

data/lib/git-process/parked_changes_error.rb

@@ -0,0 +1,41 @@
+# 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 ParkedChangesError < GitProcessError
+    include GitProc::AbstractErrorBuilder
+
+    attr_reader :error_message, :lib
+
+
+    def initialize(lib)
+      @lib = lib
+      msg = build_message
+      super(msg)
+    end
+
+
+    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.'
+    end
+
+
+    def build_commands
+      ['git branch -m _parking_ my_feature_branch']
+    end
+
+  end
+
+end

data/lib/git-process/pull_request.rb

@@ -0,0 +1,136 @@
+# 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'
+require 'git-process/github_pull_request'
+require 'git-process/pull_request_error'
+require 'git-process/syncer'
+require 'highline/import'
+
+
+module GitProc
+
+  class PullRequest < Process
+
+    def initialize(dir, opts)
+      super
+      @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]
+      @description = opts[:description]
+      @user = opts[:user]
+      @password = opts[:password]
+    end
+
+
+    def runner
+      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
+
+
+    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
+        Syncer.rebase_sync(lib, true)
+      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

@@ -0,0 +1,148 @@
+# 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'
+require 'git-process/git_rebase_error'
+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'
+require 'git-process/syncer'
+
+
+module GitProc
+
+  class RebaseToMaster < Process
+
+    def initialize(dir, opts)
+      @keep = opts[:keep]
+      @pr_number = opts[:prNumber]
+      @user = opts[:user]
+      @password = opts[:password]
+      super
+    end
+
+
+    def verify_preconditions
+      super
+
+      raise UncommittedChangesError.new unless gitlib.status.clean?
+      raise ParkedChangesError.new(gitlib) if is_parked?
+    end
+
+
+    def runner
+      if remote.exists?
+        gitlib.fetch(remote.name)
+
+        unless @pr_number.nil? or @pr_number.empty?
+          checkout_pull_request
+        end
+
+        Syncer.rebase_sync(gitlib, true)
+        current = gitlib.branches.current.name
+        gitlib.push(remote.name, current, config.master_branch)
+
+        unless @keep
+          close_pull_request
+          remove_feature_branch
+          gitlib.delete_sync_control_file!(current) if gitlib.sync_control_file_exists?(current)
+        end
+      else
+        Syncer.rebase_sync(gitlib, true)
+      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 = gitlib.branches
+
+      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_name}'")
+      end
+
+      parking_branch = mybranches['_parking_']
+      if parking_branch
+        if parking_branch.is_ahead_of(remote_master.name) and
+            !current_branch.contains_all_of(parking_branch.name)
+
+          parking_branch.rename('_parking_OLD_')
+
+          logger.warn { bad_parking_branch_msg }
+        else
+          parking_branch.delete!
+        end
+      end
+      remote_master.checkout_to_new('_parking_', :no_track => true)
+
+      current_branch.delete!(true)
+      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(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.configuration.get_config_auth_token
+        begin
+          if @pr_number
+            pr.close(@pr_number)
+          else
+            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.'
+      end
+    end
+
+
+    private
+
+
+    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)
+    end
+
+  end
+
+end

data/lib/git-process/sync_process.rb

@@ -0,0 +1,55 @@
+# 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'
+require 'git-process/parked_changes_error'
+require 'git-process/syncer'
+require 'git-process/changed_file_helper'
+
+
+module GitProc
+
+  class Sync < Process
+
+    def initialize(base, opts)
+      super
+
+      @opts = opts
+
+      self
+    end
+
+
+    #noinspection RubyControlFlowConversionInspection
+    def verify_preconditions
+      super
+
+      if not gitlib.status.clean?
+        change_file_helper.offer_to_help_uncommitted_changes
+      end
+
+      raise ParkedChangesError.new(self) if gitlib.is_parked?
+    end
+
+
+    def cleanup
+      gitlib.stash_pop if @stash_pushed
+    end
+
+
+    def runner
+      GitProc::Syncer.do_sync(gitlib, @opts)
+    end
+
+  end
+
+end