httperfrb 0.3.2 → 0.3.3

data/Gemfile

@@ -1,6 +1,5 @@
 source :rubygems
 gem 'open4'
-
 group :development do
   gem 'rspec'
   gem 'simplecov'

data/HISTORY.md

@@ -1,6 +1,10 @@
 HTTPerf.rb
 ==========
 
+### 0.3.3
+
+* adding limited grapher handling back
+
 ### 0.3.2
 
 * removed all grapher and verbose handling, as it isn't working as expected

data/README.md

@@ -1,14 +1,10 @@
-HTTPERF.rb
+HTTPerf.rb
 ==========
 
 ### [Documentation](http://rubyops.github.com/httperfrb/doc/) | [Coverage](http://rubyops.github.com/httperfrb/coverage/) | [RSpec Out](https://github.com/rubyops/httperfrb/blob/master/RSPECOUT.md)
 
 Simple Ruby interface for httperf.
 
-### Known Issues
-
-* Verbose handling isn't parsing correctly, but should not cause errors either.
-
 ## Installing 'httperf'
 
 Requires httperf, of course...
@@ -24,6 +20,10 @@ Requires httperf, of course...
 #### Redhat / CentOS
 
     sudo yum install httperf
+    
+#### My 'httperf'
+
+See: [httperf-0.9.1 with individual connection times](http://www.rubyops.net/2012/08/13/httperf-0_9_1_with_individual_connection_times).
 
 ## Install
 
@@ -135,13 +135,3 @@ Something I've been playing around with, it's more of hack really. But it works
     :errors_ftab_full
     :errors_other
   
-
-##### Addtional Verbose Parser Keys: 
-
-    :connection_time_75_pct
-    :connection_time_80_pct
-    :connection_time_85_pct
-    :connection_time_90_pct
-    :connection_time_95_pct
-    :connection_time_99_pct
-

data/lib/httperf/parser.rb

@@ -8,25 +8,17 @@ class HTTPerf
     # @return [Hash] returns hash of parsed httperf output
     # @param [String] raw httperf output
     def self.parse raw
-
       lines = raw.split("\n") 
       matches = {}
 
-      # NOTE: commenting out all verbose handling, as the parsed
-      # strings do not exist in standard httperf. This code was 
-      # based off of a custom hacked version.
-      #
       # for verbose matching
-      #verbose = false
-      #verbose_connection_times = []
+      # this only works if httperf output is
+      # generated using my version of httperf
+      # see: https://github.com/rubyops/httperf
+      verbose = false
+      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
@@ -38,30 +30,11 @@ class HTTPerf
           end
         end
       end
-
-      #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
-
+      raise "mismatch error occurred" unless expressions.keys.count == matches.keys.count
       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.
       {
@@ -146,19 +119,20 @@ class HTTPerf
       }
     end
 
-    #def self.percentiles
-      #[ 75, 80, 85, 90, 95, 99 ]
-    #end
+    # everything below is for verbose mode
+    def self.percentiles
+      [ 75, 80, 85, 90, 95, 99 ]
+    end
 
-    #private
-    #def self.calculate_percentile percentile, values
-      #v = values.sort
-      #v[percentile_index(percentile, values.count)]
-    #end
+    private
+    def self.calculate_percentile percentile, values
+      v = values.sort
+      v[percentile_index(percentile, values.count)]
+    end
 
-    #def self.percentile_index percentile, count
-      #((count/100)*percentile)-1
-    #end
+    def self.percentile_index percentile, count
+      ((count/100)*percentile)-1
+    end
   end
 end
 

data/lib/httperf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000Z
+date: 2012-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17940520 !ruby/object:Gem::Requirement
+  requirement: &20381740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17940520
+  version_requirements: *20381740
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &17939680 !ruby/object:Gem::Requirement
+  requirement: &20381080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17939680
+  version_requirements: *20381080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &17939000 !ruby/object:Gem::Requirement
+  requirement: &20380540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17939000
+  version_requirements: *20380540
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &17938280 !ruby/object:Gem::Requirement
+  requirement: &20380060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17938280
+  version_requirements: *20380060
 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: -407478064777664208
+      hash: 568389306351562567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: