httperfrb 0.3.5 → 0.3.6

data/Gemfile

@@ -6,4 +6,6 @@ group :development do
   gem 'yard'
   gem 'redcarpet'
   gem 'rake'
+  gem 'pry'
+  gem 'pry-doc'
 end

data/HISTORY.md

@@ -1,6 +1,10 @@
 HTTPerf.rb
 ==========
 
+### 0.3.6
+
+* cleaning up Open3 vs. Open4 and making them autoload for a slight performance increase
+
 ### 0.3.5
 
 * fixing bug with parsing verbose output
@@ -22,7 +26,7 @@ HTTPerf.rb
 
 * added handling for [HTTPerf::Grapher](http://github.com/rubyops/httperfrb-grapher)
 
-### 0.2.1 
+### 0.2.1
 
 * added verbose handling
 * refactored parser a bit

data/lib/httperf/parser.rb

@@ -9,7 +9,7 @@ class HTTPerf
     # @param [String] raw httperf output
     def self.parse raw
 
-      lines = raw.split("\n") 
+      lines = raw.split("\n")
       matches = {}
 
       # for verbose matching
@@ -22,7 +22,7 @@ class HTTPerf
       lines.each do |line|
 
         if verbose_expression.match(line)
-          verbose_connection_times.push($1) 
+          verbose_connection_times.push($1)
           next
         end
 
@@ -68,7 +68,7 @@ class HTTPerf
 
         # Maximum connect burst length:
         :max_connect_burst_length   => /Maximum connect burst length: ([0-9]*?\.?[0-9]+)$/,
-        
+
         # Total:
         :total_connections          => /^Total: connections ([0-9]*?\.?[0-9]+) /,
         :total_requests             => /^Total: connections .+ requests ([0-9]*?\.?[0-9]+) /,
@@ -76,15 +76,15 @@ class HTTPerf
         :total_test_duration        => /^Total: connections .+ test-duration ([0-9]*?\.?[0-9]+) /,
 
         # Connection rate:
-        :connection_rate_per_sec    => /^Connection rate: ([0-9]*?\.?[0-9]+) /, 
-        :connection_rate_ms_conn    => /^Connection rate: .+ \(([0-9]*?\.?[0-9]+) ms/, 
+        :connection_rate_per_sec    => /^Connection rate: ([0-9]*?\.?[0-9]+) /,
+        :connection_rate_ms_conn    => /^Connection rate: .+ \(([0-9]*?\.?[0-9]+) ms/,
 
         # Connection time [ms]:
-        :connection_time_min        => /^Connection time \[ms\]: min ([0-9]*?\.?[0-9]+) /, 
-        :connection_time_avg        => /^Connection time \[ms\]: min .+ avg ([0-9]*?\.?[0-9]+) /, 
-        :connection_time_max        => /^Connection time \[ms\]: min .+ max ([0-9]*?\.?[0-9]+) /, 
-        :connection_time_median     => /^Connection time \[ms\]: min .+ median ([0-9]*?\.?[0-9]+) /, 
-        :connection_time_stddev     => /^Connection time \[ms\]: min .+ stddev ([0-9]*?\.?[0-9]+)$/, 
+        :connection_time_min        => /^Connection time \[ms\]: min ([0-9]*?\.?[0-9]+) /,
+        :connection_time_avg        => /^Connection time \[ms\]: min .+ avg ([0-9]*?\.?[0-9]+) /,
+        :connection_time_max        => /^Connection time \[ms\]: min .+ max ([0-9]*?\.?[0-9]+) /,
+        :connection_time_median     => /^Connection time \[ms\]: min .+ median ([0-9]*?\.?[0-9]+) /,
+        :connection_time_stddev     => /^Connection time \[ms\]: min .+ stddev ([0-9]*?\.?[0-9]+)$/,
         :connection_time_connect    => /^Connection time \[ms\]: connect ([0-9]*?\.?[0-9]+)$/,
 
         # Connection length [replies/conn]:
@@ -103,7 +103,7 @@ class HTTPerf
         :reply_rate_max             => /^Reply rate \[replies\/s\]: min .+ max ([0-9]*?\.?[0-9]+) /,
         :reply_rate_stddev          => /^Reply rate \[replies\/s\]: min .+ stddev ([0-9]*?\.?[0-9]+) /,
         :reply_rate_samples         => /^Reply rate \[replies\/s\]: min .+ \(([0-9]*?\.?[0-9]+) samples/,
-        
+
         # Reply time [ms]:
         :reply_time_response        => /^Reply time \[ms\]: response ([0-9]*?\.?[0-9]+) /,
         :reply_time_transfer        => /^Reply time \[ms\]: response .+ transfer ([0-9]*?\.?[0-9]+)$/,
@@ -127,7 +127,7 @@ class HTTPerf
         :cpu_time_user_pct          => /^CPU time \[s\]: user .+ \(user ([0-9]*?\.?[0-9]+)\% /,
         :cpu_time_system_pct        => /^CPU time \[s\]: user .+ system .+ system ([0-9]*?\.?[0-9]+)\% /,
         :cpu_time_total_pct         => /^CPU time \[s\]: user .+ total ([0-9]*?\.?[0-9]+)\%/,
-       
+
         # Net I/O:
         :net_io_kb_sec              => /^Net I\/O: ([0-9]*?\.?[0-9]+) KB/,
         :net_io_bps                 => /^Net I\/O: .+ \((.+) bps\)/,
@@ -158,7 +158,7 @@ class HTTPerf
       when 2
         values.last
       else
-        values.sort[((values.count.to_f/100)*percentile.to_f).round(0)-1] 
+        values.sort[((values.count.to_f/100)*percentile.to_f).round(0)-1]
       end
     end
 

data/lib/httperf/version.rb

@@ -1,4 +1,4 @@
 class HTTPerf
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
 

data/lib/httperf.rb

@@ -1,12 +1,16 @@
 # @author Joshua Mervine <joshua@mervine.net>
 $:.unshift File.dirname(__FILE__)
-require 'open4'
 require 'httperf/parser'
 require 'httperf/version'
-begin 
+
+autoload :Open3, 'open3'
+autoload :Open4, 'open4'
+
+begin
   require 'httperf/grapher'
 rescue LoadError
 end
+
 class HTTPerf
 
   # @return [Boolean] parse flag
@@ -61,11 +65,11 @@ class HTTPerf
   #   -  wsesslog
   #   -  wset
   def initialize options={}, path=nil
-    self.parse = options.delete("parse") 
+    self.parse = options.delete("parse")
     options.each_key do |k|
       raise "'#{k}' is an invalid httperf param" unless params.keys.include?(k)
     end
-    @options = params.merge(options)  
+    @options = params.merge(options)
     if path.nil?
       @command = %x{ which httperf }.chomp
       raise "httperf not found" unless @command =~ /httperf/
@@ -84,7 +88,7 @@ class HTTPerf
   # run httperf and wait for it to finish
   #  return errors if any, otherwise return
   #  results
-  def run 
+  def run
     status, out, err = nil
     Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
       pid = wait_thr.pid
@@ -127,7 +131,7 @@ class HTTPerf
 
   # print httperf command to be run
   # - for debugging and testing
-  def command 
+  def command
     return "#{@command} #{options}"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20419100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20419100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20418540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20418540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &20418080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20418080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &20417560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20417560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple interface for calling httperf via ruby.
 email:
 - joshua@mervine.net
@@ -62,9 +82,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/httperf.rb
 - lib/httperf/version.rb
 - lib/httperf/parser.rb
-- lib/httperf.rb
 - README.md
 - HISTORY.md
 - Gemfile
@@ -80,9 +100,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3635307491401586106
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HTTPerf via Ruby