kronk 1.9.3 → 1.9.4

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 1.9.4 / 2012-09-04
+
+* Enhancements:
+
+  * Support for oauth authentication.
+
+* Bugfixes:
+
+  * Updated Cookie parsing to display correctly when loading from cache.
+
 === 1.9.3 / 2012-07-16
 
 * Bugfixes:

data/README.rdoc

@@ -28,7 +28,7 @@ Kronk was made possible by the sponsoring of YP.com.
 
 * Launch IRB console with the retrieved response data.
 
-* Support for proxies, ssl, and basic auth.
+* Support for proxies, ssl, oauth, and basic auth.
 
 * Cookie/session handling.
 

data/Rakefile

@@ -22,10 +22,11 @@ Hoe.spec 'kronk' do
   self.history_file     = "History.rdoc"
   self.extra_rdoc_files = FileList['*.rdoc']
 
-  self.extra_deps << ['json',       '~>1.5']
-  self.extra_deps << ['cookiejar',  '~>0.3.0']
-  self.extra_deps << ['ruby-path',  '~>1.0.0']
-  self.extra_deps << ['mime-types', '~>1.18.0']
+  self.extra_deps << ['json',         '~>1.5']
+  self.extra_deps << ['cookiejar',    '~>0.3.0']
+  self.extra_deps << ['ruby-path',    '~>1.0.0']
+  self.extra_deps << ['mime-types',   '~>1.18.0']
+  self.extra_deps << ['simple_oauth', '~>0.1.9']
 
   self.extra_dev_deps << ['plist',    '~>3.1.0']
   self.extra_dev_deps << ['nokogiri', '~>1.4']

data/TODO.rdoc

@@ -2,6 +2,8 @@
 
 == Maybe Later
 
+* Investigate streaming and Yajl.
+
 * Animate Suite player cursor when waiting for input.
 
 * Consider getting off of net/http.

data/lib/kronk.rb

@@ -4,17 +4,19 @@ require 'json'
 require 'cookiejar'
 require 'path'
 require 'mime/types'
+require 'simple_oauth'
 
 require 'thread'
 require 'stringio'
 
 require 'net/http'
+require 'base64'
 require 'yaml'
 
 class Kronk
 
   # This gem's version.
-  VERSION = '1.9.3'
+  VERSION = '1.9.4'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'
@@ -279,6 +281,7 @@ class Kronk
   # :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
+  # :oauth:: Hash - :consumer_key, :token, :consumer_secret, :token_secret
   # :proxy:: Hash/String - http proxy to use; defaults to nil
   # :keep_indicies:: Boolean - indicies of modified arrays display as hashes
   # :show_headers:: Boolean/String/Array - which headers to show in output
@@ -389,7 +392,7 @@ class Kronk
 
       req = Request.new uri, opts
       Cmd.verbose "Retrieving URL:  #{req.uri}\n" if defined?(Cmd)
-      resp = req.retrieve opts
+      resp = req.stream opts
 
       hist_uri = req.uri.to_s[0..-req.uri.request_uri.length]
       hist_uri = hist_uri[(req.uri.scheme.length + 3)..-1]
@@ -429,7 +432,7 @@ class Kronk
           out_opts[key] = val.merge out_opts[key], &DEEP_MERGE
 
         # Hashes
-        when :headers, :auth
+        when :headers, :auth, :oauth
           out_opts[key] = val.merge out_opts[key]
 
         # Proxy hash or String

data/lib/kronk/cmd.rb

@@ -106,7 +106,6 @@ class Kronk
 
     def self.parse_args argv
       options = {
-        :auth         => {},
         :no_body      => false,
         :player       => {},
         :proxy        => {},
@@ -450,6 +449,11 @@ Parse and run diffs against data from live and cached http responses.
         end
 
 
+        opt.on('--oauth', String, 'Yaml file with Oauth credentials') do |file|
+          options[:oauth] = YAML.load_file file
+        end
+
+
         opt.on('-x', '--proxy STR', String,
                'Use HTTP proxy on given port: host[:port]') do |value|
           options[:proxy][:host], options[:proxy][:port] = value.split ":", 2
@@ -498,6 +502,7 @@ Parse and run diffs against data from live and cached http responses.
 
         opt.on('-u', '--user STR', String,
                'Set server auth user and/or password: usr[:pass]') do |value|
+          options[:auth] ||= {}
           options[:auth][:username], options[:auth][:password] =
             value.split ":", 2
 
@@ -679,17 +684,20 @@ Parse and run diffs against data from live and cached http responses.
     # to $stdout.
 
     def self.render kronk, options={}
-      cache_response kronk.response
+      status =
+        if options[:irb]
+          irb kronk.response
 
-      if options[:irb]
-        irb kronk.response
+        elsif kronk.diff
+          render_diff kronk.diff
 
-      elsif kronk.diff
-        render_diff kronk.diff
+        elsif kronk.response
+          render_response kronk.response, kronk.options
+        end
 
-      elsif kronk.response
-        render_response kronk.response, kronk.options
-      end
+      cache_response kronk.response
+
+      status
     end
 
 

data/lib/kronk/constants.rb

@@ -49,9 +49,12 @@ class Kronk
       Hash === v1 && Hash === v2 ? v1.merge(v2,&DEEP_MERGE) : v2
     end
 
+  RUBY_ENGINE = 'ruby' unless defined?(RUBY_ENGINE)
+
   # The default Kronk user agent.
   DEFAULT_USER_AGENT =
-    "Kronk/#{VERSION} (http://github.com/yaksnrainbows/kronk)"
+    "Kronk/#{VERSION} (#{RUBY_PLATFORM}; U; en-US; http://kronk.me) \
+#{RUBY_ENGINE}/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
 
   # Aliases for various user-agents. Thanks Mechanize! :)
   USER_AGENTS = {

data/lib/kronk/request.rb

@@ -225,6 +225,7 @@ class Kronk
     # :query:: Hash/String - the data to append to the http request path
     # :user_agent:: String - user agent string or alias; defaults to 'kronk'
     # :auth:: Hash - must contain :username and :password; defaults to nil
+    # :oauth:: Hash - :consumer_key, :token, :consumer_secret, :token_secret
     # :headers:: Hash - extra headers to pass to the request
     # :http_method:: Symbol - the http method to use; defaults to :get
     # :proxy:: Hash/String - http proxy to use; defaults to {}
@@ -234,7 +235,8 @@ class Kronk
     # to using a post request.
 
     def initialize uri, opts={}
-      @auth = opts[:auth]
+      @auth  = opts[:auth]
+      @oauth = opts[:oauth]
 
       @connection = nil
       @response   = nil
@@ -283,19 +285,37 @@ class Kronk
     # Returns the basic auth credentials if available.
 
     def auth
-      @auth ||= Hash.new
+      if (!@auth || !@auth[:username]) && @headers['Authorization'] &&
+          @headers['Authorization'] !~ /^OAuth\s/
 
-      if !@auth[:username] && @headers['Authorization']
-        require 'base64'
         str = Base64.decode64 @headers['Authorization'].split[1]
         username, password = str.split(":", 2)
-        @auth = {:username => username, :password => password}.merge @auth
+        @auth = {
+          :username => username,
+          :password => password
+        }.merge(@auth || {})
       end
 
       @auth
     end
 
 
+    ##
+    # Returns the oauth credentials if available.
+
+    def oauth
+      if (!@oauth || !@oauth[:token] || !@oauth[:consumer_key]) &&
+          @headers['Authorization'].to_s =~ /^OAuth\s/
+
+        @oauth =
+          SimpleOAuth::Header.parse(@headers['Authorization']).
+            merge(@oauth || {})
+      end
+
+      @oauth
+    end
+
+
     ##
     # Assign request body. Supports String, Hash, and IO. Will attempt to
     # correctly assing the Content-Type and Transfer-Encoding headers.
@@ -446,7 +466,7 @@ class Kronk
     def retrieve opts={}, &block
       start_time = Time.now
 
-      @response = stream opts
+      @response = stream opts, &block
 
       @response.body # make sure to read the full body from io
       @response.time = Time.now - start_time - @response.conn_time
@@ -466,6 +486,7 @@ class Kronk
 
     def stream opts={}, &block
       retried = false
+      opts    = opts.merge(:request => self)
 
       begin
         start_time = Time.now
@@ -475,7 +496,6 @@ class Kronk
 
         @response           = conn.request http_request, nil, opts, &block
         @response.conn_time = conn_time
-        @response.request   = self
 
         @response
 
@@ -501,8 +521,9 @@ class Kronk
         :no_cookies  => !self.use_cookies
       }
 
-      hash[:auth]    = @auth if @auth
-      hash[:data]    = @body if @body
+      hash[:auth]    = @auth  if @auth
+      hash[:oauth]   = @oauth if @oauth
+      hash[:data]    = @body  if @body
       hash[:headers] = @headers   unless @headers.empty?
       hash[:proxy]   = self.proxy unless self.proxy.empty?
 
@@ -517,7 +538,7 @@ class Kronk
 
     def to_s
       out = "#{@http_method} #{@uri.request_uri} HTTP/1.1\r\n"
-      out << "host: #{@uri.host}:#{@uri.port}\r\n"
+      out << "Host: #{@uri.host}:#{@uri.port}\r\n"
 
       http_request.each do |name, value|
         out << "#{name}: #{value}\r\n" unless name =~ /host/i
@@ -549,8 +570,12 @@ class Kronk
     def http_request
       req = VanillaRequest.new @http_method, @uri.request_uri, @headers
 
-      req.basic_auth @auth[:username], @auth[:password] if
-        @auth && @auth[:username]
+      if @oauth
+        req['Authorization'] =
+          SimpleOAuth::Header.new(@http_method, @uri, {}, self.oauth).to_s
+      elsif @auth && @auth[:username]
+        req.basic_auth @auth[:username], @auth[:password]
+      end
 
       # Stream Multipart
       if Kronk::Multipart === @body

data/lib/kronk/response.rb

@@ -67,16 +67,22 @@ class Kronk
 
       @cookies = []
 
-      if URI::HTTP === uri
-        jar = CookieJar::Jar.new
-        jar.set_cookies_from_headers uri, @headers
+      Array(@headers['set-cookie']).each do |cvalue|
+        cookie = CookieJar::CookieValidation.parse_set_cookie(cvalue).to_hash
+        cookie.delete :version
+        cookie.keys.each{|k| cookie[k.to_s] = cookie.delete(k) }
+        @cookies << cookie
+      end
 
-        jar.to_a.each do |cookie|
-          @cookies << cookie.to_hash
-          Kronk.cookie_jar.add_cookie cookie unless opts[:no_cookies]
-        end
+      Array(@headers['set-cookie2']).each do |cvalue|
+        cookie = CookieJar::CookieValidation.parse_set_cookie2(cvalue).to_hash
+        cookie.keys.each{|k| cookie[k.to_s] = cookie.delete(k) }
+        @cookies << cookie
       end
 
+      Kronk.cookie_jar.set_cookies_from_headers uri, @headers unless
+        opts[:no_cookies] || !(URI::HTTP === uri)
+
       self.gzip    = opts[:force_gzip]
       self.inflate = opts[:force_inflate]
       gzip?
@@ -544,7 +550,7 @@ class Kronk
 
       new_opts.merge!(opts)
 
-      Request.new(self.location, new_opts).retrieve(new_opts, &block)
+      Request.new(self.location, new_opts).stream(new_opts, &block)
     end
 
 
@@ -590,7 +596,7 @@ class Kronk
     # See Path::Transaction for supported transform actions in the
     # {ruby-path gem}[http://github.com/yaksnrainbows/ruby-path].
 
-    def data opts={}
+    def data opts={}, &block
       data = nil
 
       unless opts[:no_body]
@@ -923,29 +929,3 @@ class Kronk
     end
   end
 end
-
-
-class CookieJar::Cookie
-  def to_hash
-    result = {
-      'name'       => @name,
-      'value'      => @value,
-      'domain'     => @domain,
-      'path'       => @path,
-    }
-    {
-      'expiry'      => @expiry,
-      'secure'      => (true if @secure),
-      'http_only'   => (true if @http_only),
-      'version'     => (@version if version != 0),
-      'comment'     => @comment,
-      'comment_url' => @comment_url,
-      'discard'     => (true if @discard),
-      'ports'       => @ports
-    }.each do |name, value|
-      result[name] = value if value
-    end
-
-    result
-  end
-end

data/test/test_helper.rb

@@ -196,7 +196,7 @@ def expect_request req_method, url, opts={}
     with(uri.host, uri.port, {:proxy => proxy, :ssl => !!opts.delete(:ssl)}).
     returns http
 
-  http.expects(:request).with(req, nil, opts).returns resp
+  http.expects(:request).with(req, nil, has_entries(opts)).returns resp
 
   yield http, req, resp if block_given?
 

data/test/test_helper_methods.rb

@@ -10,9 +10,9 @@ class TestHelperMethods < Test::Unit::TestCase
     @mock_resp  = Kronk::Response.new io
     @mock_resp2 = Kronk::Response.new \
                     StringIO.new mock_resp("200_response.json")
-    @mock_req   = stub("mock_req", :retrieve => @mock_resp,
+    @mock_req   = stub("mock_req", :stream => @mock_resp,
                         :uri => URI.parse("http://host.com"))
-    @mock_req2  = stub("mock_req", :retrieve => @mock_resp2,
+    @mock_req2  = stub("mock_req", :stream => @mock_resp2,
                         :uri => URI.parse("http://host.com"))
 
     @mock_thread = stub("mock_thread", :join => true,
@@ -142,7 +142,7 @@ class TestHelperMethods < Test::Unit::TestCase
 
   def test_retrieve_unparsable
     mock_resp = Kronk::Response.new StringIO.new(mock_200_response)
-    mock_req  = stub("mock_req", :retrieve => mock_resp,
+    mock_req  = stub("mock_req", :stream => mock_resp,
                       :uri => URI.parse("http://host.com"))
 
     Kronk::Request.expects(:new).
@@ -163,8 +163,8 @@ class TestHelperMethods < Test::Unit::TestCase
   def test_retrieve_two_unparsable
     mock_resp = Kronk::Response.new StringIO.new(mock_200_response)
 
-    Kronk::Request.any_instance.expects(:retrieve).returns mock_resp
-    Kronk::Request.any_instance.expects(:retrieve).returns mock_resp
+    Kronk::Request.any_instance.expects(:stream).returns mock_resp
+    Kronk::Request.any_instance.expects(:stream).returns mock_resp
 
     retrieve "host1.com", "host2.com", :foo => "bar"
 

data/test/test_kronk.rb

@@ -482,7 +482,7 @@ class TestKronk < Test::Unit::TestCase
   def test_follow_redirect_infinite
     res = Kronk::Response.new mock_301_response
     req = Kronk::Request.new "http://www.google.com/"
-    req.stubs(:retrieve).returns res
+    req.stubs(:stream).returns res
 
     Kronk::Request.stubs(:new).
       with("http://www.google.com/",{:follow_redirects => true}).returns req
@@ -501,7 +501,7 @@ class TestKronk < Test::Unit::TestCase
   def test_num_follow_redirect
     res = Kronk::Response.new mock_301_response
     req = Kronk::Request.new "http://www.google.com/"
-    req.stubs(:retrieve).returns res
+    req.stubs(:stream).returns res
 
     Kronk::Request.expects(:new).
       with("http://www.google.com/",{:follow_redirects => 3}).returns(req).
@@ -517,7 +517,7 @@ class TestKronk < Test::Unit::TestCase
   def test_follow_redirect_no_redirect
     res = Kronk::Response.new mock_200_response
     req = Kronk::Request.new "http://www.google.com/"
-    req.stubs(:retrieve).returns res
+    req.stubs(:stream).returns res
 
     Kronk::Request.expects(:new).with("http://www.google.com/",{}).never
     Kronk::Request.expects(:new).
@@ -530,7 +530,7 @@ class TestKronk < Test::Unit::TestCase
   def test_do_not_follow_redirect
     res = Kronk::Response.new mock_302_response
     req = Kronk::Request.new "http://www.google.com/"
-    req.stubs(:retrieve).returns res
+    req.stubs(:stream).returns res
 
     Kronk::Request.expects(:new).with("http://www.google.com/",{}).never
     Kronk::Request.expects(:new).

data/test/test_player.rb

@@ -392,8 +392,8 @@ class TestPlayer < Test::Unit::TestCase
       with("beta-example.com", :uri_suffix => '/test', :include_headers => true).
       returns req2
 
-    req1.expects(:retrieve).returns resp1
-    req2.expects(:retrieve).returns resp2
+    req1.expects(:stream).returns resp1
+    req2.expects(:stream).returns resp2
 
     @got_results = nil
 
@@ -485,7 +485,7 @@ class TestPlayer < Test::Unit::TestCase
 
     req.each_with_index do |r, i|
       mock_res = Kronk::Response.new resp[i]
-      mock_req = stub("mock_req", :retrieve => mock_res,
+      mock_req = stub("mock_req", :stream => mock_res,
                         :uri => URI.parse("http://host.com"))
 
       Kronk::Request.stubs(:new).with(req[i], opts).returns mock_req

data/test/test_request.rb

@@ -360,6 +360,103 @@ class TestRequest < Test::Unit::TestCase
   end
 
 
+  def test_oauth
+    oauth = {
+      :token => "blah",
+      :token_secret => "tsecret",
+      :consumer_key => "ckey",
+      :consumer_secret => "csecret"
+    }
+
+    req = Kronk::Request.new "foo.com", :oauth => oauth
+    auth = req.http_request['Authorization']
+
+    assert auth =~ /^OAuth\s/,
+      ":oauth option should have triggered Authorization header"
+
+    assert auth =~ / oauth_consumer_key="ckey"/,
+      "Authorization should have the consumer key"
+    assert auth =~ / oauth_token="blah"/,
+      "Authorization should have token"
+  end
+
+
+  def test_oauth_basic_auth_collision
+    oauth = {
+      :token => "blah",
+      :token_secret => "tsecret",
+      :consumer_key => "ckey",
+      :consumer_secret => "csecret"
+    }
+
+    req = Kronk::Request.new "foo.com", :oauth => oauth,
+            :auth => {:username => "foo", :password => "bar"}
+
+    assert_equal({:username => "foo", :password => "bar"}, req.auth)
+    assert_equal(oauth, req.oauth)
+
+    auth = req.http_request['Authorization']
+
+    assert auth =~ /^OAuth\s/,
+      ":oauth option should have triggered Authorization header"
+
+    assert auth =~ / oauth_consumer_key="ckey"/,
+      "Authorization should have the consumer key"
+    assert auth =~ / oauth_token="blah"/,
+      "Authorization should have token"
+  end
+
+
+  def test_oauth_from_headers
+    oauth = "OAuth oauth_consumer_key=\"ckey\", \
+      oauth_nonce=\"e95a6580533f4b122dc1b67bf28ea320\", \
+      oauth_signature=\"NLYgre5962QIYBQFjCQdt5nymBc%3D\", \
+      oauth_signature_method=\"HMAC-SHA1\", \
+      oauth_timestamp=\"1344556946\", \
+      oauth_token=\"blah\", \
+      oauth_version=\"1.0\""
+
+    req = Kronk::Request.new "foo.com", :headers => {'Authorization' => oauth}
+    auth = req.http_request['Authorization']
+
+    assert auth =~ /^OAuth\s/,
+      ":oauth option should have triggered Authorization header"
+
+    assert auth =~ / oauth_consumer_key="ckey"/,
+      "Authorization should have the consumer key"
+    assert auth =~ / oauth_token="blah"/,
+      "Authorization should have token"
+  end
+
+
+  def test_oauth_from_headers_and_opts
+    oauth = "OAuth oauth_consumer_key=\"ckey\", \
+      oauth_nonce=\"e95a6580533f4b122dc1b67bf28ea320\", \
+      oauth_signature=\"NLYgre5962QIYBQFjCQdt5nymBc%3D\", \
+      oauth_signature_method=\"HMAC-SHA1\", \
+      oauth_timestamp=\"1344556946\", \
+      oauth_token=\"blah\", \
+      oauth_version=\"1.0\""
+
+    oath_opt = {
+    }
+
+    req = Kronk::Request.new "foo.com/bar",
+      :oauth   => {:token => "newtoken"},
+      :headers => {'Authorization' => oauth}
+
+    auth = req.http_request['Authorization']
+
+    assert auth =~ /^OAuth\s/,
+      ":oauth option should have triggered Authorization header"
+
+    assert auth =~ / oauth_consumer_key="ckey"/,
+      "Authorization should have the consumer key"
+    assert auth =~ / oauth_token="newtoken"/,
+      "Authorization should have token"
+  end
+
+
   def test_auth_from_headers
     req = Kronk::Request.parse File.read("test/mocks/get_request.txt")
     assert_equal "bob",    req.auth[:username]
@@ -451,8 +548,7 @@ class TestRequest < Test::Unit::TestCase
   def test_retrieve_user_agent_default
     expect_request "GET", "http://example.com",
     :headers => {
-      'User-Agent' =>
-        "Kronk/#{Kronk::VERSION} (http://github.com/yaksnrainbows/kronk)"
+      'User-Agent' => Kronk::DEFAULT_USER_AGENT
     }
 
     Kronk::Request.new("http://example.com").retrieve

data/test/test_response.rb

@@ -54,11 +54,6 @@ class TestResponse < Test::Unit::TestCase
   end
 
 
-  def test_init_no_cookies_from_file
-    assert @html_resp.cookies.empty?
-  end
-
-
   def test_init_cookies
     Kronk.cookie_jar.expects(:add_cookie).twice
 
@@ -72,13 +67,13 @@ class TestResponse < Test::Unit::TestCase
          "ID=99d644506f26d85e:FF=0:TM=1290788168:LM=1290788168:S=VSMemgJxlmlToFA3",
         "domain"=>".google.com",
         "path"=>"/",
-        "expiry"=>Time.parse("2012-11-25 08:16:08 -0800")},
+        "expires_at"=>Time.parse("2012-11-25 08:16:08 -0800")},
        {"name"=>"NID",
         "value"=>
          "41=CcmNDE4SfDu5cdTOYVkrCVjlrGO-oVbdo1awh_p8auk2gI4uaX1vNznO0QN8nZH4Mh9WprRy3yI2yd_Fr1WaXVru6Xq3adlSLGUTIRW8SzX58An2nH3D2PhAY5JfcJrl",
         "domain"=>".google.com",
         "path"=>"/",
-        "expiry"=>Time.parse("2011-05-28 09:16:08 -0700"),
+        "expires_at"=>Time.parse("2011-05-28 09:16:08 -0700"),
         "http_only"=>true
       }]
 
@@ -101,13 +96,13 @@ class TestResponse < Test::Unit::TestCase
          "ID=99d644506f26d85e:FF=0:TM=1290788168:LM=1290788168:S=VSMemgJxlmlToFA3",
         "domain"=>".google.com",
         "path"=>"/",
-        "expiry"=>Time.parse("2012-11-25 08:16:08 -0800")},
+        "expires_at"=>Time.parse("2012-11-25 08:16:08 -0800")},
        {"name"=>"NID",
         "value"=>
          "41=CcmNDE4SfDu5cdTOYVkrCVjlrGO-oVbdo1awh_p8auk2gI4uaX1vNznO0QN8nZH4Mh9WprRy3yI2yd_Fr1WaXVru6Xq3adlSLGUTIRW8SzX58An2nH3D2PhAY5JfcJrl",
         "domain"=>".google.com",
         "path"=>"/",
-        "expiry"=>Time.parse("2011-05-28 09:16:08 -0700"),
+        "expires_at"=>Time.parse("2011-05-28 09:16:08 -0700"),
         "http_only"=>true
       }]
 

metadata

@@ -1,182 +1,198 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kronk
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 1.9.4
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 3
-  version: 1.9.3
 platform: ruby
-authors: 
+authors:
 - Jeremie Castagna
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cookiejar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-path
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: ruby-path
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 95
-        segments: 
-        - 1
-        - 18
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.9
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.9
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: plist
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 9
-        - 12
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id009
-description: |-
-  Kronk is a command line swiss-army-knife for HTTP services.
-  
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'Kronk is a command line swiss-army-knife for HTTP services.
+
+
   With Kronk, you easily parse and segregate data, run diffs between
+
   the parsed data from different queries, and easily replay logs and loadtest
+
   your HTTP applications.
-  
-  Kronk was made possible by the sponsoring of YP.com.
-email: 
+
+
+  Kronk was made possible by the sponsoring of YP.com.'
+email:
 - yaksnrainbows@gmail.com
-executables: 
+executables:
 - kronk
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.rdoc
 - Manifest.txt
 - README.rdoc
 - TODO.rdoc
-files: 
+files:
 - .autotest
 - History.rdoc
 - Manifest.txt
@@ -243,39 +259,31 @@ files:
 - .gemtest
 homepage: http://kronk.me
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kronk
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Kronk is a command line swiss-army-knife for HTTP services
-test_files: 
+test_files:
 - test/test_assertions.rb
 - test/test_cmd.rb
 - test/test_data_string.rb