hub 1.11.0 → 1.11.1

data/Rakefile

@@ -173,7 +173,7 @@ task :homebrew do
     sh "git checkout -q -B #{branch}"
     sh "git commit -m 'hub v#{Hub::VERSION}' -- #{formula_file}"
     sh "git push -u mislav #{branch}"
-    sh "hub pull-request 'upgrade hub to v#{Hub::VERSION}'"
+    sh "hub pull-request -m 'upgrade hub to v#{Hub::VERSION}'"
 
     sh "git checkout -q master"
   end

data/lib/hub/context.rb

@@ -18,7 +18,8 @@ module Hub
         @executable = executable || 'git'
         # caches output when shelling out to git
         read_proc ||= lambda { |cache, cmd|
-          result = %x{#{command_to_string(cmd)} 2>#{NULL}}.chomp
+          str = command_to_string(cmd)
+          result = silence_stderr { %x{#{str}}.chomp }
           cache[cmd] = $?.success? && !result.empty? ? result : nil
         }
         @cache = Hash.new(&read_proc)
@@ -61,6 +62,14 @@ module Hub
         full_cmd = to_exec(cmd)
         full_cmd.respond_to?(:shelljoin) ? full_cmd.shelljoin : full_cmd.join(' ')
       end
+
+      def silence_stderr
+        oldio = STDERR.dup
+        STDERR.reopen(NULL)
+        yield
+      ensure
+        STDERR.reopen(oldio)
+      end
     end
 
     module GitReaderMethods
@@ -88,17 +97,19 @@ module Hub
     private :git_config, :git_command
 
     def local_repo(fatal = true)
-      @local_repo ||= begin
-        if is_repo?
-          LocalRepo.new git_reader, current_dir
+      return nil if defined?(@local_repo) && @local_repo == false
+      @local_repo =
+        if git_dir = git_command('rev-parse -q --git-dir')
+          LocalRepo.new(git_reader, current_dir, git_dir)
         elsif fatal
           raise FatalError, "Not a git repository"
+        else
+          false
         end
-      end
     end
 
     repo_methods = [
-      :current_branch,
+      :current_branch, :git_dir,
       :remote_branch_and_project,
       :repo_owner, :repo_host,
       :remotes, :remotes_group, :origin_remote
@@ -116,7 +127,7 @@ module Hub
       end
     end
 
-    class LocalRepo < Struct.new(:git_reader, :dir)
+    class LocalRepo < Struct.new(:git_reader, :dir, :git_dir)
       include GitReaderMethods
 
       def name
@@ -151,28 +162,49 @@ module Hub
       end
 
       def current_branch
-        if branch = git_command('symbolic-ref -q HEAD')
-          Branch.new self, branch
+        @current_branch ||= branch_at_ref('HEAD')
+      end
+
+      def branch_at_ref(*parts)
+        begin
+          head = file_read(*parts)
+        rescue Errno::ENOENT
+          return nil
+        else
+          Branch.new(self, head.rstrip) if head.sub!('ref: ', '')
         end
       end
 
+      def file_read(*parts)
+        File.read(File.join(git_dir, *parts))
+      end
+
+      def file_exist?(*parts)
+        File.exist?(File.join(git_dir, *parts))
+      end
+
       def master_branch
         if remote = origin_remote
-          default_branch = git_command("rev-parse --symbolic-full-name #{remote}")
+          default_branch = branch_at_ref("refs/remotes/#{remote}/HEAD")
         end
-        Branch.new(self, default_branch || 'refs/heads/master')
+        default_branch || Branch.new(self, 'refs/heads/master')
       end
 
       ORIGIN_NAMES = %w[ upstream github origin ]
 
       def remotes
         @remotes ||= begin
-          # TODO: is there a plumbing command to get a list of remotes?
-          list = git_command('remote').to_s.split("\n")
-          list = ORIGIN_NAMES.inject([]) { |sorted, name|
-            sorted << list.delete(name)
-          }.compact.concat(list)
-          list.map { |name| Remote.new self, name }
+          names = []
+          url_memo = Hash.new {|h,k| names << k; h[k]=[] }
+          git_command('remote -v').to_s.split("\n").map do |line|
+            next if line !~ /^(.+?)\t(.+) \(/
+            name, url = $1, $2
+            url_memo[name] << url
+          end
+          ((ORIGIN_NAMES + names) & names).map do |name|
+            urls = url_memo[name].uniq
+            Remote.new(self, name, urls)
+          end
         end
       end
 
@@ -194,12 +226,10 @@ module Hub
         remotes.find {|r| r.name == remote_name }
       end
 
-      def known_hosts
-        hosts = git_config('hub.host', :all).to_s.split("\n")
-        hosts << default_host
-        # support ssh.github.com
-        # https://help.github.com/articles/using-ssh-over-the-https-port
-        hosts << "ssh.#{default_host}"
+      def known_host?(host)
+        default = default_host
+        default == host || "ssh.#{default}" == host ||
+          git_config('hub.host', :all).to_s.split("\n").include?(host)
       end
 
       def self.default_host
@@ -220,7 +250,7 @@ module Hub
 
     class GithubProject < Struct.new(:local_repo, :owner, :name, :host)
       def self.from_url(url, local_repo)
-        if local_repo.known_hosts.include? url.host
+        if local_repo.known_host?(url.host)
           _, owner, name = url.path.split('/', 4)
           GithubProject.new(local_repo, owner, name.sub(/\.git$/, ''), url.host)
         end
@@ -335,7 +365,7 @@ module Hub
           refs = local_repo.remotes_for_publish(owner_name).map { |remote|
             "refs/remotes/#{remote}/#{short}"
           }
-          if branch = refs.detect {|ref| local_repo.git_command("rev-parse -q --verify #{ref}") }
+          if branch = refs.detect {|ref| local_repo.file_exist?(ref) }
             Branch.new(local_repo, branch)
           end
         end
@@ -351,7 +381,7 @@ module Hub
       end
     end
 
-    class Remote < Struct.new(:local_repo, :name)
+    class Remote < Struct.new(:local_repo, :name, :raw_urls)
       alias to_s name
 
       def ==(other)
@@ -359,7 +389,7 @@ module Hub
       end
 
       def project
-        urls.each_value { |url|
+        urls.each { |url|
           if valid = GithubProject.from_url(url, local_repo)
             return valid
           end
@@ -368,27 +398,29 @@ module Hub
       end
 
       def urls
-        return @urls if defined? @urls
-        @urls = {}
-        local_repo.git_command('remote -v').to_s.split("\n").map do |line|
-          next if line !~ /^(.+?)\t(.+) \((.+)\)$/
-          remote, uri, type = $1, $2, $3
-          next if remote != self.name
-          if uri =~ %r{^[\w-]+://} or uri =~ %r{^([^/]+?):}
-            uri = "ssh://#{$1}/#{$'}" if $1
+        @urls ||= raw_urls.map do |url|
+          with_normalized_url(url) do |normalized|
             begin
-              @urls[type] = uri_parse(uri)
+              uri_parse(normalized)
             rescue URI::InvalidURIError
             end
           end
         end
-        @urls
+      end
+
+      def with_normalized_url(url)
+        if url =~ %r{^[\w-]+://} || url =~ %r{^([^/]+?):}
+          url = "ssh://#{$1}/#{$'}" if $1
+          yield url
+        end
       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 }
+        if uri.host != local_repo.default_host
+          ssh = local_repo.ssh_config
+          uri.host = ssh.get_value(uri.host, :HostName) { uri.host }
+        end
         uri
       end
     end
@@ -447,12 +479,8 @@ module Hub
       PWD
     end
 
-    def git_dir
-      git_command 'rev-parse -q --git-dir'
-    end
-
     def is_repo?
-      !!git_dir
+      !!local_repo(false)
     end
 
     def git_editor

data/lib/hub/runner.rb

@@ -58,6 +58,7 @@ module Hub
         if cmd.respond_to?(:call) then cmd.call
         elsif i == commands.length - 1
           # last command in chain
+          STDOUT.flush; STDERR.flush
           exec(*cmd)
         else
           exit($?.exitstatus) unless system(*cmd)

data/lib/hub/ssh_config.rb

@@ -1,8 +1,9 @@
 module Hub
-  # Reads ssh configuration files and records each setting under its host
-  # pattern so it can be looked up by hostname.
+  # Reads ssh_config(5) files and records "Host" to "HostName" mappings to
+  # provide resolving of ssh aliases.
   class SshConfig
     CONFIG_FILES = %w(~/.ssh/config /etc/ssh_config /etc/ssh/ssh_config)
+    CONFIG_RE = /^\s*(Host|HostName)\s+/
 
     def initialize files = nil
       @settings = Hash.new {|h,k| h[k] = {} }
@@ -15,67 +16,21 @@ module Hub
     # Public: Get a setting as it would apply to a specific hostname.
     #
     # 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
+    def get_value(host, key, &fallback)
+      host = host.to_s.downcase
+      @settings[host].fetch(key.to_sym, &fallback)
     end
 
     def parse_file file
-      host_patterns = [HostPattern.new('*')]
+      host_patterns = %w[*]
 
       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!
+        next unless line =~ CONFIG_RE
+        key, value = $1.to_sym, $'.chomp
+        value.gsub!(/^"|"$/, '')
 
-        if 'host' == key
-          host_patterns = value.split(/\s+/).map {|p| HostPattern.new p }
+        if :Host == key
+          host_patterns = value.downcase.split(/\s+/)
         else
           record_setting key, value, host_patterns
         end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.11.0'
+  Version = VERSION = '1.11.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: hub
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,40 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: rake
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: webmock
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+date: 2013-12-26 00:00:00.000000000 Z
+dependencies: []
 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
@@ -69,23 +37,10 @@ files:
 - lib/hub/standalone.rb
 - lib/hub/version.rb
 - lib/hub.rb
-- bin/bench
 - bin/hub
 - man/hub.1
 - man/hub.1.html
 - man/hub.1.ronn
-- script/cached-bundle
-- script/s3-put
-- script/test
-- script/test_each
-- test/context_test.rb
-- test/deps.rip
-- test/fakebin/git
-- test/fakebin/open
-- test/github_api_test.rb
-- test/helper.rb
-- test/hub_test.rb
-- test/standalone_test.rb
 homepage: http://hub.github.com/
 licenses:
 - MIT
@@ -99,17 +54,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/bin/bench

@@ -1,37 +0,0 @@
-#!/bin/bash
-set -e
-
-iterations=20
-
-ruby="$(rbenv which ruby)"
-ruby_args="--disable-gems"
-
-unset RUBYLIB
-unset RUBYOPT
-
-export TIMEFORMAT='%3R'
-
-time_ruby() {
-  (time "$ruby" $ruby_args "$@" >/dev/null) 2>&1
-}
-
-time_plain() {
-  (time "$@" >/dev/null) 2>&1
-}
-
-measure() {
-  local count="$iterations"
-  echo "$@"
-  { while [ "$count" -gt 0 ]; do
-      # time_ruby "$@"
-      time_plain "$@"
-      count=$((count - 1))
-    done
-  } | stdev
-}
-
-/usr/bin/ruby -v
-measure tmp/hub-slow version
-measure tmp/hub-slow browse -u
-measure tmp/hub-fast version
-measure tmp/hub-fast browse -u