kronk 1.0.3 → 1.1.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,25 @@
+=== 1.1.0 / 2010-12-12
+
+* Enhancements:
+
+  * Support for http ssl, proxy, and basic auth.
+
+  * Support for cookies and sessions.
+
+  * URL queries can now be set from the command line or the config file.
+
+  * Support for piping to the kronk bin.
+
+  * Support for customizing User-Agent and added user agent aliases.
+
+* Bugfixes:
+
+  * No longer need to explicitely specify raw mode for content types
+    with no parsers.
+
+  * Updated how --prev option does cache retrieval, so cache is always
+    the left side of the diff.
+
 === 1.0.3 / 2010-12-09
 
 * Enhancements:

data/Manifest.txt

@@ -1,7 +1,7 @@
 .autotest
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/kronk
 lib/kronk.rb
@@ -11,4 +11,16 @@ lib/kronk/plist_parser.rb
 lib/kronk/request.rb
 lib/kronk/response.rb
 lib/kronk/xml_parser.rb
+test/mocks/200_response.json
+test/mocks/200_response.plist
+test/mocks/200_response.txt
+test/mocks/200_response.xml
+test/mocks/301_response.txt
+test/mocks/302_response.txt
+test/test_data_set.rb
+test/test_diff.rb
+test/test_helper.rb
 test/test_kronk.rb
+test/test_request.rb
+test/test_response.rb
+test/test_xml_parser.rb

data/README.rdoc

@@ -0,0 +1,258 @@
+= Kronk
+
+* https://github.com/yaksnrainbows/kronk
+
+== DESCRIPTION:
+
+Kronk runs diffs against data from live and cached http responses.
+Kronk was made possible by the sponsoring of AT&T Interactive.
+
+== FEATURES:
+
+* Parse and display or diff data from http response body and/or headers.
+
+* Follow redirects automatically.
+
+* Include or exclude specific data points with file-glob-like paths.
+
+* Supports json, rails-ish xml, and plist.
+
+* Support for custom data parsers and diff formatters.
+
+* Support for proxies, ssl, and basic auth.
+
+* Cookie/session handling.
+
+* Easy-to-read output (color or ascii, line numbers, etc).
+
+== FUTURE:
+
+* Auto-queryer with optional param randomizing.
+
+* Support for test suites.
+
+== SYNOPSIS:
+
+Check if your json response returns the same data as your xml variety:
+
+  $ kronk http://host.com/path.json http://host.com/path.xml
+
+Compare body structure only (uses datatypes instead of values):
+
+  $ kronk http://host.com/path.json http://host.com/path.xml --struct
+
+Call comparison with similar uri suffixes:
+
+  $ kronk http://host.com/path.json http://host.com/path.xml --suff '?page=1'
+
+Compare response with the previous call:
+
+  $ kronk http://host.com/path --prev
+
+Compare response with a local file:
+
+  $ kronk http://host.com/path.json ./saved_response.json
+
+Do a simple text diff on the http response, including headers:
+
+  $ kronk http://host.com/A/path.json http://host.com/B/path.json --raw -i
+
+Run it to display formatted data:
+
+  $ kronk http://host.com/path.json
+
+Run it to display raw data with headers:
+
+  $ kronk http://host.com/path.json --raw -i
+
+== CONFIGURATION:
+
+Kronk pulls it's config from $HOME/.kronk and supports the following:
+
+Set the file to save the last http response retrieved in:
+
+  :cache_file: ~/.kronk_cache
+
+Content types to match to a parser. Keys are used as a part of
+a regexp and values are evaluated by const_get.
+
+  :content_types:
+    xml:   XMLParser
+    plist: PlistParser
+    json:  JSON
+
+How to format the diff output. Supports the "special" values
+:ascii_diff and :color_diff or any string that will correctly
+resolve to a constant:
+
+  :diff_format: :ascii_diff
+
+Adding User-Agent aliases is useful and simple!
+
+  :user_agents:
+    win_ie9: Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 6.0)
+
+Disabling cookies altogether may be done as so:
+
+  :use_cookies: false
+
+Setting URI-specific config options - useful if you always need to send
+headers or use one-off configs. Each URI option key is dropped in a regexp
+to match against the given URIs so this also works for local files.
+See Kronk::Request.retrieve and Kronk::Response#selective_data
+for all options supported:
+
+  :uri_options:
+    example.com:
+      :parser:      XMLParser
+      :http_method: POST
+
+      :follow_redirects: true
+
+      :ignore_data:
+        - path/to/data/point
+
+      :headers:
+        X-Something: custom header value
+
+      :query:
+        offset: 1
+        limit:  10
+
+Require specific files or gems in the ruby runtime:
+
+  :requires:
+    - kronk-my_custom_parser
+    - kronk-my_custom_diff_formatter
+
+Show line numbers in the output:
+
+  :show_lines: true
+
+== DATA TRAVERSING:
+
+One of Kronk's most powerful features is its ability to segregate data.
+From the command line, this is done by passing data paths after '--':
+
+  $ kronk http://host.com -- data/path1 data/path2/1/child
+
+The previous example will narrow down the parsed data returned to
+something like:
+
+  {
+    "data" => {
+      "path1" => "value1",
+      "path2" => [
+        nil,
+        {
+          "child" => "child value"
+        },
+        nil,
+        nil
+      ]
+    }
+  }
+
+If excluding data points is preferred, prepending a '-' to the path will
+flag it to remove data:
+
+  $ kronk http://host.com -- -data/path2
+
+  {
+    "data" => {
+      "path1" => "value1",
+      "path3" => "value3",
+      "path4" => "value4"
+    }
+  }
+
+If you would like to exclude or include only items with a specific child
+attribute, you can do so by prepending the path with a ':'.
+Both ':' and '-' can be combined as ':-'.
+
+  $ kronk http://host.com -- :data/path2/1/child
+
+  {
+    "data" => {
+      "path2" => [
+        nil,
+        {
+          "first_child" => "first value",
+          "child" => "child value",
+          "last_child" => "last value"
+        },
+        nil,
+        nil
+      ]
+    }
+  }
+
+There are additionally a variety of wildcard and special characters that
+are supported:
+
+* \* matches /.*/, meaning zero or more characters
+
+* \*\*/ matches any key recursively down the data structure
+
+* ? matches zero or one character
+
+* | effectively works as an "OR" character, matches /^val1|val2$/
+
+* = is used to match values and may be used in conjuction with a key or not.
+
+* Parentheses are ok to use if in conjunction with other special characters
+  for a given path item, such as: /path(1|2)
+
+Check out Kronk::DataSet for more details on data traversing.
+
+Note: Bash may try to parse your data paths, especially if they start with
+wildcards or if they contain the pipe "|" character, so you may need to put
+single quotes around some of your paths.
+  
+== REQUIREMENTS:
+
+* activesupport gem
+
+* nokogiri gem
+
+* plist gem
+
+* json gem
+
+== INSTALL:
+
+  $ sudo gem install kronk
+
+== DEVELOPERS:
+
+After checking out the source, run:
+
+  $ rake newb
+
+This task will install any missing dependencies, run the tests/specs,
+and generate the RDoc.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2010 Jeremie Castagna
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -7,12 +7,16 @@ Hoe.plugin :isolate
 
 Hoe.spec 'kronk' do
   developer('Jeremie Castagna', 'yaksnrainbows@gmail.com')
+  self.readme_file      = "README.rdoc"
+  self.history_file     = "History.rdoc"
+  self.extra_rdoc_files = FileList['*.rdoc']
 
   self.extra_deps << ['plist',         '~>3.1.0']
   self.extra_deps << ['json',          '~>1.2']
   self.extra_deps << ['nokogiri',      '~>1.3']
   self.extra_deps << ['i18n',          '~>0.5']
   self.extra_deps << ['activesupport', '>=2.0.0']
+  self.extra_deps << ['cookiejar',     '~>0.3.0']
 
   self.extra_dev_deps << ['mocha', '~>0.9.10']
 end

data/lib/kronk.rb

@@ -2,22 +2,24 @@ require 'rubygems'
 require 'plist'
 require 'json'
 require 'nokogiri'
+require 'cookiejar'
 
 # Support for new and old versions of ActiveSupport
 begin
   require 'active_support/inflector'
-rescue LoadError
+rescue LoadError => e
+  raise unless e.message =~ /-- active_support/
   require 'activesupport'
 end
 
-require 'net/http'
+require 'net/https'
 require 'optparse'
 require 'yaml'
 
 class Kronk
 
   # This gem's version.
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 
 
   require 'kronk/data_set'
@@ -36,6 +38,10 @@ class Kronk
   DEFAULT_CACHE_FILE = File.expand_path "~/.kronk_cache"
 
 
+  # Default cookies file.
+  DEFAULT_COOKIES_FILE = File.expand_path "~/.kronk_cookies"
+
+
   # Default Content-Type header to parser mapping.
   DEFAULT_CONTENT_TYPES = {
     'js'      => 'JSON',
@@ -45,14 +51,44 @@ class Kronk
   }
 
 
+  # Aliases for various user-agents. Thanks Mechanize! :)
+  USER_AGENTS = {
+    'kronk'         =>
+    "Kronk/#{VERSION} (http://github.com/yaksnrainbows/kronk)",
+    'iphone'        =>
+    "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3",
+    'linux_firefox' =>
+    "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.1) Gecko/20100122 firefox/3.6.1",
+    'linux_mozilla' =>
+    "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624",
+    'mac_mozilla'   =>
+    "Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.4a) Gecko/20030401",
+    'linux_konqueror' =>
+    "Mozilla/5.0 (compatible; Konqueror/3; Linux)",
+    'mac_firefox'   =>
+    "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6",
+    'mac_safari'    =>
+    "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10",
+    'win_ie6'       =>
+    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
+    'win_ie7'       =>
+    "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
+    'win_mozilla'   =>
+    "Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6"
+  }
+
+
   # Default config to use.
   DEFAULT_CONFIG = {
     :content_types  => DEFAULT_CONTENT_TYPES.dup,
     :diff_format    => :ascii_diff,
     :show_lines     => false,
     :cache_file     => DEFAULT_CACHE_FILE,
+    :cookies_file   => DEFAULT_COOKIES_FILE,
+    :use_cookies    => true,
     :requires       => [],
-    :uri_options    => {}
+    :uri_options    => {},
+    :user_agents    => USER_AGENTS.dup
   }
 
 
@@ -71,6 +107,7 @@ class Kronk
     conf          = YAML.load_file DEFAULT_CONFIG_FILE
     content_types = conf.delete :content_types
     uri_options   = conf.delete :uri_options
+    user_agents   = conf.delete :user_agents
 
     if conf[:requires]
       requires = [*conf.delete(:requires)]
@@ -78,9 +115,10 @@ class Kronk
       self.config[:requires].concat requires
     end
 
-    self.config[:uri_options].merge! uri_options if uri_options
+    self.config[:uri_options].merge! uri_options     if uri_options
+    self.config[:content_types].merge! content_types if content_types
+    self.config[:user_agents].merge! user_agents     if user_agents
 
-    self.config[:content_types].merge!(content_types) if content_types
     self.config.merge! conf
   end
 
@@ -88,9 +126,9 @@ class Kronk
   ##
   # Load the config-based requires.
 
-  def self.load_requires
-    return unless config[:requires]
-    config[:requires].each{|lib| require lib }
+  def self.load_requires more_requires=nil
+    return unless config[:requires] || more_requires
+    (config[:requires] | more_requires.to_a).each{|lib| require lib }
   end
 
 
@@ -149,16 +187,73 @@ class Kronk
   end
 
 
+  ##
+  # Ask the user for a password from stdinthe command line.
+
+  def self.query_password str=nil
+    $stderr << "#{(str || "Password:")} "
+    system "stty -echo"
+    password = $stdin.gets.chomp
+  ensure
+    system "stty echo"
+    $stderr << "\n"
+    password
+  end
+
+
+  ##
+  # Load the saved cookies file.
+
+  def self.load_cookie_jar file=nil
+    file ||= config[:cookies_file]
+    @cookie_jar = YAML.load_file file if File.file? file
+    @cookie_jar ||= CookieJar::Jar.new
+    @cookie_jar.expire_cookies
+    @cookie_jar
+  end
+
+
+  ##
+  # Save the cookie jar to file.
+
+  def self.save_cookie_jar file=nil
+    file ||= config[:cookies_file]
+    File.open(file, "w") do |file|
+      file.write @cookie_jar.to_yaml
+    end
+  end
+
+
+  ##
+  # Deletes all cookies from the runtime.
+  # If Kronk.run is in use, will write the change to the cookies file as well.
+
+  def self.clear_cookies!
+    @cookie_jar = CookieJar::Jar.new
+  end
+
+
+  ##
+  # Returns the kronk cookie jar.
+
+  def self.cookie_jar
+    @cookie_jar ||= load_cookie_jar
+  end
+
+
   ##
   # Make requests, parse the responses and compare the data.
-  # If the second argument is omitted or is passed :cache, will
-  # attempt to compare with the last made request. If there was no last
-  # request will compare against nil.
+  # Query arguments may be set to the special value :cache to use the
+  # last live http response retrieved.
   #
   # Supports the following options:
   # :data:: Hash/String - the data to pass to the http request
+  # :query:: Hash/String - the data to append to the http request path
   # :headers:: Hash - extra headers to pass to the request
   # :http_method:: Symbol - the http method to use; defaults to :get
+  # :user_agent:: String - user agent string or alias; defaults to 'kronk'
+  # :auth:: Hash - must contain :username and :password; defaults to nil
+  # :proxy:: Hash/String - http proxy to use; defaults to nil
   # :only_data:: String/Array - extracts the data from given data paths
   # :ignore_data:: String/Array - defines which data points to exclude
   # :with_headers:: Bool/String/Array - defines which headers to include
@@ -167,45 +262,34 @@ class Kronk
   #
   # Returns a diff object.
 
-  def self.compare query1, query2=:cache, options={}
-    diff =
-      if options[:raw]
-        raw_diff query1, query2, options
-      else
-        data_diff query1, query2, options
-      end
+  def self.compare query1, query2, options={}
+    str1 = retrieve_data_string query1, options
+    str2 = retrieve_data_string query2, options
 
-    diff
+    Diff.new str1, str2
   end
 
 
   ##
-  # Return a diff object from two responses' raw data.
-
-  def self.raw_diff query1, query2, options={}
-    opts1 = options.merge options_for_uri(query1)
-    opts2 = options.merge options_for_uri(query2)
+  # Return a data string, parsed or raw.
+  # See Kronk.compare for supported options.
 
-    resp1 = Request.retrieve query1, opts1
-    resp2 = Request.retrieve query2, opts2
+  def self.retrieve_data_string query, options={}
+    options = options.merge options_for_uri(query)
 
-    Diff.new resp1.selective_string(opts1), resp2.selective_string(opts2)
-  end
+    resp = Request.retrieve query, options
 
-
-  ##
-  # Return a diff object from two parsed responses.
-
-  def self.data_diff query1, query2, options={}
-    opts1 = options.merge options_for_uri(query1)
-    opts2 = options.merge options_for_uri(query2)
-
-    resp1 = Request.retrieve query1, opts1
-    resp2 = Request.retrieve query2, opts2
-
-    Diff.new_from_data resp1.selective_data(opts1),
-                       resp2.selective_data(opts2),
-                       options
+    if options[:raw]
+      resp.selective_string options
+    else
+      begin
+        data = resp.selective_data options
+        Diff.ordered_data_string data, options[:struct]
+      rescue Response::MissingParser
+        verbose "Warning: No parser for #{resp['Content-Type']} [#{query}]"
+        resp.selective_string options
+      end
+    end
   end
 
 
@@ -225,10 +309,15 @@ class Kronk
       exit 1
     end
 
+    load_cookie_jar
+
     options = parse_args argv
 
-    config[:requires].concat options[:requires] if options[:requires]
-    load_requires
+    load_requires options[:requires]
+
+    at_exit do
+      save_cookie_jar
+    end
 
     options[:cache_response] = config[:cache_file] if config[:cache_file]
 
@@ -239,19 +328,9 @@ class Kronk
       puts diff.formatted
       verbose "\n\nFound #{diff.count} diff(s).\n"
 
-    elsif options[:raw]
-      options = options.merge options_for_uri(uri1)
-
-      out = Request.retrieve(uri1, options).selective_string options
-      out = Diff.insert_line_nums out if config[:show_lines]
-      puts out
-
     else
-      options = options.merge options_for_uri(uri1)
-
-      data = Request.retrieve(uri1, options).selective_data options
-      out  = Diff.ordered_data_string data, options[:struct]
-      out  = Diff.insert_line_nums out if config[:show_lines]
+      out = retrieve_data_string uri1, options
+      out = Diff.insert_line_nums out if config[:show_lines]
       puts out
     end
 
@@ -274,9 +353,11 @@ class Kronk
 
   def self.parse_args argv
     options = {
-      :with_headers    => false,
-      :no_body         => false,
-      :uris            => []
+      :auth           => {},
+      :no_body        => false,
+      :proxy          => {},
+      :uris           => [],
+      :with_headers   => false
     }
 
     options = parse_data_path_args options, argv
@@ -308,30 +389,19 @@ Kronk runs diffs against data from live and cached http responses.
   Options:
       STR
 
-      opt.on('-d', '--data STR', String,
-             'Post data with the request') do |value|
-        options[:data] = value
-        options[:http_method] ||= 'POST'
-      end
-
-
-      opt.on('--prev', 'Use last response to diff against') do
-        options[:uris] << :cache
+      opt.on('--ascii', 'Return ascii formatted diff') do
+        config[:diff_format] = :ascii_diff
       end
 
 
-      opt.on('--suff STR', String,
-             'Add common path items to the end of each URI') do |value|
-        options[:uri_suffix] = value
+      opt.on('--color', 'Return color formatted diff') do
+        config[:diff_format] = :color_diff
       end
 
 
-      opt.on('-H', '--header STR', String,
-             'Header to pass to the server request') do |value|
-        options[:headers] ||= {}
-
-        key, value = value.split ": ", 2
-        options[:headers][key] = value
+      opt.on('--format STR', String,
+             'Use a custom diff formatter') do |value|
+        config[:diff_format] = value
       end
 
 
@@ -363,22 +433,19 @@ Kronk runs diffs against data from live and cached http responses.
       end
 
 
-      opt.on('-L', '--location [NUM]', Integer,
-             'Follow the location header always or num times') do |value|
-        options[:follow_redirects] = value || true
+      opt.on('--lines', 'Show line numbers') do
+        config[:show_lines] = true
       end
 
 
-      opt.on('-X', '--request STR', String,
-             'The request method to use') do |value|
-        options[:http_method] = value
+      opt.on('--parser STR', String,
+             'Override default parser') do |value|
+        options[:parser] = value
       end
 
 
-      opt.on('-r', '--require lib1,lib2', Array,
-             'Require a library or gem') do |value|
-        options[:requires] ||= []
-        options[:requires].concat value
+      opt.on('--prev', 'Use last response to diff against') do
+        options[:uris].unshift :cache
       end
 
 
@@ -387,40 +454,105 @@ Kronk runs diffs against data from live and cached http responses.
       end
 
 
+      opt.on('-r', '--require lib1,lib2', Array,
+             'Require a library or gem') do |value|
+        options[:requires] ||= []
+        options[:requires].concat value
+      end
+
+
       opt.on('--struct', 'Run diff on the data structure') do
         options[:struct] = true
       end
 
 
-      opt.on('--ascii', 'Return ascii formatted diff') do
-        config[:diff_format] = :ascii_diff
+      opt.on('-V', '--verbose', 'Make the operation more talkative') do
+        config[:verbose] = true
       end
 
 
-      opt.on('--color', 'Return color formatted diff') do
-        config[:diff_format] = :color_diff
+      opt.separator <<-STR
+
+  HTTP Options:
+      STR
+
+      opt.on('--clear-cookies', 'Delete all saved cookies') do
+        clear_cookies!
       end
 
 
-      opt.on('--format STR', String,
-             'Use a custom diff formatter') do |value|
-        config[:diff_format] = value
+      opt.on('-d', '--data STR', String,
+             'Post data with the request') do |value|
+        options[:data] = value
+        options[:http_method] ||= 'POST'
       end
 
 
-      opt.on('--lines', 'Show line numbers') do
-        config[:show_lines] = true
+      opt.on('-H', '--header STR', String,
+             'Header to pass to the server request') do |value|
+        options[:headers] ||= {}
+
+        key, value = value.split ": ", 2
+        options[:headers][key] = value.strip
       end
 
 
-      opt.on('--parser STR', String,
-             'Override default parser') do |value|
-        options[:parser] = value
+      opt.on('-A', '--user-agent STR', String,
+             'User-Agent to send to server or a valid alias') do |value|
+        options[:user_agent] = value
       end
 
 
-      opt.on('-V', '--verbose', 'Make the operation more talkative') do
-        config[:verbose] = true
+      opt.on('-L', '--location [NUM]', Integer,
+             'Follow the location header always or num times') do |value|
+        options[:follow_redirects] = value || true
+      end
+
+
+      opt.on('--no-cookies', 'Don\'t use cookies for this session') do
+        options[:no_cookies] = true
+      end
+
+
+      opt.on('-?', '--query STR', String,
+             'Append query to URLs') do |value|
+        options[:query] = value
+      end
+
+
+      opt.on('--suff STR', String,
+             'Add common path items to the end of each URL') do |value|
+        options[:uri_suffix] = 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] =
+          value.split ":", 2
+
+        options[:proxy][:password] ||= query_password "Proxy password:"
+      end
+
+
+      opt.on('-u', '--user STR', String,
+             'Set server auth user and/or password: usr[:pass]') do |value|
+        options[:auth][:username], options[:auth][:password] =
+          value.split ":", 2
+
+        options[:auth][:password] ||= query_password "Server password:"
+      end
+
+
+      opt.on('-X', '--request STR', String,
+             'The request method to use') do |value|
+        options[:http_method] = value
+      end
+
+
+      opt.on('-x', '--proxy STR', String,
+             'Use HTTP proxy on given port: host[:port]') do |value|
+        options[:proxy][:address], options[:proxy][:port] = value.split ":", 2
       end
 
       opt.separator nil
@@ -428,6 +560,11 @@ Kronk runs diffs against data from live and cached http responses.
 
     opts.parse! argv
 
+    unless $stdin.tty?
+      io = StringIO.new $stdin.read
+      options[:uris] << io
+    end
+
     options[:uris].concat argv
     options[:uris].slice!(2..-1)