httperfrb 0.3.0pre1 → 0.3.0pre2

data/lib/httperf/grapher.rb

@@ -1,57 +1,7 @@
 class HTTPerf
   class Grapher
-    attr_accessor :output_file
-    attr_reader   :graph_settings
-
     def initialize gs={}
-      begin
-        require 'gruff'
-        @output_file    = "httperf_graph.png"
-        @graph_settings = default_graph_settings.merge(gs)
-      rescue LoadError
-        puts "WARNING: HTTPerf::Grapher not available -- please install 'gruff'."
-      end
-    end
-
-    def graph_settings=(s)
-      @graph_settings = graph_settings.merge(s)
-    end
-
-    def graph results
-      raise "missing connection times" unless results.has_key?(:connection_times)
-      graph = Gruff::Line.new 
-
-      conn_times = results[:connection_times].map { |i| i.to_f }
-
-      graph_settings.each do |key,val|
-        graph.send("#{key}=".to_sym, val)
-      end
-
-      graph.data("Connection Times", conn_times)
-      graph.data("Average [#{results[:connection_time_avg].to_f}]", draw_line(results[:connection_time_avg].to_f, conn_times.count))
-      graph.data("85th [#{results[:connection_time_85_pct].to_f}]", draw_line(results[:connection_time_85_pct].to_f, conn_times.count))
-      graph.data("95th [#{results[:connection_time_95_pct].to_f}]", draw_line(results[:connection_time_95_pct].to_f, conn_times.count))
-      graph.data("99th [#{results[:connection_time_99_pct].to_f}]", draw_line(results[:connection_time_99_pct].to_f, conn_times.count))
-
-      graph.labels = {}
-      (1..(conn_times.count/10)).each do |i|
-        graph.labels[i*10] = (i*10).to_s
-      end
-
-      graph.write(output_file)
-    end
-
-    private
-    def default_graph_settings
-      {
-        hide_dots:        true,
-        legend_font_size: 14,
-        marker_font_size: 14,
-        title:            "HTTPerf Results"
-      }
-    end
-    def draw_line value, length
-      (1..length).collect { value }
+      puts "WARNING: HTTPerf::Grapher not available -- please install 'httperfrb-grapher'."
     end
   end
 end

data/lib/httperf/parser.rb

@@ -7,8 +7,9 @@ class HTTPerf
 
     # @return [Hash] returns hash of parsed httperf output
     # @param [String] raw httperf output
-    def self.parse raw, verbose=false, grapher=false
+    def self.parse raw
 
+      verbose = false
       lines = raw.split("\n") 
       matches = {}
 
@@ -17,7 +18,7 @@ class HTTPerf
 
       lines.each do |line|
 
-        if verbose and verbose_expression.match(line)
+        if verbose_expression.match(line)
           verbose_connection_times.push($1) 
           next
         end
@@ -38,18 +39,16 @@ class HTTPerf
         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 == matches.keys.count
+        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
 
-      if grapher
-        matches[:connection_times] = verbose_connection_times
-      end
-
       return matches
     end
 

data/lib/httperf/version.rb

@@ -1,4 +1,4 @@
 class HTTPerf
-  VERSION = "0.3.0pre1"
+  VERSION = "0.3.0pre2"
 end
 

data/lib/httperf.rb

@@ -6,7 +6,7 @@ require 'httperf/version'
 class HTTPerf
 
   # @return [Boolean] parse flag
-  attr_accessor :parse, :verbose
+  attr_accessor :parse
 
   # availbe instance methods
   @fork_out, @fork_err = ''
@@ -58,7 +58,6 @@ class HTTPerf
   #   -  wset
   def initialize options={}, path=nil
     self.parse = options.delete("parse") 
-    self.verbose = true if options.has_key?("verbose")
     options.each_key do |k|
       raise "'#{k}' is an invalid httperf param" unless params.keys.include?(k)
     end
@@ -91,7 +90,7 @@ class HTTPerf
     end
     if status == 0
       if @parse
-        return Parser.parse(out.join, self.verbose)
+        return Parser.parse(out.join)
       else
         return out.join
       end
@@ -128,10 +127,6 @@ class HTTPerf
     return "#{@command} #{options}"
   end
 
-  def verbose
-    @verbose||false
-  end
-
   private
   # build commandline options string
   def options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.3.0pre1
+  version: 0.3.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13531760 !ruby/object:Gem::Requirement
+  requirement: &11913560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13531760
+  version_requirements: *11913560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13530720 !ruby/object:Gem::Requirement
+  requirement: &11913100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13530720
+  version_requirements: *11913100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13529960 !ruby/object:Gem::Requirement
+  requirement: &11912600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13529960
+  version_requirements: *11912600
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &13528560 !ruby/object:Gem::Requirement
+  requirement: &11899880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13528560
+  version_requirements: *11899880
 description: Simple interface for calling httperf via ruby.
 email:
 - joshua@mervine.net
@@ -83,16 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3299317405384709120
+      hash: -3739833727762130142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-requirements:
-- rmagick version ~>2.13.1
-- gruff version ~>0.3.6
+requirements: []
 rubyforge_project: 
 rubygems_version: 1.7.2
 signing_key: