gettc 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c1445699b1e6f8a76afbe8abae2037ce70b2a9
-  data.tar.gz: 40efda2730b2655a7c7bf3c22c418052afa4b640
+  metadata.gz: ce198ab839b5f78ae035a774c6294bd1d8378807
+  data.tar.gz: 5d0295e172711215ef34efa74b95a03701b9e308
 SHA512:
-  metadata.gz: c4853d10fbf7c4c628cb4046f6672c38f7eaec88c21975c35eef10f0b8a812b6f41790228db0b4ad60ee875575e097f0c005dd546839b83403de8f494f3e99c3
-  data.tar.gz: 0976b9ec10c389974383ed00d272f1509eb63c89af202348e77d3e75707799e6c4d7f8e44f36745bc98c3a822863d5a0b2bd08d26fdafdb0e1efea4dbe8d1944
+  metadata.gz: bdee525b1578930dc32be932897b8cbf29cb9bdcbf2463a748772d4aef35b1420ebd0e87964105980b3d80aedb0151898b957b9cbbb67a31997a2ec668b1a127
+  data.tar.gz: 6675ce735256bf4b6d9ae8485fb6d9b35fda904e36198a31d11a9a47f84b6b4564cca507216907f31c07df55316d94c35160aa4600a45aa5692ecc78515cd505

data/Rakefile

@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
     s.name = 'gettc'
     s.summary = 'TopCoder offline arena supporting multiple languages'
     s.description = 'Given a TopCoder problem ID, gettc downloads the problem specification, parses the whole thing into a Markdown file, generates inputs/outputs based on the Examples and System Tests given, and finally generates basic solution files for you to get started.'
-    s.version = '1.4'
+    s.version = '1.5'
 
     s.author = 'Seri'
     s.email = 'seritrinh@gmail.com'

data/core/lib/topcoder/download.rb

@@ -1,6 +1,7 @@
 require 'net/https'
 require 'cgi'
 require 'uri' 
+require 'ostruct'
 
 module TopCoder 
     class Account
@@ -35,8 +36,38 @@ module TopCoder
         LIMIT = 10
         def initialize account
             @account = account
+            @proxy = get_proxy
             @raw = get_cookie
         end
+        def get_proxy
+            uri = URI.parse ENV['http_proxy']
+            proxy = OpenStruct.new
+            proxy.host, proxy.port = uri.host, uri.port
+            if uri.userinfo then
+                proxy.user, proxy.pass = uri.userinfo.split /:/
+            else
+                proxy.user, proxy.pass = nil, nil
+            end
+            return proxy
+        rescue URI::InvalidURIError
+            return nil
+        end
+        def connect uri
+            if @proxy.nil? then
+                Net::HTTP.start(uri.host, uri.port) do |http|
+                    yield http
+                end
+            else
+                Net::HTTP.start(uri.host, uri.port, @proxy.host, @proxy.port,
+                                @proxy.user, @proxy.pass) do |http|
+                begin
+                    yield http
+                rescue Errno::ECONNRESET
+                    raise DownloadError.new "Check the http_proxy environmental variable"
+                end
+                end
+            end 
+        end
         def get_cookie
             uri = URI.join(ROOT, 'tc?&module=Login')
 
@@ -45,8 +76,9 @@ module TopCoder
                                'password' => @account.password,
                                'rem' => 'on' })
 
-            http = Net::HTTP.new uri.host, uri.port
-            res = http.request req
+            res = connect uri do |http|
+                http.request req
+            end
             raw = res['set-cookie']
 
             cookie = CGI::Cookie.parse raw
@@ -61,20 +93,22 @@ module TopCoder
             unless uri.is_a? URI then
                 uri = url.start_with?('http') ? URI.parse(url) : URI.join(ROOT, url) 
             end 
-            LIMIT.times do
-                req = Net::HTTP::Get.new uri.request_uri
-                req['cookie'] = @raw
 
-                http = Net::HTTP.new uri.host, uri.port
-                res = http.request req   
-                
-                return res.body if res.is_a? Net::HTTPSuccess
-                unless res.is_a? Net::HTTPMovedPermanently then
-                    raise DownloadError.new res.class.to_s 
+            connect uri do |http|
+                LIMIT.times do
+                    req = Net::HTTP::Get.new uri.request_uri
+                    req['cookie'] = @raw
+                    res = http.request req   
+                    
+                    return res.body if res.is_a? Net::HTTPSuccess
+                    unless res.is_a? Net::HTTPMovedPermanently then
+                        raise DownloadError.new res.class.to_s 
+                    end
+                    uri = URI.parse res['location']
                 end
-                uri = URI.parse res['location']
-            end
-            raise DownloadError.new "Tried #{LIMIT} times without success"
+
+                raise DownloadError.new "Tried #{LIMIT} times without success"
+            end 
         end
         def download_problem id
             url = "/stat?c=problem_statement&pm=#{id}"

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: gettc
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Seri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Given a TopCoder problem ID, gettc downloads the problem specification,
@@ -99,12 +99,12 @@ require_paths:
 - core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []