hub 1.10.2 → 1.10.3

data/HISTORY.md

@@ -1,3 +1,14 @@
+## 1.10.3 (2012-11-22)
+
+* fix `browse` on Windows
+* fix hub on JRuby
+* try fixing Ruby 1.8.7 error with API requests
+* fix various edge cases around `create` command
+* have `fork` set up a remote even if own fork already exists
+* fix `pull-request` with Unicode chars on Ruby 1.8
+* respect $GITHUB_USER & $GITHUB_PASSWORD
+* improve reading git remotes configuration
+
 ## 1.10.2 (2012-07-24)
 
 * fix pushing multiple refs to multiple remotes

data/README.md

@@ -79,20 +79,49 @@ $ cd hub
 $ rake install prefix=/usr/local
 ~~~
 
-### Help! It's Slow!
+### Help! It's slow!
 
-Is your prompt slow? It may be hub.
+#### Is `hub` noticeably slower than plain git?
 
-1. Check that it's **not** installed using RubyGems.
-2. Check that RUBYOPT isn't loading anything shady:
+That is inconvenient, especially if you want to alias hub as `git`. Few things
+you can try:
 
-        $ echo $RUBYOPT
+* Find out which ruby is used for the hub executable:
 
-3. Check that your system Ruby is speedy:
+    ``` sh
+    head -1 `which hub`
+    ```
 
-        $ time /usr/bin/env ruby -e0
+* That ruby should be speedy. Time it with:
 
-If #3 is slow, it may be your [GC settings][gc].
+    ``` sh
+    time /usr/bin/ruby -e0
+    #=> it should be below 0.01 s total
+    ```
+
+* Check that Ruby isn't loading something shady:
+
+    ``` sh
+    echo $RUBYOPT
+    ```
+
+* Check your [GC settings][gc]
+
+General recommendation: you should change hub's shebang line to run with system
+ruby (usually `/usr/bin/ruby`) instead of currently active ruby (`/usr/bin/env
+ruby`). Also, Ruby 1.8 is speedier than 1.9.
+
+#### Is your shell prompt slow?
+
+Does your prompt show git information? Hub may be slowing down your prompt.
+
+This can happen if you've aliased hub as `git`. This is fine when you use `git`
+manually, but may be unacceptable for your prompt, which doesn't need hub
+features anyway!
+
+The solution is to identify which shell functions are calling `git`, and replace
+each occurrence of that with `command git`. This is a shell feature that enables
+you to call a command directly and skip aliases and functions wrapping it.
 
 
 Aliasing

data/lib/hub.rb

@@ -1,4 +1,4 @@
-require 'hub/version'
+require 'hub/version' unless defined?(Hub::VERSION)
 require 'hub/args'
 require 'hub/ssh_config'
 require 'hub/github_api'

data/lib/hub/commands.rb

@@ -9,12 +9,12 @@ module Hub
   # 1. hub is invoked from the command line:
   #    $ hub clone rtomayko/tilt
   #
-  # 2. The Hub class is initialized:
-  #    >> hub = Hub.new('clone', 'rtomayko/tilt')
+  # 2. The Runner class is initialized:
+  #    >> Hub::Runner.new('clone', 'rtomayko/tilt')
   #
   # 3. The method representing the git subcommand is executed with the
   #    full args:
-  #    >> Commands.clone('clone', 'rtomayko/tilt')
+  #    >> Hub::Commands.clone(['clone', 'rtomayko/tilt'])
   #
   # 4. That method rewrites the args as it sees fit:
   #    >> args[1] = "git://github.com/" + args[1] + ".git"
@@ -465,9 +465,14 @@ module Hub
       end
       forked_project = project.owned_by(github_user(project.host))
 
-      if api_client.repo_exists?(forked_project)
-        abort "Error creating fork: %s already exists on %s" %
-          [ forked_project.name_with_owner, forked_project.host ]
+      existing_repo = api_client.repo_info(forked_project)
+      if existing_repo.success?
+        parent_data = existing_repo.data['parent']
+        parent_url  = parent_data && resolve_github_url(parent_data['html_url'])
+        if !parent_url or parent_url.project != project
+          abort "Error creating fork: %s already exists on %s" %
+            [ forked_project.name_with_owner, forked_project.host ]
+        end
       else
         api_client.fork_repo(project) unless args.noop?
       end
@@ -520,7 +525,10 @@ module Hub
           action = "set remote origin"
         else
           action = "created repository"
-          api_client.create_repo(new_project, options) unless args.noop?
+          unless args.noop?
+            repo_data = api_client.create_repo(new_project, options)
+            new_project = github_project(repo_data['full_name'])
+          end
         end
 
         url = new_project.git_url(:private => true, :https => https_protocol?)
@@ -949,6 +957,8 @@ help
         read.close
         write.close
       end
+    rescue NotImplementedError
+      # fork might not available, such as in JRuby
     end
 
     def pullrequest_editmsg(changes)
@@ -993,7 +1003,7 @@ help
         end
       end
     end
-
+    
     def display_api_exception(action, response)
       $stderr.puts "Error #{action}: #{response.message.strip} (HTTP #{response.status})"
       if 422 == response.status and response.error_message?

data/lib/hub/context.rb

@@ -220,6 +220,7 @@ module Hub
 
       def initialize(*args)
         super
+        self.name = self.name.tr(' ', '-')
         self.host ||= (local_repo || LocalRepo).default_host
         self.host = host.sub(/^ssh\./i, '') if 'ssh.github.com' == host.downcase
       end
@@ -331,7 +332,7 @@ module Hub
       end
 
       def project
-        urls.each { |url|
+        urls.each_value { |url|
           if valid = GithubProject.from_url(url, local_repo)
             return valid
           end
@@ -340,15 +341,21 @@ module Hub
       end
 
       def urls
-        @urls ||= local_repo.git_config("remote.#{name}.url", :all).to_s.split("\n").map { |uri|
-          begin
-            if uri =~ %r{^[\w-]+://}    then uri_parse(uri)
-            elsif uri =~ %r{^([^/]+?):} then uri_parse("ssh://#{$1}/#{$'}")  # scp-like syntax
+        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
+            begin
+              @urls[type] = uri_parse(uri)
+            rescue URI::InvalidURIError
             end
-          rescue URI::InvalidURIError
-            nil
           end
-        }.compact
+        end
+        @urls
       end
 
       def uri_parse uri
@@ -435,7 +442,7 @@ module Hub
       # Returns an array, e.g.: ['open']
       def browser_launcher
         browser = ENV['BROWSER'] || (
-          osx? ? 'open' : windows? ? 'start' :
+          osx? ? 'open' : windows? ? %w[cmd /c start] :
           %w[xdg-open cygstart x-www-browser firefox opera mozilla netscape].find { |comm| which comm }
         )
 

data/lib/hub/github_api.rb

@@ -77,6 +77,7 @@ module Hub
         res = post "https://%s/user/repos" % api_host(project.host), params
       end
       res.error! unless res.success?
+      res.data
     end
 
     # Public: Fetch info about a pull request.
@@ -111,7 +112,10 @@ module Hub
 
     # Methods for performing HTTP requests
     #
-    # Requires access to a `config` object that implements `proxy_uri(with_ssl)`
+    # Requires access to a `config` object that implements:
+    # - proxy_uri(with_ssl)
+    # - username(host)
+    # - password(host, user)
     module HttpMethods
       # Decorator for Net::HTTPResponse
       module ResponseMethods
@@ -139,10 +143,17 @@ module Hub
         perform_request url, :Post do |req|
           if params
             req.body = JSON.dump params
-            req['Content-Type'] = 'application/json'
+            req['Content-Type'] = 'application/json;charset=utf-8'
           end
           yield req if block_given?
-          req['Content-Length'] = req.body ? req.body.length : 0
+          req['Content-Length'] = byte_size req.body
+        end
+      end
+
+      def byte_size str
+        if    str.respond_to? :bytesize then str.bytesize
+        elsif str.respond_to? :length   then str.length
+        else  0
         end
       end
 
@@ -162,11 +173,14 @@ module Hub
 
         apply_authentication(req, url)
         yield req if block_given?
-        res = http.start { http.request(req) }
-        res.extend ResponseMethods
-        res
-      rescue SocketError => err
-        raise Context::FatalError, "error with #{type.to_s.upcase} #{url} (#{err.message})"
+
+        begin
+          res = http.start { http.request(req) }
+          res.extend ResponseMethods
+          return res
+        rescue SocketError => err
+          raise Context::FatalError, "error with #{type.to_s.upcase} #{url} (#{err.message})"
+        end
       end
 
       def request_uri url
@@ -316,6 +330,7 @@ module Hub
       end
 
       def username host
+        return ENV['GITHUB_USER'] unless ENV['GITHUB_USER'].to_s.empty?
         host = normalize_host host
         @data.fetch_user host do
           if block_given? then yield
@@ -334,6 +349,7 @@ module Hub
       end
 
       def password host, user
+        return ENV['GITHUB_PASSWORD'] unless ENV['GITHUB_PASSWORD'].to_s.empty?
         host = normalize_host host
         @password_cache["#{user}@#{host}"] ||= prompt_password host, user
       end

data/lib/hub/json.rb

@@ -111,10 +111,22 @@ class Hub::JSON
       end
     end
 
-    def generate_String(str) str.inspect end
-    alias generate_Numeric generate_String
-    alias generate_TrueClass generate_String
-    alias generate_FalseClass generate_String
+    ESC_MAP = Hash.new {|h,k| k }.update \
+      "\r" => 'r',
+      "\n" => 'n',
+      "\f" => 'f',
+      "\t" => 't',
+      "\b" => 'b'
+
+    def generate_String(str)
+      escaped = str.gsub(/[\r\n\f\t\b"\\]/) { "\\#{ESC_MAP[$&]}"}
+      %("#{escaped}")
+    end
+
+    def generate_simple(obj) obj.inspect end
+    alias generate_Numeric generate_simple
+    alias generate_TrueClass generate_simple
+    alias generate_FalseClass generate_simple
 
     def generate_Symbol(sym) generate_String(sym.to_s) end
 

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.10.2'
+  Version = VERSION = '1.10.3'
 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" "May 2012" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "November 2012" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -155,6 +155,9 @@ If instead of normal \fITITLE\fR an issue number is given with \fB\-i\fR, the pu
 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"\.
 .
 .P
+To avoid being prompted, use \fIGITHUB_USER\fR and \fIGITHUB_PASSWORD\fR environment variables\.
+.
+.P
 If you prefer the HTTPS protocol for GitHub repositories, you can set "hub\.protocol" to "https"\. This will affect \fBclone\fR, \fBfork\fR, \fBremote add\fR and other operations that expand references to GitHub repositories as full URLs that otherwise use git and ssh protocols\.
 .
 .IP "" 4

data/man/hub.1.html

@@ -199,6 +199,9 @@ of title you can paste a full URL to an issue on GitHub.</p></dd>
 <p>Hub will prompt for GitHub username &amp; password the first time it needs to access
 the API and exchange it for an OAuth token, which it saves in "~/.config/hub".</p>
 
+<p>To avoid being prompted, use <var>GITHUB_USER</var> and <var>GITHUB_PASSWORD</var> environment
+variables.</p>
+
 <p>If you prefer the HTTPS protocol for GitHub repositories, you can set
 "hub.protocol" to "https". This will affect <code>clone</code>, <code>fork</code>, <code>remote add</code>
 and other operations that expand references to GitHub repositories as full
@@ -437,7 +440,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>May 2012</li>
+    <li class='tc'>November 2012</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/man/hub.1.ronn

@@ -156,6 +156,9 @@ hub also adds some custom commands that are otherwise not present in git:
 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".
 
+To avoid being prompted, use <GITHUB_USER> and <GITHUB_PASSWORD> environment
+variables.
+
 If you prefer the HTTPS protocol for GitHub repositories, you can set
 "hub.protocol" to "https". This will affect `clone`, `fork`, `remote add`
 and other operations that expand references to GitHub repositories as full

data/test/helper.rb

@@ -11,6 +11,22 @@ ENV['PATH'] = "#{fakebin_dir}:#{ENV['PATH']}"
 # Use an isolated config file in testing
 ENV['HUB_CONFIG'] = File.join(ENV['TMPDIR'] || '/tmp', 'hub-test-config')
 
+# Disable `abort` and `exit` in the main test process, but allow it in
+# subprocesses where we need to test does a command properly bail out.
+Hub::Commands.extend Module.new {
+  main_pid = Process.pid
+
+  [:abort, :exit].each do |method|
+    define_method method do |*args|
+      if Process.pid == main_pid
+        raise "#{method} is disabled"
+      else
+        super(*args)
+      end
+    end
+  end
+}
+
 class Test::Unit::TestCase
   # Shortcut for creating a `Hub` instance. Pass it what you would
   # normally pass `hub` on the command line, e.g.

data/test/hub_test.rb

@@ -10,6 +10,13 @@ WebMock::BodyPattern.class_eval do
   undef normalize_hash
   # override normalizing hash since it otherwise requires JSON
   def normalize_hash(hash) hash end
+
+  # strip out the "charset" directive from Content-type value
+  alias matches_with_dumb_content_type matches?
+  def matches?(body, content_type = "")
+    content_type = content_type.split(';').first if content_type.respond_to? :split
+    matches_with_dumb_content_type(body, content_type)
+  end
 end
 
 class HubTest < Test::Unit::TestCase
@@ -74,8 +81,7 @@ class HubTest < Test::Unit::TestCase
     @git_reader.stub! \
       'remote' => "mislav\norigin",
       'symbolic-ref -q HEAD' => 'refs/heads/master',
-      'config --get-all remote.origin.url' => 'git://github.com/defunkt/hub.git',
-      'config --get-all remote.mislav.url' => 'git://github.com/mislav/hub.git',
+      'remote -v' => "origin\tgit://github.com/defunkt/hub.git (fetch)\nmislav\tgit://github.com/mislav/hub.git (fetch)",
       'rev-parse --symbolic-full-name master@{upstream}' => 'refs/remotes/origin/master',
       'config --get --bool hub.http-clone' => 'false',
       'config --get hub.protocol' => nil,
@@ -641,11 +647,6 @@ class HubTest < Test::Unit::TestCase
     assert_forwarded 'name'
   end
 
-  def test_multiple_remote_urls
-    stub_repo_url("git://example.com/other.git\ngit://github.com/my/repo.git")
-    assert_command "browse", "open https://github.com/my/repo"
-  end
-
   def test_global_flags_preserved
     cmd = '--no-pager --bare -c core.awesome=true -c name=value --git-dir=/srv/www perform'
     assert_command cmd, 'git --bare -c core.awesome=true -c name=value --git-dir=/srv/www --no-pager perform'
@@ -655,7 +656,7 @@ class HubTest < Test::Unit::TestCase
   private
 
     def stub_repo_url(value, remote_name = 'origin')
-      stub_config_value "remote.#{remote_name}.url", value, '--get-all'
+      stub_command_output 'remote -v', "#{remote_name}\t#{value} (fetch)"
     end
 
     def stub_branch(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Command-line wrapper for git and GitHub