kronk 1.2.3 → 1.2.4

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.2.4 / 2011-03-04
+
+* Enhancements:
+
+  * Cleaner exit on sigint.
+
+  * Support for connection timeout in both config and uri options.
+
 === 1.2.3 / 2011-02-20
 
 * Bugfixes:

data/lib/kronk.rb

@@ -11,7 +11,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 
 
   ##
@@ -85,15 +85,15 @@ class Kronk
   # Default config to use.
   DEFAULT_CONFIG = {
     :content_types  => DEFAULT_CONTENT_TYPES.dup,
-    :default_host   => "http://localhost:3000",
-    :diff_format    => :ascii_diff,
-    :show_lines     => false,
     :cache_file     => DEFAULT_CACHE_FILE,
     :cookies_file   => DEFAULT_COOKIES_FILE,
+    :default_host   => "http://localhost:3000",
+    :diff_format    => :ascii_diff,
     :history_file   => DEFAULT_HISTORY_FILE,
-    :use_cookies    => true,
     :requires       => [],
+    :show_lines     => false,
     :uri_options    => {},
+    :use_cookies    => true,
     :user_agents    => USER_AGENTS.dup
   }
 
@@ -428,6 +428,11 @@ class Kronk
       save_history
     end
 
+    trap 'INT' do
+      exit 2
+    end
+
+
     options[:cache_response] = config[:cache_file] if config[:cache_file]
 
     uri1, uri2 = options.delete :uris
@@ -448,7 +453,7 @@ class Kronk
       puts out
     end
 
-  rescue Request::NotFoundError, Response::MissingParser => e
+  rescue Request::Exception, Response::MissingParser => e
     $stderr << "\nError: #{e.message}\n"
     exit 2
   end
@@ -671,6 +676,12 @@ Parse and run diffs against data from live and cached http responses.
       end
 
 
+      opt.on('--timeout INT', Integer,
+             'Timeout for http connection in seconds') do |value|
+        config[:timeout] = value
+      end
+
+
       opt.on('-U', '--proxy-user STR', String,
              'Set proxy user and/or password: usr[:pass]') do |value|
         options[:proxy][:username], options[:proxy][:password] =

data/lib/kronk/request.rb

@@ -5,10 +5,15 @@ class Kronk
 
   class Request
 
+    # Generic Request exception.
+    class Exception < ::Exception; end
 
     # Raised when the URI was not resolvable.
     class NotFoundError < Exception; end
 
+    # Raised when HTTP times out.
+    class TimeoutError < Exception; end
+
     ##
     # Follows the redirect from a 30X response object and decrease the
     # number of redirects left if it's an Integer.
@@ -66,8 +71,12 @@ class Kronk
       end
 
       resp
+
     rescue SocketError, Errno::ENOENT, Errno::ECONNREFUSED
       raise NotFoundError, "#{uri} could not be found"
+
+    rescue Timeout::Error
+      raise TimeoutError, "#{uri} took too long to respond"
     end
 
 
@@ -197,6 +206,9 @@ class Kronk
       req = http_class.new uri.host, uri.port
       req.use_ssl = true if uri.scheme =~ /^https$/
 
+      options[:timeout] ||= Kronk.config[:timeout]
+      req.read_timeout = options[:timeout] if options[:timeout]
+
       resp = req.start do |http|
         socket = http.instance_variable_get "@socket"
         socket.debug_output = socket_io = StringIO.new

data/test/test_request.rb

@@ -116,7 +116,8 @@ class TestRequest < Test::Unit::TestCase
 
     Kronk::Request.expects(:follow_redirect).
       with resp, :follow_redirects => true,
-      :headers => {'User-Agent' => Kronk::USER_AGENTS['kronk']}
+      :headers => {'User-Agent' => Kronk::USER_AGENTS['kronk']},
+      :timeout => nil
 
     Kronk::Request.retrieve_uri "http://example.com/request/path?foo=bar",
       :follow_redirects => true
@@ -129,7 +130,8 @@ class TestRequest < Test::Unit::TestCase
 
     Kronk::Request.expects(:follow_redirect).
       with resp, :follow_redirects => 3, :data => {:foo => "bar"},
-      :headers => {'User-Agent' => Kronk::USER_AGENTS['kronk']}
+      :headers => {'User-Agent' => Kronk::USER_AGENTS['kronk']},
+      :timeout => nil
 
     Kronk::Request.retrieve_uri "http://example.com/request/path?foo=bar",
       :follow_redirects => 3, :data => {:foo => "bar"}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency