hub 1.7.0 → 1.8.0

data/lib/hub/json.rb

@@ -0,0 +1,76 @@
+require 'strscan'
+require 'forwardable'
+
+class Hub::JSON
+  WSP = /\s+/
+  OBJ = /[{\[]/
+  NUM = /-?\d+(\.\d+)?([eE][+-]?\d+)?/
+  BOL = /(?:true|false)\b/
+  NUL = /null\b/
+
+  extend Forwardable
+
+  attr_reader :scanner
+  alias_method :s, :scanner
+  private :s
+  def_delegators :scanner, :scan, :matched
+
+  def self.parse(str)
+    self.new(str).parse
+  end
+
+  def initialize data
+    @scanner = StringScanner.new data.to_s
+  end
+
+  def space
+    scan WSP
+  end
+
+  def parse
+    space
+    object
+  end
+
+  def object
+    case scan(OBJ)
+    when '{' then hash
+    when '[' then array
+    end
+  end
+
+  def value
+    object or string or
+      (scan(NUM) || scan(BOL)) ? eval(matched) :
+      scan(NUL) && nil
+  end
+
+  def hash
+    current = {}
+    space
+    until scan(/\}/)
+      key = string
+      scan(/\s*:\s*/)
+      current[key] = value
+      scan(/\s*,\s*/) or space
+    end
+    current
+  end
+
+  def array
+    current = []
+    space
+    until scan(/\]/)
+      current << value
+      scan(/\s*,\s*/) or space
+    end
+    current
+  end
+
+  def string
+    if str = scan(/"/)
+      begin; str << s.scan_until(/"/); end while s.pre_match[-1,1] == '\\'
+      eval str
+    end
+  end
+end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.7.0'
+  Version = VERSION = '1.8.0'
 end

data/man/hub.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HUB" "1" "November 2011" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "January 2012" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -138,8 +138,8 @@ Open a GitHub compare view page in the system\'s default web browser\. \fISTART\
 Forks the original project (referenced by "origin" remote) on GitHub and adds a new remote for it under your username\. Requires \fBgithub\.token\fR to be set (see CONFIGURATION)\.
 .
 .TP
-\fBgit pull\-request\fR [\fB\-f\fR] [\fITITLE\fR|\fB\-i\fR \fIISSUE\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
-\fBgit pull\-request\fR [\fB\-f\fR] \fIISSUE\-URL\fR [\fB\-h\fR \fIHEAD\fR] Opens a pull request on GitHub for the project that the "origin" remote points to\. The default head of the pull request is the current branch\. Both base and head of the pull request can be explicitly given in one of the following formats: "branch", "owner:branch", "owner/repo:branch"\. This command will abort operation if it detects that the current topic branch has local commits that are not yet pushed to its upstream branch on the remote\. To skip this check, use \fB\-f\fR\.
+\fBgit pull\-request\fR [\fB\-f\fR] [\fITITLE\fR|\fB\-i\fR \fIISSUE\fR|\fIISSUE\-URL\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
+Opens a pull request on GitHub for the project that the "origin" remote points to\. The default head of the pull request is the current branch\. Both base and head of the pull request can be explicitly given in one of the following formats: "branch", "owner:branch", "owner/repo:branch"\. This command will abort operation if it detects that the current topic branch has local commits that are not yet pushed to its upstream branch on the remote\. To skip this check, use \fB\-f\fR\.
 .
 .IP
 If \fITITLE\fR is omitted, a text editor will open in which title and body of the pull request can be entered in the same manner as git commit message\.
@@ -193,6 +193,46 @@ $ git config \-\-global hub\.protocol https
 .
 .IP "" 0
 .
+.SS "GitHub Enterprise"
+By default, hub will only work with repositories that have remotes which point to github\.com\. GitHub Enterprise hosts need to be whitelisted to configure hub to treat such remotes same as github\.com:
+.
+.IP "" 4
+.
+.nf
+
+$ git config \-\-global \-\-add hub\.host my\.git\.org
+.
+.fi
+.
+.IP "" 0
+.
+.P
+API username and token need also be configured for each Enterprise host:
+.
+.IP "" 4
+.
+.nf
+
+$ git config \-\-global github\."my\.git\.org"\.user <username>
+$ git config \-\-global github\."my\.git\.org"\.token <token>
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The default host for commands like \fBinit\fR and \fBclone\fR is still github\.com, but this can be affected with the \fIGITHUB_HOST\fR environment variable:
+.
+.IP "" 4
+.
+.nf
+
+$ GITHUB_HOST=my\.git\.org git clone myproject
+.
+.fi
+.
+.IP "" 0
+.
 .SH "EXAMPLES"
 .
 .SS "git clone"

data/man/hub.1.html

@@ -176,8 +176,7 @@ GitHub will compare against the base branch (the default is "master").</p></dd>
 <dt><code>git fork</code> [<code>--no-remote</code>]</dt><dd><p>Forks the original project (referenced by "origin" remote) on GitHub and
 adds a new remote for it under your username. Requires <code>github.token</code> to
 be set (see CONFIGURATION).</p></dd>
-<dt><code>git pull-request</code> [<code>-f</code>] [<var>TITLE</var>|<code>-i</code> <var>ISSUE</var>] [<code>-b</code> <var>BASE</var>] [<code>-h</code> <var>HEAD</var>]</dt><dd><p><code>git pull-request</code> [<code>-f</code>] <var>ISSUE-URL</var> [<code>-h</code> <var>HEAD</var>]
-Opens a pull request on GitHub for the project that the "origin" remote
+<dt><code>git pull-request</code> [<code>-f</code>] [<var>TITLE</var>|<code>-i</code> <var>ISSUE</var>|<var>ISSUE-URL</var>] [<code>-b</code> <var>BASE</var>] [<code>-h</code> <var>HEAD</var>]</dt><dd><p>Opens a pull request on GitHub for the project that the "origin" remote
 points to. The default head of the pull request is the current branch.
 Both base and head of the pull request can be explicitly given in one of
 the following formats: "branch", "owner:branch", "owner/repo:branch".
@@ -221,6 +220,28 @@ URLs that otherwise use git and ssh protocols.</p>
 <pre><code>$ git config --global hub.protocol https
 </code></pre>
 
+<h3 id="GitHub-Enterprise">GitHub Enterprise</h3>
+
+<p>By default, hub will only work with repositories that have remotes which
+point to github.com. GitHub Enterprise hosts need to be whitelisted to
+configure hub to treat such remotes same as github.com:</p>
+
+<pre><code>$ git config --global --add hub.host my.git.org
+</code></pre>
+
+<p>API username and token need also be configured for each Enterprise host:</p>
+
+<pre><code>$ git config --global github."my.git.org".user &lt;username>
+$ git config --global github."my.git.org".token &lt;token>
+</code></pre>
+
+<p>The default host for commands like <code>init</code> and <code>clone</code> is still
+github.com, but this can be affected with the <var>GITHUB_HOST</var> environment
+variable:</p>
+
+<pre><code>$ GITHUB_HOST=my.git.org git clone myproject
+</code></pre>
+
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h3 id="git-clone">git clone</h3>
@@ -428,7 +449,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>November 2011</li>
+    <li class='tc'>January 2012</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/man/hub.1.ronn

@@ -132,8 +132,7 @@ hub also adds some custom commands that are otherwise not present in git:
     adds a new remote for it under your username. Requires `github.token` to
     be set (see CONFIGURATION).
 
-  * `git pull-request` [`-f`] [<TITLE>|`-i` <ISSUE>] [`-b` <BASE>] [`-h` <HEAD>]:
-    `git pull-request` [`-f`] <ISSUE-URL> [`-h` <HEAD>]
+  * `git pull-request` [`-f`] [<TITLE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]:
     Opens a pull request on GitHub for the project that the "origin" remote
     points to. The default head of the pull request is the current branch.
     Both base and head of the pull request can be explicitly given in one of
@@ -173,6 +172,25 @@ URLs that otherwise use git and ssh protocols.
 
     $ git config --global hub.protocol https
 
+### GitHub Enterprise
+
+By default, hub will only work with repositories that have remotes which
+point to github.com. GitHub Enterprise hosts need to be whitelisted to
+configure hub to treat such remotes same as github.com:
+
+    $ git config --global --add hub.host my.git.org
+
+API username and token need also be configured for each Enterprise host:
+
+    $ git config --global github."my.git.org".user <username>
+    $ git config --global github."my.git.org".token <token>
+
+The default host for commands like `init` and `clone` is still
+github.com, but this can be affected with the <GITHUB_HOST> environment
+variable:
+
+    $ GITHUB_HOST=my.git.org git clone myproject
+
 ## EXAMPLES
 
 {{README}}

data/test/hub_test.rb

@@ -3,7 +3,6 @@ require 'webmock/test_unit'
 require 'rbconfig'
 require 'yaml'
 require 'forwardable'
-require 'json'
 
 WebMock::BodyPattern.class_eval do
   undef normalize_hash
@@ -57,22 +56,26 @@ class HubTest < Test::Unit::TestCase
       'rev-parse --symbolic-full-name master@{upstream}' => 'refs/remotes/origin/master',
       'config --get --bool hub.http-clone' => 'false',
       'config --get hub.protocol' => nil,
+      'config --get-all hub.host' => nil,
       'rev-parse -q --git-dir' => '.git'
   end
 
   def test_private_clone
+    stub_no_git_repo
     input   = "clone -p rtomayko/ronn"
     command = "git clone git@github.com:rtomayko/ronn.git"
     assert_command input, command
   end
 
   def test_private_clone_noop
+    stub_no_git_repo
     input   = "--noop clone -p rtomayko/ronn"
     command = "git clone git@github.com:rtomayko/ronn.git\n"
     assert_output command, hub(input)
   end
 
   def test_https_clone
+    stub_no_git_repo
     stub_https_is_preferred
     input   = "clone rtomayko/ronn"
     command = "git clone https://github.com/rtomayko/ronn.git"
@@ -80,34 +83,47 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_public_clone
+    stub_no_git_repo
     input   = "clone rtomayko/ronn"
     command = "git clone git://github.com/rtomayko/ronn.git"
     assert_command input, command
   end
 
   def test_your_private_clone
+    stub_no_git_repo
     input   = "clone -p resque"
     command = "git clone git@github.com:tpw/resque.git"
     assert_command input, command
   end
 
   def test_your_clone_is_always_private
+    stub_no_git_repo
     input   = "clone resque"
     command = "git clone git@github.com:tpw/resque.git"
     assert_command input, command
   end
 
+  def test_clone_repo_with_period
+    stub_no_git_repo
+    input   = "clone hookio/hook.js"
+    command = "git clone git://github.com/hookio/hook.js.git"
+    assert_command input, command
+  end
+
   def test_clone_with_arguments
+    stub_no_git_repo
     input   = "clone --bare -o master resque"
     command = "git clone --bare -o master git@github.com:tpw/resque.git"
     assert_command input, command
   end
 
   def test_clone_with_arguments_and_destination
+    stub_no_git_repo
     assert_forwarded "clone --template=one/two git://github.com/tpw/resque.git --origin master resquetastic"
   end
 
   def test_your_private_clone_fails_without_config
+    stub_no_git_repo
     out = hub("clone -p mustache") do
       stub_github_user(nil)
     end
@@ -116,6 +132,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_your_public_clone_fails_without_config
+    stub_no_git_repo
     out = hub("clone mustache") do
       stub_github_user(nil)
     end
@@ -124,25 +141,39 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_private_clone_left_alone
+    stub_no_git_repo
     assert_forwarded "clone git@github.com:rtomayko/ronn.git"
   end
 
   def test_public_clone_left_alone
+    stub_no_git_repo
     assert_forwarded "clone git://github.com/rtomayko/ronn.git"
   end
 
   def test_normal_public_clone_with_path
+    stub_no_git_repo
     assert_forwarded "clone git://github.com/rtomayko/ronn.git ronn-dev"
   end
 
   def test_normal_clone_from_path
+    stub_no_git_repo
     assert_forwarded "clone ./test"
   end
 
   def test_clone_with_host_alias
+    stub_no_git_repo
     assert_forwarded "clone server:git/repo.git"
   end
 
+  def test_enterprise_clone
+    stub_no_git_repo
+    stub_github_user('myfiname', 'git.my.org')
+    with_host_env('git.my.org') do
+      assert_command "clone myrepo", "git clone git@git.my.org:myfiname/myrepo.git"
+      assert_command "clone another/repo", "git clone git@git.my.org:another/repo.git"
+    end
+  end
+
   def test_alias_expand
     stub_alias 'c', 'clone --bare'
     input   = "c rtomayko/ronn"
@@ -168,16 +199,24 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_remote_add_with_name
+    input   = "remote add another hookio/hub.js"
+    command = "git remote add another git://github.com/hookio/hub.js.git"
+    assert_command input, command
+  end
+
   def test_private_remote_origin
     input   = "remote add -p origin"
     command = "git remote add origin git@github.com:tpw/hub.git"
     assert_command input, command
   end
 
-  def test_public_remote_origin_as_normal
-    input   = "remote add origin http://github.com/defunkt/resque.git"
-    command = "git remote add origin http://github.com/defunkt/resque.git"
-    assert_command input, command
+  def test_public_remote_url_untouched
+    assert_forwarded "remote add origin http://github.com/defunkt/resque.git"
+  end
+
+  def test_private_remote_url_untouched
+    assert_forwarded "remote add origin git@github.com:defunkt/resque.git"
   end
 
   def test_remote_from_rel_path
@@ -192,8 +231,10 @@ class HubTest < Test::Unit::TestCase
     assert_forwarded "remote add origin server:/git/repo.git"
   end
 
-  def test_private_remote_origin_as_normal
-    assert_forwarded "remote add origin git@github.com:defunkt/resque.git"
+  def test_remote_add_enterprise
+    stub_hub_host('git.my.org')
+    stub_repo_url('git@git.my.org:defunkt/hub.git')
+    assert_command "remote add another", "git remote add another git@git.my.org:another/hub.git"
   end
 
   def test_public_submodule
@@ -294,6 +335,29 @@ class HubTest < Test::Unit::TestCase
                     "fetch xoebus"
   end
 
+  def test_fetch_new_remote_https_protocol
+    stub_remotes_group('xoebus', nil)
+    stub_existing_fork('xoebus')
+    stub_https_is_preferred
+
+    assert_commands "git remote add xoebus https://github.com/xoebus/hub.git",
+                    "git fetch xoebus",
+                    "fetch xoebus"
+  end
+
+  def test_fetch_no_auth
+    stub_github_user nil
+    stub_github_token nil
+    stub_remotes_group('xoebus', nil)
+    # stub_existing_fork('xoebus')
+    stub_request(:get, "https://github.com/api/v2/yaml/repos/show/xoebus/hub").
+      to_return(:status => 200)
+
+    assert_commands "git remote add xoebus git://github.com/xoebus/hub.git",
+                    "git fetch xoebus",
+                    "fetch xoebus"
+  end
+
   def test_fetch_new_remote_with_options
     stub_remotes_group('xoebus', nil)
     stub_existing_fork('xoebus')
@@ -404,6 +468,13 @@ class HubTest < Test::Unit::TestCase
     end
   end
 
+  def test_am_no_tmpdir
+    with_tmpdir(nil) do
+      cmd = Hub("am https://github.com/defunkt/hub/pull/55").command
+      assert_includes '/tmp/55.patch', cmd
+    end
+  end
+
   def test_am_commit_url
     with_tmpdir('/tmp/') do
       url = 'https://github.com/davidbalbert/hub/commit/fdb9921'
@@ -460,9 +531,20 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_init
+    stub_no_remotes
+    stub_no_git_repo
     assert_commands "git init", "git remote add origin git@github.com:tpw/hub.git", "init -g"
   end
 
+  def test_init_enterprise
+    stub_no_remotes
+    stub_no_git_repo
+    stub_github_user('myfiname', 'git.my.org')
+    with_host_env('git.my.org') do
+      assert_commands "git init", "git remote add origin git@git.my.org:myfiname/hub.git", "init -g"
+    end
+  end
+
   def test_init_no_login
     out = hub("init -g") do
       stub_github_user(nil)
@@ -528,7 +610,10 @@ class HubTest < Test::Unit::TestCase
 
   def test_create_no_openssl
     stub_no_remotes
-    stub_nonexisting_fork('tpw')
+    # stub_nonexisting_fork('tpw')
+    stub_request(:get, "http://#{auth}github.com/api/v2/yaml/repos/show/tpw/hub").
+      to_return(:status => 404)
+
     stub_request(:post, "http://#{auth}github.com/api/v2/yaml/repos/create").
       with(:body => { 'name' => 'hub' })
 
@@ -555,13 +640,15 @@ class HubTest < Test::Unit::TestCase
 
   def test_create_with_env_authentication
     stub_no_remotes
-    stub_nonexisting_fork('mojombo')
-
     old_user  = ENV['GITHUB_USER']
     old_token = ENV['GITHUB_TOKEN']
     ENV['GITHUB_USER']  = 'mojombo'
     ENV['GITHUB_TOKEN'] = '123abc'
 
+    # stub_nonexisting_fork('mojombo')
+    stub_request(:get, "https://#{auth('mojombo', '123abc')}github.com/api/v2/yaml/repos/show/mojombo/hub").
+      to_return(:status => 404)
+
     stub_request(:post, "https://#{auth('mojombo', '123abc')}github.com/api/v2/yaml/repos/create").
       with(:body => { 'name' => 'hub' })
 
@@ -606,7 +693,7 @@ class HubTest < Test::Unit::TestCase
     stub_no_remotes
     stub_existing_fork('tpw')
 
-    expected = "tpw/hub already exists on GitHub\n"
+    expected = "tpw/hub already exists on github.com\n"
     expected << "remote add -f origin git@github.com:tpw/hub.git\n"
     expected << "set remote origin: tpw/hub\n"
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
@@ -617,7 +704,7 @@ class HubTest < Test::Unit::TestCase
     stub_existing_fork('tpw')
     stub_https_is_preferred
 
-    expected = "tpw/hub already exists on GitHub\n"
+    expected = "tpw/hub already exists on github.com\n"
     expected << "remote add -f origin https://github.com/tpw/hub.git\n"
     expected << "set remote origin: tpw/hub\n"
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
@@ -647,11 +734,33 @@ class HubTest < Test::Unit::TestCase
 
   def test_fork
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub")
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub").
+      with { |req| req.headers['Content-Length'] == 0 }
 
     expected = "remote add -f tpw git@github.com:tpw/hub.git\n"
     expected << "new remote: tpw\n"
-    assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
+    assert_output expected, "fork"
+  end
+
+  def test_fork_not_in_repo
+    stub_no_git_repo
+    expected = "fatal: Not a git repository\n"
+    assert_output expected, "fork"
+  end
+
+  def test_fork_enterprise
+    stub_hub_host('git.my.org')
+    stub_repo_url('git@git.my.org:defunkt/hub.git')
+    stub_github_user('myfiname', 'git.my.org')
+    stub_github_token('789xyz', 'git.my.org')
+
+    stub_request(:get, "https://#{auth('myfiname', '789xyz')}git.my.org/api/v2/yaml/repos/show/myfiname/hub").
+      to_return(:status => 404)
+    stub_request(:post, "https://#{auth('myfiname', '789xyz')}git.my.org/api/v2/yaml/repos/fork/defunkt/hub")
+
+    expected = "remote add -f myfiname git@git.my.org:myfiname/hub.git\n"
+    expected << "new remote: myfiname\n"
+    assert_output expected, "fork"
   end
 
   def test_fork_failed
@@ -673,7 +782,7 @@ class HubTest < Test::Unit::TestCase
   def test_fork_already_exists
     stub_existing_fork('tpw')
 
-    expected = "tpw/hub already exists on GitHub\n"
+    expected = "tpw/hub already exists on github.com\n"
     expected << "remote add -f tpw git@github.com:tpw/hub.git\n"
     expected << "new remote: tpw\n"
     assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
@@ -683,7 +792,7 @@ class HubTest < Test::Unit::TestCase
     stub_existing_fork('tpw')
     stub_https_is_preferred
 
-    expected = "tpw/hub already exists on GitHub\n"
+    expected = "tpw/hub already exists on github.com\n"
     expected << "remote add -f tpw https://github.com/tpw/hub.git\n"
     expected << "new remote: tpw\n"
     assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
@@ -708,9 +817,10 @@ class HubTest < Test::Unit::TestCase
     stub_branch('refs/heads/feature')
     stub_tracking_nothing('feature')
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo"} }).
-      to_return(:body => mock_pullreq_response(1))
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo"} }) { |req|
+        req.headers['Content-Length'] == 76
+      }.to_return(:body => mock_pullreq_response(1))
 
     expected = "https://github.com/defunkt/hub/pull/1\n"
     assert_output expected, "pull-request hereyougo -f"
@@ -721,7 +831,7 @@ class HubTest < Test::Unit::TestCase
     stub_tracking('feature', 'mislav', 'yay-feature')
     stub_command_output "rev-list --cherry mislav/master...", nil
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:yay-feature", 'title' => "hereyougo"} }).
       to_return(:body => mock_pullreq_response(1))
 
@@ -729,8 +839,25 @@ class HubTest < Test::Unit::TestCase
     assert_output expected, "pull-request hereyougo -f"
   end
 
+  def test_pullrequest_enterprise_no_tracking
+    stub_hub_host('git.my.org')
+    stub_repo_url('git@git.my.org:defunkt/hub.git')
+    stub_github_user('myfiname', 'git.my.org')
+    stub_github_token('789xyz', 'git.my.org')
+    stub_branch('refs/heads/feature')
+    stub_tracking_nothing('feature')
+    stub_command_output "rev-list --cherry origin/feature...", nil
+
+    stub_request(:post, "https://#{auth('myfiname', '789xyz')}git.my.org/api/v2/json/pulls/defunkt/hub").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "myfiname:feature", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1, 'defunkt/hub', 'git.my.org'))
+
+    expected = "https://git.my.org/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -f"
+  end
+
   def test_pullrequest_explicit_head
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:yay-feature", 'title' => "hereyougo"} }).
       to_return(:body => mock_pullreq_response(1))
 
@@ -739,7 +866,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_head_with_owner
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mojombo:feature", 'title' => "hereyougo"} }).
       to_return(:body => mock_pullreq_response(1))
 
@@ -748,7 +875,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_base
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
       to_return(:body => mock_pullreq_response(1))
 
@@ -757,7 +884,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_base_with_owner
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/mojombo/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/mojombo/hub").
       with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
       to_return(:body => mock_pullreq_response(1))
 
@@ -766,7 +893,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_base_with_repo
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/mojombo/hubbub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/mojombo/hubbub").
       with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
       to_return(:body => mock_pullreq_response(1))
 
@@ -779,7 +906,7 @@ class HubTest < Test::Unit::TestCase
     stub_tracking('myfix', 'mislav', 'awesomefix')
     stub_command_output "rev-list --cherry mislav/awesomefix...", nil
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
       to_return(:body => mock_pullreq_response(92))
 
@@ -792,7 +919,7 @@ class HubTest < Test::Unit::TestCase
     stub_tracking('myfix', 'mislav', 'awesomefix')
     stub_command_output "rev-list --cherry mislav/awesomefix...", nil
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/mojombo/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/mojombo/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
       to_return(:body => mock_pullreq_response(92, 'mojombo/hub'))
 
@@ -800,12 +927,23 @@ class HubTest < Test::Unit::TestCase
     assert_output expected, "pull-request https://github.com/mojombo/hub/issues/92#comment_4"
   end
 
+  def test_pullrequest_fails
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
+      to_return(:status => [422, "Unprocessable Entity"],
+                :headers => {"Content-type" => "application/json"},
+                :body => %({"error":["oh no!", "it failed."]}))
+
+    expected = "Error creating pull request: Unprocessable Entity (HTTP 422)\n"
+    expected << "oh no!\nit failed.\n"
+    assert_output expected, "pull-request hereyougo -b feature -f"
+  end
+
   def test_checkout_no_changes
     assert_forwarded "checkout master"
   end
 
   def test_checkout_pullrequest
-    stub_request(:get, "http://github.com/api/v2/json/pulls/defunkt/hub/73").
+    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
       to_return(:body => mock_pull_response('blueyed:feature'))
 
     assert_commands 'git remote add -f -t feature blueyed git://github.com/blueyed/hub.git',
@@ -813,8 +951,17 @@ class HubTest < Test::Unit::TestCase
       "checkout https://github.com/defunkt/hub/pull/73/files"
   end
 
+  def test_checkout_private_pullrequest
+    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
+      to_return(:body => mock_pull_response('blueyed:feature', :private))
+
+    assert_commands 'git remote add -f -t feature blueyed git@github.com:blueyed/hub.git',
+      'git checkout -b blueyed-feature blueyed/feature',
+      "checkout https://github.com/defunkt/hub/pull/73/files"
+  end
+
   def test_checkout_pullrequest_custom_branch
-    stub_request(:get, "http://github.com/api/v2/json/pulls/defunkt/hub/73").
+    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
       to_return(:body => mock_pull_response('blueyed:feature'))
 
     assert_commands 'git remote add -f -t feature blueyed git://github.com/blueyed/hub.git',
@@ -825,7 +972,7 @@ class HubTest < Test::Unit::TestCase
   def test_checkout_pullrequest_existing_remote
     stub_command_output 'remote', "origin\nblueyed"
 
-    stub_request(:get, "http://github.com/api/v2/json/pulls/defunkt/hub/73").
+    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
       to_return(:body => mock_pull_response('blueyed:feature'))
 
     assert_commands 'git remote set-branches --add blueyed feature',
@@ -991,11 +1138,24 @@ config
       "open https://github.com/mislav/hub/commits/experimental"
   end
 
+  def test_hub_browse_on_complex_branch
+    stub_branch('refs/heads/feature/foo')
+    stub_tracking('feature/foo', 'mislav', 'feature/bar')
+
+    assert_command 'browse',
+      'open https://github.com/mislav/hub/tree/feature/bar'
+  end
+
   def test_hub_browse_current
     assert_command "browse", "open https://github.com/defunkt/hub"
     assert_command "browse --", "open https://github.com/defunkt/hub"
   end
 
+  def test_hub_browse_current_https_uri
+    stub_repo_url "https://github.com/defunkt/hub"
+    assert_command "browse", "open https://github.com/defunkt/hub"
+  end
+
   def test_hub_browse_commit_from_current
     assert_command "browse -- commit/6616e4", "open https://github.com/defunkt/hub/commit/6616e4"
   end
@@ -1092,14 +1252,16 @@ config
     assert_equal %w[git --bare -c core.awesome=true -c name=value --git-dir=/srv/www], git_reader.executable
   end
 
-  protected
+  private
 
-    def stub_github_user(name)
-      stub_config_value 'github.user', name
+    def stub_github_user(name, host = '')
+      host = %(."#{host}") unless host.empty?
+      stub_config_value "github#{host}.user", name
     end
 
-    def stub_github_token(token)
-      stub_config_value 'github.token', token
+    def stub_github_token(token, host = '')
+      host = %(."#{host}") unless host.empty?
+      stub_config_value "github#{host}.token", token
     end
 
     def stub_repo_url(value, remote_name = 'origin')
@@ -1144,7 +1306,7 @@ config
     end
 
     def stub_fork(user, repo, status)
-      stub_request(:get, "github.com/api/v2/yaml/repos/show/#{user}/#{repo}").
+      stub_request(:get, "https://#{auth}github.com/api/v2/yaml/repos/show/#{user}/#{repo}").
         to_return(:status => status)
     end
 
@@ -1156,6 +1318,10 @@ config
       stub_config_value 'hub.protocol', 'https'
     end
 
+    def stub_hub_host(names)
+      stub_config_value "hub.host", Array(names).join("\n"), '--get-all'
+    end
+
     def with_browser_env(value)
       browser, ENV['BROWSER'] = ENV['BROWSER'], value
       yield
@@ -1170,6 +1336,13 @@ config
       ENV['TMPDIR'] = dir
     end
 
+    def with_host_env(value)
+      host, ENV['GITHUB_HOST'] = ENV['GITHUB_HOST'], value
+      yield
+    ensure
+      ENV['GITHUB_HOST'] = host
+    end
+
     def assert_browser(browser)
       assert_command "browse", "#{browser} https://github.com/defunkt/hub"
     end
@@ -1188,14 +1361,12 @@ config
       "#{user}%2Ftoken:#{password}@"
     end
 
-    def mock_pullreq_response(id, name_with_owner = 'defunkt/hub')
-      YAML.dump('pull' => {
-        'html_url' => "https://github.com/#{name_with_owner}/pull/#{id}"
-      })
+    def mock_pullreq_response(id, name_with_owner = 'defunkt/hub', host = 'github.com')
+      %({"pull": { "html_url": "https://#{host}/#{name_with_owner}/pull/#{id}" }})
     end
 
-    def mock_pull_response(label)
-      JSON.generate('pull' => { 'head' => {'label' => label} })
+    def mock_pull_response(label, priv = false)
+      %({"pull": { "head": { "label": "#{label}", "repository": {"private":#{!!priv}} }}})
     end
 
     def improved_help_text