hub 1.10.6 → 1.11.0

data/test/hub_test.rb

@@ -1,5 +1,5 @@
 require 'helper'
-require 'webmock/test_unit'
+require 'webmock/minitest'
 require 'rbconfig'
 require 'yaml'
 require 'forwardable'
@@ -19,7 +19,7 @@ WebMock::BodyPattern.class_eval do
   end
 end
 
-class HubTest < Test::Unit::TestCase
+class HubTest < Minitest::Test
   extend Forwardable
 
   if defined? WebMock::API
@@ -83,10 +83,19 @@ class HubTest < Test::Unit::TestCase
       'symbolic-ref -q HEAD' => 'refs/heads/master',
       'remote -v' => "origin\tgit://github.com/defunkt/hub.git (fetch)\nmislav\tgit://github.com/mislav/hub.git (fetch)",
       'rev-parse --symbolic-full-name master@{upstream}' => 'refs/remotes/origin/master',
+      'rev-parse --symbolic-full-name origin' => 'refs/remotes/origin/master',
       'config --get --bool hub.http-clone' => 'false',
       'config --get hub.protocol' => nil,
       'config --get-all hub.host' => nil,
+      'config --get push.default' => nil,
       'rev-parse -q --git-dir' => '.git'
+
+    stub_remote_branch('origin/master')
+  end
+
+  def teardown
+    super
+    WebMock.reset!
   end
 
   def test_cherry_pick
@@ -139,17 +148,23 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_am_pull_request
+    stub_request(:get, "https://api.github.com/repos/defunkt/hub/pulls/55").
+      with(:headers => {'Accept'=>'application/vnd.github.v3.patch', 'Authorization'=>'token OTOKEN'}).
+      to_return(:status => 200)
+
     with_tmpdir('/tmp/') do
-      assert_commands "curl -#LA 'hub #{Hub::Version}' https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch",
-                      "git am --signoff /tmp/55.patch -p2",
+      assert_commands "git am --signoff /tmp/55.patch -p2",
                       "am --signoff https://github.com/defunkt/hub/pull/55#comment_123 -p2"
 
       cmd = Hub("am https://github.com/defunkt/hub/pull/55/files").command
-      assert_includes '/pull/55.patch', cmd
+      assert_includes '/tmp/55.patch', cmd
     end
   end
 
   def test_am_no_tmpdir
+    stub_request(:get, "https://api.github.com/repos/defunkt/hub/pulls/55").
+      to_return(:status => 200)
+
     with_tmpdir(nil) do
       cmd = Hub("am https://github.com/defunkt/hub/pull/55").command
       assert_includes '/tmp/55.patch', cmd
@@ -157,21 +172,34 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_am_commit_url
+    stub_request(:get, "https://api.github.com/repos/davidbalbert/hub/commits/fdb9921").
+      with(:headers => {'Accept'=>'application/vnd.github.v3.patch', 'Authorization'=>'token OTOKEN'}).
+      to_return(:status => 200)
+
     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 am --signoff /tmp/fdb9921.patch -p2",
+      assert_commands "git am --signoff /tmp/fdb9921.patch -p2",
                       "am --signoff #{url} -p2"
     end
   end
 
   def test_am_gist
+    stub_request(:get, "https://api.github.com/gists/8da7fb575debd88c54cf").
+      with(:headers => {'Authorization'=>'token OTOKEN'}).
+      to_return(:body => Hub::JSON.generate(:files => {
+        'file.diff' => {
+          :raw_url => "https://gist.github.com/raw/8da7fb575debd88c54cf/SHA/file.diff"
+        }
+      }))
+
+    stub_request(:get, "https://gist.github.com/raw/8da7fb575debd88c54cf/SHA/file.diff").
+      with(:headers => {'Accept'=>'text/plain'}).
+      to_return(:status => 200)
+
     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 am --signoff /tmp/gist-8da7fb575debd88c54cf.txt -p2",
+      assert_commands "git am --signoff /tmp/gist-8da7fb575debd88c54cf.txt -p2",
                       "am --signoff #{url} -p2"
     end
   end
@@ -181,32 +209,46 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_apply_pull_request
+    stub_request(:get, "https://api.github.com/repos/defunkt/hub/pulls/55").
+      to_return(:status => 200)
+
     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",
+      assert_commands "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
+      assert_includes '/tmp/55.patch', cmd
     end
   end
 
   def test_apply_commit_url
+    stub_request(:get, "https://api.github.com/repos/davidbalbert/hub/commits/fdb9921").
+      to_return(:status => 200)
+
     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",
+      assert_commands "git apply /tmp/fdb9921.patch -p2",
                       "apply #{url} -p2"
     end
   end
 
   def test_apply_gist
+    stub_request(:get, "https://api.github.com/gists/8da7fb575debd88c54cf").
+      with(:headers => {'Authorization'=>'token OTOKEN'}).
+      to_return(:body => Hub::JSON.generate(:files => {
+        'file.diff' => {
+          :raw_url => "https://gist.github.com/raw/8da7fb575debd88c54cf/SHA/file.diff"
+        }
+      }))
+
+    stub_request(:get, "https://gist.github.com/raw/8da7fb575debd88c54cf/SHA/file.diff").
+      to_return(:status => 200)
+
     with_tmpdir('/tmp/') do
-      url = 'https://gist.github.com/8da7fb575debd88c54cf'
+      url = 'https://gist.github.com/mislav/8da7fb575debd88c54cf'
 
-      assert_commands "curl -#LA 'hub #{Hub::Version}' #{url}.txt -o /tmp/gist-8da7fb575debd88c54cf.txt",
-                      "git apply /tmp/gist-8da7fb575debd88c54cf.txt -p2",
+      assert_commands "git apply /tmp/gist-8da7fb575debd88c54cf.txt -p2",
                       "apply #{url} -p2"
     end
   end
@@ -257,71 +299,24 @@ class HubTest < Test::Unit::TestCase
                     "push origin,staging master new-feature"
   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-pick --right-only --no-merges 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://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => { 'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo" }) { |req|
-        req.headers['Content-Length'] == 63
-      }.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_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => {'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_from_branch_tracking_local
+    stub_config_value 'push.default', 'upstream'
     stub_branch('refs/heads/feature')
     stub_tracking('feature', 'refs/heads/master')
 
     stub_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => {'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo" }).
+      with(:body => {'base' => "master", 'head' => "defunkt: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_invalid_remote
-    stub_repo_url('gh:singingwolfboy/sekrit.git')
-    stub_branch('refs/heads/feature')
-    stub_tracking('feature', 'origin', 'feature')
-
-    expected = "Aborted: the origin remote doesn't point to a GitHub repository.\n"
-    assert_output expected, "pull-request hereyougo"
+    assert_output expected, "pull-request -m 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_branch('refs/heads/feature')
+    stub_remote_branch('origin/feature')
     stub_tracking_nothing('feature')
     stub_command_output "rev-list --cherry-pick --right-only --no-merges origin/feature...", nil
     edit_hub_config do |data|
@@ -329,136 +324,16 @@ class HubTest < Test::Unit::TestCase
     end
 
     stub_request(:post, "https://git.my.org/api/v3/repos/defunkt/hub/pulls").
-      with(:body => {'base' => "master", 'head' => "myfiname:feature", 'title' => "hereyougo" }).
+      with(:body => {'base' => "master", 'head' => "defunkt:feature", 'title' => "hereyougo" }).
       to_return(:body => mock_pullreq_response(1, 'api/v3/defunkt/hub', 'git.my.org'))
 
     expected = "https://git.my.org/api/v3/defunkt/hub/pull/1\n"
-    assert_output expected, "pull-request hereyougo -f"
+    assert_output expected, "pull-request -m hereyougo -f"
   end
 
-  def test_pullrequest_explicit_head
-    stub_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => {'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://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => {'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://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => {'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://api.github.com/repos/mojombo/hub/pulls").
-      with(:body => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo" }).
-      to_return(:body => mock_pullreq_response(1, 'mojombo/hub'))
-
-    expected = "https://github.com/mojombo/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://api.github.com/repos/mojombo/hubbub/pulls").
-      with(:body => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo" }).
-      to_return(:body => mock_pullreq_response(1, 'mojombo/hubbub'))
-
-    expected = "https://github.com/mojombo/hubbub/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-pick --right-only --no-merges mislav/awesomefix...", nil
-
-    stub_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
-      with(:body => {'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-pick --right-only --no-merges mislav/awesomefix...", nil
-
-    stub_request(:post, "https://api.github.com/repos/mojombo/hub/pulls").
-      with(:body => {'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_pullrequest_fails
-    stub_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
-      to_return(:status => [422, "Unprocessable Entity"],
-                :headers => {"Content-type" => "application/json"},
-                :body => %({"message":["oh no!\\nit 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, "https://api.github.com/repos/defunkt/hub/pulls/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 -f --track -B blueyed-feature blueyed/feature -q',
-      "checkout -f https://github.com/defunkt/hub/pull/73/files -q"
-  end
-
-  def test_checkout_private_pullrequest
-    stub_request(:get, "https://api.github.com/repos/defunkt/hub/pulls/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 --track -B blueyed-feature blueyed/feature',
-      "checkout https://github.com/defunkt/hub/pull/73/files"
-  end
-
-  def test_checkout_pullrequest_custom_branch
-    stub_request(:get, "https://api.github.com/repos/defunkt/hub/pulls/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 --track -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, "https://api.github.com/repos/defunkt/hub/pulls/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 --track -B blueyed-feature blueyed/feature',
-      "checkout https://github.com/defunkt/hub/pull/73/files"
+  def test_pullrequest_alias
+    out = hub('e-note')
+    assert_equal hub('pull-request'), out
   end
 
   def test_version
@@ -495,24 +370,29 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_help_hub
-    help_manpage = hub("help hub")
+    help_manpage = strip_man_escapes hub("help hub")
     assert_includes "git + hub = github", help_manpage
     assert_includes "Hub will prompt for GitHub username & password", help_manpage.gsub(/ {2,}/, ' ')
   end
 
   def test_help_flag_on_command
-    help_manpage = hub("browse --help")
+    help_manpage = strip_man_escapes hub("browse --help")
     assert_includes "git + hub = github", help_manpage
     assert_includes "git browse", help_manpage
   end
 
+  def test_help_custom_command
+    help_manpage = strip_man_escapes hub("help fork")
+    assert_includes "git fork [--no-remote]", help_manpage
+  end
+
   def test_help_short_flag_on_command
     usage_help = hub("create -h")
     expected = "Usage: git create [NAME] [-p] [-d DESCRIPTION] [-h HOMEPAGE]\n"
     assert_equal expected, usage_help
 
     usage_help = hub("pull-request -h")
-    expected = "Usage: git pull-request [-f] [TITLE|-i ISSUE] [-b BASE] [-h HEAD]\n"
+    expected = "Usage: git pull-request [-f] [-m MESSAGE|-F FILE|-i ISSUE|ISSUE-URL] [-b BASE] [-h HEAD]\n"
     assert_equal expected, usage_help
   end
 
@@ -612,6 +492,10 @@ class HubTest < Test::Unit::TestCase
       stub_tracking(from, nil)
     end
 
+    def stub_remote_branch(branch, sha = 'abc123')
+      stub_command_output "rev-parse -q --verify refs/remotes/#{branch}", sha
+    end
+
     def stub_remotes_group(name, value)
       stub_config_value "remotes.#{name}", value
     end
@@ -716,4 +600,8 @@ class HubTest < Test::Unit::TestCase
       end
     end
 
+    def strip_man_escapes(manpage)
+      manpage.gsub(/_\010/, '').gsub(/\010./, '')
+    end
+
 end

data/test/standalone_test.rb

@@ -3,7 +3,7 @@ require 'hub/standalone'
 require 'fileutils'
 require 'stringio'
 
-class StandaloneTest < Test::Unit::TestCase
+class StandaloneTest < Minitest::Test
   include FileUtils
 
   def setup
@@ -36,7 +36,11 @@ class StandaloneTest < Test::Unit::TestCase
 
   def test_standalone_save
     Hub::Standalone.save("hub")
-    assert File.size('./hub') > 100
+    output = `RUBYOPT= RUBYLIB= ./hub version 2>&1`
+    assert_equal <<-OUT, output
+git version 1.7.0.4
+hub version #{Hub::VERSION}
+    OUT
   end
 
   def test_standalone_save_permission_denied

metadata

@@ -2,7 +2,7 @@
 name: hub
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.10.6
+  version: 1.11.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,40 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   name: rake
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   name: webmock
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: ! "  `hub` is a command line utility which adds GitHub knowledge to `git`.\n\n
   \ It can used on its own or as a `git` wrapper.\n\n  Normal:\n\n      $ hub clone
   rtomayko/tilt\n\n      Expands to:\n      $ git clone git://github.com/rtomayko/tilt.git\n\n
@@ -58,51 +58,58 @@ files:
 - README.md
 - Rakefile
 - LICENSE
-- HISTORY.md
 - lib/hub/args.rb
 - lib/hub/commands.rb
 - lib/hub/context.rb
 - lib/hub/github_api.rb
 - lib/hub/json.rb
 - lib/hub/runner.rb
+- lib/hub/speedy_stdlib.rb
 - lib/hub/ssh_config.rb
 - lib/hub/standalone.rb
 - lib/hub/version.rb
 - lib/hub.rb
+- bin/bench
 - bin/hub
 - man/hub.1
 - man/hub.1.html
 - man/hub.1.ronn
+- script/cached-bundle
+- script/s3-put
+- script/test
+- script/test_each
+- test/context_test.rb
 - test/deps.rip
 - test/fakebin/git
 - test/fakebin/open
+- test/github_api_test.rb
 - test/helper.rb
 - test/hub_test.rb
 - test/standalone_test.rb
-homepage: http://defunkt.io/hub/
+homepage: http://hub.github.com/
 licenses:
 - MIT
 post_install_message: ! "\n------------------------------------------------------------\n\n
   \                 You there! Wait, I say!\n                  =======================\n\n
   \      If you are a heavy user of `git` on the command\n       line  you  may  want
   \ to  install `hub` the old\n       fashioned way.  Faster  startup  time,  you
-  see.\n\n       Check  out  the  installation  instructions  at\n       https://github.com/defunkt/hub#readme
+  see.\n\n       Check  out  the  installation  instructions  at\n       https://github.com/github/hub#readme
   \ under the\n       \"Standalone\" section.\n\n       Cheers,\n       defunkt\n\n------------------------------------------------------------\n\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23