git-process 0.9.1.pre3 → 0.9.2

data/lib/git-process/github_pull_request.rb

@@ -0,0 +1,107 @@
+# 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 'shellwords'
+
+require 'git-process/github_service'
+require 'octokit'
+require 'octokit/repository'
+
+
+module GitHub
+
+  class PullRequest
+    include GitHubService
+
+    attr_reader :lib, :repo
+
+    def initialize(lib, repo, opts = {})
+      @lib = lib
+      @repo = repo
+      @user = opts[:user]
+      @password = opts[:password]
+    end
+
+
+    def pull_requests
+      @pull_requests ||= client.pull_requests(repo)
+    end
+
+
+    def create(base, head, title, body)
+      logger.info { "Creating a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
+      begin
+        client.create_pull_request(repo, base, head, title, body)
+      rescue Octokit::UnprocessableEntity => exp
+        pull = pull_requests.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
+        logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
+        pull
+      end
+    end
+
+
+    def find_pull_request(base, head)
+      json = pull_requests
+      json.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
+    end
+
+
+    def close(*args)
+      pull_number = nil
+
+      if args.size == 2
+        base = args[0]
+        head = args[1]
+        logger.info { "Closing a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
+
+        json = pull_requests
+        pull = json.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
+
+        raise NotFoundError.new(base, head, repo, json) if pull.nil?
+
+        pull_number = pull[:number]
+      elsif args.size == 1
+        pull_number = args[0]
+        logger.info { "Closing a pull request \##{pull_number} on #{repo}." }
+      end
+
+      client.patch("repos/#{Octokit::Repository.new(repo)}/pulls/#{pull_number}", {:state  => 'closed'})
+    end
+
+
+    class NotFoundError < StandardError
+      attr_reader :base, :head, :repo
+
+      def initialize(base, head, repo, pull_requests_json)
+        @base = base
+        @head = head
+        @repo = repo
+
+        @pull_requests = pull_requests_json.map do |p|
+          {:head => p[:head][:ref], :base => p[:base][:ref]}
+        end
+
+        msg = "Could not find a pull request for '#{head}' to be merged with '#{base}' on #{repo}."
+        msg += "\n\nExisting Pull Requests:"
+        msg = pull_requests.inject(msg) {|a,v| "#{a}\n  #{v[:head]} -> #{v[:base]}" }
+
+        super(msg)
+      end
+
+
+      def pull_requests
+        @pull_requests
+      end
+
+    end
+
+  end
+
+end

data/lib/git-process/{github-service.rb → github_service.rb}

@@ -1,12 +1,24 @@
+# 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 'shellwords'
+
 require 'highline/import'
-require 'github-client'
+require 'git-process/github_client'
 require 'uri'
 
 
 module GitHubService
 
   def client
-    unless @client
+    if @client.nil?
       auth_token
       logger.debug { "Creating GitHub client for user #{user} using token '#{auth_token}'" }
       @client = GitHubClient.new(:login => user, :oauth_token=> auth_token)
@@ -36,11 +48,13 @@ module GitHubService
 
       raise URI::InvalidURIError.new("Need a scheme in URI: '#{origin_url}'") unless scheme
 
-      unless host
+      if host.nil?
         # assume that the 'scheme' is the named configuration in ~/.ssh/config
         host = hostname_from_ssh_config(scheme, opts[:ssh_config_file] ||= "#{ENV['HOME']}/.ssh/config")
       end
 
+      raise GitHubService::NoRemoteRepository.new("Could not determine a host from #{origin_url}") if host.nil?
+
       site = host_to_site(host, scheme == 'https')
     end
     site
@@ -48,23 +62,27 @@ module GitHubService
 
 
   def hostname_from_ssh_config(host_alias, config_file)
-    config_lines = File.new(config_file).readlines
+    if File.exists?(config_file)
+      config_lines = File.new(config_file).readlines
 
-    in_host_section = false
-    host_name = nil
+      in_host_section = false
+      host_name = nil
 
-    sections = config_lines.each do |line|
-      line.chop!
-      if /^\s*Host\s+#{host_alias}\s*$/ =~ line
-          in_host_section = true
-        next
-      end
-      if in_host_section and (/^\s*HostName\s+\S+\s*$/ =~ line)
-        host_name = line.sub(/^\s*HostName\s+(\S+)\s*$/, '\1')
-        break
+      sections = config_lines.each do |line|
+        line.chop!
+        if /^\s*Host\s+#{host_alias}\s*$/ =~ line
+            in_host_section = true
+          next
+        end
+        if in_host_section and (/^\s*HostName\s+\S+\s*$/ =~ line)
+          host_name = line.sub(/^\s*HostName\s+(\S+)\s*$/, '\1')
+          break
+        end
       end
+      host_name
+    else
+      nil
     end
-    host_name
   end
 
 
@@ -93,7 +111,7 @@ module GitHubService
   def user
     unless @user
       user = lib.config('github.user')
-      if user.empty?
+      if user.nil? or user.empty?
         user = ask("Your <%= color('GitHub', [:bold, :blue]) %> username: ") do |q|
           q.validate = /^\w\w+$/
         end
@@ -108,7 +126,7 @@ module GitHubService
   def password
     unless @password
       @password = ask("Your <%= color('GitHub', [:bold, :blue]) %> password: ") do |q|
-        q.validate = /^\w\w+$/
+        q.validate = /^\S\S+$/
         q.echo = 'x'
       end
     end
@@ -122,7 +140,7 @@ module GitHubService
 
 
   def create_authorization
-    logger.info("Authorizing this to work with your repos.")
+    logger.info("Authorizing #{user} to work with #{site}.")
     auth = pw_client.create_authorization(:scopes => ['repo', 'user', 'gist'],
                                           :note => 'Git-Process',
                                           :note_url => 'http://jdigger.github.com/git-process')
@@ -133,9 +151,9 @@ module GitHubService
 
 
   def config_auth_token
-    unless @auth_token
+    if @auth_token.nil?
       c_auth_token = lib.config('gitProcess.github.authToken')
-      @auth_token = c_auth_token.empty? ? nil : c_auth_token
+      @auth_token = (c_auth_token.nil? or c_auth_token.empty?) ? nil : c_auth_token
     end
     @auth_token
   end

data/lib/git-process/new_fb.rb

@@ -0,0 +1,40 @@
+# 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 'shellwords'
+
+require 'git-process/git_process'
+
+module GitProc
+
+  class NewFeatureBranch < Process
+
+    def initialize(dir, opts)
+      @branch_name = opts[:branch_name]
+      super
+    end
+
+
+    def runner
+      mybranches = branches()
+      on_parking = (mybranches.parking == mybranches.current)
+
+      if on_parking
+        new_branch = checkout(@branch_name, :new_branch => '_parking_')
+        mybranches.parking.delete
+        new_branch
+      else
+        checkout(@branch_name, :new_branch => remote_master_branch)
+      end
+    end
+
+  end
+
+end

data/lib/git-process/parked_changes_error.rb

@@ -0,0 +1,40 @@
+# 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 'shellwords'
+
+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,61 @@
+# 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 'shellwords'
+
+require 'git-process/git_process'
+require 'git-process/github_pull_request'
+require 'highline/import'
+
+
+module GitProc
+
+  class PullRequest < Process
+    include GitLib
+
+
+    def initialize(dir, opts)
+      super
+      @title = opts[:title]
+      @base_branch = opts[:base_branch] || master_branch
+      @head_branch = opts[:head_branch] || branches.current
+      @repo_name = opts[:repo_name] || repo_name()
+      @title = opts[:title] || ask_for_pull_title()
+      @description = opts[:description] || ask_for_pull_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)
+    end
+
+
+    private
+
+
+    def ask_for_pull_title
+      ask("What <%= color('title', [:bold]) %> do you want to give the pull request? ") do |q|
+        q.validate = /^\w+.*/
+      end
+    end
+
+
+    def ask_for_pull_description
+      ask("What <%= color('description', [:bold]) %> do you want to give the pull request? ")
+    end
+
+  end
+
+end

data/lib/git-process/rebase_to_master.rb

@@ -0,0 +1,110 @@
+# 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 'shellwords'
+
+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/github_pull_request'
+
+
+module GitProc
+
+  class RebaseToMaster < Process
+
+    def runner
+      raise UncommittedChangesError.new unless status.clean?
+      raise ParkedChangesError.new(self) if is_parked?
+
+      if has_a_remote?
+        fetch(server_name)
+        proc_rebase(remote_master_branch)
+        push(server_name, branches.current, master_branch)
+        close_pull_request
+        remove_feature_branch
+      else
+        proc_rebase(master_branch)
+      end
+    end
+
+
+    def remove_feature_branch
+      mybranches = branches
+
+      remote_master = mybranches[remote_master_branch]
+      current_branch = mybranches.current
+
+      unless remote_master.contains_all_of(current_branch.name)
+        raise GitProcessError.new("Branch '#{current_branch.name}' has not been merged into '#{remote_master_branch}'")
+      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["#{server_name}/#{current_branch.name}"]
+        push(server_name, nil, nil, :delete => current_branch.name)
+      end
+    end
+
+
+    def close_pull_request
+      pr = GitHub::PullRequest.new(self, 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
+        begin
+          mybranches = branches()
+          pull = pr.find_pull_request(master_branch, mybranches.current.name)
+          if pull
+            pr.close(pull[:number])
+          else
+            logger.debug { "There is no pull request for #{mybranches.current.name} against #{master_branch}" }
+          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.rb

@@ -0,0 +1,63 @@
+# 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 'shellwords'
+
+require 'git-process/git_lib'
+require 'git-process/git_process'
+require 'git-process/parked_changes_error'
+require 'git-process/uncommitted_changes_error'
+
+
+module GitProc
+
+  class Sync < Process
+
+    def initialize(dir, opts)
+      @do_rebase = opts[:rebase]
+      @force = opts[:force]
+      super
+    end
+
+
+    def runner
+      raise UncommittedChangesError.new unless status.clean?
+      raise ParkedChangesError.new(self) if is_parked?
+
+      current_branch = branches.current
+      remote_branch = "#{server_name}/#{current_branch}"
+
+      fetch(server_name)
+
+      if @do_rebase
+        proc_rebase(remote_master_branch)
+      else
+        proc_merge(remote_master_branch)
+      end
+
+      old_sha = command('rev-parse', remote_branch) rescue ''
+
+      unless current_branch == master_branch
+        fetch(server_name)
+        new_sha = command('rev-parse', remote_branch) rescue ''
+        unless old_sha == new_sha
+          logger.warn("'#{current_branch}' changed on '#{server_name}'"+
+                      " [#{old_sha[0..5]}->#{new_sha[0..5]}]; trying sync again.")
+          sync_with_server(@do_rebase, @force)
+        end
+        push(server_name, current_branch, current_branch, :force => @force)
+      else
+        logger.warn("Not pushing to the server because the current branch is the master branch.")
+      end
+    end
+
+  end
+
+end

data/lib/git-process/uncommitted_changes_error.rb

@@ -0,0 +1,23 @@
+# 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 'shellwords'
+
+require 'git-process/git_process_error'
+
+module GitProc
+
+  class UncommittedChangesError < GitProcessError
+    def initialize()
+      super("There are uncommitted changes.\nPlease either commit your changes, or use 'git stash' to set them aside.")
+    end
+  end
+
+end

data/lib/git-process/version.rb

@@ -1,12 +1,22 @@
-module Git
-  module Process
-    module Version
-      MAJOR = 0
-      MINOR = 9
-      PATCH = 1
-      BUILD = 'pre3'
+# 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 'shellwords'
 
-      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
-    end
+module GitProc
+  module Version
+    MAJOR = 0
+    MINOR = 9
+    PATCH = 2
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end
 end