httperfrb 0.3.1 → 0.3.2

data/Gemfile

@@ -1,11 +1,5 @@
 source :rubygems
 gem 'open4'
-gem 'gruff'
-gem 'rmagick'
-
-group :grapher do
-  gem 'httperfrb-grapher', '0.0.1pre1'
-end
 
 group :development do
   gem 'rspec'

data/HISTORY.md

@@ -1,6 +1,10 @@
 HTTPerf.rb
 ==========
 
+### 0.3.2
+
+* removed all grapher and verbose handling, as it isn't working as expected
+
 ### 0.3.1
 
 * fixing verbose bug

data/README.md

@@ -5,9 +5,9 @@ HTTPERF.rb
 
 Simple Ruby interface for httperf.
 
-### Note
+### Known Issues
 
-Also see: [HTTPerf::Grapher](http://github.com/rubyops/httperfrb-grapher)
+* Verbose handling isn't parsing correctly, but should not cause errors either.
 
 ## Installing 'httperf'
 

data/lib/httperf/parser.rb

@@ -9,19 +9,23 @@ class HTTPerf
     # @param [String] raw httperf output
     def self.parse raw
 
-      verbose = false
       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_connection_times = []
+      #verbose = false
+      #verbose_connection_times = []
 
       lines.each do |line|
 
-        if verbose_expression.match(line)
-          verbose_connection_times.push($1) 
-          next
-        end
+        #if verbose_expression.match(line)
+          #verbose_connection_times.push($1) 
+          #next
+        #end
 
         matched = false
         unless line.empty?
@@ -35,28 +39,28 @@ class HTTPerf
         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
+      #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
+      #end
 
       return matches
     end
 
     protected
 
-    def self.verbose_expression
-      /^Connection lifetime = ([0-9]*?\.?[0-9]+)$/
-    end
+    #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.
@@ -142,19 +146,19 @@ class HTTPerf
       }
     end
 
-    def self.percentiles
-      [ 75, 80, 85, 90, 95, 99 ]
-    end
+    #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.1"
+  VERSION = "0.3.2"
 end
 

data/lib/httperf.rb

@@ -4,11 +4,6 @@ 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.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19990820 !ruby/object:Gem::Requirement
+  requirement: &17940520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19990820
+  version_requirements: *17940520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &19989840 !ruby/object:Gem::Requirement
+  requirement: &17939680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19989840
+  version_requirements: *17939680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19988720 !ruby/object:Gem::Requirement
+  requirement: &17939000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19988720
+  version_requirements: *17939000
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &19987960 !ruby/object:Gem::Requirement
+  requirement: &17938280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19987960
+  version_requirements: *17938280
 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: -4394276421810491553
+      hash: -407478064777664208
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: