httperfrb 0.3.3 → 0.3.4

data/lib/httperf/parser.rb

@@ -8,6 +8,7 @@ class HTTPerf
     # @return [Hash] returns hash of parsed httperf output
     # @param [String] raw httperf output
     def self.parse raw
+
       lines = raw.split("\n") 
       matches = {}
 
@@ -19,6 +20,12 @@ class HTTPerf
       verbose_connection_times = []
 
       lines.each do |line|
+
+        if verbose_expression.match(line)
+          verbose_connection_times.push($1) 
+          next
+        end
+
         matched = false
         unless line.empty?
           next if matched
@@ -30,11 +37,30 @@ class HTTPerf
           end
         end
       end
-      raise "mismatch error occurred" unless expressions.keys.count == matches.keys.count
+
+      unless verbose_connection_times.empty?
+        percentiles.each do |percentile|
+          matches["connection_time_#{percentile}_pct".to_sym] = calculate_percentile(percentile, verbose_connection_times)
+        end
+        matches[:connection_times] = verbose_connection_times
+        verbose = true
+      end
+
+      if verbose
+        raise "mismatch error occurred" unless expressions.keys.count+percentiles.count+1 == matches.keys.count
+      else
+        raise "mismatch error occurred" unless expressions.keys.count == matches.keys.count
+      end
+
       return matches
     end
 
     protected
+
+    def self.verbose_expression
+      /^Connection lifetime = ([0-9]*?\.?[0-9]+)$/
+    end
+
     def self.expressions
       # While this isn't the most efficent way of doing this, it's the most maintainable.
       {

data/lib/httperf/version.rb

@@ -1,4 +1,4 @@
 class HTTPerf
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end
 

data/lib/httperf.rb

@@ -3,7 +3,10 @@ $:.unshift File.dirname(__FILE__)
 require 'open4'
 require 'httperf/parser'
 require 'httperf/version'
-
+begin 
+  require 'httperf/grapher'
+rescue LoadError
+end
 class HTTPerf
 
   # @return [Boolean] parse flag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20381740 !ruby/object:Gem::Requirement
+  requirement: &12594280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20381740
+  version_requirements: *12594280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20381080 !ruby/object:Gem::Requirement
+  requirement: &12593740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20381080
+  version_requirements: *12593740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &20380540 !ruby/object:Gem::Requirement
+  requirement: &12593260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20380540
+  version_requirements: *12593260
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &20380060 !ruby/object:Gem::Requirement
+  requirement: &12592720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20380060
+  version_requirements: *12592720
 description: Simple interface for calling httperf via ruby.
 email:
 - joshua@mervine.net
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 568389306351562567
+      hash: -4553796568660204658
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: