kronk 1.9.1 → 1.9.2

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.9.2 / 2012-05-23
+
+* Bugfixes:
+
+  * Ensure HTTP response body is read before feeding to the pool.
+
 === 1.9.1 / 2012-05-22
 
 * Enhancements:

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.9.1'
+  VERSION = '1.9.2'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'

data/lib/kronk/http.rb

@@ -198,6 +198,7 @@ class Kronk
         D 'Conn socket closed'
       elsif keep_alive?(req, res)
         D 'Conn keep-alive'
+        res.body
         add_to_pool
       elsif not res.body and @close_on_empty_response
         D 'Conn close'

data/lib/kronk/player/benchmark.rb

@@ -77,6 +77,15 @@ class Kronk
         @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
+      end
+
+
+      def clean_req_log
+        if @paths.length > 500
+          order_reqs[500..-1].each{|(uri, vals)| @paths.delete uri }
+        end
       end
 
 
@@ -148,8 +157,13 @@ class Kronk
       end
 
 
+      def order_reqs
+        @paths.to_a.sort{|x,y| y[1] <=> x[1]}
+      end
+
+
       def slowest_reqs
-        @slowest_reqs ||= @paths.to_a.sort{|x,y| y[1] <=> x[1]}[0..9]
+        @slowest_reqs ||= order_reqs[0..9]
       end
 
 
@@ -262,10 +276,11 @@ Avg. Slowest Requests (ms, count)
 
 
     def render
-      clear_screen if @interactive
-      out = "#{head}#{body}\n"
-      @line_count = out.to_s.split("\n").length
+      out         = "#{head}#{body}\n"
+      new_count   = out.to_s.split("\n").length
       @last_print = Time.now
+      clear_screen if @interactive
+      @line_count = new_count
       $stdout.print out
       $stdout.flush
     end

data/lib/kronk/request.rb

@@ -448,11 +448,7 @@ class Kronk
 
       @response = stream opts
 
-      if block_given?
-        block = lambda{|chunk| yield @response, chunk }
-      end
-
-      @response.body(&block) # make sure to read the full body from io
+      @response.body # make sure to read the full body from io
       @response.time = Time.now - start_time - @response.conn_time
 
       @response
@@ -468,7 +464,7 @@ class Kronk
     # Connection must be closed using:
     #   request.connection.finish
 
-    def stream opts={}
+    def stream opts={}, &block
       retried = false
 
       begin
@@ -477,7 +473,7 @@ class Kronk
         conn.start unless conn.started?
         conn_time  = Time.now - start_time
 
-        @response           = conn.request http_request, nil, opts
+        @response           = conn.request http_request, nil, opts, &block
         @response.conn_time = conn_time
         @response.request   = self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronk
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70132287844660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70132287844660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: cookiejar
-  requirement: &70132287844220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132287844220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-path
-  requirement: &70132287843780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132287843780
+  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: &70132287843340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132287843340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70132287842900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70132287842900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70132287842460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70132287842460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70132287842020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70132287842020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70132287841540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70132287841540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70132287841020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +149,12 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70132287841020
+  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.
 
 
@@ -217,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kronk
-rubygems_version: 1.8.11
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Kronk is a command line swiss-army-knife for HTTP services