hub 1.6.1 → 1.7.0

data/test/alias_test.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
 require 'helper'
 
 class AliasTest < Test::Unit::TestCase

data/test/helper.rb

@@ -1,15 +1,8 @@
 require 'test/unit'
-
-begin
-  require 'redgreen'
-rescue LoadError
-end
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'hub'
 require 'hub/standalone'
 
-# We're looking for `open` in the tests.
+# We're checking for `open` in our tests
 ENV['BROWSER'] = 'open'
 
 # Setup path with fake executables in case a test hits them
@@ -108,4 +101,11 @@ class Test::Unit::TestCase
     assert !haystack.include?(needle),
       "didn't expect #{needle.inspect} in #{haystack.inspect}"
   end
+
+  # Version of assert_equal tailored for big output
+  def assert_output(expected, command)
+    output = hub(command) { ENV['GIT'] = 'echo' }
+    assert expected == output,
+      "expected:\n#{expected}\ngot:\n#{output}"
+  end
 end

data/test/hub_test.rb

@@ -1,7 +1,9 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
 require 'helper'
 require 'webmock/test_unit'
 require 'rbconfig'
+require 'yaml'
+require 'forwardable'
+require 'json'
 
 WebMock::BodyPattern.class_eval do
   undef normalize_hash
@@ -10,6 +12,8 @@ WebMock::BodyPattern.class_eval do
 end
 
 class HubTest < Test::Unit::TestCase
+  extend Forwardable
+
   if defined? WebMock::API
     include WebMock::API
   else
@@ -25,30 +29,35 @@ class HubTest < Test::Unit::TestCase
     end
   end
 
+  attr_reader :git_reader
+  include Hub::Context::GitReaderMethods
+  def_delegators :git_reader, :stub_config_value, :stub_command_output
+
   def setup
+    super
     COMMANDS.replace %w[open groff]
-    Hub::Context::DIRNAME.replace 'hub'
-    Hub::Context::REMOTES.clear
+    Hub::Context::PWD.replace '/path/to/hub'
 
-    Hub::Context::GIT_CONFIG.executable = 'git'
-
-    @git = Hub::Context::GIT_CONFIG.replace(Hash.new { |h, k|
-      unless k.index('config alias.') == 0
-        raise ArgumentError, "`git #{k}` not stubbed"
+    @git_reader = Hub::Context::GitReader.new 'git' do |cache, cmd|
+      unless cmd.index('config --get alias.') == 0
+        raise ArgumentError, "`git #{cmd}` not stubbed"
       end
-    }).update(
+    end
+
+    Hub::Commands.instance_variable_set :@git_reader, @git_reader
+    Hub::Commands.instance_variable_set :@local_repo, nil
+
+    @git_reader.stub! \
       'remote' => "mislav\norigin",
       'symbolic-ref -q HEAD' => 'refs/heads/master',
-      'config github.user'   => 'tpw',
-      'config github.token'  => 'abc123',
+      'config --get github.user'   => 'tpw',
+      'config --get github.token'  => 'abc123',
       'config --get-all remote.origin.url' => 'git://github.com/defunkt/hub.git',
       'config --get-all remote.mislav.url' => 'git://github.com/mislav/hub.git',
-      'config branch.master.remote'  => 'origin',
-      'config branch.master.merge'   => 'refs/heads/master',
-      'config --bool hub.http-clone' => 'false',
-      'config core.repositoryformatversion' => '0'
-    )
-    super
+      'rev-parse --symbolic-full-name master@{upstream}' => 'refs/remotes/origin/master',
+      'config --get --bool hub.http-clone' => 'false',
+      'config --get hub.protocol' => nil,
+      'rev-parse -q --git-dir' => '.git'
   end
 
   def test_private_clone
@@ -57,6 +66,19 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_private_clone_noop
+    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_https_is_preferred
+    input   = "clone rtomayko/ronn"
+    command = "git clone https://github.com/rtomayko/ronn.git"
+    assert_command input, command
+  end
+
   def test_public_clone
     input   = "clone rtomayko/ronn"
     command = "git clone git://github.com/rtomayko/ronn.git"
@@ -69,15 +91,15 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
-  def test_your_public_clone
+  def test_your_clone_is_always_private
     input   = "clone resque"
-    command = "git clone git://github.com/tpw/resque.git"
+    command = "git clone git@github.com:tpw/resque.git"
     assert_command input, command
   end
 
   def test_clone_with_arguments
     input   = "clone --bare -o master resque"
-    command = "git clone --bare -o master git://github.com/tpw/resque.git"
+    command = "git clone --bare -o master git@github.com:tpw/resque.git"
     assert_command input, command
   end
 
@@ -90,7 +112,7 @@ class HubTest < Test::Unit::TestCase
       stub_github_user(nil)
     end
 
-    assert_equal "** No GitHub user set. See http://help.github.com/git-email-settings/\n", out
+    assert_equal "** No GitHub user set. See http://help.github.com/set-your-user-name-email-and-github-token/\n", out
   end
 
   def test_your_public_clone_fails_without_config
@@ -98,7 +120,7 @@ class HubTest < Test::Unit::TestCase
       stub_github_user(nil)
     end
 
-    assert_equal "** No GitHub user set. See http://help.github.com/git-email-settings/\n", out
+    assert_equal "** No GitHub user set. See http://help.github.com/set-your-user-name-email-and-github-token/\n", out
   end
 
   def test_private_clone_left_alone
@@ -117,6 +139,10 @@ class HubTest < Test::Unit::TestCase
     assert_forwarded "clone ./test"
   end
 
+  def test_clone_with_host_alias
+    assert_forwarded "clone server:git/repo.git"
+  end
+
   def test_alias_expand
     stub_alias 'c', 'clone --bare'
     input   = "c rtomayko/ronn"
@@ -162,6 +188,10 @@ class HubTest < Test::Unit::TestCase
     assert_forwarded "remote add origin /path"
   end
 
+  def test_remote_with_host_alias
+    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"
   end
@@ -196,6 +226,13 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_https_protocol_remote
+    stub_https_is_preferred
+    input   = "remote add rtomayko"
+    command = "git remote add rtomayko https://github.com/rtomayko/hub.git"
+    assert_command input, command
+  end
+
   def test_public_remote
     input   = "remote add rtomayko"
     command = "git remote add rtomayko git://github.com/rtomayko/hub.git"
@@ -334,7 +371,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_cherry_pick_github_user_notation
-    assert_commands "git fetch mislav", "git cherry-pick a319d88", "cherry-pick mislav@a319d88"
+    assert_commands "git fetch mislav", "git cherry-pick 368af20", "cherry-pick mislav@368af20"
   end
 
   def test_cherry_pick_github_user_repo_notation
@@ -387,6 +424,41 @@ class HubTest < Test::Unit::TestCase
     end
   end
 
+  def test_apply_untouched
+    assert_forwarded "apply some.patch"
+  end
+
+  def test_apply_pull_request
+    with_tmpdir('/tmp/') do
+      assert_commands "curl -#LA 'hub #{Hub::Version}' https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch",
+                      "git apply /tmp/55.patch -p2",
+                      "apply https://github.com/defunkt/hub/pull/55 -p2"
+
+      cmd = Hub("apply https://github.com/defunkt/hub/pull/55/files").command
+      assert_includes '/pull/55.patch', cmd
+    end
+  end
+
+  def test_apply_commit_url
+    with_tmpdir('/tmp/') do
+      url = 'https://github.com/davidbalbert/hub/commit/fdb9921'
+
+      assert_commands "curl -#LA 'hub #{Hub::Version}' #{url}.patch -o /tmp/fdb9921.patch",
+                      "git apply /tmp/fdb9921.patch -p2",
+                      "apply #{url} -p2"
+    end
+  end
+
+  def test_apply_gist
+    with_tmpdir('/tmp/') do
+      url = 'https://gist.github.com/8da7fb575debd88c54cf'
+
+      assert_commands "curl -#LA 'hub #{Hub::Version}' #{url}.txt -o /tmp/gist-8da7fb575debd88c54cf.txt",
+                      "git apply /tmp/gist-8da7fb575debd88c54cf.txt -p2",
+                      "apply #{url} -p2"
+    end
+  end
+
   def test_init
     assert_commands "git init", "git remote add origin git@github.com:tpw/hub.git", "init -g"
   end
@@ -396,7 +468,7 @@ class HubTest < Test::Unit::TestCase
       stub_github_user(nil)
     end
 
-    assert_equal "** No GitHub user set. See http://help.github.com/git-email-settings/\n", out
+    assert_equal "** No GitHub user set. See http://help.github.com/set-your-user-name-email-and-github-token/\n", out
   end
 
   def test_push_untouched
@@ -424,21 +496,60 @@ class HubTest < Test::Unit::TestCase
   def test_create
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/create").
-      with(:body => { 'login'=>'tpw', 'token'=>'abc123', 'name' => 'hub' })
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'hub' })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
     expected << "created repository: tpw/hub\n"
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
   end
 
+  def test_create_custom_name
+    stub_no_remotes
+    stub_nonexisting_fork('tpw', 'hubbub')
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'hubbub' })
+
+    expected = "remote add -f origin git@github.com:tpw/hubbub.git\n"
+    expected << "created repository: tpw/hubbub\n"
+    assert_equal expected, hub("create hubbub") { ENV['GIT'] = 'echo' }
+  end
+
+  def test_create_in_organization
+    stub_no_remotes
+    stub_nonexisting_fork('acme', 'hubbub')
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'acme/hubbub' })
+
+    expected = "remote add -f origin git@github.com:acme/hubbub.git\n"
+    expected << "created repository: acme/hubbub\n"
+    assert_equal expected, hub("create acme/hubbub") { ENV['GIT'] = 'echo' }
+  end
+
+  def test_create_no_openssl
+    stub_no_remotes
+    stub_nonexisting_fork('tpw')
+    stub_request(:post, "http://#{auth}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'hub' })
+
+    expected = "remote add -f origin git@github.com:tpw/hub.git\n"
+    expected << "created repository: tpw/hub\n"
+
+    assert_equal expected, hub("create") {
+      ENV['GIT'] = 'echo'
+      require 'net/https'
+      Object.send :remove_const, :OpenSSL
+    }
+  end
+
   def test_create_failed
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
       to_return(:status => [401, "Your token is fail"])
 
-    expected = "error creating repository: Your token is fail (HTTP 401)\n"
+    expected = "Error creating repository: Your token is fail (HTTP 401)\n"
+    expected << "Check your token configuration (`git config github.token`)\n"
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
   end
 
@@ -451,8 +562,8 @@ class HubTest < Test::Unit::TestCase
     ENV['GITHUB_USER']  = 'mojombo'
     ENV['GITHUB_TOKEN'] = '123abc'
 
-    stub_request(:post, "github.com/api/v2/yaml/repos/create").
-      with(:body => { 'login'=>'mojombo', 'token'=>'123abc', 'name' => 'hub' })
+    stub_request(:post, "https://#{auth('mojombo', '123abc')}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'hub' })
 
     expected = "remote add -f origin git@github.com:mojombo/hub.git\n"
     expected << "created repository: mojombo/hub\n"
@@ -466,8 +577,8 @@ class HubTest < Test::Unit::TestCase
   def test_create_private_repository
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/create").
-      with(:body => { 'login'=>'tpw', 'token'=>'abc123', 'name' => 'hub', 'public' => '0' })
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'hub', 'public' => '0' })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
     expected << "created repository: tpw/hub\n"
@@ -477,9 +588,8 @@ class HubTest < Test::Unit::TestCase
   def test_create_with_description_and_homepage
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/create").with(:body => {
-      'login'=>'tpw', 'token'=>'abc123', 'name' => 'hub',
-      'description' => 'toyproject', 'homepage' => 'http://example.com'
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").with(:body => {
+      'name' => 'hub', 'description' => 'toyproject', 'homepage' => 'http://example.com'
     })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
@@ -487,6 +597,11 @@ class HubTest < Test::Unit::TestCase
     assert_equal expected, hub("create -d toyproject -h http://example.com") { ENV['GIT'] = 'echo' }
   end
 
+  def test_create_with_invalid_arguments
+    assert_equal "invalid argument: -a\n",   hub("create -a blah")   { ENV['GIT'] = 'echo' }
+    assert_equal "invalid argument: bleh\n", hub("create blah bleh") { ENV['GIT'] = 'echo' }
+  end
+
   def test_create_with_existing_repository
     stub_no_remotes
     stub_existing_fork('tpw')
@@ -497,12 +612,23 @@ class HubTest < Test::Unit::TestCase
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
   end
 
+  def test_create_https_protocol
+    stub_no_remotes
+    stub_existing_fork('tpw')
+    stub_https_is_preferred
+
+    expected = "tpw/hub already exists on GitHub\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' }
+  end
+
   def test_create_no_user
     stub_no_remotes
     out = hub("create") do
       stub_github_token(nil)
     end
-    assert_equal "** No GitHub token set. See http://help.github.com/git-email-settings/\n", out
+    assert_equal "** No GitHub token set. See http://help.github.com/set-your-user-name-email-and-github-token/\n", out
   end
 
   def test_create_outside_git_repo
@@ -512,8 +638,8 @@ class HubTest < Test::Unit::TestCase
 
   def test_create_origin_already_exists
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/create").
-      with(:body => { 'login'=>'tpw', 'token'=>'abc123', 'name' => 'hub' })
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+      with(:body => { 'name' => 'hub' })
 
     expected = "remote -v\ncreated repository: tpw/hub\n"
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
@@ -521,8 +647,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_fork
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/fork/defunkt/hub").
-      with(:body => { 'login'=>'tpw', 'token'=>'abc123' })
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub")
 
     expected = "remote add -f tpw git@github.com:tpw/hub.git\n"
     expected << "new remote: tpw\n"
@@ -531,16 +656,16 @@ class HubTest < Test::Unit::TestCase
 
   def test_fork_failed
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/fork/defunkt/hub").
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub").
       to_return(:status => [500, "Your fork is fail"])
 
-    expected = "error creating fork: Your fork is fail (HTTP 500)\n"
+    expected = "Error creating fork: Your fork is fail (HTTP 500)\n"
     assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
   end
 
   def test_fork_no_remote
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "github.com/api/v2/yaml/repos/fork/defunkt/hub")
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub")
 
     assert_equal "", hub("fork --no-remote") { ENV['GIT'] = 'echo' }
   end
@@ -554,6 +679,161 @@ class HubTest < Test::Unit::TestCase
     assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
   end
 
+  def test_fork_https_protocol
+    stub_existing_fork('tpw')
+    stub_https_is_preferred
+
+    expected = "tpw/hub already exists on GitHub\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' }
+  end
+
+  def test_pullrequest
+    expected = "Aborted: head branch is the same as base (\"master\")\n" <<
+      "(use `-h <branch>` to specify an explicit pull request head)\n"
+    assert_output expected, "pull-request hereyougo"
+  end
+
+  def test_pullrequest_with_unpushed_commits
+    stub_tracking('master', 'mislav', 'master')
+    stub_command_output "rev-list --cherry mislav/master...", "+abcd1234\n+bcde2345"
+
+    expected = "Aborted: 2 commits are not yet pushed to mislav/master\n" <<
+      "(use `-f` to force submit a pull request anyway)\n"
+    assert_output expected, "pull-request hereyougo"
+  end
+
+  def test_pullrequest_from_branch
+    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))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -f"
+  end
+
+  def test_pullrequest_from_tracking_branch
+    stub_branch('refs/heads/feature')
+    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").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:yay-feature", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/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").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:yay-feature", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -h yay-feature -f"
+  end
+
+  def test_pullrequest_explicit_head_with_owner
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "mojombo:feature", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -h mojombo:feature -f"
+  end
+
+  def test_pullrequest_explicit_base
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/defunkt/hub").
+      with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -b feature -f"
+  end
+
+  def test_pullrequest_explicit_base_with_owner
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/mojombo/hub").
+      with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -b mojombo:feature -f"
+  end
+
+  def test_pullrequest_explicit_base_with_repo
+    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/pulls/mojombo/hubbub").
+      with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -b mojombo/hubbub:feature -f"
+  end
+
+  def test_pullrequest_existing_issue
+    stub_branch('refs/heads/myfix')
+    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").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
+      to_return(:body => mock_pullreq_response(92))
+
+    expected = "https://github.com/defunkt/hub/pull/92\n"
+    assert_output expected, "pull-request -i 92"
+  end
+
+  def test_pullrequest_existing_issue_url
+    stub_branch('refs/heads/myfix')
+    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").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
+      to_return(:body => mock_pullreq_response(92, 'mojombo/hub'))
+
+    expected = "https://github.com/mojombo/hub/pull/92\n"
+    assert_output expected, "pull-request https://github.com/mojombo/hub/issues/92#comment_4"
+  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").
+      to_return(:body => mock_pull_response('blueyed:feature'))
+
+    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").
+      to_return(:body => mock_pull_response('blueyed:feature'))
+
+    assert_commands 'git remote add -f -t feature blueyed git://github.com/blueyed/hub.git',
+      'git checkout -b review blueyed/feature',
+      "checkout https://github.com/defunkt/hub/pull/73/files review"
+  end
+
+  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").
+      to_return(:body => mock_pull_response('blueyed:feature'))
+
+    assert_commands 'git remote set-branches --add blueyed feature',
+      'git fetch blueyed +refs/heads/feature:refs/remotes/blueyed/feature',
+      'git checkout -b blueyed-feature blueyed/feature',
+      "checkout https://github.com/defunkt/hub/pull/73/files"
+  end
+
   def test_version
     out = hub('--version')
     assert_includes "git version 1.7.0.4", out
@@ -567,7 +847,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_exec_path_arg
     out = hub('--exec-path=/home/wombat/share/my-l33t-git-core')
-    assert_equal Hub::Commands.improved_help_text, out
+    assert_equal improved_help_text, out
   end
 
   def test_html_path
@@ -576,15 +856,15 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_help
-    assert_equal Hub::Commands.improved_help_text, hub("help")
+    assert_equal improved_help_text, hub("help")
   end
 
   def test_help_by_default
-    assert_equal Hub::Commands.improved_help_text, hub("")
+    assert_equal improved_help_text, hub("")
   end
 
   def test_help_with_pager
-    assert_equal Hub::Commands.improved_help_text, hub("-p")
+    assert_equal improved_help_text, hub("-p")
   end
 
   def test_help_hub
@@ -623,7 +903,7 @@ config
 
   def test_hub_compare_tracking_branch
     stub_branch('refs/heads/feature')
-    stub_tracking('feature', 'mislav', 'refs/heads/experimental')
+    stub_tracking('feature', 'mislav', 'experimental')
 
     assert_command "compare",
       "open https://github.com/mislav/hub/compare/experimental"
@@ -634,6 +914,21 @@ config
       "open https://github.com/defunkt/hub/compare/1.0...fix"
   end
 
+  def test_hub_compare_range_fixes_two_dots_for_tags
+    assert_command "compare 1.0..fix",
+      "open https://github.com/defunkt/hub/compare/1.0...fix"
+  end
+
+  def test_hub_compare_range_fixes_two_dots_for_shas
+    assert_command "compare 1234abc..3456cde",
+      "open https://github.com/defunkt/hub/compare/1234abc...3456cde"
+  end
+
+  def test_hub_compare_range_ignores_two_dots_for_complex_ranges
+    assert_command "compare @{a..b}..@{c..d}",
+      "open https://github.com/defunkt/hub/compare/@{a..b}..@{c..d}"
+  end
+
   def test_hub_compare_on_wiki
     stub_repo_url 'git://github.com/defunkt/hub.wiki.git'
     assert_command "compare 1.0...fix",
@@ -654,6 +949,10 @@ config
     assert_command "browse mojombo/bert", "open https://github.com/mojombo/bert"
   end
 
+  def test_hub_browse_commit
+    assert_command "browse mojombo/bert commit/5d5582", "open https://github.com/mojombo/bert/commit/5d5582"
+  end
+
   def test_hub_browse_tracking_nothing
     stub_tracking_nothing
     assert_command "browse mojombo/bert", "open https://github.com/mojombo/bert"
@@ -678,7 +977,7 @@ config
 
   def test_hub_browse_on_branch
     stub_branch('refs/heads/feature')
-    stub_tracking('feature', 'mislav', 'refs/heads/experimental')
+    stub_tracking('feature', 'mislav', 'experimental')
 
     assert_command "browse resque", "open https://github.com/tpw/resque"
     assert_command "browse resque commits",
@@ -697,6 +996,10 @@ config
     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
+
   def test_hub_browse_no_tracking
     stub_tracking_nothing
     assert_command "browse", "open https://github.com/defunkt/hub"
@@ -704,7 +1007,7 @@ config
 
   def test_hub_browse_no_tracking_on_branch
     stub_branch('refs/heads/feature')
-    stub_tracking('feature', nil, nil)
+    stub_tracking_nothing('feature')
     assert_command "browse", "open https://github.com/defunkt/hub"
   end
 
@@ -786,63 +1089,62 @@ config
   def test_global_flags_preserved
     cmd = '--no-pager --bare -c core.awesome=true -c name=value --git-dir=/srv/www perform'
     assert_command cmd, 'git --bare -c core.awesome=true -c name=value --git-dir=/srv/www --no-pager perform'
-    assert_equal %w[git --bare -c core.awesome=true -c name=value --git-dir=/srv/www], @git.executable
+    assert_equal %w[git --bare -c core.awesome=true -c name=value --git-dir=/srv/www], git_reader.executable
   end
 
   protected
 
     def stub_github_user(name)
-      @git['config github.user'] = name
+      stub_config_value 'github.user', name
     end
 
     def stub_github_token(token)
-      @git['config github.token'] = token
+      stub_config_value 'github.token', token
     end
 
-    def stub_repo_url(value)
-      @git['config --get-all remote.origin.url'] = value
-      Hub::Context::REMOTES.clear
+    def stub_repo_url(value, remote_name = 'origin')
+      stub_config_value "remote.#{remote_name}.url", value, '--get-all'
     end
 
     def stub_branch(value)
-      @git['symbolic-ref -q HEAD'] = value
+      stub_command_output 'symbolic-ref -q HEAD', value
     end
 
     def stub_tracking(from, remote_name, remote_branch)
-      @git["config branch.#{from}.remote"] = remote_name
-      @git["config branch.#{from}.merge"] = remote_branch
+      stub_command_output "rev-parse --symbolic-full-name #{from}@{upstream}",
+        remote_branch ? "refs/remotes/#{remote_name}/#{remote_branch}" : nil
     end
 
-    def stub_tracking_nothing
-      stub_tracking('master', nil, nil)
+    def stub_tracking_nothing(from = 'master')
+      stub_tracking(from, nil, nil)
     end
 
     def stub_remotes_group(name, value)
-      @git["config remotes.#{name}"] = value
+      stub_config_value "remotes.#{name}", value
     end
 
     def stub_no_remotes
-      @git['remote'] = ''
+      stub_command_output 'remote', nil
     end
 
     def stub_no_git_repo
-      @git.replace({})
+      stub_command_output 'rev-parse -q --git-dir', nil
     end
 
     def stub_alias(name, value)
-      @git["config alias.#{name}"] = value
+      stub_config_value "alias.#{name}", value
     end
 
-    def stub_existing_fork(user)
-      stub_fork(user, 200)
+    def stub_existing_fork(user, repo = 'hub')
+      stub_fork(user, repo, 200)
     end
 
-    def stub_nonexisting_fork(user)
-      stub_fork(user, 404)
+    def stub_nonexisting_fork(user, repo = 'hub')
+      stub_fork(user, repo, 404)
     end
 
-    def stub_fork(user, status)
-      stub_request(:get, "github.com/api/v2/yaml/repos/show/#{user}/hub").
+    def stub_fork(user, repo, status)
+      stub_request(:get, "github.com/api/v2/yaml/repos/show/#{user}/#{repo}").
         to_return(:status => status)
     end
 
@@ -850,6 +1152,10 @@ config
       COMMANDS.replace names
     end
 
+    def stub_https_is_preferred
+      stub_config_value 'hub.protocol', 'https'
+    end
+
     def with_browser_env(value)
       browser, ENV['BROWSER'] = ENV['BROWSER'], value
       yield
@@ -878,4 +1184,22 @@ config
       end
     end
 
+    def auth(user = git_config('github.user'), password = git_config('github.token'))
+      "#{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}"
+      })
+    end
+
+    def mock_pull_response(label)
+      JSON.generate('pull' => { 'head' => {'label' => label} })
+    end
+
+    def improved_help_text
+      Hub::Commands.send :improved_help_text
+    end
+
 end