git-process 1.0.11 → 1.1.0

data/lib/git-process/github_client.rb

@@ -1,83 +0,0 @@
-# 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 'octokit'
-
-module Octokit
-
-  module Connection
-
-    #
-    # Unfortunately, there's no way to change the URL except by completely replacing
-    # this method.
-    #
-    def connection(authenticate=true, raw=false, version=3, force_urlencoded=false)
-      if site
-        url = site
-      elsif version == 2
-        url = "https://github.com"
-      else
-        url = "https://api.github.com"
-      end
-
-      options = {
-          :proxy => proxy,
-          :ssl => {:verify => false},
-          :url => url,
-      }
-
-      options.merge!(:params => {:access_token => oauth_token}) if oauthed? && !authenticated?
-
-      connection = Faraday.new(options) do |builder|
-        if version >= 3 && !force_urlencoded
-          builder.request :json
-        else
-          builder.request :url_encoded
-        end
-        builder.use Faraday::Response::RaiseOctokitError
-        unless raw
-          builder.use FaradayMiddleware::Mashify
-          builder.use FaradayMiddleware::ParseJson
-        end
-        builder.adapter(adapter)
-      end
-      connection.basic_auth authentication[:login], authentication[:password] if authenticate and authenticated?
-      connection
-    end
-  end
-
-end
-
-
-class GitHubClient < Octokit::Client
-
-  def site
-    @site
-  end
-
-
-  def site=(new_site)
-    @site = new_site
-  end
-
-
-  alias :old_request :request
-
-
-  def request(method, path, options={})
-    if /api.github.com/ !~ site
-      path = "/api/v3/#{path}"
-    end
-    old_request(method, path, options)
-  end
-
-end

data/lib/git-process/github_service.rb

@@ -1,174 +0,0 @@
-# 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 'highline/import'
-require 'git-process/github_client'
-require 'uri'
-
-
-module GitHubService
-
-  def 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)
-      @client.site = site
-    end
-    @client
-  end
-
-
-  def site(opts = {})
-    @site ||= compute_site(opts)
-  end
-
-
-  def compute_site(opts = {})
-    origin_url = lib.config('remote.origin.url')
-
-    raise GitHubService::NoRemoteRepository.new("There is no value set for 'remote.origin.url'") if origin_url.empty?
-
-    if /^git@/ =~ origin_url
-      host = origin_url.sub(/^git@(.*?):.*$/, '\1')
-      site = host_to_site(host, true)
-    else
-      uri = URI.parse(origin_url)
-      host = uri.host
-      scheme = uri.scheme
-
-      raise URI::InvalidURIError.new("Need a scheme in URI: '#{origin_url}'") unless scheme
-
-      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 == 'http'))
-    end
-    site
-  end
-
-
-  def hostname_from_ssh_config(host_alias, config_file)
-    if File.exists?(config_file)
-      config_lines = File.new(config_file).readlines
-
-      in_host_section = false
-      host_name = nil
-
-      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
-  end
-
-
-  def host_to_site(host, ssl)
-    if /github.com$/ =~ host
-      'https://api.github.com'
-    else
-      "http#{ssl ? 's' : ''}://#{host}"
-    end
-  end
-
-
-  private :host_to_site, :compute_site
-
-
-  def pw_client
-    unless @pw_client
-      logger.debug { "Creating GitHub client for user #{user} using password #{password}" }
-      @pw_client = GitHubClient.new(:login => user, :password => password)
-      @pw_client.site = site
-    end
-    @pw_client
-  end
-
-
-  def user
-    unless @user
-      user = lib.config('github.user')
-      if user.nil? or user.empty?
-        user = ask("Your <%= color('GitHub', [:bold, :blue]) %> username: ") do |q|
-          q.validate = /^\w\w+$/
-        end
-        lib.config('github.user', user)
-      end
-      @user = user
-    end
-    @user
-  end
-
-
-  def password
-    unless @password
-      @password = ask("Your <%= color('GitHub', [:bold, :blue]) %> password: ") do |q|
-        q.validate = /^\S\S+$/
-        q.echo = 'x'
-      end
-    end
-    @password
-  end
-
-
-  def auth_token
-    @auth_token ||= config_auth_token || create_authorization
-  end
-
-
-  def create_authorization
-    logger.info("Authorizing #{user} to work with #{site}.")
-    auth = pw_client.create_authorization(:scopes => %w(repo user gist),
-                                          :note => 'Git-Process',
-                                          :note_url => 'http://jdigger.github.com/git-process')
-    config_auth_token = auth['token']
-    lib.config('gitProcess.github.authToken', config_auth_token)
-    config_auth_token
-  end
-
-
-  def config_auth_token
-    if @auth_token.nil?
-      c_auth_token = lib.config('gitProcess.github.authToken')
-      @auth_token = (c_auth_token.nil? or c_auth_token.empty?) ? nil : c_auth_token
-    end
-    @auth_token
-  end
-
-
-  def logger
-    @lib.logger
-  end
-
-
-  class GithubServiceError < StandardError
-  end
-
-
-  class NoRemoteRepository < GithubServiceError
-  end
-
-end

data/spec/github_service_spec.rb

@@ -1,211 +0,0 @@
-require 'git-process/github_service'
-require 'webmock/rspec'
-require 'json'
-require 'octokit'
-require 'tempfile'
-require 'rspec/mocks/methods'
-require 'rspec/mocks/test_double'
-require 'rspec/mocks/mock'
-
-
-class GHS
-  include GitHubService
-
-
-  def initialize(user = nil, password = nil, site = nil)
-    @user = user
-    @password = password
-    @site = site
-
-    logger = RSpec::Mocks::Mock.new('logger')
-    logger.stub(:debug)
-    logger.stub(:info)
-
-    @lib = RSpec::Mocks::Mock.new('lib')
-    @lib.stub(:logger).and_return(logger)
-  end
-
-
-  def lib
-    @lib
-  end
-end
-
-
-describe GitHubService do
-
-  def test_token
-    'hfgkdjfgksjhdfkls'
-  end
-
-
-  describe "create_authorization" do
-
-    def ghs
-      unless @ghs
-        @ghs = GHS.new('tu', 'dfsdf')
-        @ghs.lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
-      end
-      @ghs
-    end
-
-
-    it "should return an auth_token for a good request" do
-      ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
-
-      stub_request(:post, /api.github.com\/authorizations/).
-          to_return(:status => 200, :body => JSON({:token => test_token}))
-
-      ghs.create_authorization().should == test_token
-    end
-
-
-    it "should 401 for bad password" do
-      stub_request(:post, /api.github.com\/authorizations/).
-          to_return(:status => 401)
-
-      lambda { ghs.create_authorization() }.should raise_error Octokit::Unauthorized
-    end
-
-  end
-
-
-  describe "auth_token" do
-
-    it "should get the token from config if it exists" do
-      ghs = GHS.new
-      ghs.lib.stub(:config).with('github.user').and_return('test_user')
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
-      ghs.lib.stub(:config).with('gitProcess.github.authToken').and_return(test_token)
-
-      ghs.auth_token.should == test_token
-    end
-
-
-    it "should get the token from the server if it does not exist in config" do
-      ghs = GHS.new(nil, 'dfsdf')
-      ghs.lib.stub(:config).with('github.user').and_return('test_user')
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
-      ghs.lib.stub(:config).with('gitProcess.github.authToken').and_return('')
-      ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
-
-      stub_request(:post, /api.github.com\/authorizations/).
-          to_return(:status => 200, :body => JSON({:token => test_token}))
-
-      ghs.auth_token.should == test_token
-    end
-
-  end
-
-
-  describe "user" do
-
-    it "should get the value from config" do
-      ghs = GHS.new(nil, 'dfsdf')
-      ghs.lib.stub(:config).with('github.user').and_return('test_user')
-
-      ghs.user.should == 'test_user'
-    end
-
-
-    it "should prompt the user and store it in the config" do
-      ghs = GHS.new(nil, 'dfsdf')
-      ghs.lib.stub(:config).with('github.user').and_return('')
-      ghs.lib.stub(:config).with('github.user', anything).once
-
-      ghs.stub(:ask).with(/username/).and_return('test_user')
-      ghs.user.should == 'test_user'
-    end
-
-  end
-
-
-  describe "using GHE instead of GitHub.com" do
-
-    def ghs
-      @ghs ||= GHS.new('tu', 'dfsdf', nil)
-    end
-
-
-    it "should use the correct server and path for a non-GitHub.com site" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@myco.com:jdigger/git-process.git')
-      ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
-
-      stub_request(:post, /myco.com\/api\/v3\/authorizations/).
-          to_return(:status => 200, :body => JSON({:token => test_token}))
-
-      ghs.create_authorization().should == test_token
-    end
-
-
-    it "site should work for git@... ssh address" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@myco.com:jdigger/git-process.git')
-
-      ghs.site.should == 'https://myco.com'
-    end
-
-
-    it "site should work for https address" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('https://myco.com/jdigger/git-process.git')
-
-      ghs.site.should == 'https://myco.com'
-    end
-
-
-    it "site should work for http address" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('http://jdigger@myco.com/jdigger/git-process.git')
-
-      ghs.site.should == 'http://myco.com'
-    end
-
-
-    it "site should work for git://myco.com/ address" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('git://myco.com/jdigger/git-process.git')
-
-      ghs.site.should == 'https://myco.com'
-    end
-
-
-    it "site should raise an error if remote.origin.url not set" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('')
-
-      lambda { ghs.site }.should raise_error GitHubService::NoRemoteRepository
-    end
-
-
-    it "site should not work for a garbase url address" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('garbage')
-
-      lambda { ghs.site }.should raise_error URI::InvalidURIError
-    end
-
-
-    def in_tempfile(content, &block)
-      file = Tempfile.new('ssh_config')
-      file.puts content
-      file.flush
-
-      begin
-        block.call(file)
-      ensure
-        file.close
-        file.unlink
-      end
-    end
-
-
-    it "site should work for an ssh-configged url address" do
-      ghs.lib.stub(:config).with('remote.origin.url').and_return('mygithub:jdigger/git-process.git')
-
-      content = "\nHost mygithub\n"+
-          "  User git\n"+
-          "  HostName github.myco.com\n"
-
-      in_tempfile(content) do |file|
-        ghs.site(:ssh_config_file => file.path).should == 'https://github.myco.com'
-      end
-    end
-
-  end
-
-end