hub 1.9.0 → 1.10.0

data/HISTORY.md

@@ -1,3 +1,15 @@
+## master
+
+* fix GitHub username prompt in `create` command
+* make `fetch` command work with private repos too
+* add `merge` command to merge pull requests
+
+## 1.9.0 (2012-05-04)
+
+* internal refactoring and code reorganization
+* switch to GitHub API v3 and authenticate via OAuth
+* auth info is now stored in ~/.config/hub instead of ~/.gitconfig
+
 ## 1.8.4 (2012-03-20)
 
 * add bash, zsh completion

data/README.md

@@ -206,11 +206,17 @@ superpowers:
 
 ### git checkout
 
-    # $ git checkout https://github.com/defunkt/hub/pull/73
-    # > git remote add -f -t feature git://github:com/mislav/hub.git
-    # > git checkout --track -B mislav-feature mislav/feature
+    $ git checkout https://github.com/defunkt/hub/pull/73
+    > git remote add -f -t feature git://github:com/mislav/hub.git
+    > git checkout --track -B mislav-feature mislav/feature
 
-    # $ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name
+    $ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name
+
+### git merge
+
+    $ git merge https://github.com/defunkt/hub/pull/73
+    > git fetch git://github.com/mislav/hub.git +refs/heads/feature:refs/remotes/mislav/feature
+    > git merge mislav/feature --no-ff -m 'Merge pull request #73 from mislav/feature...'
 
 ### git create
 
@@ -307,7 +313,7 @@ Configuration
 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".
 
-### HTTPS insted of git protocol
+### HTTPS instead of git protocol
 
 If you prefer using the HTTPS protocol for GitHub repositories instead of the git
 protocol for read and ssh for write, you can set "hub.protocol" to "https".

data/lib/hub/commands.rb

@@ -55,7 +55,7 @@ module Hub
       respect_help_flags(expanded_args || args) if custom_command? cmd
 
       # git commands can have dashes
-      cmd = cmd.sub(/(\w)-/, '\1_')
+      cmd = cmd.gsub(/(\w)-/, '\1_')
       if method_defined?(cmd) and cmd != 'run'
         args.replace expanded_args if expanded_args
         send(cmd, args)
@@ -213,12 +213,10 @@ module Hub
           # $ hub clone rtomayko/tilt
           # $ hub clone tilt
           if arg =~ NAME_WITH_OWNER_RE and !File.directory?(arg)
-            # FIXME: this logic shouldn't be duplicated here!
             name, owner = arg, nil
             owner, name = name.split('/', 2) if name.index('/')
-            host = ENV['GITHUB_HOST'] || 'github.com'
-            project = Context::GithubProject.new(nil, owner || github_user(host), name, host)
-            ssh ||= args[0] != 'submodule' && project.owner == github_user(host) || host != 'github.com'
+            project = github_project(name, owner || github_user)
+            ssh ||= args[0] != 'submodule' && project.owner == github_user(project.host) { }
             args[idx] = project.git_url(:private => ssh, :https => https_protocol?)
           end
           break
@@ -321,7 +319,11 @@ module Hub
       projects = names.map { |name|
         unless name =~ /\W/ or remotes.include?(name) or remotes_group(name)
           project = github_project(nil, name)
-          project if api_client.repo_exists?(project)
+          repo_info = api_client.repo_info(project)
+          if repo_info.success?
+            project.repo_data = repo_info.data
+            project
+          end
         end
       }.compact
 
@@ -360,6 +362,31 @@ module Hub
       end
     end
 
+    # $ git merge https://github.com/defunkt/hub/pull/73
+    # > git fetch git://github.com/mislav/hub.git +refs/heads/feature:refs/remotes/mislav/feature
+    # > git merge mislav/feature --no-ff -m 'Merge pull request #73 from mislav/feature...'
+    def merge(args)
+      _, url_arg = args.words
+      if url = resolve_github_url(url_arg) and url.project_path =~ /^pull\/(\d+)/
+        pull_id = $1
+        pull_data = api_client.pullrequest_info(url.project, pull_id)
+
+        user, branch = pull_data['head']['label'].split(':', 2)
+        abort "Error: #{user}'s fork is not available anymore" unless pull_data['head']['repo']
+
+        url = github_project(url.project_name, user).git_url(:private => pull_data['head']['repo']['private'],
+                                                             :https => https_protocol?)
+
+        merge_head = "#{user}/#{branch}"
+        args.before ['fetch', url, "+refs/heads/#{branch}:refs/remotes/#{merge_head}"]
+
+        idx = args.index url_arg
+        args.delete_at idx
+        args.insert idx, merge_head, '--no-ff', '-m',
+                    "Merge pull request ##{pull_id} from #{merge_head}\n\n#{pull_data['title']}"
+      end
+    end
+
     # $ git cherry-pick http://github.com/mislav/hub/commit/a319d88#comments
     # > git remote add -f mislav git://github.com/mislav/hub.git
     # > git cherry-pick a319d88
@@ -423,10 +450,7 @@ module Hub
     # > git remote add origin git@github.com:USER/REPO.git
     def init(args)
       if args.delete('-g')
-        # can't use default_host because there is no local_repo yet
-        # FIXME: this shouldn't be here!
-        host = ENV['GITHUB_HOST'] || 'github.com'
-        project = Context::GithubProject.new(nil, github_user(host), File.basename(current_dir), host)
+        project = github_project(File.basename(current_dir))
         url = project.git_url(:private => true, :https => https_protocol?)
         args.after ['remote', 'add', 'origin', url]
       end
@@ -466,7 +490,8 @@ module Hub
     def create(args)
       if !is_repo?
         abort "'create' must be run from inside a git repository"
-      elsif owner = github_user
+      else
+        owner = github_user
         args.shift
         options = {}
         options[:private] = true if args.delete('-p')
@@ -702,10 +727,9 @@ module Hub
       end
     end
 
-    def github_user host = nil
-      host ||= local_repo(false) && local_repo.main_host
-      return nil if host.nil?
-      api_client.config.username(host) { }
+    def github_user host = nil, &block
+      host ||= (local_repo(false) || Context::LocalRepo).default_host
+      api_client.config.username(host, &block)
     end
 
     def custom_command? cmd
@@ -768,12 +792,19 @@ Remote Commands:
    push       Upload data, tags and branches to a remote repository
    remote     View and manage a set of remote repositories
 
-Advanced commands:
+Advanced Commands:
    reset      Reset your staging area or working directory to another point
    rebase     Re-apply a series of patches in one branch onto another
    bisect     Find by binary search the change that introduced a bug
    grep       Print files with lines matching a pattern in your codebase
 
+GitHub Commands:
+   pull-request   Open a pull request on GitHub
+   fork           Make a fork of a remote repository on GitHub and add as remote
+   create         Create this repository on GitHub and add GitHub as origin
+   browse         Open a GitHub page in the default browser
+   compare        Open a compare page on GitHub
+
 See 'git help <command>' for more information on a specific command.
 help
     end
@@ -944,7 +975,7 @@ help
       title.tr!("\n", ' ')
       title.strip!
       body.strip!
-      
+
       [title =~ /\S/ ? title : nil, body =~ /\S/ ? body : nil]
     end
 

data/lib/hub/context.rb

@@ -179,14 +179,17 @@ module Hub
         git_config('hub.host', :all).to_s.split("\n") + [default_host]
       end
 
-      def default_host
+      def self.default_host
         ENV['GITHUB_HOST'] || main_host
       end
 
-      def main_host
+      def self.main_host
         'github.com'
       end
 
+      extend Forwardable
+      def_delegators :'self.class', :default_host, :main_host
+
       def ssh_config
         @ssh_config ||= SshConfig.new
       end
@@ -200,13 +203,16 @@ module Hub
         end
       end
 
+      attr_accessor :repo_data
+
       def initialize(*args)
         super
-        self.host ||= local_repo.default_host
+        self.host ||= (local_repo || LocalRepo).default_host
       end
 
       def private?
-        local_repo and host != local_repo.main_host
+        repo_data ? repo_data.fetch('private') :
+          host != (local_repo || LocalRepo).main_host
       end
 
       def owned_by(new_owner)
@@ -357,7 +363,7 @@ module Hub
         project.name = name
         project
       else
-        GithubProject.new(local_repo, owner, name)
+        GithubProject.new(local_repo(false), owner, name)
       end
     end
 

data/lib/hub/github_api.rb

@@ -46,11 +46,15 @@ module Hub
       'github.com' == host ? 'api.github.com' : host
     end
 
-    # Public: Determine whether a specific repo already exists.
-    def repo_exists? project
-      res = get "https://%s/repos/%s/%s" %
+    # Public: Fetch data for a specific repo.
+    def repo_info project
+      get "https://%s/repos/%s/%s" %
         [api_host(project.host), project.owner, project.name]
-      res.success?
+    end
+
+    # Public: Determine whether a specific repo exists.
+    def repo_exists? project
+      repo_info(project).success?
     end
 
     # Public: Fork the specified repo.
@@ -147,11 +151,14 @@ module Hub
       end
 
       def perform_request url, type
-        url = URI.parse url unless url.respond_to? :hostname
+        url = URI.parse url unless url.respond_to? :host
 
         require 'net/https'
         req = Net::HTTP.const_get(type).new(url.request_uri)
-        http = create_connection(url)
+        # TODO: better naming?
+        http = configure_connection(req, url) do |host_url|
+          create_connection host_url
+        end
 
         apply_authentication(req, url)
         yield req if block_given?
@@ -162,6 +169,17 @@ module Hub
         raise Context::FatalError, "error with #{type.to_s.upcase} #{url} (#{err.message})"
       end
 
+      def configure_connection req, url
+        if ENV['HUB_TEST_HOST']
+          req['Host'] = url.host
+          url = url.dup
+          url.scheme = 'http'
+          url.host, test_port = ENV['HUB_TEST_HOST'].split(':')
+          url.port = test_port.to_i if test_port
+        end
+        yield url
+      end
+
       def apply_authentication req, url
         user = url.user || config.username(url.host)
         pass = config.password(url.host, user)
@@ -325,9 +343,14 @@ module Hub
       # special prompt that has hidden input
       def prompt_password host, user
         print "#{host} password for #{user} (never stored): "
-        password = askpass
-        puts ''
-        password
+        if $stdin.tty?
+          password = askpass
+          puts ''
+          password
+        else
+          # in testing
+          $stdin.gets.chomp
+        end
       end
 
       # FIXME: probably not cross-platform
@@ -349,7 +372,7 @@ module Hub
 
       def proxy_uri(with_ssl)
         env_name = "HTTP#{with_ssl ? 'S' : ''}_PROXY"
-        if proxy = ENV[env_name] || ENV[env_name.downcase]
+        if proxy = ENV[env_name] || ENV[env_name.downcase] and !proxy.empty?
           proxy = "http://#{proxy}" unless proxy.include? '://'
           URI.parse proxy
         end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.9.0'
+  Version = VERSION = '1.10.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" "April 2012" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "May 2012" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -31,6 +31,9 @@
 \fBgit checkout\fR \fIPULLREQ\-URL\fR [\fIBRANCH\fR]
 .
 .br
+\fBgit merge\fR \fIPULLREQ\-URL\fR
+.
+.br
 \fBgit cherry\-pick\fR \fIGITHUB\-REF\fR
 .
 .br
@@ -96,6 +99,10 @@ Adds missing remote(s) with \fBgit remote add\fR prior to fetching\. New remotes
 Checks out the head of the pull request as a local branch, to allow for reviewing, rebasing and otherwise cleaning up the commits in the pull request before merging\. The name of the local branch can explicitly be set with \fIBRANCH\fR\.
 .
 .TP
+\fBgit merge\fR \fIPULLREQ\-URL\fR
+Merge the pull request with a commit message that includes the pull request ID and title, similar to the GitHub Merge Button\.
+.
+.TP
 \fBgit cherry\-pick\fR \fIGITHUB\-REF\fR
 Cherry\-pick a commit from a fork using either full URL to the commit or GitHub\-flavored Markdown notation, which is \fBuser@sha\fR\. If the remote doesn\'t yet exist, it will be added\. A \fBgit fetch <user>\fR is issued prior to the cherry\-pick attempt\.
 .
@@ -300,11 +307,21 @@ $ git pull\-request \-i 123
 .
 .nf
 
-# $ git checkout https://github\.com/defunkt/hub/pull/73
-# > git remote add \-f \-t feature git://github:com/mislav/hub\.git
-# > git checkout \-\-track \-B mislav\-feature mislav/feature
+$ git checkout https://github\.com/defunkt/hub/pull/73
+> git remote add \-f \-t feature git://github:com/mislav/hub\.git
+> git checkout \-\-track \-B mislav\-feature mislav/feature
+
+$ git checkout https://github\.com/defunkt/hub/pull/73 custom\-branch\-name
+.
+.fi
+.
+.SS "git merge"
+.
+.nf
 
-# $ git checkout https://github\.com/defunkt/hub/pull/73 custom\-branch\-name
+$ git merge https://github\.com/defunkt/hub/pull/73
+> git fetch git://github\.com/mislav/hub\.git +refs/heads/feature:refs/remotes/mislav/feature
+> git merge mislav/feature \-\-no\-ff \-m \'Merge pull request #73 from mislav/feature\.\.\.\'
 .
 .fi
 .

data/man/hub.1.html

@@ -87,6 +87,7 @@
 <code>git remote set-url</code> [<code>-p</code>] <var>OPTIONS</var> <var>REMOTE-NAME</var> <var>USER</var>[/<var>REPOSITORY</var>]<br />
 <code>git fetch</code> <var>USER-1</var>,[<var>USER-2</var>,...]<br />
 <code>git checkout</code> <var>PULLREQ-URL</var> [<var>BRANCH</var>]<br />
+<code>git merge</code> <var>PULLREQ-URL</var><br />
 <code>git cherry-pick</code> <var>GITHUB-REF</var><br />
 <code>git am</code> <var>GITHUB-URL</var><br />
 <code>git apply</code> <var>GITHUB-URL</var><br />
@@ -131,6 +132,8 @@ remotes are only added if they correspond to valid forks on GitHub.</p></dd>
 reviewing, rebasing and otherwise cleaning up the commits in the pull
 request before merging. The name of the local branch can explicitly be
 set with <var>BRANCH</var>.</p></dd>
+<dt><code>git merge</code> <var>PULLREQ-URL</var></dt><dd><p>Merge the pull request with a commit message that includes the pull request
+ID and title, similar to the GitHub Merge Button.</p></dd>
 <dt><code>git cherry-pick</code> <var>GITHUB-REF</var></dt><dd><p>Cherry-pick a commit from a fork using either full URL to the commit
 or GitHub-flavored Markdown notation, which is <code>user@sha</code>. If the remote
 doesn't yet exist, it will be added. A <code>git fetch &lt;user></code> is issued
@@ -311,11 +314,18 @@ $ git pull-request -i 123
 
 <h3 id="git-checkout">git checkout</h3>
 
-<pre><code># $ git checkout https://github.com/defunkt/hub/pull/73
-# &gt; git remote add -f -t feature git://github:com/mislav/hub.git
-# &gt; git checkout --track -B mislav-feature mislav/feature
+<pre><code>$ git checkout https://github.com/defunkt/hub/pull/73
+&gt; git remote add -f -t feature git://github:com/mislav/hub.git
+&gt; git checkout --track -B mislav-feature mislav/feature
 
-# $ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name
+$ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name
+</code></pre>
+
+<h3 id="git-merge">git merge</h3>
+
+<pre><code>$ git merge https://github.com/defunkt/hub/pull/73
+&gt; git fetch git://github.com/mislav/hub.git +refs/heads/feature:refs/remotes/mislav/feature
+&gt; git merge mislav/feature --no-ff -m 'Merge pull request #73 from mislav/feature...'
 </code></pre>
 
 <h3 id="git-create">git create</h3>
@@ -427,7 +437,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>April 2012</li>
+    <li class='tc'>May 2012</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/man/hub.1.ronn

@@ -14,6 +14,7 @@ hub(1) -- git + hub = github
 `git remote set-url` [`-p`] <OPTIONS> <REMOTE-NAME> <USER>[/<REPOSITORY>]  
 `git fetch` <USER-1>,[<USER-2>,...]  
 `git checkout` <PULLREQ-URL> [<BRANCH>]  
+`git merge` <PULLREQ-URL>  
 `git cherry-pick` <GITHUB-REF>  
 `git am` <GITHUB-URL>  
 `git apply` <GITHUB-URL>  
@@ -73,6 +74,10 @@ hub enhances various git commands to ease most common workflows with GitHub.
     request before merging. The name of the local branch can explicitly be
     set with <BRANCH>.
 
+  * `git merge` <PULLREQ-URL>:
+    Merge the pull request with a commit message that includes the pull request
+    ID and title, similar to the GitHub Merge Button.
+
   * `git cherry-pick` <GITHUB-REF>:
     Cherry-pick a commit from a fork using either full URL to the commit
     or GitHub-flavored Markdown notation, which is `user@sha`. If the remote

data/test/hub_test.rb

@@ -82,79 +82,6 @@ class HubTest < Test::Unit::TestCase
       'rev-parse -q --git-dir' => '.git'
   end
 
-  def test_fetch_existing_remote
-    assert_forwarded "fetch mislav"
-  end
-
-  def test_fetch_new_remote
-    stub_remotes_group('xoebus', nil)
-    stub_existing_fork('xoebus')
-
-    assert_commands "git remote add xoebus git://github.com/xoebus/hub.git",
-                    "git fetch xoebus",
-                    "fetch xoebus"
-  end
-
-  def test_fetch_new_remote_https_protocol
-    stub_remotes_group('xoebus', nil)
-    stub_existing_fork('xoebus')
-    stub_https_is_preferred
-
-    assert_commands "git remote add xoebus https://github.com/xoebus/hub.git",
-                    "git fetch xoebus",
-                    "fetch xoebus"
-  end
-
-  def test_fetch_new_remote_with_options
-    stub_remotes_group('xoebus', nil)
-    stub_existing_fork('xoebus')
-
-    assert_commands "git remote add xoebus git://github.com/xoebus/hub.git",
-                    "git fetch --depth=1 --prune xoebus",
-                    "fetch --depth=1 --prune xoebus"
-  end
-
-  def test_fetch_multiple_new_remotes
-    stub_remotes_group('xoebus', nil)
-    stub_remotes_group('rtomayko', nil)
-    stub_existing_fork('xoebus')
-    stub_existing_fork('rtomayko')
-
-    assert_commands "git remote add xoebus git://github.com/xoebus/hub.git",
-                    "git remote add rtomayko git://github.com/rtomayko/hub.git",
-                    "git fetch --multiple xoebus rtomayko",
-                    "fetch --multiple xoebus rtomayko"
-  end
-
-  def test_fetch_multiple_comma_separated_remotes
-    stub_remotes_group('xoebus', nil)
-    stub_remotes_group('rtomayko', nil)
-    stub_existing_fork('xoebus')
-    stub_existing_fork('rtomayko')
-
-    assert_commands "git remote add xoebus git://github.com/xoebus/hub.git",
-                    "git remote add rtomayko git://github.com/rtomayko/hub.git",
-                    "git fetch --multiple xoebus rtomayko",
-                    "fetch xoebus,rtomayko"
-  end
-
-  def test_fetch_multiple_new_remotes_with_filtering
-    stub_remotes_group('xoebus', nil)
-    stub_remotes_group('mygrp', 'one two')
-    stub_remotes_group('typo', nil)
-    stub_existing_fork('xoebus')
-    stub_nonexisting_fork('typo')
-
-    # mislav: existing remote; skipped
-    # xoebus: new remote, fork exists; added
-    # mygrp:  a remotes group; skipped
-    # URL:    can't be a username; skipped
-    # typo:   fork doesn't exist; skipped
-    assert_commands "git remote add xoebus git://github.com/xoebus/hub.git",
-                    "git fetch --multiple mislav xoebus mygrp git://example.com typo",
-                    "fetch --multiple mislav xoebus mygrp git://example.com typo"
-  end
-
   def test_cherry_pick
     assert_forwarded "cherry-pick a319d88"
   end
@@ -317,192 +244,6 @@ class HubTest < Test::Unit::TestCase
                     "push origin,staging,qa cool-feature"
   end
 
-  def test_create
-    stub_no_remotes
-    stub_nonexisting_fork('tpw')
-    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"
-    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://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"
-    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://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_failed
-    stub_no_remotes
-    stub_nonexisting_fork('tpw')
-    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"
-    assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_create_private_repository
-    stub_no_remotes
-    stub_nonexisting_fork('tpw')
-    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"
-    assert_equal expected, hub("create -p") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_create_private_repository_fails
-    stub_no_remotes
-    stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://api.github.com/user/repos").
-      to_return(:status => [422, "Unprocessable Entity"],
-                :headers => {"Content-type" => "application/json"},
-                :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"
-    assert_equal expected, hub("create -p") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_create_with_description_and_homepage
-    stub_no_remotes
-    stub_nonexisting_fork('tpw')
-    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"
-    expected << "created repository: tpw/hub\n"
-    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')
-
-    expected = "tpw/hub already exists on github.com\n"
-    expected << "remote add -f origin git@github.com:tpw/hub.git\n"
-    expected << "set remote origin: tpw/hub\n"
-    assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_create_https_protocol
-    stub_no_remotes
-    stub_existing_fork('tpw')
-    stub_https_is_preferred
-
-    expected = "tpw/hub already exists on github.com\n"
-    expected << "remote add -f origin https://github.com/tpw/hub.git\n"
-    expected << "set remote origin: tpw/hub\n"
-    assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
-  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")
-  end
-
-  def test_create_origin_already_exists
-    stub_nonexisting_fork('tpw')
-    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' }
-  end
-
-  def test_fork
-    stub_nonexisting_fork('tpw')
-    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"
-    expected << "new remote: tpw\n"
-    assert_output expected, "fork"
-  end
-
-  def test_fork_https_protocol
-    stub_https_is_preferred
-    stub_nonexisting_fork('tpw')
-    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"
-    assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_fork_not_in_repo
-    stub_no_git_repo
-    expected = "fatal: Not a git repository\n"
-    assert_output expected, "fork"
-  end
-
-  def test_fork_enterprise
-    stub_hub_host('git.my.org')
-    stub_repo_url('git@git.my.org:defunkt/hub.git')
-    edit_hub_config do |data|
-      data['git.my.org'] = [{'user'=>'myfiname', 'oauth_token' => 'FITOKEN'}]
-    end
-
-    stub_request(:get, "https://git.my.org/repos/myfiname/hub").
-      to_return(:status => 404)
-    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"
-    assert_output expected, "fork"
-  end
-
-  def test_fork_failed
-    stub_nonexisting_fork('tpw')
-    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"
-    assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_fork_no_remote
-    stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://api.github.com/repos/defunkt/hub/forks")
-
-    assert_equal "", hub("fork --no-remote") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_fork_already_exists
-    stub_existing_fork('tpw')
-
-    expected = "Error creating fork: tpw/hub already exists on github.com\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"
@@ -743,7 +484,7 @@ class HubTest < Test::Unit::TestCase
   def test_help_hub
     help_manpage = hub("help hub")
     assert_includes "git + hub = github", help_manpage
-    assert_includes "Hub will prompt for GitHub username & password", help_manpage
+    assert_includes "Hub will prompt for GitHub username & password", help_manpage.gsub(/ {2,}/, ' ')
   end
 
   def test_help_flag_on_command

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70352271416600 !ruby/object:Gem::Requirement
+  requirement: &70214831337220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352271416600
+  version_requirements: *70214831337220
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70352271431980 !ruby/object:Gem::Requirement
+  requirement: &70214831336720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352271431980
+  version_requirements: *70214831336720
 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
@@ -63,7 +63,6 @@ files:
 - man/hub.1
 - man/hub.1.html
 - man/hub.1.ronn
-- test/alias_test.rb
 - test/deps.rip
 - test/fakebin/git
 - test/fakebin/open

data/test/alias_test.rb

@@ -1,59 +0,0 @@
-require 'helper'
-
-class AliasTest < Test::Unit::TestCase
-  def test_alias_instructions
-    expected = "# Wrap git automatically by adding the following to your profile:\n"
-    expected << "\n"
-    expected << 'eval "$(hub alias -s)"' << "\n"
-    assert_equal expected, hub("alias sh")
-  end
-
-  def test_alias_instructions_bash
-    with_shell('bash') do
-      assert_includes '~/.bash_profile', hub("alias")
-    end
-  end
-
-  def test_alias_instructions_zsh
-    with_shell('zsh') do
-      assert_includes '~/.zshrc', hub("alias")
-    end
-  end
-
-  def test_alias_script_bash
-    with_shell('bash') do
-      assert_equal "alias git=hub\n", hub("alias -s")
-    end
-  end
-
-  def test_alias_script_zsh
-    with_shell('zsh') do
-      script = hub("alias -s")
-      assert_includes "alias git=hub\n", script
-      assert_includes "compdef hub=git\n", script
-    end
-  end
-
-  def test_unknown_shell
-    with_shell(nil) do
-      assert_equal "hub alias: unknown shell\n", hub("alias -s")
-    end
-  end
-
-  def test_unsupported_shell
-    with_shell('foosh') do
-      expected = "hub alias: unsupported shell\n"
-      expected << "supported shells: bash zsh sh ksh csh fish\n"
-      assert_equal expected, hub("alias -s")
-    end
-  end
-
-  private
-
-  def with_shell(shell)
-    old_shell, ENV['SHELL'] = ENV['SHELL'], shell
-    yield
-  ensure
-    ENV['SHELL'] = old_shell
-  end
-end