hub 1.8.4 → 1.9.0

data/lib/hub/standalone.rb

@@ -2,57 +2,58 @@ module Hub
   module Standalone
     extend self
 
-    RUBY_BIN = if File.executable? '/usr/bin/ruby' then '/usr/bin/ruby'
-               else
-                 require 'rbconfig'
-                 File.join RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']
-               end
+    HUB_ROOT = File.expand_path('../../..', __FILE__)
 
     PREAMBLE = <<-preamble
-#!#{RUBY_BIN}
 #
-# This file, hub, is generated code.
-# Please DO NOT EDIT or send patches for it.
+# This file is generated code. DO NOT send patches for it.
 #
-# Please take a look at the source from
+# Original source files with comments are at:
 # https://github.com/defunkt/hub
-# and submit patches against the individual files
-# that build hub.
 #
 
 preamble
 
-    POSTAMBLE = "Hub::Runner.execute(*ARGV)\n"
-    __DIR__   = File.dirname(__FILE__)
-    MANPAGE   = "__END__\n#{File.read(__DIR__ + '/../../man/hub.1')}"
-
     def save(filename, path = '.')
       target = File.join(File.expand_path(path), filename)
       File.open(target, 'w') do |f|
-        f.puts build
+        build f
         f.chmod 0755
       end
     end
 
-    def build
-      root = File.dirname(__FILE__)
+    def build io
+      io.puts "#!#{ruby_executable}"
+      io << PREAMBLE
 
-      standalone = ''
-      standalone << PREAMBLE
+      each_source_file do |filename|
+        File.open(filename, 'r') do |source|
+          source.each_line {|line| io << line if line !~ /^\s*#/ }
+        end
+        io.puts ''
+      end
 
-      files = Dir["#{root}/*.rb"].sort - [__FILE__]
-      # ensure context.rb appears before others
-      ctx = files.find {|f| f['context.rb'] } and files.unshift(files.delete(ctx))
+      io.puts "Hub::Runner.execute(*ARGV)"
+      io.puts "\n__END__"
+      io << File.read(File.join(HUB_ROOT, 'man/hub.1'))
+    end
 
-      files.each do |file|
-        File.readlines(file).each do |line|
-          standalone << line if line !~ /^\s*#/
+    def each_source_file
+      File.open(File.join(HUB_ROOT, 'lib/hub.rb'), 'r') do |main|
+        main.each_line do |req|
+          if req =~ /^require\s+["'](.+)["']/
+            yield File.join(HUB_ROOT, 'lib', "#{$1}.rb")
+          end
         end
       end
+    end
 
-      standalone << POSTAMBLE
-      standalone << MANPAGE
-      standalone
+    def ruby_executable
+      if File.executable? '/usr/bin/ruby' then '/usr/bin/ruby'
+      else
+        require 'rbconfig'
+        File.join RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']
+      end
     end
   end
 end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.8.4'
+  Version = VERSION = '1.9.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" "March 2012" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "April 2012" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -132,7 +132,7 @@ Open a GitHub compare view page in the system\'s default web browser\. \fISTART\
 .
 .TP
 \fBgit fork\fR [\fB\-\-no\-remote\fR]
-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)\.
+Forks the original project (referenced by "origin" remote) on GitHub and adds a new remote for it under your username\.
 .
 .TP
 \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]
@@ -145,37 +145,7 @@ If \fITITLE\fR is omitted, a text editor will open in which title and body of th
 If instead of normal \fITITLE\fR an issue number is given with \fB\-i\fR, the pull request will be attached to an existing GitHub issue\. Alternatively, instead of title you can paste a full URL to an issue on GitHub\.
 .
 .SH "CONFIGURATION"
-Use git\-config(1) to display the currently configured GitHub username:
-.
-.IP "" 4
-.
-.nf
-
-$ git config \-\-global github\.user
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Or, set the GitHub username and token with:
-.
-.IP "" 4
-.
-.nf
-
-$ git config \-\-global github\.user <username>
-$ git config \-\-global github\.token <token>
-.
-.fi
-.
-.IP "" 0
-.
-.P
-You can override these values with \fIGITHUB_USER\fR and \fIGITHUB_TOKEN\fR environment variables\.
-.
-.P
-See \fIhttp://help\.github\.com/set\-your\-user\-name\-email\-and\-github\-token/\fR for more information\.
+Hub will prompt for GitHub username & password the first time it needs to access the API and exchange it for an OAuth token, which it saves in "~/\.config/hub"\.
 .
 .P
 If you prefer the HTTPS protocol for GitHub repositories, you can set "hub\.protocol" to "https"\. This will affect \fBclone\fR, \fBfork\fR, \fBremote add\fR and other operations that expand references to GitHub repositories as full URLs that otherwise use git and ssh protocols\.
@@ -204,20 +174,6 @@ $ git config \-\-global \-\-add hub\.host my\.git\.org
 .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

data/man/hub.1.html

@@ -173,8 +173,7 @@ the range of history to compare. If a range with two dots (<code>a..b</code>) is
 it will be transformed into one with three dots. If <var>START</var> is omitted,
 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>
+adds a new remote for it under your username.</p></dd>
 <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
@@ -194,22 +193,8 @@ of title you can paste a full URL to an issue on GitHub.</p></dd>
 
 <h2 id="CONFIGURATION">CONFIGURATION</h2>
 
-<p>Use <span class="man-ref">git-config<span class="s">(1)</span></span> to display the currently configured GitHub username:</p>
-
-<pre><code>$ git config --global github.user
-</code></pre>
-
-<p>Or, set the GitHub username and token with:</p>
-
-<pre><code>$ git config --global github.user &lt;username>
-$ git config --global github.token &lt;token>
-</code></pre>
-
-<p>You can override these values with <var>GITHUB_USER</var> and <var>GITHUB_TOKEN</var>
-environment variables.</p>
-
-<p>See <a href="http://help.github.com/set-your-user-name-email-and-github-token/" data-bare-link="true">http://help.github.com/set-your-user-name-email-and-github-token/</a> for more
-information.</p>
+<p>Hub will prompt for GitHub username &amp; password the first time it needs to access
+the API and exchange it for an OAuth token, which it saves in "~/.config/hub".</p>
 
 <p>If you prefer the HTTPS protocol for GitHub repositories, you can set
 "hub.protocol" to "https". This will affect <code>clone</code>, <code>fork</code>, <code>remote add</code>
@@ -228,12 +213,6 @@ 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>
@@ -448,7 +427,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>March 2012</li>
+    <li class='tc'>April 2012</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/man/hub.1.ronn

@@ -128,8 +128,7 @@ hub also adds some custom commands that are otherwise not present in git:
 
   * `git fork` [`--no-remote`]:
     Forks the original project (referenced by "origin" remote) on GitHub and
-    adds a new remote for it under your username. Requires `github.token` to
-    be set (see CONFIGURATION).
+    adds a new remote for it under your username.
 
   * `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
@@ -149,20 +148,8 @@ hub also adds some custom commands that are otherwise not present in git:
 
 ## CONFIGURATION
 
-Use git-config(1) to display the currently configured GitHub username:
-
-    $ git config --global github.user
-
-Or, set the GitHub username and token with:
-
-    $ git config --global github.user <username>
-    $ git config --global github.token <token>
-
-You can override these values with <GITHUB_USER> and <GITHUB_TOKEN>
-environment variables.
-
-See <http://help.github.com/set-your-user-name-email-and-github-token/> for more
-information.
+Hub will prompt for GitHub username & password the first time it needs to access
+the API and exchange it for an OAuth token, which it saves in "~/.config/hub".
 
 If you prefer the HTTPS protocol for GitHub repositories, you can set
 "hub.protocol" to "https". This will affect `clone`, `fork`, `remote add`
@@ -179,11 +166,6 @@ 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:

data/test/helper.rb

@@ -1,6 +1,5 @@
 require 'test/unit'
 require 'hub'
-require 'hub/standalone'
 
 # We're checking for `open` in our tests
 ENV['BROWSER'] = 'open'
@@ -9,6 +8,9 @@ ENV['BROWSER'] = 'open'
 fakebin_dir = File.expand_path('../fakebin', __FILE__)
 ENV['PATH'] = "#{fakebin_dir}:#{ENV['PATH']}"
 
+# Use an isolated config file in testing
+ENV['HUB_CONFIG'] = File.join(ENV['TMPDIR'] || '/tmp', 'hub-test-config')
+
 class Test::Unit::TestCase
   # Shortcut for creating a `Hub` instance. Pass it what you would
   # normally pass `hub` on the command line, e.g.
@@ -98,4 +100,15 @@ class Test::Unit::TestCase
     assert expected == output,
       "expected:\n#{expected}\ngot:\n#{output}"
   end
+
+  def edit_hub_config
+    config = ENV['HUB_CONFIG']
+    if File.exist? config
+      data = YAML.load File.read(config)
+    else
+      data = {}
+    end
+    yield data
+    File.open(config, 'w') { |cfg| cfg << YAML.dump(data) }
+  end
 end

data/test/hub_test.rb

@@ -3,6 +3,7 @@ require 'webmock/test_unit'
 require 'rbconfig'
 require 'yaml'
 require 'forwardable'
+require 'fileutils'
 
 WebMock::BodyPattern.class_eval do
   undef normalize_hash
@@ -21,7 +22,7 @@ class HubTest < Test::Unit::TestCase
 
   COMMANDS = []
 
-  Hub::Context.class_eval do
+  Hub::Context::System.class_eval do
     remove_method :which
     define_method :which do |name|
       COMMANDS.include?(name) ? "/usr/bin/#{name}" : nil
@@ -36,7 +37,22 @@ class HubTest < Test::Unit::TestCase
     super
     COMMANDS.replace %w[open groff]
     Hub::Context::PWD.replace '/path/to/hub'
-    Hub::Context::SshConfig::CONFIG_FILES.replace []
+    Hub::SshConfig::CONFIG_FILES.replace []
+
+    @prompt_stubs = prompt_stubs = []
+    @password_prompt_stubs = password_prompt_stubs = []
+
+    Hub::GitHubAPI::Configuration.class_eval do
+      undef prompt
+      undef prompt_password
+
+      define_method :prompt do |what|
+        prompt_stubs.shift.call(what)
+      end
+      define_method :prompt_password do |host, user|
+        password_prompt_stubs.shift.call(host, user)
+      end
+    end
 
     @git_reader = Hub::Context::GitReader.new 'git' do |cache, cmd|
       unless cmd.index('config --get alias.') == 0
@@ -46,12 +62,17 @@ class HubTest < Test::Unit::TestCase
 
     Hub::Commands.instance_variable_set :@git_reader, @git_reader
     Hub::Commands.instance_variable_set :@local_repo, nil
+    Hub::Commands.instance_variable_set :@api_client, nil
+
+    FileUtils.rm_rf ENV['HUB_CONFIG']
+
+    edit_hub_config do |data|
+      data['github.com'] = [{'user' => 'tpw', 'oauth_token' => 'OTOKEN'}]
+    end
 
     @git_reader.stub! \
       'remote' => "mislav\norigin",
       'symbolic-ref -q HEAD' => 'refs/heads/master',
-      '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',
       'rev-parse --symbolic-full-name master@{upstream}' => 'refs/remotes/origin/master',
@@ -61,278 +82,6 @@ class HubTest < Test::Unit::TestCase
       '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"
-    assert_command input, command
-  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
-
-    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
-    stub_no_git_repo
-    out = hub("clone mustache") do
-      stub_github_user(nil)
-    end
-
-    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
-    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_unchanged_clone_from_existing_directory
-    stub_no_git_repo
-    assert_forwarded "clone test"
-  end
-
-  def test_local_clone_with_destination
-    stub_no_git_repo
-    assert_forwarded "clone -l . ../copy"
-  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"
-    command = "git clone --bare git://github.com/rtomayko/ronn.git"
-    assert_command input, command
-  end
-
-  def test_alias_expand_advanced
-    stub_alias 'c', 'clone --template="white space"'
-    input   = "c rtomayko/ronn"
-    command = "git clone '--template=white space' git://github.com/rtomayko/ronn.git"
-    assert_command input, command
-  end
-
-  def test_alias_doesnt_expand_for_unknown_commands
-    stub_alias 'c', 'compute --fast'
-    assert_forwarded "c rtomayko/ronn"
-  end
-
-  def test_remote_origin
-    input   = "remote add origin"
-    command = "git remote add origin git://github.com/tpw/hub.git"
-    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_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
-    assert_forwarded "remote add origin ./path"
-  end
-
-  def test_remote_from_abs_path
-    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_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
-    input   = "submodule add wycats/bundler vendor/bundler"
-    command = "git submodule add git://github.com/wycats/bundler.git vendor/bundler"
-    assert_command input, command
-  end
-
-  def test_private_submodule
-    input   = "submodule add -p grit vendor/grit"
-    command = "git submodule add git@github.com:tpw/grit.git vendor/grit"
-    assert_command input, command
-  end
-
-  def test_submodule_branch
-    input   = "submodule add -b ryppl ryppl/pip vendor/pip"
-    command = "git submodule add -b ryppl git://github.com/ryppl/pip.git vendor/pip"
-    assert_command input, command
-  end
-
-  def test_submodule_with_args
-    input   = "submodule -q add --bare -- grit grit"
-    command = "git submodule -q add --bare -- git://github.com/tpw/grit.git grit"
-    assert_command input, command
-  end
-
-  def test_private_remote
-    input   = "remote add -p rtomayko"
-    command = "git remote add rtomayko git@github.com:rtomayko/hub.git"
-    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"
-    assert_command input, command
-  end
-
-  def test_public_remote_f
-    input   = "remote add -f rtomayko"
-    command = "git remote add -f rtomayko git://github.com/rtomayko/hub.git"
-    assert_command input, command
-  end
-
-  def test_named_public_remote
-    input   = "remote add origin rtomayko"
-    command = "git remote add origin git://github.com/rtomayko/hub.git"
-    assert_command input, command
-  end
-
-  def test_named_public_remote_f
-    input   = "remote add -f origin rtomayko"
-    command = "git remote add -f origin git://github.com/rtomayko/hub.git"
-    assert_command input, command
-  end
-
-  def test_private_remote_with_repo
-    input   = "remote add -p jashkenas/coffee-script"
-    command = "git remote add jashkenas git@github.com:jashkenas/coffee-script.git"
-    assert_command input, command
-  end
-
-  def test_public_remote_with_repo
-    input   = "remote add jashkenas/coffee-script"
-    command = "git remote add jashkenas git://github.com/jashkenas/coffee-script.git"
-    assert_command input, command
-  end
-
-  def test_public_remote_f_with_repo
-    input   = "remote add -f jashkenas/coffee-script"
-    command = "git remote add -f jashkenas git://github.com/jashkenas/coffee-script.git"
-    assert_command input, command
-  end
-
-  def test_named_private_remote_with_repo
-    input   = "remote add -p origin jashkenas/coffee-script"
-    command = "git remote add origin git@github.com:jashkenas/coffee-script.git"
-    assert_command input, command
-  end
-
   def test_fetch_existing_remote
     assert_forwarded "fetch mislav"
   end
@@ -356,19 +105,6 @@ class HubTest < Test::Unit::TestCase
                     "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')
@@ -550,18 +286,13 @@ class HubTest < Test::Unit::TestCase
   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"
+    edit_hub_config do |data|
+      data['git.my.org'] = [{'user'=>'myfiname'}]
     end
-  end
 
-  def test_init_no_login
-    out = hub("init -g") do
-      stub_github_user(nil)
+    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
-
-    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
@@ -589,8 +320,8 @@ class HubTest < Test::Unit::TestCase
   def test_create
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
-      with(:body => { 'name' => 'hub' })
+    stub_request(:post, "https://api.github.com/user/repos").
+      with(:body => { 'name' => 'hub', 'private' => false })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
     expected << "created repository: tpw/hub\n"
@@ -600,8 +331,8 @@ class HubTest < Test::Unit::TestCase
   def test_create_custom_name
     stub_no_remotes
     stub_nonexisting_fork('tpw', 'hubbub')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
-      with(:body => { 'name' => 'hubbub' })
+    stub_request(:post, "https://api.github.com/user/repos").
+      with(:body => { 'name' => 'hubbub', 'private' => false })
 
     expected = "remote add -f origin git@github.com:tpw/hubbub.git\n"
     expected << "created repository: tpw/hubbub\n"
@@ -611,72 +342,29 @@ class HubTest < Test::Unit::TestCase
   def test_create_in_organization
     stub_no_remotes
     stub_nonexisting_fork('acme', 'hubbub')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
-      with(:body => { 'name' => 'acme/hubbub' })
+    stub_request(:post, "https://api.github.com/orgs/acme/repos").
+      with(:body => { 'name' => 'hubbub', 'private' => false })
 
     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(: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/json/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, "https://#{auth}github.com/api/v2/json/repos/create").
+    stub_request(:post, "https://api.github.com/user/repos").
       to_return(:status => [401, "Your token is fail"])
 
     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
 
-  def test_create_with_env_authentication
-    stub_no_remotes
-    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/json/repos/create").
-      with(:body => { 'name' => 'hub' })
-
-    expected = "remote add -f origin git@github.com:mojombo/hub.git\n"
-    expected << "created repository: mojombo/hub\n"
-    assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
-
-  ensure
-    ENV['GITHUB_USER']  = old_user
-    ENV['GITHUB_TOKEN'] = old_token
-  end
-
   def test_create_private_repository
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
-      with(:body => { 'name' => 'hub', 'public' => '0' })
+    stub_request(:post, "https://api.github.com/user/repos").
+      with(:body => { 'name' => 'hub', 'private' => true })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
     expected << "created repository: tpw/hub\n"
@@ -686,10 +374,10 @@ class HubTest < Test::Unit::TestCase
   def test_create_private_repository_fails
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
+    stub_request(:post, "https://api.github.com/user/repos").
       to_return(:status => [422, "Unprocessable Entity"],
                 :headers => {"Content-type" => "application/json"},
-                :body => %({"error":"repository creation failed: You are over your quota."}))
+                :body => %({"message":"repository creation failed: You are over your quota."}))
 
     expected = "Error creating repository: Unprocessable Entity (HTTP 422)\n"
     expected << "repository creation failed: You are over your quota.\n"
@@ -699,8 +387,9 @@ class HubTest < Test::Unit::TestCase
   def test_create_with_description_and_homepage
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").with(:body => {
-      'name' => 'hub', 'description' => 'toyproject', 'homepage' => 'http://example.com'
+    stub_request(:post, "https://api.github.com/user/repos").with(:body => {
+      'name' => 'hub', 'private' => false,
+      'description' => 'toyproject', 'homepage' => 'http://example.com'
     })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
@@ -734,14 +423,6 @@ class HubTest < Test::Unit::TestCase
     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/set-your-user-name-email-and-github-token/\n", out
-  end
-
   def test_create_outside_git_repo
     stub_no_git_repo
     assert_equal "'create' must be run from inside a git repository\n", hub("create")
@@ -749,8 +430,8 @@ class HubTest < Test::Unit::TestCase
 
   def test_create_origin_already_exists
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
-      with(:body => { 'name' => 'hub' })
+    stub_request(:post, "https://api.github.com/user/repos").
+      with(:body => { 'name' => 'hub', 'private' => false })
 
     expected = "remote -v\ncreated repository: tpw/hub\n"
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
@@ -758,7 +439,7 @@ 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://api.github.com/repos/defunkt/hub/forks").
       with { |req| req.headers['Content-Length'] == 0 }
 
     expected = "remote add -f tpw git@github.com:tpw/hub.git\n"
@@ -769,7 +450,7 @@ class HubTest < Test::Unit::TestCase
   def test_fork_https_protocol
     stub_https_is_preferred
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub")
+    stub_request(:post, "https://api.github.com/repos/defunkt/hub/forks")
 
     expected = "remote add -f tpw https://github.com/tpw/hub.git\n"
     expected << "new remote: tpw\n"
@@ -785,12 +466,14 @@ class HubTest < Test::Unit::TestCase
   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')
+    edit_hub_config do |data|
+      data['git.my.org'] = [{'user'=>'myfiname', 'oauth_token' => 'FITOKEN'}]
+    end
 
-    stub_request(:get, "https://#{auth('myfiname', '789xyz')}git.my.org/api/v2/yaml/repos/show/myfiname/hub").
+    stub_request(:get, "https://git.my.org/repos/myfiname/hub").
       to_return(:status => 404)
-    stub_request(:post, "https://#{auth('myfiname', '789xyz')}git.my.org/api/v2/yaml/repos/fork/defunkt/hub")
+    stub_request(:post, "https://git.my.org/repos/defunkt/hub/forks").
+      with(:headers => {"Authorization" => "token FITOKEN"})
 
     expected = "remote add -f myfiname git@git.my.org:myfiname/hub.git\n"
     expected << "new remote: myfiname\n"
@@ -799,7 +482,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_fork_failed
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub").
+    stub_request(:post, "https://api.github.com/repos/defunkt/hub/forks").
       to_return(:status => [500, "Your fork is fail"])
 
     expected = "Error creating fork: Your fork is fail (HTTP 500)\n"
@@ -808,7 +491,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_fork_no_remote
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/fork/defunkt/hub")
+    stub_request(:post, "https://api.github.com/repos/defunkt/hub/forks")
 
     assert_equal "", hub("fork --no-remote") { ENV['GIT'] = 'echo' }
   end
@@ -839,9 +522,9 @@ class HubTest < Test::Unit::TestCase
     stub_branch('refs/heads/feature')
     stub_tracking_nothing('feature')
 
-    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
+    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"
@@ -852,8 +535,8 @@ class HubTest < Test::Unit::TestCase
     stub_branch('refs/heads/feature')
     stub_tracking('feature', 'mislav', 'yay-feature')
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:yay-feature", 'title' => "hereyougo"} }).
+    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"
@@ -864,8 +547,8 @@ class HubTest < Test::Unit::TestCase
     stub_branch('refs/heads/feature')
     stub_tracking('feature', 'refs/heads/master')
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo"} }).
+    stub_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
+      with(:body => {'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo" }).
       to_return(:body => mock_pullreq_response(1))
 
     expected = "https://github.com/defunkt/hub/pull/1\n"
@@ -884,14 +567,15 @@ class HubTest < Test::Unit::TestCase
   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-pick --right-only --no-merges origin/feature...", nil
+    edit_hub_config do |data|
+      data['git.my.org'] = [{'user'=>'myfiname', 'oauth_token' => 'FITOKEN'}]
+    end
 
-    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"} }).
+    stub_request(:post, "https://git.my.org/repos/defunkt/hub/pulls").
+      with(:body => {'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"
@@ -899,8 +583,8 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_head
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:yay-feature", 'title' => "hereyougo"} }).
+    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"
@@ -908,8 +592,8 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_head_with_owner
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "mojombo:feature", 'title' => "hereyougo"} }).
+    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"
@@ -917,8 +601,8 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_base
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "feature", 'head' => "defunkt:master", 'title' => "hereyougo"} }).
+    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"
@@ -926,20 +610,20 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_explicit_base_with_owner
-    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))
+    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/defunkt/hub/pull/1\n"
+    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://#{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))
+    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/defunkt/hub/pull/1\n"
+    expected = "https://github.com/mojombo/hubbub/pull/1\n"
     assert_output expected, "pull-request hereyougo -b mojombo/hubbub:feature -f"
   end
 
@@ -948,8 +632,8 @@ class HubTest < Test::Unit::TestCase
     stub_tracking('myfix', 'mislav', 'awesomefix')
     stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/awesomefix...", nil
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
+    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"
@@ -961,8 +645,8 @@ class HubTest < Test::Unit::TestCase
     stub_tracking('myfix', 'mislav', 'awesomefix')
     stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/awesomefix...", nil
 
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/mojombo/hub").
-      with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
+    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"
@@ -970,10 +654,10 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_pullrequest_fails
-    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
+    stub_request(:post, "https://api.github.com/repos/defunkt/hub/pulls").
       to_return(:status => [422, "Unprocessable Entity"],
                 :headers => {"Content-type" => "application/json"},
-                :body => %({"error":["oh no!", "it failed."]}))
+                :body => %({"message":["oh no!\\nit failed."]}))
 
     expected = "Error creating pull request: Unprocessable Entity (HTTP 422)\n"
     expected << "oh no!\nit failed.\n"
@@ -985,7 +669,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_checkout_pullrequest
-    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
+    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',
@@ -994,7 +678,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_checkout_private_pullrequest
-    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
+    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',
@@ -1003,7 +687,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_checkout_pullrequest_custom_branch
-    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
+    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',
@@ -1014,7 +698,7 @@ class HubTest < Test::Unit::TestCase
   def test_checkout_pullrequest_existing_remote
     stub_command_output 'remote', "origin\nblueyed"
 
-    stub_request(:get, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub/73").
+    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',
@@ -1059,9 +743,7 @@ class HubTest < Test::Unit::TestCase
   def test_help_hub
     help_manpage = hub("help hub")
     assert_includes "git + hub = github", help_manpage
-    assert_includes <<-config, help_manpage
-Use git-config(1) to display the currently configured GitHub username:
-config
+    assert_includes "Hub will prompt for GitHub username & password", help_manpage
   end
 
   def test_help_flag_on_command
@@ -1086,8 +768,7 @@ config
   end
 
   def test_hub_standalone
-    help_standalone = hub("hub standalone")
-    assert_equal Hub::Standalone.build, help_standalone
+    assert_includes 'This file is generated code', hub("hub standalone")
   end
 
   def test_hub_compare
@@ -1324,16 +1005,6 @@ config
 
   private
 
-    def stub_github_user(name, host = '')
-      host = %(."#{host}") unless host.empty?
-      stub_config_value "github#{host}.user", name
-    end
-
-    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')
       stub_config_value "remote.#{remote_name}.url", value, '--get-all'
     end
@@ -1376,7 +1047,7 @@ config
     end
 
     def stub_fork(user, repo, status)
-      stub_request(:get, "https://#{auth}github.com/api/v2/yaml/repos/show/#{user}/#{repo}").
+      stub_request(:get, "https://api.github.com/repos/#{user}/#{repo}").
         to_return(:status => status)
     end
 
@@ -1427,16 +1098,15 @@ 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', host = 'github.com')
-      %({"pull": { "html_url": "https://#{host}/#{name_with_owner}/pull/#{id}" }})
+      Hub::JSON.generate :html_url => "https://#{host}/#{name_with_owner}/pull/#{id}"
     end
 
     def mock_pull_response(label, priv = false)
-      %({"pull": { "head": { "label": "#{label}", "repository": {"private":#{!!priv}} }}})
+      Hub::JSON.generate :head => {
+        :label => label,
+        :repo => {:private => !!priv}
+      }
     end
 
     def improved_help_text
@@ -1445,7 +1115,7 @@ config
 
     def with_ssh_config
       config_file = File.expand_path '../ssh_config', __FILE__
-      Hub::Context::SshConfig::CONFIG_FILES.replace [config_file]
+      Hub::SshConfig::CONFIG_FILES.replace [config_file]
       yield
     end