git-process-lib 2.0.4 → 3.0.0

data/spec/git_remote_spec.rb

@@ -17,7 +17,7 @@ describe GitRemote do
 
       clone_repo('master', 'origin') do |gl|
         gl.remote.name.should == 'origin'
-        gl.branches.include?('origin/master').should be_true
+        gl.branches.include?('origin/master').should be true
       end
     end
 
@@ -27,7 +27,7 @@ describe GitRemote do
 
       clone_repo('master', 'a_remote') do |gl|
         gl.remote.name.should == 'a_remote'
-        gl.branches.include?('a_remote/master').should be_true
+        gl.branches.include?('a_remote/master').should be true
       end
     end
 

data/spec/github_configuration_spec.rb

@@ -1,7 +1,7 @@
 require 'git-process/github_configuration'
 require 'json'
 require 'github_test_helper'
-
+# require 'vcr'
 
 describe GitHubService::Configuration, :git_repo_helper do
   include GitHubTestHelper
@@ -19,10 +19,10 @@ describe GitHubService::Configuration, :git_repo_helper do
 
   describe 'create_authorization' do
 
-    it "should return an auth_token for a good request" do
+    it 'should return an auth_token for a good request' do
       gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
       stub_post('https://tu:dfsdf@api.github.com/authorizations', :send => auth_json,
-                :body => {:token => test_token})
+                :body => JSON({:token => test_token}).to_s)
 
       ghc.create_authorization().should == test_token
     end
@@ -36,12 +36,62 @@ describe GitHubService::Configuration, :git_repo_helper do
       expect { ghc.create_authorization() }.to raise_error Octokit::Unauthorized
     end
 
+
+    it 'should 401 for needing two-factor authentication' do
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+
+      stub_request(:post, 'https://tu:dfsdf@api.github.com/authorizations').to_return do |request|
+        # noinspection RubyStringKeysInHashInspection
+        if request.headers.has_key? 'x-github-otp'
+          {
+              :body => JSON({:token => test_token}).to_s,
+              :headers => {'Content-Type' => 'application/json'},
+              :status => 200
+          }
+        else
+          {
+              :body => '',
+              :status => 401,
+              :headers => {'X-GitHub-OTP' => 'required; app'}
+          }
+        end
+      end
+      GitHubService::Configuration.stub(:ask_for_two_factor).and_return('572269')
+
+      ghc.create_authorization().should == test_token
+    end
+
+
+    it 'should 422 if two-factor authorization already exists' do
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+
+      stub_request(:post, 'https://tu:dfsdf@api.github.com/authorizations').to_return do |request|
+        # noinspection RubyStringKeysInHashInspection
+        if request.headers.has_key? 'x-github-otp'
+          {
+              :body => JSON({errors: [{:resource => 'OauthAccess', :code => 'already_exists'}]}).to_s,
+              :headers => {'Content-Type' => 'application/json'},
+              :status => 422
+          }
+        else
+          {
+              :body => '',
+              :status => 401,
+              :headers => {'X-GitHub-OTP' => 'required; app'}
+          }
+        end
+      end
+      GitHubService::Configuration.stub(:ask_for_two_factor).and_return('572269')
+
+      expect { ghc.create_authorization() }.to raise_error GitHubService::TokenAlreadyExists
+    end
+
   end
 
 
-  describe "auth_token no username or password" do
+  describe 'auth_token no username or password' do
 
-    it "should get the token from config if it exists" do
+    it 'should get the token from config if it exists' do
       gitlib.config['github.user'] = 'test_user'
       gitlib.config['gitProcess.github.authToken'] = test_token
 
@@ -64,7 +114,7 @@ describe GitHubService::Configuration, :git_repo_helper do
       gitlib.config['gitProcess.github.authToken'] = ''
 
       stub_post('https://test_user:dfsdf@api.github.com/authorizations', :send => auth_json,
-                :body => {:token => test_token})
+                :body => JSON({:token => test_token}).to_s)
 
       ghc.auth_token.should == test_token
     end
@@ -86,7 +136,7 @@ describe GitHubService::Configuration, :git_repo_helper do
     end
 
 
-    it "should prompt the user and store it in the config" do
+    it 'should prompt the user and store it in the config' do
       gitlib.config['github.user'] = ''
 
       GitHubService::Configuration.stub(:ask_for_user).and_return('test_user')
@@ -96,34 +146,34 @@ describe GitHubService::Configuration, :git_repo_helper do
   end
 
 
-  describe "using GHE instead of GitHub.com" do
+  describe 'using GHE instead of GitHub.com' do
 
-    it "should use the correct server and path for a non-GitHub.com site" do
+    it 'should use the correct server and path for a non-GitHub.com site' do
       gitlib.remote.add('origin', 'git@myco.com:jdigger/git-process.git')
 
       stub_post('https://tu:dfsdf@myco.com/api/v3/authorizations',
                 :send => auth_json,
-                :body => {:token => test_token})
+                :body => JSON({:token => test_token}).to_s)
 
       ghc.create_authorization().should == test_token
     end
 
 
-    it "site should raise an error if remote.origin.url not set" do
+    it 'site should raise an error if remote.origin.url not set' do
       gitlib.config['remote.origin.url'] = ''
 
       expect { ghc.base_github_api_url_for_remote }.to raise_error GitHubService::NoRemoteRepository
     end
 
 
-    it "site should not work for a garbage url address" do
+    it 'site should not work for a garbage url address' do
       gitlib.remote.add('origin', 'garbage')
 
       expect { ghc.base_github_api_url_for_remote }.to raise_error URI::InvalidURIError
     end
 
 
-    it "site should work for an ssh-configured url address" do
+    it 'site should work for an ssh-configured url address' do
       gitlib.remote.add('origin', 'git@github.myco.com:fooble')
 
       ghc.base_github_api_url_for_remote.should == 'https://github.myco.com'
@@ -132,7 +182,7 @@ describe GitHubService::Configuration, :git_repo_helper do
   end
 
 
-  it "#url_to_base_github_api_url" do
+  it '#url_to_base_github_api_url' do
     c = GitHubService::Configuration
 
     c.url_to_base_github_api_url('ssh://git@github.myco.com/fooble').should == 'https://github.myco.com'
@@ -145,8 +195,9 @@ describe GitHubService::Configuration, :git_repo_helper do
 
 
   def auth_json
-    JSON({:note_url => 'http://jdigger.github.com/git-process',
-          :scopes => %w(repo user gist), :note => "Git-Process"})
+    JSON({:scopes => %w(repo user gist),
+          :note => 'Git-Process',
+          :note_url => 'http://jdigger.github.com/git-process'}).to_s
   end
 
 end

data/spec/github_pull_request_spec.rb

@@ -15,7 +15,7 @@ describe GitHub::PullRequest, :git_repo_helper do
 
 
   def pull_request
-    @pr ||= GitHub::PullRequest.new(gitlib, 'test_remote', 'test_repo', :user => 'test_user')
+    @pr ||= GitHub::PullRequest.new(gitlib, 'test_remote', 'tester/test_repo', :user => 'test_user')
   end
 
 
@@ -28,7 +28,7 @@ describe GitHub::PullRequest, :git_repo_helper do
   describe '#create' do
 
     it 'should return a pull request for a good request' do
-      stub_post('https://api.github.com/repos/test_repo/pulls', :body => {:number => 1, :state => 'open'})
+      stub_post('https://api.github.com/repos/tester/test_repo/pulls', :body => {:number => 1, :state => 'open'})
 
       pull_request.create('test_base', 'test_head', 'test title', 'test body')[:state].should == 'open'
     end
@@ -36,10 +36,10 @@ describe GitHub::PullRequest, :git_repo_helper do
 
     it 'should handle asking for a duplicate pull request' do
       # trying to create the request should return "HTTP 422: Unprocessable Entity" because it already exists
-      stub_post('https://api.github.com/repos/test_repo/pulls', :status => 422)
+      stub_post('https://api.github.com/repos/tester/test_repo/pulls', :status => 422)
 
       # listing all existing pull requests should contain the current branch
-      stub_get('https://api.github.com/repos/test_repo/pulls?state=open', :status => 200,
+      stub_get('https://api.github.com/repos/tester/test_repo/pulls', :status => 200,
                :body => [{:html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}])
 
       pull_request.create('test_base', 'test_head', 'test title', 'test body')[:html_url].should == 'test_url'
@@ -51,7 +51,7 @@ describe GitHub::PullRequest, :git_repo_helper do
   describe 'get' do
 
     it 'should return a pull request for a good request' do
-      stub_get('https://api.github.com/repos/test_repo/pulls/1', :body => {:number => 1, :state => 'open'})
+      stub_get('https://api.github.com/repos/tester/test_repo/pulls/1', :body => {:number => 1, :state => 'open'})
 
       pull_request.pull_request(1)[:state].should == 'open'
     end
@@ -62,19 +62,20 @@ describe GitHub::PullRequest, :git_repo_helper do
   describe '#close' do
 
     it 'should close a good current pull request' do
-      stub_get('https://api.github.com/repos/test_repo/pulls?state=open', :body => [
-          {:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'},
-           :base => {:ref => 'test_base'}}])
-      stub_patch('https://api.github.com/repos/test_repo/pulls/1', :send => JSON({:state => 'closed'}),
+      stub_get('https://api.github.com/repos/tester/test_repo/pulls', :body => [
+                                                                        {:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'},
+                                                                         :base => {:ref => 'test_base'}}])
+      stub_patch('https://api.github.com/repos/tester/test_repo/pulls/1', :send => {:state => 'closed'},
                  :body => {:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'},
                            :base => {:ref => 'test_base'}})
 
-      pull_request.close('test_base', 'test_head')[:state].should == 'closed'
+      close_result = pull_request.close('test_base', 'test_head')
+      close_result[:state].should == 'closed'
     end
 
 
     it 'should close a good current pull request using the pull request number' do
-      stub_patch('https://api.github.com/repos/test_repo/pulls/1', :send => JSON({:state => 'closed'}),
+      stub_patch('https://api.github.com/repos/tester/test_repo/pulls/1', :send => JSON({:state => 'closed'}),
                  :body => {:number => 1, :state => 'closed', :html_url => 'test_url',
                            :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}})
 
@@ -83,7 +84,7 @@ describe GitHub::PullRequest, :git_repo_helper do
 
 
     it 'should retry closing a good current pull request when getting a 422' do
-      stub = stub_request(:patch, 'https://api.github.com/repos/test_repo/pulls/1')
+      stub = stub_request(:patch, 'https://api.github.com/repos/tester/test_repo/pulls/1')
 
       stub.with(:body => JSON({:state => 'closed'}))
 
@@ -91,17 +92,17 @@ describe GitHub::PullRequest, :git_repo_helper do
           to_raise(Octokit::UnprocessableEntity.new).then.
           to_raise(Octokit::UnprocessableEntity.new).then.
           to_raise(Octokit::UnprocessableEntity.new).then.
-          to_return(:status => 200, :body => {:number => 1, :state => 'closed', :html_url => 'test_url',
-                           :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}})
+          to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url',
+                                              :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}).to_s)
 
       pull_request.close(1)[:state].should == 'closed'
     end
 
 
     it 'should complain about a missing pull request' do
-      stub_get('https://api.github.com/repos/test_repo/pulls?state=open', :body => [
-          {:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'},
-           :base => {:ref => 'test_base'}}])
+      stub_get('https://api.github.com/repos/tester/test_repo/pulls', :body => [
+                                                                        {:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'},
+                                                                         :base => {:ref => 'test_base'}}])
 
       expect { pull_request.close('test_base', 'missing_head') }.to raise_error GitHub::PullRequest::NotFoundError
     end

data/spec/github_test_helper.rb

@@ -2,6 +2,32 @@ require 'FileHelpers'
 require 'git-process/git_process'
 require 'webmock/rspec'
 
+################
+#
+# Monkey-patch WebMock to stop screwing with the capitalization of resource headers
+#
+################
+module WebMock
+  module Util
+    class Headers
+      def self.normalize_headers(headers)
+        headers
+      end
+    end
+  end
+end
+
+module Net::HTTPHeader
+  def add_field(key, val)
+    if @header.key?(key)
+      @header[key].push val
+    else
+      @header[key] = [val]
+    end
+  end
+end
+
+
 module GitHubTestHelper
 
 
@@ -12,7 +38,7 @@ module GitHubTestHelper
       stub.with(:Authorization => "token #{opts[:token]}")
     end
 
-    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => opts[:body] ? opts[:body] : '')
+    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => to_body(opts[:body]))
     stub
   end
 
@@ -20,13 +46,30 @@ module GitHubTestHelper
   def stub_post(url, opts = {})
     stub = stub_request(:post, url)
 
+    with_headers = opts[:headers] || {}
+
     if opts[:token]
       stub.with(:Authorization => "token #{opts[:token]}")
     end
 
-    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => opts[:body] ? opts[:body] : '')
+    if opts[:send]
+      stub.with(:body => to_body(opts[:send]))
+    end
 
-    stub
+    if opts[:two_factor]
+      # noinspection RubyStringKeysInHashInspection
+      with_headers.merge!({'X-GitHub-OTP'.downcase => [opts[:two_factor]]})
+    end
+
+    if opts[:body]
+      # noinspection RubyStringKeysInHashInspection
+      opts[:response_headers] = {'Content-Type' => 'application/json'}.merge(opts[:response_headers] || {})
+    end
+
+    stub.with(:headers => with_headers) unless with_headers.empty?
+    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => to_body(opts[:body]), :headers => opts[:response_headers] ? opts[:response_headers] : {})
+
+    return stub
   end
 
 
@@ -38,12 +81,23 @@ module GitHubTestHelper
     end
 
     if opts[:send]
-      stub.with(:body => opts[:send])
+      stub.with(:body => to_body(opts[:send]))
     end
 
-    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => opts[:body] ? opts[:body] : '')
+    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => to_body(opts[:body]))
 
     stub
   end
 
+  def to_body(body)
+    return '' if body.nil?
+
+    return body if body.is_a? String
+
+    if body.is_a? Hash or body.is_a? Array
+      return JSON(body).to_s
+    end
+    raise "Do not know what to do with #{body.class} #{body}"
+  end
+
 end

data/spec/new_fb_spec.rb

@@ -1,4 +1,4 @@
-require 'git-process/new_fb'
+require File.dirname(__FILE__) + '/../lib/git-process/new_fb'
 require 'GitRepoHelper'
 include GitProc
 
@@ -42,7 +42,7 @@ describe NewFeatureBranch do
   end
 
 
-  it "should bring committed changes on _parking_ over to the new branch" do
+  it 'should bring committed changes on _parking_ over to the new branch' do
     clone_repo do |gl|
       gl.checkout('_parking_', :new_branch => 'master')
       change_file_and_commit('a', '', gl)
@@ -53,12 +53,12 @@ describe NewFeatureBranch do
 
       new_branch.name.should == 'test_branch'
       Dir.chdir(gl.workdir) do |_|
-        File.exists?('a').should be_true
-        File.exists?('b').should be_true
+        File.exists?('a').should be true
+        File.exists?('b').should be true
       end
 
-      gl.config["branch.test_branch.remote"].should == 'origin'
-      gl.config["branch.test_branch.merge"].should == 'refs/heads/master'
+      gl.config['branch.test_branch.remote'].should == 'origin'
+      gl.config['branch.test_branch.merge'].should == 'refs/heads/master'
 
       gl.fetch
       gl.branches.parking.should be_nil
@@ -68,7 +68,7 @@ describe NewFeatureBranch do
   end
 
 
-  it "should move new branch over to the integration branch" do
+  it 'should move new branch over to the integration branch' do
     clone_repo do |gl|
       gl.checkout('_parking_', :new_branch => 'master')
       change_file_and_commit('a', '', gitlib)
@@ -80,8 +80,8 @@ describe NewFeatureBranch do
 
       new_branch.name.should == 'test_branch'
       Dir.chdir(gitlib.workdir) do |_|
-        File.exists?('a').should be_true
-        File.exists?('b').should be_true
+        File.exists?('a').should be true
+        File.exists?('b').should be true
       end
 
       gl.config["branch.test_branch.remote"].should == 'origin'
@@ -95,7 +95,7 @@ describe NewFeatureBranch do
   end
 
 
-  it "should use 'integration_branch' instead of 'remote_master_branch'" do
+  it 'should use "integration_branch" instead of "remote_master_branch"' do
     change_file_and_commit('a', '')
 
     new_branch = gitprocess.runner
@@ -104,7 +104,7 @@ describe NewFeatureBranch do
   end
 
 
-  it "should bring new/uncommitted changes on _parking_ over to the new branch" do
+  it 'should bring new/uncommitted changes on _parking_ over to the new branch' do
     gitlib.branch('origin/master', :base_branch => 'master')
     gitlib.checkout('_parking_', :new_branch => 'master')
     change_file_and_commit('a', '')
@@ -115,9 +115,9 @@ describe NewFeatureBranch do
 
     new_branch.name.should == 'test_branch'
     Dir.chdir(gitlib.workdir) do |_|
-      File.exists?('a').should be_true
-      File.exists?('b').should be_true
-      File.exists?('c').should be_true
+      File.exists?('a').should be true
+      File.exists?('b').should be true
+      File.exists?('c').should be true
     end
 
     gitlib.branches.parking.should be_nil