hub 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c0677c16aef1654f0bb45debbd4bb13711b80c
-  data.tar.gz: b05264bdc353d8ba0875402951cf5fcb869fe0bd
+  metadata.gz: 5407dc0fb9ed147f8062d7fc71105e47917d81f5
+  data.tar.gz: 822b2cea8f672f01c39a020d8ae7e0f32948c057
 SHA512:
-  metadata.gz: d5b0533962cce93062ca8e65b29d4c916008b7394d3cddcc700cec8b379e26e7f11fb0ab398cdadea7a6d905d81966f9637ecaa416320b2fdabea8db5e482a31
-  data.tar.gz: 87fce8fb1670724bcdb9c169df01998be68fbd260341529a2f8677d669575256e6f5df2a1af900e90f52b67a7172641e8554ece4d296a8111552757895eb9ab7
+  metadata.gz: 8685da13cb734dc61dc20ad80fc54967bbfd3f00b8b72b4e99f600d16f25e89e87abd20db7783b9a04ac37cc61e948bc313ca7a94ce083e55c9b761d481d0392
+  data.tar.gz: f5bb42ef98e1282d6aacb9e5ee1d0a6f69c9cb2ee702848f25a122dd090d1e0023b0a995333bb1eb98dd0fe426c0cf74b17517c0c9ce05e9d905637574ff19a2

data/lib/hub/commands.rb

@@ -86,7 +86,7 @@ module Hub
         abort "Aborted: the origin remote doesn't point to a GitHub repository."
       end
 
-      unless sha = local_repo.git_command("rev-parse -q #{ref}")
+      unless sha = local_repo.git_command("rev-parse -q '%s'" % ref.gsub("'", "\\'"))
         abort "Aborted: no revision could be determined from '#{ref}'"
       end
 
@@ -228,8 +228,11 @@ module Hub
         else
           format = '%h (%aN, %ar)%n%w(78,3,3)%s%n%+b'
           default_message = nil
-          commit_summary = git_command "log --no-color --format='%s' --cherry %s...%s" %
-            [format, base_branch, remote_branch]
+          commit_summary = git_command "log --no-color --format='%s' --cherry '%s...%s'" % [
+            format,
+            base_branch.to_s.gsub("'", "\\'"),
+            remote_branch.to_s.gsub("'", "\\'")
+          ]
         end
 
         options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg, initial_message, cc|
@@ -294,7 +297,7 @@ module Hub
             name, owner = arg, nil
             owner, name = name.split('/', 2) if name.index('/')
             project = github_project(name, owner || github_user)
-            unless ssh || args[0] == 'submodule' || args.noop? || https_protocol?
+            unless ssh || args[0] == 'submodule' || https_protocol?
               repo_info = api_client.repo_info(project)
               ssh = repo_info.success? && (repo_info.data['private'] || repo_info.data['permissions']['push'])
             end
@@ -690,7 +693,7 @@ module Hub
         elsif subpage && !%w[commits tree blob settings].include?(subpage)
           branch = master_branch
           project = local_repo.main_project
-        else
+        elsif local_repo(false)
           # $ hub browse
           prefer_upstream = current_branch && current_branch.master?
           branch, project = remote_branch_and_project(method(:github_user), prefer_upstream)

data/lib/hub/context.rb

@@ -355,7 +355,8 @@ module Hub
       end
 
       def upstream
-        if branch = local_repo.git_command("rev-parse --symbolic-full-name #{short_name}@{upstream}")
+        escaped_name = short_name.gsub("'", "\\'")
+        if branch = local_repo.git_command("rev-parse --symbolic-full-name '#{escaped_name}@{upstream}'")
           Branch.new local_repo, branch
         end
       end
@@ -479,7 +480,10 @@ module Hub
     end
 
     def rev_list(a, b)
-      git_command("rev-list --cherry-pick --right-only --no-merges #{a}...#{b}")
+      git_command "rev-list --cherry-pick --right-only --no-merges '%s...%s'" % [
+        a.to_s.gsub("'", "\\'"),
+        b.to_s.gsub("'", "\\'")
+      ]
     end
 
     PWD = Dir.pwd

data/lib/hub/github_api.rb

@@ -273,13 +273,15 @@ module Hub
 
       def configure_connection req, url
         url.scheme = config.protocol(url.host)
+        url.port = 80 if url.scheme == 'http'
         if ENV['HUB_TEST_HOST']
           req['Host'] = url.host
           req['X-Original-Scheme'] = url.scheme
+          req['X-Original-Port'] = url.port
           url = url.dup
           url.scheme = 'http'
           url.host, test_port = ENV['HUB_TEST_HOST'].split(':')
-          url.port = test_port.to_i if test_port
+          url.port = test_port ? test_port.to_i : 80
         end
         yield url
       end

data/lib/hub/speedy_stdlib.rb

@@ -33,7 +33,9 @@ unless defined?(URI)
   end
 
   module URI
-    InvalidURIError = Class.new(StandardError)
+    Error = Class.new(StandardError)
+    InvalidURIError = Class.new(Error)
+    InvalidComponentError = Class.new(Error)
 
     def self.parse(str)
       URI::HTTP.new(str)
@@ -56,23 +58,24 @@ unless defined?(URI)
 
     class HTTP
       attr_accessor :scheme, :user, :password, :host, :path, :query, :fragment
-      attr_writer :port
+      attr_reader :port
       alias hostname host
 
       def initialize(str)
         m = str.to_s.match(%r{^ ([\w-]+): // (?:([^/@]+)@)? ([^/?#]+) }x)
         raise InvalidURIError unless m
         _, self.scheme, self.userinfo, host = m.to_a
-        self.host, self.port = host.split(':', 2)
+        self.host, port = host.split(':', 2)
+        self.port = port ? port.to_i : default_port
         path, self.fragment = m.post_match.split('#', 2)
-        self.path, self.query = path.to_s.split('?', 2)
+        path, self.query = path.split('?', 2) if path
+        self.path = path.to_s
       end
 
       def to_s
         url = "#{scheme}://"
         url << "#{userinfo}@" if user || password
-        url << host
-        url << ":#{@port}" if @port
+        url << host << display_port
         url << path
         url << "?#{query}" if query
         url << "##{fragment}" if fragment
@@ -85,8 +88,12 @@ unless defined?(URI)
         url
       end
 
-      def port
-        (@port || (scheme == 'https' ? 443 : 80)).to_i
+      def port=(number)
+        if number.is_a?(Fixnum) && number > 0
+          @port = number
+        else
+          raise InvalidComponentError, "bad component(expected port component): %p" % number
+        end
       end
 
       def userinfo=(info)
@@ -102,6 +109,20 @@ unless defined?(URI)
 
       def find_proxy
       end
+
+      private
+
+      def default_port
+        self.scheme == 'https' ? 443 : 80
+      end
+
+      def display_port
+        if port != default_port
+          ":#{port}"
+        else
+          ""
+        end
+      end
     end
   end
 end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.12.2'
+  Version = VERSION = '1.12.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies: []
 description: |2
     `hub` is a command line utility which adds GitHub knowledge to `git`.