hub 1.11.2 → 1.12.0

data/lib/hub/commands.rb

@@ -111,6 +111,10 @@ module Hub
         $stdout.puts ref_state
       end
       exit exit_code
+    rescue GitHubAPI::Exceptions
+      response = $!.response
+      display_api_exception("fetching CI status", response)
+      exit 1
     end
 
     # $ hub pull-request
@@ -158,11 +162,13 @@ module Hub
           head_project, options[:head] = from_github_ref.call(head, head_project)
         when '-i'
           options[:issue] = args.shift
+        when '-o', '--browse'
+          open_with_browser = true
         else
           if url = resolve_github_url(arg) and url.project_path =~ /^issues\/(\d+)/
             options[:issue] = $1
             base_project = url.project
-          elsif !options[:title]
+          elsif !options[:title] && arg.index('-') != 0
             options[:title] = arg
             warn "hub: Specifying pull request title without a flag is deprecated."
             warn "Please use one of `-m' or `-F' options."
@@ -237,8 +243,10 @@ module Hub
 
       pull = api_client.create_pullrequest(options)
 
-      args.executable = 'echo'
-      args.replace [pull['html_url']]
+      args.push('-u') unless open_with_browser
+      browse_command(args) do
+        pull['html_url']
+      end
     rescue GitHubAPI::Exceptions
       response = $!.response
       display_api_exception("creating pull request", response)
@@ -693,7 +701,7 @@ module Hub
           "/#{subpage}"
         end
 
-        project.web_url(path)
+        project.web_url(path, api_client.config.method(:protocol))
       end
     end
 
@@ -724,7 +732,8 @@ module Hub
           end
         end
 
-        project.web_url "/compare/#{range.tr('/', ';')}"
+        path = '/compare/%s' % range.tr('/', ';')
+        project.web_url(path, api_client.config.method(:protocol))
       end
     end
 
@@ -829,7 +838,9 @@ module Hub
         config_file = ENV['HUB_CONFIG'] || '~/.config/hub'
         file_store = GitHubAPI::FileStore.new File.expand_path(config_file)
         file_config = GitHubAPI::Configuration.new file_store
-        GitHubAPI.new file_config, :app_url => 'http://hub.github.com/'
+        GitHubAPI.new file_config,
+          :app_url => 'http://hub.github.com/',
+          :verbose => !ENV['HUB_VERBOSE'].to_s.empty?
       end
     end
 
@@ -1032,7 +1043,7 @@ help
         write.close
 
         # Don't page if the input is short enough
-        ENV['LESS'] = 'FSRX'
+        ENV['LESS'] = 'FSR'
 
         # Wait until we have input before we start the pager
         Kernel.select [STDIN]

data/lib/hub/context.rb

@@ -288,7 +288,7 @@ module Hub
         local_repo.remotes.find { |r| r.project == self }
       end
 
-      def web_url(path = nil)
+      def web_url(path = nil, protocol_config = nil)
         project_name = name_with_owner
         if project_name.sub!(/\.wiki$/, '')
           unless '/wiki' == path
@@ -298,7 +298,11 @@ module Hub
             path = '/wiki' + path
           end
         end
-        "https://#{host}/" + project_name + path.to_s
+        '%s://%s/%s' % [
+          protocol_config ? protocol_config.call(host) : 'https',
+          host,
+          project_name + path.to_s
+        ]
       end
 
       def git_url(options = {})

data/lib/hub/github_api.rb

@@ -27,8 +27,11 @@ module Hub
     def initialize config, options
       @config = config
       @oauth_app_url = options.fetch(:app_url)
+      @verbose = options.fetch(:verbose, false)
     end
 
+    def verbose?() @verbose end
+
     # Fake exception type for net/http exception handling.
     # Necessary because net/http may or may not be loaded at the time.
     module Exceptions
@@ -180,6 +183,8 @@ module Hub
             when 'custom'        then err['message']
             when 'missing_field'
               %(Missing field: "%s") % err['field']
+            when 'already_exists'
+              %(Duplicate value for "%s") % err['field']
             when 'invalid'
               %(Invalid value for "%s": "%s") % [ err['field'], err['value'] ]
             when 'unauthorized'
@@ -246,8 +251,10 @@ module Hub
       end
 
       def configure_connection req, url
+        url.scheme = config.protocol(url.host)
         if ENV['HUB_TEST_HOST']
           req['Host'] = url.host
+          req['X-Original-Scheme'] = url.scheme
           url = url.dup
           url.scheme = 'http'
           url.host, test_port = ENV['HUB_TEST_HOST'].split(':')
@@ -322,7 +329,7 @@ module Hub
           end
         end
 
-        if found = res.data.find {|auth| auth['app']['url'] == oauth_app_url }
+        if found = res.data.find {|auth| auth['note'] == 'hub' || auth['note_url'] == oauth_app_url }
           found['token']
         else
           # create a new authorization
@@ -342,9 +349,63 @@ module Hub
       end
     end
 
+    module Verbose
+      def finalize_request(req, url)
+        super
+        dump_request_info(req, url) if verbose?
+      end
+
+      def perform_request(*)
+        res = super
+        dump_response_info(res) if verbose?
+        res
+      end
+
+      def verbose_puts(msg)
+        msg = "\e[36m%s\e[m" % msg if $stderr.tty?
+        $stderr.puts msg
+      end
+
+      def dump_request_info(req, url)
+        verbose_puts "> %s %s://%s%s" % [
+          req.method.to_s.upcase,
+          url.scheme,
+          url.host,
+          req.path,
+        ]
+        dump_headers(req, '> ')
+        dump_body(req)
+      end
+
+      def dump_response_info(res)
+        verbose_puts "< HTTP %s" % res.status
+        dump_headers(res, '< ')
+        dump_body(res)
+      end
+
+      def dump_body(obj)
+        verbose_puts obj.body if obj.body
+      end
+
+      DUMP_HEADERS = %w[ Authorization X-GitHub-OTP Location ]
+
+      def dump_headers(obj, indent)
+        DUMP_HEADERS.each do |header|
+          if value = obj[header]
+            verbose_puts '%s%s: %s' % [
+              indent,
+              header,
+              value.sub(/^(basic|token) (.+)/i, '\1 [REDACTED]'),
+            ]
+          end
+        end
+      end
+    end
+
     include HttpMethods
     include OAuth
     include GistAuth
+    include Verbose
 
     # Filesystem store suitable for Configuration
     class FileStore
@@ -472,6 +533,11 @@ module Hub
         end
       end
 
+      def protocol host
+        host = normalize_host host
+        @data.fetch_value(host, nil, :protocol) { 'https' }
+      end
+
       def value_to_persist(value = nil)
         @data.persist_next_change!
         value
@@ -481,6 +547,7 @@ module Hub
         print "#{what}: "
         $stdin.gets.chomp
       rescue Interrupt
+        puts
         abort
       end
 
@@ -496,6 +563,7 @@ module Hub
           $stdin.gets.chomp
         end
       rescue Interrupt
+        puts
         abort
       end
 
@@ -503,6 +571,7 @@ module Hub
         print "two-factor authentication code: "
         $stdin.gets.chomp
       rescue Interrupt
+        puts
         abort
       end
 

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.11.2'
+  Version = VERSION = '1.12.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" "December 2013" "GITHUB" "Hub Manual"
+.TH "HUB" "1" "February 2014" "GITHUB" "Hub Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -61,7 +61,7 @@
 \fBgit fork\fR [\fB\-\-no\-remote\fR]
 .
 .br
-\fBgit pull\-request\fR [\fB\-f\fR] [\fB\-m\fR \fIMESSAGE\fR|\fB\-F\fR \fIFILE\fR|\fB\-i\fR \fIISSUE\fR|\fIISSUE\-URL\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
+\fBgit pull\-request\fR [\fB\-o\fR|\fB\-\-browse\fR] [\fB\-f\fR] [\fB\-m\fR \fIMESSAGE\fR|\fB\-F\fR \fIFILE\fR|\fB\-i\fR \fIISSUE\fR|\fIISSUE\-URL\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
 .
 .br
 \fBgit ci\-status\fR [\fB\-v\fR] [\fICOMMIT\fR]
@@ -148,13 +148,16 @@ Open a GitHub compare view page in the system\'s default web browser\. \fISTART\
 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] [\fB\-m\fR \fIMESSAGE\fR|\fB\-F\fR \fIFILE\fR|\fB\-i\fR \fIISSUE\fR|\fIISSUE\-URL\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
+\fBgit pull\-request\fR [\fB\-o\fR|\fB\-\-browse\fR] [\fB\-f\fR] [\fB\-m\fR \fIMESSAGE\fR|\fB\-F\fR \fIFILE\fR|\fB\-i\fR \fIISSUE\fR|\fIISSUE\-URL\fR] [\fB\-b\fR \fIBASE\fR] [\fB\-h\fR \fIHEAD\fR]
 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 the following formats: "branch", "owner:branch", "owner/repo:branch"\. This command will abort operation if it detects that the current topic branch has local commits that are not yet pushed to its upstream branch on the remote\. To skip this check, use \fB\-f\fR\.
 .
 .IP
 Without \fIMESSAGE\fR or \fIFILE\fR, a text editor will open in which title and body of the pull request can be entered in the same manner as git commit message\. Pull request message can also be passed via stdin with \fB\-F \-\fR\.
 .
 .IP
+With \fB\-o\fR or \fB\-\-browse\fR, the new pull request will open in the web browser\.
+.
+.IP
 Issue to pull request conversion via \fB\-i <ISSUE>\fR or \fIISSUE\-URL\fR arguments is deprecated and will likely be removed from the future versions of both hub and GitHub API\.
 .
 .TP

data/man/hub.1.html

@@ -100,7 +100,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>] [<code>-m</code> <var>MESSAGE</var>|<code>-F</code> <var>FILE</var>|<code>-i</code> <var>ISSUE</var>|<var>ISSUE-URL</var>] [<code>-b</code> <var>BASE</var>] [<code>-h</code> <var>HEAD</var>]<br />
+<code>git pull-request</code> [<code>-o</code>|<code>--browse</code>] [<code>-f</code>] [<code>-m</code> <var>MESSAGE</var>|<code>-F</code> <var>FILE</var>|<code>-i</code> <var>ISSUE</var>|<var>ISSUE-URL</var>] [<code>-b</code> <var>BASE</var>] [<code>-h</code> <var>HEAD</var>]<br />
 <code>git ci-status</code> [<code>-v</code>] [<var>COMMIT</var>]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
@@ -184,7 +184,7 @@ If <var>END</var> is omitted, GitHub compare view is opened for the current bran
 With <code>-u</code>, outputs the URL rather than opening the browser.</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.</p></dd>
-<dt><code>git pull-request</code> [<code>-f</code>] [<code>-m</code> <var>MESSAGE</var>|<code>-F</code> <var>FILE</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
+<dt><code>git pull-request</code> [<code>-o</code>|<code>--browse</code>] [<code>-f</code>] [<code>-m</code> <var>MESSAGE</var>|<code>-F</code> <var>FILE</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
 the following formats: "branch", "owner:branch", "owner/repo:branch".
@@ -196,6 +196,8 @@ on the remote. To skip this check, use <code>-f</code>.</p>
 of the pull request can be entered in the same manner as git commit message.
 Pull request message can also be passed via stdin with <code>-F -</code>.</p>
 
+<p>With <code>-o</code> or <code>--browse</code>, the new pull request will open in the web browser.</p>
+
 <p>Issue to pull request conversion via <code>-i &lt;ISSUE></code> or <var>ISSUE-URL</var>
 arguments is deprecated and will likely be removed from the future versions
 of both hub and GitHub API.</p></dd>
@@ -457,7 +459,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>GITHUB</li>
-    <li class='tc'>December 2013</li>
+    <li class='tc'>February 2014</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/man/hub.1.ronn

@@ -27,7 +27,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`] [`-m` <MESSAGE>|`-F` <FILE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]  
+`git pull-request` [`-o`|`--browse`] [`-f`] [`-m` <MESSAGE>|`-F` <FILE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]  
 `git ci-status` [`-v`] [<COMMIT>]
 
 ## DESCRIPTION
@@ -142,7 +142,7 @@ hub also adds some custom commands that are otherwise not present in git:
     Forks the original project (referenced by "origin" remote) on GitHub and
     adds a new remote for it under your username.
 
-  * `git pull-request` [`-f`] [`-m` <MESSAGE>|`-F` <FILE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]:
+  * `git pull-request` [`-o`|`--browse`] [`-f`] [`-m` <MESSAGE>|`-F` <FILE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]:
     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
@@ -155,6 +155,8 @@ hub also adds some custom commands that are otherwise not present in git:
     of the pull request can be entered in the same manner as git commit message.
     Pull request message can also be passed via stdin with `-F -`.
 
+    With `-o` or `--browse`, the new pull request will open in the web browser.
+
     Issue to pull request conversion via `-i <ISSUE>` or <ISSUE-URL>
     arguments is deprecated and will likely be removed from the future versions
     of both hub and GitHub API.

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.0
+  prerelease: 
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -9,37 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies: []
-description: |2
-    `hub` is a command line utility which adds GitHub knowledge to `git`.
-
-    It can used on its own or as a `git` wrapper.
-
-    Normal:
-
-        $ hub clone rtomayko/tilt
-
-        Expands to:
-        $ git clone git://github.com/rtomayko/tilt.git
-
-    Wrapping `git`:
-
-        $ git clone rack/rack
-
-        Expands to:
-        $ git clone git://github.com/rack/rack.git
+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
+  \ Wrapping `git`:\n\n      $ git clone rack/rack\n\n      Expands to:\n      $ git
+  clone git://github.com/rack/rack.git\n"
 email: mislav.marohnic@gmail.com
 executables:
 - hub
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
 - Rakefile
-- bin/hub
-- lib/hub.rb
+- LICENSE
 - lib/hub/args.rb
 - lib/hub/commands.rb
 - lib/hub/context.rb
@@ -50,50 +36,39 @@ files:
 - lib/hub/ssh_config.rb
 - lib/hub/standalone.rb
 - lib/hub/version.rb
+- lib/hub.rb
+- bin/hub
 - man/hub.1
 - man/hub.1.html
 - man/hub.1.ronn
 homepage: http://hub.github.com/
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2+
-
-  ------------------------------------------------------------
-
-                    You there! Wait, I say!
-                    =======================
-
-         If you are a heavy user of `git` on the command
-         line  you  may  want  to  install `hub` the old
-         fashioned way.  Faster  startup  time,  you see.
-
-         Check  out  the  installation  instructions  at
-         https://github.com/github/hub#readme  under the
-         "Standalone" section.
-
-         Cheers,
-         defunkt
-
-  ------------------------------------------------------------
-
+post_install_message: ! "\n------------------------------------------------------------\n\n
+  \                 You there! Wait, I say!\n                  =======================\n\n
+  \      If you are a heavy user of `git` on the command\n       line  you  may  want
+  \ to  install `hub` the old\n       fashioned way.  Faster  startup  time,  you
+  see.\n\n       Check  out  the  installation  instructions  at\n       https://github.com/github/hub#readme
+  \ under the\n       \"Standalone\" section.\n\n       Cheers,\n       defunkt\n\n------------------------------------------------------------\n\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Command-line wrapper for git and GitHub
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 33425262679ba4de3ce4878fc66c286f6d25ef3b
-  data.tar.gz: 521fb0f37a0ee0d416952ced4d411b6b59812283
-SHA512:
-  metadata.gz: 57892fa9c30df8535ad45f3add227a01ceb5914b6886b77562ec7a3fd4e876885f0fb4e2087659673017c7cfa0fec2675c23fd873c7152f2991b243474b5bfb1
-  data.tar.gz: 372b734e8ad6ea150dde927387fda9d3d3b0957574e50800c2806d5b1f58c2385734efd97d5170c280ecf231325d596c9f1de0206b32a0da0ef012d09a51251a