hub 1.8.3 → 1.8.4

data/HISTORY.md

@@ -0,0 +1,189 @@
+## 1.8.4 (2012-03-20)
+
+* add bash, zsh completion
+* improve `hub alias` command
+* change `git fork` so it fails when repo already exists under user
+* teach custom commands to respect `-h` & `--help` flags
+* `pull-request`: better error message for invalid remotes/URLs
+* respect local SSH aliases for host names
+
+## 1.8.3 (2012-03-02)
+
+* fix `pull-request` from branch tracking another local branch
+* fix `browse` command when not on any branch
+
+## 1.8.2 (2012-02-07)
+
+* if `pull-request` editor is vim, set appropriate filetype
+* `pull-request` editor message defaults to single commit message
+* fix cherry-picking from an existing remote
+* fix `clone` from local repository
+* `checkout` command forwards flags to internal checkout command,
+  force-resets the existing local branch by default
+* fix `am` command when given URLs that include the fragment
+
+## 1.8.1 (2012-01-24)
+
+* fix JSON parsing error while using GitHub API
+* HTTP(S) proxy support
+
+## 1.8.0 (2012-01-03)
+
+* fix `pull-request` on GH Enterprise project branch without upstream
+* ensure Content-Length for POST requests
+* handle pull requests from private repos
+* support branches with slashes in their name
+* display server errors when creating pullrequest fails
+* support GitHub Enterprise via multiple whitelisted host names
+* GitHub remote urls don't have to necessarily end in ".git"
+* fix `git init -g`
+* authenticate all API requests, helps dealing with private repos
+* ensure periods are allowed in repository names
+* fix am/apply commands if TMPDIR environment variable isn't set
+
+## 1.7.0 (2011-11-24)
+
+* lock down standalone script to system ruby
+* don't try to use command output pager on Windows
+* opt in for HTTPS: `git config hub.protocol https`
+* add `hub pull-request`
+* improve detecting upstream configuration ("tracking" branches)
+* introduce `hub --noop`
+* `hub apply` now downloads GitHub patches same as `hub am`
+* `hub create <name>` to explicitly name a repository
+* switch API communication to HTTPS
+* better handling of API HTTP exceptions
+* replace two dots (`sha1..sha2`) with three for ranges in `compare`
+* avoid ugly error & stack trace when git is not found on the system
+
+## 1.6.1 (2011-05-13)
+
+* `git push remote1,remote2` without branch name pushes the current branch
+* fix `browse` command for current repo with no tracking setup
+* preserve global flags to git such as `--bare` and `--git-dir=/some/path`
+* true cross-platform command detection and browser launcher
+
+## 1.6.0 (2011-03-24)
+
+* `am` strips extra path from pull reqs URLs such as "pull/42/files"
+* Fixed permissions on `hub(1)` when installing
+* gem renamed from `git-hub` to `hub`!
+
+## 1.5.1 (2011-03-18)
+
+* support git aliases
+* Bugfix: `browse/compare` for wiki repos
+* gracefully handle HTTP errors in `create` and `fork`
+* `hub am` supports Gist URLs
+* Bugfix: `clone` command doesn't get confused by mixed arguments
+
+## 1.5.0 (2010-12-28)
+
+* compensate for GitHub switch to HTTPS
+* `hub am`: cherry-pick pull request and commit URLs
+* support multiple URLs for a single remote
+* Bugfix: ensure that internal ruby methods can't pretend to be git commands
+* Bugfix: don't show help when `--exec-path` or `--html-path` flags are used
+* Support for `GITHUB_USER` and `GITHUB_TOKEN` env variables
+* Eliminate some ruby warnings
+
+## 1.4.1 (2010-08-08)
+## 1.4.0 (2010-08-08)
+
+* Added new `hub create` command
+* Added support for `remote set-url`
+* Bugfix: Don't try multiple git commands on a non-git dir when grabbing remote
+* Bugfix: Adding remotes when no remotes exist
+
+## 1.3.2 (2010-07-24)
+
+* bugfix: cherry picking of commit URL
+* bugfix: git init -g
+
+## 1.3.1 (2010-04-29)
+## 1.3.0 (2010-04-29)
+
+* Tracking branches awareness
+* `git browse` subpages (e.g. `git browse repo issues`)
+* `git fetch <fork>` adds new remotes if missing
+* `cherry-pick` supports GitHub commit URLs and "user@sha" notation
+
+## 1.2.0 (2010-04-11)
+
+* `hub compare` command - Thanks joshthecoder!
+
+## 1.1.0 (2010-04-07)
+
+* `hub fork` command - Thanks Mislav!
+
+## 1.0.3 (2010-03-10)
+
+* Bugfix: `hub remote` for repos with -, /, etc
+
+## 1.0.2 (2010-03-07)
+
+* Bugfix: `hub remote -f name` (for real this time)
+* Bugfix: zsh quoting [thommay]
+
+## 1.0.1 (2010-03-05)
+
+* Bugfix: `hub remote -f name`
+
+## 1.0.0 (2010-03-03)
+
+* `hub browse` with no arguments uses the current repo.
+* `hub submodule add user/repo directory
+* `hub remote add rtomayko/tilt`
+* `remote add -p origin rtomayko/tilt`
+
+## 0.3.2 (2010-02-17)
+
+* Fixed zshell git completion / aliasing - `hub alias zsh`.
+
+## 0.3.1 (2010-02-13)
+
+* Add `hub remote origin` shortcut. Assumes your GitHub login.
+
+## 0.3.0 (2010-01-23)
+
+* Add `hub browse` command for opening a repo in a browser.
+* Add `hub standalone` for installation of standalone via RubyGems
+* Bugfix: Don't run hub standalone in standalone mode
+* Bugfix: `git clone` flags are now passed through.
+* Bugfix: `git clone` with url and path works.
+* Bugfix: basename call
+* Bugfix: Check for local directories before cloning
+
+
+## 0.2.0 (2009-12-24)
+
+* Respected GIT_PAGER and core.pager
+* Aliased `--help` to `help`
+* Ruby 1.9 fixes
+* Respect git behavior when pager is empty string
+* `git push` multi-remote support
+* `hub.http-clone` configuration setting
+* Use the origin url to find the repo name
+
+## 0.1.3 (2009-12-11)
+
+* Homebrew!
+* Fix inaccuracy in man page
+* Better help arrangement
+* Bugfix: Path problems in standalone.rb
+* Bugfix: Standalone not loaded by default
+
+## 0.1.2 (2009-12-10)
+
+* Fixed README typos
+* Better standalone install line
+* Added man page
+* Added `hub help hub`
+
+## 0.1.1 (2009-12-08)
+
+* Fixed gem problems
+
+## 0.1.0 (2009-12-08)
+
+* First release

data/README.md

@@ -1,76 +1,82 @@
-hub: git + hub = github
-=======================
+git + hub = github
+==================
 
-`hub` is a command line utility which adds GitHub knowledge to `git`.
+hub is a command line tool that wraps `git` in order to extend it with extra
+features and commands that make working with GitHub easier.
 
-It can be used on its own or as a `git` wrapper.
+~~~ sh
+$ hub clone rtomayko/tilt
 
-Normal:
+# expands to:
+$ git clone git://github.com/rtomayko/tilt.git
+~~~
 
-    $ hub clone rtomayko/tilt
+hub is best aliased as `git`, so you can type `$ git <command>` in the shell and
+get all the usual `hub` features. See "Aliasing" below.
 
-    Expands to:
-    $ git clone git://github.com/rtomayko/tilt.git
 
-Wrapping `git`:
+Installation
+------------
 
-    $ git clone rack/rack
+Dependencies:
 
-    Expands to:
-    $ git clone git://github.com/rack/rack.git
+* **git 1.7.3** or newer
+* **Ruby 1.8.6** or newer
 
-hub requires you have `git` installed and in your `$PATH`. It also
-requires Ruby 1.8.6+ or Ruby 1.9.1+. No other libraries necessary.
+### Homebrew
 
+Installing on OS X is easiest with Homebrew:
 
-Install
--------
+~~~ sh
+$ brew install hub
+~~~
 
 ### Standalone
 
-`hub` is most easily installed as a standalone script:
+`hub` is easily installed as a standalone script:
 
-    curl http://defunkt.io/hub/standalone -sLo ~/bin/hub &&
-    chmod 755 ~/bin/hub
+~~~ sh
+$ curl http://defunkt.io/hub/standalone -sLo ~/bin/hub &&
+  chmod +x ~/bin/hub
+~~~
 
-Assuming `~/bin/` is in your `$PATH`, you're ready to roll:
+Assuming "~/bin/" is in your `$PATH`, you're ready to roll:
 
-    $ hub version
-    git version 1.7.0.4
-    hub version 1.1.0
-
-### Homebrew
-
-    $ brew install hub
-    $ which hub
-    /usr/local/bin/hub
-    $ hub version
-    ...
+~~~ sh
+$ hub version
+git version 1.7.6
+hub version 1.8.3
+~~~
 
 ### RubyGems
 
-Though not recommended, `hub` can also be installed as a RubyGem:
+Though not recommended, hub can also be installed as a RubyGem:
 
-    $ gem install hub
+~~~ sh
+$ gem install hub
+~~~
 
 (It's not recommended for casual use because of the RubyGems startup
 time. See [this gist][speed] for information.)
 
-### Standalone via RubyGems
+#### Standalone via RubyGems
 
-    $ gem install hub
-    $ hub hub standalone > ~/bin/hub && chmod 755 ~/bin/hub
+~~~ sh
+$ gem install hub
+$ hub hub standalone > ~/bin/hub && chmod +x ~/bin/hub
+~~~
 
 This installs a standalone version which doesn't require RubyGems to
-run.
+run, so it's faster.
 
 ### Source
 
 You can also install from source:
 
-    $ git clone git://github.com/defunkt/hub.git
-    $ cd hub
-    $ rake install prefix=/usr/local
+~~~ sh
+$ git clone git://github.com/defunkt/hub.git
+$ cd hub && rake install prefix=/usr/local
+~~~
 
 ### Help! It's Slow!
 
@@ -79,11 +85,11 @@ Is your prompt slow? It may be hub.
 1. Check that it's **not** installed using RubyGems.
 2. Check that RUBYOPT isn't loading anything shady:
 
-       $ echo $RUBYOPT
+        $ echo $RUBYOPT
 
 3. Check that your system Ruby is speedy:
 
-       $ time /usr/bin/env ruby -e0
+        $ time /usr/bin/env ruby -e0
 
 If #3 is slow, it may be your [GC settings][gc].
 
@@ -91,30 +97,31 @@ If #3 is slow, it may be your [GC settings][gc].
 Aliasing
 --------
 
-`hub` works best when it wraps `git`. This is not dangerous - your
-normal git commands should all work. hub merely adds some sugar.
+Using hub feels best when it's aliased as `git`. This is not dangerous; your
+_normal git commands will all work_. hub merely adds some sugar.
 
-Typing `hub alias <shell>` will display alias instructions for
-your shell. `hub alias` alone will show the known shells.
+`hub alias` displays instructions for the current shell. With the `-s` flag, it
+outputs a script suitable for `eval`.
 
-For example:
+You should place this command in your `.bash_profile` or other startup script:
 
-    $ hub alias bash
-    Run this in your shell to start using `hub` as `git`:
-      alias git=hub
+~~~ sh
+eval "$(hub alias -s)"
+~~~
 
-You should place this command in your `.bash_profile` or other startup
-script to ensure runs on login.
+### Shell tab-completion
 
-The alias command can also be eval'd directly using the `-s` flag:
+hub repository contains tab-completion scripts for bash and zsh. These scripts
+complement existing completion scripts that ship with git.
 
-    $ eval `hub alias -s bash`
+* [hub bash completion](https://github.com/defunkt/hub/blob/master/etc/hub.bash_completion.sh)
+* [hub zsh completion](https://github.com/defunkt/hub/blob/master/etc/hub.zsh_completion)
 
 
 Commands
 --------
 
-Assuming you've aliased `hub` to `git`, the following commands now have
+Assuming you've aliased hub as `git`, the following commands now have
 superpowers:
 
 ### git clone
@@ -292,10 +299,12 @@ superpowers:
     > (hub man page)
 
 
-GitHub Login
-------------
+Configuration
+-------------
+
+### GitHub username & token
 
-To get the most out of `hub`, you'll want to ensure your GitHub login
+To get the most out of hub, you'll want to ensure your GitHub login
 is stored locally in your Git config or environment variables.
 
 To test it run this:
@@ -312,59 +321,47 @@ setup "github.token" as well. See [GitHub config guide][2] for more information.
 If present, environment variables `GITHUB_USER` and `GITHUB_TOKEN` override the
 values of "github.user" and "github.token".
 
-Configuration
--------------
+### HTTPS insted 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".
 
-For example:
+~~~ sh
+# default behavior
+$ git clone defunkt/repl
+< git clone >
 
-    $ git clone defunkt/repl
-    < git clone >
-    
-    $ git config --global hub.protocol https
-    $ git clone defunkt/repl
-    < https clone >
-
-Prior Art
----------
-
-These projects also aim to either improve git or make interacting with
-GitHub simpler:
-
-* [eg](http://www.gnome.org/~newren/eg/)
-* [github-gem](https://github.com/defunkt/github-gem)
+# opt into HTTPS:
+$ git config --global hub.protocol https
+$ git clone defunkt/repl
+< https clone >
+~~~
 
 
 Contributing
 ------------
 
-These instructions assume that you already have `hub` installed and that
-you've set it up so it wraps `git` (see "Aliasing").
+These instructions assume that you already have hub installed and aliased as
+`git` (see "Aliasing").
 
 1. Clone hub:  
-    `git clone defunkt/hub`
-2. Verify that existing tests pass (see "Development dependencies"):  
-    `rake test`
+    `git clone defunkt/hub && cd hub`
+1. Install development dependencies:  
+    `bundle install`
+2. Verify that existing tests pass:  
+    `bundle exec rake`
 3. Create a topic branch:  
-    `git checkout -b my_branch`
-4. Make your changes – it helps a lot if you write tests first
+    `git checkout -b feature`
+4. **Make your changes.** (It helps a lot if you write tests first.)
 5. Verify that tests still pass:  
-    `rake test`
+    `bundle exec rake`
 6. Fork hub on GitHub (adds a remote named "YOUR_USER"):  
     `git fork`
 7. Push to your fork:  
-    `git push -u YOUR_USER my_branch`
+    `git push -u YOUR_USER feature`
 8. Open a pull request describing your changes:  
     `git pull-request`
 
-### Development dependencies
-
-You will need the following libraries for development:
-
-* [ronn](https://github.com/rtomayko/ronn) (building man pages)
-* [webmock](https://github.com/bblimke/webmock)
 
 Meta
 ----
@@ -372,12 +369,16 @@ Meta
 * Home: <https://github.com/defunkt/hub>
 * Bugs: <https://github.com/defunkt/hub/issues>
 * Gem: <https://rubygems.org/gems/hub>
+* Authors: <https://github.com/defunkt/hub/contributors>
+
+### Prior art
 
+These projects also aim to either improve git or make interacting with
+GitHub simpler:
 
-Authors
--------
+* [eg](http://www.gnome.org/~newren/eg/)
+* [github-gem](https://github.com/defunkt/github-gem)
 
-<https://github.com/defunkt/hub/contributors>
 
 [speed]: http://gist.github.com/284823
 [2]: http://help.github.com/set-your-user-name-email-and-github-token/

data/Rakefile

@@ -36,15 +36,6 @@ Rake::TestTask.new do |t|
   t.verbose = false
 end
 
-if command? :kicker
-  desc "Launch Kicker (like autotest)"
-  task :kicker do
-    puts "Kicking... (ctrl+c to cancel)"
-    exec "kicker -e rake test lib"
-  end
-end
-
-
 #
 # Manual
 #

data/lib/hub/commands.rb

@@ -38,6 +38,8 @@ module Hub
     OWNER_RE = /[a-zA-Z0-9-]+/
     NAME_WITH_OWNER_RE = /^(?:#{NAME_RE}|#{OWNER_RE}\/#{NAME_RE})$/
 
+    CUSTOM_COMMANDS = %w[alias create browse compare fork pull-request]
+
     def run(args)
       slurp_global_flags(args)
 
@@ -45,13 +47,17 @@ module Hub
       args.unshift 'help' if args.empty?
 
       cmd = args[0]
-      expanded_args = expand_alias(cmd)
-      cmd = expanded_args[0] if expanded_args
+      if expanded_args = expand_alias(cmd)
+        cmd = expanded_args[0]
+        expanded_args.concat args[1..-1]
+      end
+
+      respect_help_flags(expanded_args || args) if custom_command? cmd
 
       # git commands can have dashes
       cmd = cmd.sub(/(\w)-/, '\1_')
       if method_defined?(cmd) and cmd != 'run'
-        args[0, 1] = expanded_args if expanded_args
+        args.replace expanded_args if expanded_args
         send(cmd, args)
       end
     rescue Errno::ENOENT
@@ -73,6 +79,10 @@ module Hub
       base_project = local_repo.main_project
       head_project = local_repo.current_project
 
+      unless base_project
+        abort "Aborted: the origin remote doesn't point to a GitHub repository."
+      end
+
       from_github_ref = lambda do |ref, context_project|
         if ref.index(':')
           owner, ref = ref.split(':', 2)
@@ -136,7 +146,7 @@ module Hub
       end
 
       if args.noop?
-        puts "Would reqest a pull to #{base_project.owner}:#{options[:base]} from #{options[:head]}"
+        puts "Would request a pull to #{base_project.owner}:#{options[:base]} from #{options[:head]}"
         exit
       end
 
@@ -431,8 +441,10 @@ module Hub
         abort "Error: repository under 'origin' remote is not a GitHub project"
       end
       forked_project = project.owned_by(github_user(true, project.host))
+
       if repo_exists?(forked_project)
-        warn "#{forked_project.name_with_owner} already exists on #{forked_project.host}"
+        abort "Error creating fork: %s already exists on %s" %
+          [ forked_project.name_with_owner, forked_project.host ]
       else
         fork_repo(project) unless args.noop?
       end
@@ -613,43 +625,38 @@ module Hub
     end
 
     def alias(args)
-      shells = {
-        'sh'   => 'alias git=hub',
-        'bash' => 'alias git=hub',
-        'zsh'  => 'function git(){hub "$@"}',
-        'csh'  => 'alias git hub',
-        'fish' => 'alias git hub'
-      }
+      shells = %w[bash zsh sh ksh csh fish]
 
-      silent = args.delete('-s')
+      script = !!args.delete('-s')
+      shell = args[1] || ENV['SHELL']
+      abort "hub alias: unknown shell" if shell.nil? or shell.empty?
+      shell = File.basename shell
 
-      if shell = args[1]
-        if silent.nil?
-          puts "Run this in your shell to start using `hub` as `git`:"
-          print "  "
-        end
-      else
-        puts "usage: hub alias [-s] SHELL", ""
-        puts "You already have hub installed and available in your PATH,"
-        puts "but to get the full experience you'll want to alias it to"
-        puts "`git`.", ""
-        puts "To see how to accomplish this for your shell, run the alias"
-        puts "command again with the name of your shell.", ""
-        puts "Known shells:"
-        shells.map { |key, _| key }.sort.each do |key|
-          puts "  " + key
-        end
-        puts "", "Options:"
-        puts "  -s   Silent. Useful when using the output with eval, e.g."
-        puts "       $ eval `hub alias -s bash`"
-
-        exit
+      unless shells.include? shell
+        $stderr.puts "hub alias: unsupported shell"
+        warn "supported shells: #{shells.join(' ')}"
+        abort
       end
 
-      if shells[shell]
-        puts shells[shell]
+      if script
+        puts "alias git=hub"
+        if 'zsh' == shell
+          puts "if type compdef >/dev/null; then"
+          puts "   compdef hub=git"
+          puts "fi"
+        end
       else
-        abort "fatal: never heard of `#{shell}'"
+        profile = case shell
+          when 'bash' then '~/.bash_profile'
+          when 'zsh'  then '~/.zshrc'
+          when 'ksh'  then '~/.profile'
+          else
+            'your profile'
+          end
+
+        puts "# Wrap git automatically by adding the following to #{profile}:"
+        puts
+        puts 'eval "$(hub alias -s)"'
       end
 
       exit
@@ -685,6 +692,30 @@ module Hub
     # from the command line.
     #
 
+    def custom_command? cmd
+      CUSTOM_COMMANDS.include? cmd
+    end
+
+    # Show short usage help for `-h` flag, and open man page for `--help`
+    def respect_help_flags args
+      return if args.size > 2
+      case args[1]
+      when '-h'
+        pattern = /(git|hub) #{Regexp.escape args[0].gsub('-', '\-')}/
+        hub_raw_manpage.each_line { |line|
+          if line =~ pattern
+            $stderr.print "Usage: "
+            $stderr.puts line.gsub(/\\f./, '').gsub('\-', '-')
+            abort
+          end
+        }
+        abort "Error: couldn't find usage help for #{args[0]}"
+      when '--help'
+        puts hub_manpage
+        exit
+      end
+    end
+
     # The text print when `hub help` is run, kept in its own method
     # for the convenience of the author.
     def improved_help_text
@@ -893,7 +924,7 @@ help
       params['homepage'] = options[:homepage] if options[:homepage]
 
       load_net_http
-      response = http_post(project.api_create_url('yaml'), params)
+      response = http_post(project.api_create_url('json'), params)
       response.error! unless Net::HTTPSuccess === response
     end
 

data/lib/hub/context.rb

@@ -183,6 +183,10 @@ module Hub
       def main_host
         'github.com'
       end
+
+      def ssh_config
+        @ssh_config ||= SshConfig.new
+      end
     end
 
     class GithubProject < Struct.new(:local_repo, :owner, :name, :host)
@@ -339,14 +343,21 @@ module Hub
       def urls
         @urls ||= local_repo.git_config("remote.#{name}.url", :all).to_s.split("\n").map { |uri|
           begin
-            if uri =~ %r{^[\w-]+://}    then URI(uri)
-            elsif uri =~ %r{^([^/]+?):} then URI("ssh://#{$1}/#{$'}")  # scp-like syntax
+            if uri =~ %r{^[\w-]+://}    then uri_parse(uri)
+            elsif uri =~ %r{^([^/]+?):} then uri_parse("ssh://#{$1}/#{$'}")  # scp-like syntax
             end
           rescue URI::InvalidURIError
             nil
           end
         }.compact
       end
+
+      def uri_parse uri
+        uri = URI.parse uri
+        uri.host = local_repo.ssh_config.get_value(uri.host, 'hostname') { uri.host }
+        uri.user = local_repo.ssh_config.get_value(uri.host, 'user') { uri.user }
+        uri
+      end
     end
 
     ## helper methods for local repo, GH projects
@@ -502,5 +513,91 @@ module Hub
     def command?(name)
       !which(name).nil?
     end
+
+    class SshConfig
+      CONFIG_FILES = %w(~/.ssh/config /etc/ssh_config /etc/ssh/ssh_config)
+
+      def initialize files = nil
+        @settings = Hash.new {|h,k| h[k] = {} }
+        Array(files || CONFIG_FILES).each do |path|
+          file = File.expand_path path
+          parse_file file if File.exist? file
+        end
+      end
+
+      # yields if not found
+      def get_value hostname, key
+        key = key.to_s.downcase
+        @settings.each do |pattern, settings|
+          if pattern.match? hostname and found = settings[key]
+            return found
+          end
+        end
+        yield
+      end
+
+      class HostPattern
+        def initialize pattern
+          @pattern = pattern.to_s.downcase
+        end
+
+        def to_s() @pattern end
+        def ==(other) other.to_s == self.to_s end
+
+        def matcher
+          @matcher ||=
+            if '*' == @pattern
+              Proc.new { true }
+            elsif @pattern !~ /[?*]/
+              lambda { |hostname| hostname.to_s.downcase == @pattern }
+            else
+              re = self.class.pattern_to_regexp @pattern
+              lambda { |hostname| re =~ hostname }
+            end
+        end
+
+        def match? hostname
+          matcher.call hostname
+        end
+
+        def self.pattern_to_regexp pattern
+          escaped = Regexp.escape(pattern)
+          escaped.gsub!('\*', '.*')
+          escaped.gsub!('\?', '.')
+          /^#{escaped}$/i
+        end
+      end
+
+      def parse_file file
+        host_patterns = [HostPattern.new('*')]
+
+        IO.foreach(file) do |line|
+          case line
+          when /^\s*(#|$)/ then next
+          when /^\s*(\S+)\s*=/
+            key, value = $1, $'
+          else
+            key, value = line.strip.split(/\s+/, 2)
+          end
+
+          next if value.nil?
+          key.downcase!
+          value = $1 if value =~ /^"(.*)"$/
+          value.chomp!
+
+          if 'host' == key
+            host_patterns = value.split(/\s+/).map {|p| HostPattern.new p }
+          else
+            record_setting key, value, host_patterns
+          end
+        end
+      end
+
+      def record_setting key, value, patterns
+        patterns.each do |pattern|
+          @settings[pattern][key] ||= value
+        end
+      end
+    end
   end
 end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.8.3'
+  Version = VERSION = '1.8.4'
 end

data/man/hub.1

@@ -10,7 +10,7 @@
 \fBhub\fR [\fB\-\-noop\fR] \fICOMMAND\fR \fIOPTIONS\fR
 .
 .br
-\fBhub alias\fR [\fB\-s\fR] \fISHELL\fR
+\fBhub alias\fR [\fB\-s\fR] [\fISHELL\fR]
 .
 .SS "Expanded git commands:"
 \fBgit init \-g\fR \fIOPTIONS\fR
@@ -58,7 +58,7 @@
 \fBgit fork\fR [\fB\-\-no\-remote\fR]
 .
 .br
-\fBgit pull\-request\fR [\fB\-f\fR] [\fITITLE\fR|\fB\-i\fR \fIISSUE\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]:
+\fBgit pull\-request\fR [\fB\-f\fR] [\fITITLE\fR|\fB\-i\fR \fIISSUE\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
 .
 .SH "DESCRIPTION"
 hub enhances various git commands to ease most common workflows with GitHub\.
@@ -68,11 +68,8 @@ hub enhances various git commands to ease most common workflows with GitHub\.
 Shows which command(s) would be run as a result of the current command\. Doesn\'t perform anything\.
 .
 .TP
-\fBhub alias\fR [\fB\-s\fR] \fISHELL\fR
-Writes shell aliasing code for \fISHELL\fR (\fBbash\fR, \fBsh\fR, \fBzsh\fR, \fBcsh\fR) to standard output\. With the \fB\-s\fR option, the output of this command can be evaluated directly within the shell:
-.
-.br
-\fBeval $(hub alias \-s bash)\fR
+\fBhub alias\fR [\fB\-s\fR] [\fISHELL\fR]
+Shows shell instructions for wrapping git\. If given, \fISHELL\fR specifies the type of shell; otherwise defaults to the value of SHELL environment variable\. With \fB\-s\fR, outputs shell script suitable for \fBeval\fR\.
 .
 .TP
 \fBgit init\fR \fB\-g\fR \fIOPTIONS\fR

data/man/hub.1.html

@@ -77,7 +77,7 @@
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <p><code>hub</code> [<code>--noop</code>] <var>COMMAND</var> <var>OPTIONS</var><br />
-<code>hub alias</code> [<code>-s</code>] <var>SHELL</var></p>
+<code>hub alias</code> [<code>-s</code>] [<var>SHELL</var>]</p>
 
 <h3 id="Expanded-git-commands-">Expanded git commands:</h3>
 
@@ -99,7 +99,7 @@
 <code>git browse</code> [<code>-u</code>] [[<var>USER</var><code>/</code>]<var>REPOSITORY</var>] [SUBPAGE]<br />
 <code>git compare</code> [<code>-u</code>] [<var>USER</var>] [<var>START</var>...]<var>END</var><br />
 <code>git fork</code> [<code>--no-remote</code>]<br />
-<code>git pull-request</code> [<code>-f</code>] [<var>TITLE</var>|<code>-i</code> <var>ISSUE</var>] [<code>-b</code> <var>BASE</var>] [<code>-h</code> <var>HEAD</var>]:</p>
+<code>git pull-request</code> [<code>-f</code>] [<var>TITLE</var>|<code>-i</code> <var>ISSUE</var>] [<code>-b</code> <var>BASE</var>] [<code>-h</code> <var>HEAD</var>]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -108,10 +108,9 @@
 <dl>
 <dt><code>hub --noop</code> <var>COMMAND</var></dt><dd><p>Shows which command(s) would be run as a result of the current command.
 Doesn't perform anything.</p></dd>
-<dt><code>hub alias</code> [<code>-s</code>] <var>SHELL</var></dt><dd><p>Writes shell aliasing code for <var>SHELL</var> (<code>bash</code>, <code>sh</code>, <code>zsh</code>,
-<code>csh</code>) to standard output. With the <code>-s</code> option, the output of
-this command can be evaluated directly within the shell:<br />
-<code>eval $(hub alias -s bash)</code></p></dd>
+<dt><code>hub alias</code> [<code>-s</code>] [<var>SHELL</var>]</dt><dd><p>Shows shell instructions for wrapping git. If given, <var>SHELL</var> specifies the
+type of shell; otherwise defaults to the value of SHELL environment
+variable.  With <code>-s</code>, outputs shell script suitable for <code>eval</code>.</p></dd>
 <dt><code>git init</code> <code>-g</code> <var>OPTIONS</var></dt><dd><p>Create a git repository as with <span class="man-ref">git-init<span class="s">(1)</span></span> and add remote <code>origin</code> at
 "git@github.com:<var>USER</var>/<var>REPOSITORY</var>.git"; <var>USER</var> is your GitHub username and
 <var>REPOSITORY</var> is the current working directory's basename.</p></dd>

data/man/hub.1.ronn

@@ -4,7 +4,7 @@ hub(1) -- git + hub = github
 ## SYNOPSIS
 
 `hub` [`--noop`] <COMMAND> <OPTIONS>  
-`hub alias` [`-s`] <SHELL>
+`hub alias` [`-s`] [<SHELL>]
 
 ### Expanded git commands:
 
@@ -26,7 +26,7 @@ hub(1) -- git + hub = github
 `git browse` [`-u`] [[<USER>`/`]<REPOSITORY>] [SUBPAGE]  
 `git compare` [`-u`] [<USER>] [<START>...]<END>  
 `git fork` [`--no-remote`]  
-`git pull-request` [`-f`] [<TITLE>|`-i` <ISSUE>] [`-b` <BASE>] [`-h` <HEAD>]:  
+`git pull-request` [`-f`] [<TITLE>|`-i` <ISSUE>] [`-b` <BASE>] [`-h` <HEAD>]  
 
 ## DESCRIPTION
 
@@ -36,11 +36,10 @@ hub enhances various git commands to ease most common workflows with GitHub.
     Shows which command(s) would be run as a result of the current command.
     Doesn't perform anything.
 
-  * `hub alias` [`-s`] <SHELL>:
-    Writes shell aliasing code for <SHELL> (`bash`, `sh`, `zsh`,
-    `csh`) to standard output. With the `-s` option, the output of
-    this command can be evaluated directly within the shell:  
-    `eval $(hub alias -s bash)`
+  * `hub alias` [`-s`] [<SHELL>]:
+    Shows shell instructions for wrapping git. If given, <SHELL> specifies the
+    type of shell; otherwise defaults to the value of SHELL environment
+    variable.  With `-s`, outputs shell script suitable for `eval`.
 
   * `git init` `-g` <OPTIONS>:
     Create a git repository as with git-init(1) and add remote `origin` at

data/test/alias_test.rb

@@ -1,40 +1,59 @@
 require 'helper'
 
 class AliasTest < Test::Unit::TestCase
-  def test_alias
-    instructions = hub("alias")
-    assert_includes "bash", instructions
-    assert_includes "sh", instructions
-    assert_includes "csh", instructions
-    assert_includes "zsh", instructions
-    assert_includes "fish", instructions
+  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_silent
-    assert_equal "alias git=hub\n", hub("alias -s bash")
+  def test_alias_instructions_bash
+    with_shell('bash') do
+      assert_includes '~/.bash_profile', hub("alias")
+    end
   end
 
-  def test_alias_bash
-    assert_alias_command "bash", "alias git=hub"
+  def test_alias_instructions_zsh
+    with_shell('zsh') do
+      assert_includes '~/.zshrc', hub("alias")
+    end
   end
 
-  def test_alias_sh
-    assert_alias_command "sh", "alias git=hub"
+  def test_alias_script_bash
+    with_shell('bash') do
+      assert_equal "alias git=hub\n", hub("alias -s")
+    end
   end
 
-  def test_alias_zsh
-    assert_alias_command "zsh", 'function git(){hub "$@"}'
+  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_alias_csh
-    assert_alias_command "csh", "alias git hub"
+  def test_unknown_shell
+    with_shell(nil) do
+      assert_equal "hub alias: unknown shell\n", hub("alias -s")
+    end
   end
 
-  def test_alias_fish
-    assert_alias_command "fish", "alias git hub"
+  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
 
-  def test_alias_blah
-    assert_alias_command "blah", "fatal: never heard of `blah'"
+  private
+
+  def with_shell(shell)
+    old_shell, ENV['SHELL'] = ENV['SHELL'], shell
+    yield
+  ensure
+    ENV['SHELL'] = old_shell
   end
 end

data/test/helper.rb

@@ -80,22 +80,6 @@ class Test::Unit::TestCase
     assert !cmd.args.changed?, "arguments were not supposed to change: #{cmd.args.inspect}"
   end
 
-  # Asserts that `hub` will show a specific alias command for a
-  # specific shell.
-  #
-  # e.g.
-  #  assert_alias_command "sh", "alias git=hub"
-  #
-  # Here we are saying that this:
-  #   $ hub alias sh
-  # Should display this:
-  #   Run this in your shell to start using `hub` as `git`:
-  #     alias git=hub
-  def assert_alias_command(shell, command)
-    expected = "Run this in your shell to start using `hub` as `git`:\n  %s\n"
-    assert_equal(expected % command, hub("alias #{shell}"))
-  end
-
   # Asserts that `haystack` includes `needle`.
   def assert_includes(needle, haystack)
     assert haystack.include?(needle),

data/test/hub_test.rb

@@ -36,6 +36,7 @@ class HubTest < Test::Unit::TestCase
     super
     COMMANDS.replace %w[open groff]
     Hub::Context::PWD.replace '/path/to/hub'
+    Hub::Context::SshConfig::CONFIG_FILES.replace []
 
     @git_reader = Hub::Context::GitReader.new 'git' do |cache, cmd|
       unless cmd.index('config --get alias.') == 0
@@ -588,7 +589,7 @@ class HubTest < Test::Unit::TestCase
   def test_create
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
       with(:body => { 'name' => 'hub' })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
@@ -599,7 +600,7 @@ 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/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
       with(:body => { 'name' => 'hubbub' })
 
     expected = "remote add -f origin git@github.com:tpw/hubbub.git\n"
@@ -610,7 +611,7 @@ 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/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
       with(:body => { 'name' => 'acme/hubbub' })
 
     expected = "remote add -f origin git@github.com:acme/hubbub.git\n"
@@ -624,7 +625,7 @@ class HubTest < Test::Unit::TestCase
     stub_request(:get, "http://#{auth}github.com/api/v2/yaml/repos/show/tpw/hub").
       to_return(:status => 404)
 
-    stub_request(:post, "http://#{auth}github.com/api/v2/yaml/repos/create").
+    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"
@@ -640,7 +641,7 @@ class HubTest < Test::Unit::TestCase
   def test_create_failed
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
       to_return(:status => [401, "Your token is fail"])
 
     expected = "Error creating repository: Your token is fail (HTTP 401)\n"
@@ -659,7 +660,7 @@ class HubTest < Test::Unit::TestCase
     stub_request(:get, "https://#{auth('mojombo', '123abc')}github.com/api/v2/yaml/repos/show/mojombo/hub").
       to_return(:status => 404)
 
-    stub_request(:post, "https://#{auth('mojombo', '123abc')}github.com/api/v2/yaml/repos/create").
+    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"
@@ -674,7 +675,7 @@ class HubTest < Test::Unit::TestCase
   def test_create_private_repository
     stub_no_remotes
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
       with(:body => { 'name' => 'hub', 'public' => '0' })
 
     expected = "remote add -f origin git@github.com:tpw/hub.git\n"
@@ -682,10 +683,23 @@ class HubTest < Test::Unit::TestCase
     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://#{auth}github.com/api/v2/json/repos/create").
+      to_return(:status => [422, "Unprocessable Entity"],
+                :headers => {"Content-type" => "application/json"},
+                :body => %({"error":"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://#{auth}github.com/api/v2/yaml/repos/create").with(:body => {
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").with(:body => {
       'name' => 'hub', 'description' => 'toyproject', 'homepage' => 'http://example.com'
     })
 
@@ -735,7 +749,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_create_origin_already_exists
     stub_nonexisting_fork('tpw')
-    stub_request(:post, "https://#{auth}github.com/api/v2/yaml/repos/create").
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/repos/create").
       with(:body => { 'name' => 'hub' })
 
     expected = "remote -v\ncreated repository: tpw/hub\n"
@@ -752,6 +766,16 @@ class HubTest < Test::Unit::TestCase
     assert_output expected, "fork"
   end
 
+  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")
+
+    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"
@@ -792,19 +816,7 @@ class HubTest < Test::Unit::TestCase
   def test_fork_already_exists
     stub_existing_fork('tpw')
 
-    expected = "tpw/hub already exists on github.com\n"
-    expected << "remote add -f tpw git@github.com:tpw/hub.git\n"
-    expected << "new remote: tpw\n"
-    assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
-  end
-
-  def test_fork_https_protocol
-    stub_existing_fork('tpw')
-    stub_https_is_preferred
-
-    expected = "tpw/hub already exists on github.com\n"
-    expected << "remote add -f tpw https://github.com/tpw/hub.git\n"
-    expected << "new remote: tpw\n"
+    expected = "Error creating fork: tpw/hub already exists on github.com\n"
     assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
   end
 
@@ -860,6 +872,15 @@ class HubTest < Test::Unit::TestCase
     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"
+  end
+
   def test_pullrequest_enterprise_no_tracking
     stub_hub_host('git.my.org')
     stub_repo_url('git@git.my.org:defunkt/hub.git')
@@ -1043,6 +1064,22 @@ Use git-config(1) to display the currently configured GitHub username:
 config
   end
 
+  def test_help_flag_on_command
+    help_manpage = hub("browse --help")
+    assert_includes "git + hub = github", help_manpage
+    assert_includes "git browse", 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"
+    assert_equal expected, usage_help
+  end
+
   def test_help_hub_no_groff
     stub_available_commands()
     assert_equal "** Can't find groff(1)\n", hub("help hub")
@@ -1224,6 +1261,13 @@ config
     assert_equal "Usage: hub browse [<USER>/]<REPOSITORY>\n", hub("browse")
   end
 
+  def test_hub_browse_ssh_alias
+    with_ssh_config do
+      stub_repo_url "gh:singingwolfboy/sekrit.git"
+      assert_command "browse", "open https://github.com/singingwolfboy/sekrit"
+    end
+  end
+
   def test_custom_browser
     with_browser_env("custom") do
       assert_browser("custom")
@@ -1399,4 +1443,10 @@ config
       Hub::Commands.send :improved_help_text
     end
 
+    def with_ssh_config
+      config_file = File.expand_path '../ssh_config', __FILE__
+      Hub::Context::SshConfig::CONFIG_FILES.replace [config_file]
+      yield
+    end
+
 end

data/test/ssh_config

@@ -0,0 +1,3 @@
+Host gh
+  User git
+  HostName github.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
-dependencies: []
+date: 2012-03-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70214684711760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70214684711760
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70214684711100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70214684711100
 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
@@ -26,6 +48,7 @@ files:
 - README.md
 - Rakefile
 - LICENSE
+- HISTORY.md
 - lib/hub/args.rb
 - lib/hub/commands.rb
 - lib/hub/context.rb
@@ -44,6 +67,7 @@ files:
 - test/fakebin/open
 - test/helper.rb
 - test/hub_test.rb
+- test/ssh_config
 - test/standalone_test.rb
 homepage: https://github.com/defunkt/hub
 licenses: []