kronk 1.9.2 → 1.9.3

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 1.9.3 / 2012-07-16
+
+* Bugfixes:
+
+  * Don't override missing dependency errors.
+
+  * Fix for passing uri options to request initializer.
+
+  * Enable colors by default.
+
+  * Keep only 500 URIs in the benchmark player.
+
 === 1.9.2 / 2012-05-23
 
 * Bugfixes:

data/Manifest.txt

@@ -44,6 +44,7 @@ test/mocks/301_response.txt
 test/mocks/302_response.txt
 test/mocks/cookies.yml
 test/mocks/get_request.txt
+test/mocks/mock_config.yml
 test/test_assertions.rb
 test/test_cmd.rb
 test/test_data_string.rb

data/README.rdoc

@@ -178,7 +178,7 @@ 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 '--'.
 
 All data manipulation is handled by the
-{ruby-path gem}[http://github.com/yaksnrainbows/ruby-path].
+{ruby-path gem}[http://rubygems.org/gems/ruby-path].
 
 === Selecting and Deleting:
 

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'
@@ -379,16 +379,17 @@ class Kronk
 
     if IO === uri || StringIO === uri || BufferedIO === uri
       Cmd.verbose "Reading IO #{uri}" if defined?(Cmd)
-      Response.new uri, options
+      Response.new uri, opts
 
     elsif File.file? uri.to_s
       Cmd.verbose "Reading file:  #{uri}\n" if defined?(Cmd)
-      Response.read_file uri, options
+      Response.read_file uri, opts
 
     else
-      req = Request.new uri, options
+
+      req = Request.new uri, opts
       Cmd.verbose "Retrieving URL:  #{req.uri}\n" if defined?(Cmd)
-      resp = req.retrieve options
+      resp = req.retrieve opts
 
       hist_uri = req.uri.to_s[0..-req.uri.request_uri.length]
       hist_uri = hist_uri[(req.uri.scheme.length + 3)..-1]

data/lib/kronk/constants.rb

@@ -82,11 +82,11 @@ class Kronk
   DEFAULT_CONFIG = {
     :content_types  => DEFAULT_CONTENT_TYPES.dup,
     :cache_file     => DEFAULT_CACHE_FILE,
-    :color_data     => false,
+    :color_data     => true,
     :context        => 3,
     :cookies_file   => DEFAULT_COOKIES_FILE,
     :default_host   => "http://localhost:3000",
-    :diff_format    => 'ascii',
+    :diff_format    => 'color',
     :history_file   => DEFAULT_HISTORY_FILE,
     :indentation    => 1,
     :max_history    => 100,

data/lib/kronk/player/benchmark.rb

@@ -75,7 +75,6 @@ class Kronk
         @paths[uri] ||= [0, 0]
         pcount = @paths[uri][1] + 1
         @paths[uri][0] = (@paths[uri][0] * @paths[uri][1] + time) / pcount
-        @paths[uri][0] = @paths[uri][0].round @precision
         @paths[uri][1] = pcount
 
         clean_req_log
@@ -84,7 +83,7 @@ class Kronk
 
       def clean_req_log
         if @paths.length > 500
-          order_reqs[500..-1].each{|(uri, vals)| @paths.delete uri }
+          order_reqs[500..-1].each{|(uri,_)| @paths.delete uri }
         end
       end
 
@@ -158,7 +157,7 @@ class Kronk
 
 
       def order_reqs
-        @paths.to_a.sort{|x,y| y[1] <=> x[1]}
+        @paths.to_a.sort{|x,y| y[1][0] <=> x[1][0]}
       end
 
 

data/lib/kronk/response.rb

@@ -387,6 +387,9 @@ class Kronk
       begin
         @parsed_body = new_parser.parse(self.body) or raise RuntimeError
 
+      rescue MissingDependency
+        raise
+
       rescue => e
         msg = ParserError === e ?
                 e.message : "#{new_parser} failed parsing body"

data/test/mocks/mock_config.yml

@@ -0,0 +1,4 @@
+uri_options:
+  example.com:
+    query:
+      foo: bar

data/test/test_diff.rb

@@ -4,6 +4,7 @@ class TestDiff < Test::Unit::TestCase
 
   def setup
     @diff = Kronk::Diff.new mock_302_response, mock_301_response
+    @diff.output.format = Kronk::Diff::AsciiFormat
   end
 
 

data/test/test_helper.rb

@@ -170,7 +170,7 @@ def expect_request req_method, url, opts={}
   http   = mock 'http'
   req    = mock 'req'
 
-  data   = opts[:data]
+  data   = opts.delete(:data)
   data &&= Hash === data ? Kronk::Request.build_query(data) : data.to_s
 
   req.stubs(:body).returns(data)
@@ -179,7 +179,7 @@ def expect_request req_method, url, opts={}
   req.stubs(:[]).with('Content-Length').returns(data)
   req.stubs(:[]=)
 
-  headers = opts[:headers] || Hash.new
+  headers = opts.delete(:headers) || Hash.new
   headers['User-Agent'] ||= Kronk::DEFAULT_USER_AGENT
   headers['Connection'] ||= 'Keep-Alive'
 
@@ -190,13 +190,13 @@ def expect_request req_method, url, opts={}
   Kronk::Request::VanillaRequest.expects(:new).
     with(req_method.to_s.upcase, uri.request_uri, headers).returns req
 
-  proxy = opts[:proxy] || {}
+  proxy = opts.delete(:proxy) || {}
 
   Kronk::HTTP.expects(:new).
-    with(uri.host, uri.port, {:proxy => proxy, :ssl => !!opts[:ssl]}).
+    with(uri.host, uri.port, {:proxy => proxy, :ssl => !!opts.delete(:ssl)}).
     returns http
 
-  http.expects(:request).with(req, nil, {}).returns resp
+  http.expects(:request).with(req, nil, opts).returns resp
 
   yield http, req, resp if block_given?
 

data/test/test_kronk.rb

@@ -19,7 +19,7 @@ class TestKronk < Test::Unit::TestCase
       :history_file => Kronk::DEFAULT_HISTORY_FILE,
       :indentation  => 1,
       :default_host => "http://localhost:3000",
-      :diff_format  => 'ascii',
+      :diff_format  => 'color',
       :max_history  => 100,
       :show_lines   => false,
       :use_cookies  => true,
@@ -77,7 +77,7 @@ class TestKronk < Test::Unit::TestCase
         },
         :context     => 3,
         :default_host => "http://localhost:3000",
-        :diff_format => 'ascii',
+        :diff_format => 'color',
         :cache_file  => Kronk::DEFAULT_CACHE_FILE,
         :color_data  => false,
         :cookies_file => Kronk::DEFAULT_COOKIES_FILE,
@@ -99,6 +99,18 @@ class TestKronk < Test::Unit::TestCase
   end
 
 
+  def test_load_config_uri_options
+    with_config do
+      Kronk.load_config 'test/mocks/mock_config.yml'
+      expected = {'example.com' => {:query => {'foo' => 'bar'}}}
+      assert_equal expected, Kronk.config[:uri_options]
+
+      expect_request :get, "http://example.com/path?foo=bar", :query => {"foo"=>"bar"}
+      Kronk.request "http://example.com/path"
+    end
+  end
+
+
   def test_parser_for
     assert_equal JSON, Kronk.parser_for('json')
     assert_equal Kronk::XMLParser, Kronk.parser_for('xml')

metadata

@@ -1,182 +1,182 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kronk
-version: !ruby/object:Gem::Version
-  version: 1.9.2
+version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: 
+  segments: 
+  - 1
+  - 9
+  - 3
+  version: 1.9.3
 platform: ruby
-authors:
+authors: 
 - Jeremie Castagna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: cookiejar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cookiejar
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         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: *id002
+- !ruby/object:Gem::Dependency 
+  name: ruby-path
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         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
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mime-types
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 95
+        segments: 
+        - 1
+        - 18
+        - 0
         version: 1.18.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: plist
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: plist
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         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: *id006
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !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
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
         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: *id008
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: ! 'Kronk is a command line swiss-army-knife for HTTP services.
-
-
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id009
+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
@@ -223,6 +223,7 @@ files:
 - test/mocks/302_response.txt
 - test/mocks/cookies.yml
 - test/mocks/get_request.txt
+- test/mocks/mock_config.yml
 - test/test_assertions.rb
 - test/test_cmd.rb
 - test/test_data_string.rb
@@ -242,31 +243,39 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: kronk
-rubygems_version: 1.8.18
+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