git-process 1.0.11 → 1.1.0

data/lib/git-process/github_configuration.rb

@@ -0,0 +1,298 @@
+# 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_lib'
+require 'highline/import'
+require 'octokit'
+require 'uri'
+
+
+#
+# Provides methods related to GitHub configuration
+#
+module GitHubService
+
+  class Configuration
+
+    attr_reader :git_config
+
+
+    #
+    # @param [GitProc::GitConfig] git_config
+    # @param [Hash] opts
+    # @option opts [String] :remote_name (#remote_name) The "remote" name to use (e.g., 'origin')
+    # @option opts [String] :user the username to authenticate with
+    # @option opts [String] :password (#password) the password to authenticate with
+    #
+    # @return [String] the OAuth token
+    #
+    def initialize(git_config, opts = {})
+      @git_config = git_config
+      @user = opts[:user]
+      @password = opts[:password]
+      @remote_name = opts[:remote_name]
+    end
+
+
+    # @return [String]
+    def remote_name
+      unless @remote_name
+        @remote_name = gitlib.remote.name
+        raise NoRemoteRepository.new('No remote repository is defined') unless @remote_name
+      end
+      @remote_name
+    end
+
+
+    # @return [String]
+    def user
+      @user ||= Configuration.ask_for_user(gitlib)
+    end
+
+
+    # @return [String]
+    def password
+      @password ||= Configuration.ask_for_password
+    end
+
+
+    # @return [Octokit::Client]
+    def client
+      create_client
+    end
+
+
+    # @return [GitProc::GitLib]
+    def gitlib
+      @git_config.gitlib
+    end
+
+
+    # @return [Octokit::Client]
+    def create_client(opts = {})
+      logger.debug { "Creating GitHub client for user #{user} using token '#{auth_token}'" }
+
+      base_url = opts[:base_url] || base_github_api_url_for_remote
+
+      configure_octokit(:base_url => base_url)
+
+      Octokit::Client.new(:login => user, :oauth_token => auth_token)
+    end
+
+
+    #
+    # Configures Octokit to use the appropriate URLs for GitHub server.
+    #
+    # @param [Hash] opts the options to create a message with
+    # @option opts [String] :base_url The base URL to use for the GitHub server
+    #
+    # @return [void]
+    #
+    def configure_octokit(opts = {})
+      base_url = opts[:base_url] || base_github_api_url_for_remote
+      Octokit.configure do |c|
+        c.api_endpoint = api_endpoint(base_url)
+        c.web_endpoint = web_endpoint(base_url)
+        c.faraday_config do |f|
+          #f.response :logger
+        end
+      end
+    end
+
+
+    #
+    # Determines the URL used for using the GitHub REST interface based
+    # on a "base" URL.
+    #
+    # If the "base_url" is not provided, then it assumes that this object
+    # has a "remote_name" property that it can ask.
+    #
+    # @param [String] base_url the base GitHub URL
+    # @return [String] the GitHub REST API URL
+    #
+    def api_endpoint(base_url = nil)
+      base_url ||= base_github_api_url_for_remote
+      if /github.com/ !~ base_url
+        "#{base_url}/api/v3"
+      else
+        Octokit::Configuration::DEFAULT_API_ENDPOINT
+      end
+    end
+
+
+    #
+    # Determines the URL used for using the GitHub web interface based
+    # on a "base" URL.
+    #
+    # If the "base_url" is not provided, then it assumes that this object
+    # has a "remote_name" property that it can ask.
+    #
+    # @param [String] base_url the base GitHub URL
+    # @return [String] the GitHub web URL
+    #
+    def web_endpoint(base_url = nil)
+      base_url ||= base_github_api_url_for_remote
+      if /github.com/ !~ base_url
+        base_url
+      else
+        Octokit::Configuration::DEFAULT_WEB_ENDPOINT
+      end
+    end
+
+
+    #
+    # Determines the base URL for GitHub API calls.
+    #
+    # @return [String] the base GitHub API URL
+    #
+    def base_github_api_url_for_remote
+      url = gitlib.remote.expanded_url(remote_name)
+      Configuration.url_to_base_github_api_url(url)
+    end
+
+
+    #
+    # Translate any "git known" URL to the HTTP(S) URL needed for
+    # GitHub API calls.
+    #
+    # @param url [String] the URL to translate
+    # @return [String] the base GitHub API URL
+    #
+    def self.url_to_base_github_api_url(url)
+      uri = URI.parse(url)
+      host = uri.host
+
+      if /github.com$/ =~ host
+        'https://api.github.com'
+      else
+        scheme = uri.scheme
+        scheme = 'https' unless scheme.start_with?('http')
+        host = 'unknown-host' unless host
+        "#{scheme}://#{host}"
+      end
+    end
+
+
+    #
+    # Create a GitHub client using username and password specifically.
+    # Meant to be used to get an OAuth token for "regular" client calls.
+    #
+    # @param [Hash] opts the options to create a message with
+    # @option opts [String] :base_url The base URL to use for the GitHub server
+    # @option opts [String] :remote_name (#remote_name) The "remote" name to use (e.g., 'origin')
+    # @option opts [String] :user the username to authenticate with
+    # @option opts [String] :password (#password) the password to authenticate with
+    #
+    def create_pw_client(opts = {})
+      usr = opts[:user] || user()
+      pw = opts[:password] || password()
+
+      logger.debug { "Creating GitHub client for user #{usr} using BasicAuth w/ password" }
+
+      configure_octokit(opts)
+
+      Octokit::Client.new(:login => usr, :password => pw)
+    end
+
+
+    #
+    # Returns to OAuth token. If it's in .git/config, returns that.
+    #   Otherwise it connects to GitHub to get the authorization token.
+    #
+    # @param [Hash] opts
+    # @option opts [String] :base_url The base URL to use for the GitHub server
+    # @option opts [String] :remote_name (#remote_name) The "remote" name to use (e.g., 'origin')
+    # @option opts [String] :user the username to authenticate with
+    # @option opts [String] :password (#password) the password to authenticate with
+    #
+    # @return [String]
+    #
+    def auth_token(opts = {})
+      get_config_auth_token() || create_authorization(opts)
+    end
+
+
+    #
+    # Connects to GitHub to get an OAuth token.
+    #
+    # @param [Hash] opts
+    # @option opts [String] :base_url The base URL to use for the GitHub server
+    # @option opts [String] :remote_name (#remote_name) The "remote" name to use (e.g., 'origin')
+    # @option opts [String] :user the username to authenticate with
+    # @option opts [String] :password (#password) the password to authenticate with
+    #
+    # @return [String] the OAuth token
+    #
+    def create_authorization(opts = {})
+      username = opts[:user] || self.user
+      remote = opts[:remote_name] || self.remote_name
+      logger.info("Authorizing #{username} to work with #{remote}.")
+
+      auth = create_pw_client(opts).create_authorization(
+          :scopes => %w(repo user gist),
+          :note => 'Git-Process',
+          :note_url => 'http://jdigger.github.com/git-process')
+
+      config_auth_token = auth['token']
+
+      # remember it for next time
+      gitlib.config['gitProcess.github.authToken'] = config_auth_token
+
+      config_auth_token
+    end
+
+
+    # @return [String]
+    def get_config_auth_token
+      c_auth_token = gitlib.config['gitProcess.github.authToken']
+      (c_auth_token.nil? or c_auth_token.empty?) ? nil : c_auth_token
+    end
+
+
+    def logger
+      gitlib.logger
+    end
+
+
+    private
+
+
+    def self.ask_for_user(gitlib)
+      user = gitlib.config['github.user']
+      if user.nil? or user.empty?
+        user = ask("Your <%= color('GitHub', [:bold, :blue]) %> username: ") do |q|
+          q.validate = /^\w\w+$/
+        end
+        gitlib.config['github.user'] = user
+      end
+      user
+    end
+
+
+    def self.ask_for_password
+      ask("Your <%= color('GitHub', [:bold, :blue]) %> password: ") do |q|
+        q.validate = /^\S\S+$/
+        q.echo = 'x'
+      end
+    end
+
+  end
+
+
+  class Error < ::StandardError
+  end
+
+
+  class NoRemoteRepository < Error
+  end
+
+end

data/lib/git-process/github_pull_request.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'git-process/github_service'
+require 'git-process/github_configuration'
 require 'octokit'
 require 'octokit/repository'
 
@@ -18,21 +18,24 @@ require 'octokit/repository'
 module GitHub
 
   class PullRequest
-    include GitHubService
+    attr_reader :gitlib, :repo, :remote_name, :client, :configuration
 
-    attr_reader :lib, :repo
 
-
-    def initialize(lib, repo, opts = {})
-      @lib = lib
+    def initialize(lib, remote_name, repo, opts = {})
+      @gitlib = lib
       @repo = repo
-      @user = opts[:user]
-      @password = opts[:password]
+      @remote_name = remote_name
+      @configuration = GitHubService::Configuration.new(gitlib.config, :user => opts[:user], :password => opts[:password])
     end
 
 
-    def pull_requests
-      @pull_requests ||= client.pull_requests(repo)
+    def client
+      @client ||= @configuration.create_client
+    end
+
+
+    def pull_requests(state = 'open', opts = {})
+      @pull_requests ||= client.pull_requests(repo, state, opts)
     end
 
 
@@ -48,30 +51,62 @@ module GitHub
     end
 
 
-    def find_pull_request(base, head)
-      json = pull_requests
-      json.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
+    def logger
+      @gitlib.logger
     end
 
 
-    def close(*args)
-      pull_number = nil
+    def pull_request(pr_number)
+      client.pull_request(repo, pr_number)
+    end
 
-      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 }
+    #
+    # Find the pull request (PR) that matches the 'head' and 'base'.
+    #
+    # @param [String] base what the PR is merging into
+    # @param [String] head the branch of the PR
+    #
+    # @return [Hash]
+    # @raise [NotFoundError] if the pull request does not exist
+    #
+    def get_pull_request(base, head)
+      find_pull_request(base, head, true)
+    end
 
-        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
+    #
+    # Find the pull request (PR) that matches the 'head' and 'base'.
+    #
+    # @param [String] base what the PR is merging into
+    # @param [String] head the branch of the PR
+    # @param [boolean] error_if_missing should this error-out if the PR is not found?
+    #
+    # @return [Hash, nil]
+    # @raise [NotFoundError] if the pull request does not exist and 'error_if_missing' is true
+    #
+    def find_pull_request(base, head, error_if_missing = false)
+      logger.info { "Looking for a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
+
+      json = pull_requests
+      pr = json.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
+
+      raise NotFoundError.new(base, head, repo, json) if error_if_missing && pr.nil?
+
+      pr
+    end
+
+
+    def close(*args)
+      pull_number = if args.size == 2
+                      get_pull_request(args[0], args[1])[:number]
+                    elsif args.size == 1
+                      args[0]
+                    else
+                      raise ArgumentError.new('close(..) needs 1 or 2 arguments')
+                    end
+
+      logger.info { "Closing a pull request \##{pull_number} on #{repo}." }
 
       client.patch("repos/#{Octokit::Repository.new(repo)}/pulls/#{pull_number}", {:state => 'closed'})
     end
@@ -104,6 +139,9 @@ module GitHub
 
     end
 
+    private
+
+
   end
 
 end

data/lib/git-process/new_fb.rb

@@ -23,15 +23,25 @@ module GitProc
 
 
     def runner
-      mybranches = branches()
+      mybranches = gitlib.branches()
       on_parking = (mybranches.parking == mybranches.current)
 
       if on_parking
-        new_branch = checkout(@branch_name, :new_branch => '_parking_')
-        mybranches.parking.delete!
+        base_branch = if mybranches[config.integration_branch].contains_all_of(mybranches.parking.name)
+          config.integration_branch
+        else
+          '_parking_'
+        end
+
+        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!
         new_branch
       else
-        checkout(@branch_name, :new_branch => integration_branch)
+        gitlib.checkout(@branch_name, :new_branch => config.integration_branch)
       end
     end