hub 1.8.0 → 1.8.1

data/lib/hub/commands.rb

@@ -937,6 +937,20 @@ help
       req = Net::HTTP.const_get(type).new(url.request_uri)
       req.basic_auth "#{user}/token", token if user and token
 
+      http = setup_http(url)
+
+      yield req if block_given?
+      http.start { http.request(req) }
+    end
+
+    def http_post(url, params = nil)
+      http_request(url, :Post) do |req|
+        req.set_form_data params if params
+        req['Content-Length'] = req.body ? req.body.length : 0
+      end
+    end
+
+    def setup_http(url)
       port = url.port
       if use_ssl = 'https' == url.scheme and not use_ssl?
         # ruby compiled without openssl
@@ -944,21 +958,22 @@ help
         port = 80
       end
 
-      http = Net::HTTP.new(url.host, port)
-      if http.use_ssl = use_ssl
-        # TODO: SSL peer verification
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http_args = [url.host, port]
+      if proxy = proxy_url(use_ssl)
+        http_args.concat proxy.select(:host, :port)
+        if proxy.userinfo
+          require 'cgi'
+          http_args.concat proxy.userinfo.split(':', 2).map {|a| CGI.unescape a }
+        end
       end
 
-      yield req if block_given?
-      http.start { http.request(req) }
-    end
+      http = Net::HTTP.new(*http_args)
 
-    def http_post(url, params = nil)
-      http_request(url, :Post) do |req|
-        req.set_form_data params if params
-        req['Content-Length'] = req.body ? req.body.length : 0
+      if http.use_ssl = use_ssl
+        # TODO: SSL peer verification
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+      return http
     end
 
     def load_net_http
@@ -971,6 +986,14 @@ help
       defined? ::OpenSSL
     end
 
+    def proxy_url(use_ssl)
+      env_name = "HTTP#{use_ssl ? 'S' : ''}_PROXY"
+      if proxy = ENV[env_name] || ENV[env_name.downcase]
+        proxy = "http://#{proxy}" unless proxy.include? '://'
+        URI.parse(proxy)
+      end
+    end
+
     # Fake exception type for net/http exception handling.
     # Necessary because net/http may or may not be loaded at the time.
     module HTTPExceptions

data/lib/hub/json.rb

@@ -1,76 +1,97 @@
 require 'strscan'
 require 'forwardable'
 
+# Stupid pure Ruby JSON parser.
 class Hub::JSON
+  def self.parse(data) new(data).parse end
+
   WSP = /\s+/
-  OBJ = /[{\[]/
-  NUM = /-?\d+(\.\d+)?([eE][+-]?\d+)?/
-  BOL = /(?:true|false)\b/
-  NUL = /null\b/
+  OBJ = /[{\[]/;    HEN = /\}/;  AEN = /\]/
+  COL = /\s*:\s*/;  KEY = /\s*,\s*/
+  NUM = /-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?/
+  BOL = /true|false/;  NUL = /null/
 
   extend Forwardable
 
   attr_reader :scanner
   alias_method :s, :scanner
-  private :s
   def_delegators :scanner, :scan, :matched
-
-  def self.parse(str)
-    self.new(str).parse
-  end
+  private :s, :scan, :matched
 
   def initialize data
     @scanner = StringScanner.new data.to_s
   end
 
-  def space
-    scan WSP
-  end
-
   def parse
     space
     object
   end
 
+  private
+
+  def space() scan WSP end
+
+  def endkey() scan(KEY) or space end
+
   def object
-    case scan(OBJ)
-    when '{' then hash
-    when '[' then array
-    end
+    matched == '{' ? hash : array if scan(OBJ)
   end
 
   def value
     object or string or
-      (scan(NUM) || scan(BOL)) ? eval(matched) :
-      scan(NUL) && nil
+      scan(NUL) ? nil :
+      scan(BOL) ? matched.size == 4:
+      scan(NUM) ? eval(matched) :
+      error
   end
 
   def hash
-    current = {}
+    obj = {}
     space
-    until scan(/\}/)
-      key = string
-      scan(/\s*:\s*/)
-      current[key] = value
-      scan(/\s*,\s*/) or space
-    end
-    current
+    repeat_until(HEN) { k = string; scan(COL); obj[k] = value; endkey }
+    obj
   end
 
   def array
-    current = []
+    ary = []
     space
-    until scan(/\]/)
-      current << value
-      scan(/\s*,\s*/) or space
-    end
-    current
+    repeat_until(AEN) { ary << value; endkey }
+    ary
   end
 
+  SPEC = {'b' => "\b", 'f' => "\f", 'n' => "\n", 'r' => "\r", 't' => "\t"}
+  UNI = 'u'; CODE = /[a-fA-F0-9]{4}/
+  STR = /"/; STE = '"'
+  ESC = '\\'
+
   def string
-    if str = scan(/"/)
-      begin; str << s.scan_until(/"/); end while s.pre_match[-1,1] == '\\'
-      eval str
+    if scan(STR)
+      str, esc = '', false
+      while c = s.getch
+        if esc
+          str << (c == UNI ? (s.scan(CODE) || error).to_i(16).chr : SPEC[c] || c)
+          esc = false
+        else
+          case c
+          when ESC then esc = true
+          when STE then break
+          else str << c
+          end
+        end
+      end
+      str
+    end
+  end
+
+  def error
+    raise "parse error at: #{scan(/.{1,10}/m).inspect}"
+  end
+
+  def repeat_until reg
+    until scan(reg)
+      pos = s.pos
+      yield
+      error unless s.pos > pos
     end
   end
 end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.8.0'
+  Version = VERSION = '1.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-24 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