autograph 0.1.2 → 0.2.0

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Nick Stielau"]
     gem.add_runtime_dependency 'builder',  '= 2.1.2'
     gem.add_runtime_dependency 'ruport',  '= 1.6.3'
-    gem.add_runtime_dependency 'scruffy', '= 0.2.6'
+    gem.add_runtime_dependency 'scruffy', '= 0.2.5'
     gem.add_runtime_dependency 'gchart',  '= 1.0.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -29,5 +29,9 @@ Rake::TestTask.new(:test) do |test|
 end
 
 
+task :install_local do
+  `sudo gem install --local ./pkg/autograph-0.1.2.gem --no-ri --no-rdoc`
+end
+
 task :test => :check_dependencies
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/autograph

@@ -50,6 +50,11 @@ opt_parse_opts = OptionParser.new do |opts|
     command_parts << "--test"
   end
 
+  opts.on("--graph-renderer RENDERER", "The class to use as a graph renderer (#{BaseRenderer::AVAILABLE_GRAPH_RENDERERS.join(', ')}).") do |opt|
+    options['graph_renderer'] = opt
+    command_parts << "--graph-renderer '#{opt}'"
+  end
+
   opts.separator ""
   opts.separator "Httperf Knobs:"
 

data/lib/autograph/configuration.rb

@@ -58,6 +58,10 @@ class Configuration
   end
 
   def graph_renderer_class
-    Object.const_get(@conf['graph_renderer'].to_s)
+    begin
+      Object.const_get(@conf['graph_renderer'].to_s)
+    rescue => e
+      abort("#{@conf['graph_renderer'].to_s} is not one of the available graph renderers (#{BaseRenderer::AVAILABLE_GRAPH_RENDERERS.join(', ')})")
+    end
   end
 end

data/lib/autograph/graph_renderers/base_renderer.rb

@@ -5,6 +5,8 @@ class BaseRenderer
   attr :path, true
   attr :series
 
+  AVAILABLE_GRAPH_RENDERERS = %W(ScruffyRenderer GChartRenderer)
+
   def initialize
     @series = []
   end
@@ -21,6 +23,9 @@ class BaseRenderer
     series.map{|s| s.y_values.max}.max
   end
 
+  def self.header_html
+  end
+
   def self.generate_graphs(reports, configuration)
     graphs = {}
     reports.each do |uri, report|
@@ -41,7 +46,7 @@ class BaseRenderer
       request_rate = GraphSeries.new(:line, report.column('rate'), report.column('conn/s').map{|x| x.to_f}, "Requests for '#{uri}'")
       request_rate_graph.add_series(request_rate)
 
-      graphs[uri] << request_rate_graph.to_html
+      graphs[uri] << request_rate_graph
 
       response_time_graph = configuration.graph_renderer_class.new
       response_time_graph.path = uri
@@ -57,7 +62,7 @@ class BaseRenderer
       response_time = GraphSeries.new(:line, report.column('rate'), report.column('reply time'), "Requests for '#{uri}'")
       response_time_graph.add_series(response_time)
 
-      graphs[uri] << response_time_graph.to_html
+      graphs[uri] << response_time_graph
     end
 
     max_rate_graph = configuration.graph_renderer_class.new
@@ -70,6 +75,7 @@ class BaseRenderer
       max_request_rate = GraphSeries.new(:bar, [key], [max], "Max Request Rate for '#{key}'")
       max_rate_graph.add_series(max_request_rate)
     end
+
     graphs['summary_graph'] = max_rate_graph
     graphs
   end

data/lib/autograph/graph_renderers/flot_renderer.rb

@@ -0,0 +1,50 @@
+class FlotRenderer < BaseRenderer
+  def to_html
+    data = []
+    graph_type = ''
+    if series[0].type.to_sym == :bar
+      graph_type = "bars"
+      series.each_with_index do |s, i|
+        data << "[#{i}, #{s.y_values[0]}]"
+      end
+    else
+      graph_type = "lines"
+      1.upto(series[0].x_values.size.to_i - 1) do |index|
+        data << "[#{series[0].x_values[index]}, #{series[0].y_values[index]}]"
+      end
+    end
+
+    html = <<GRAPH_HTML
+    <div style="with:600px;height:350px;" id="#{graph_name}"></div>
+    <script language="javascript" type="text/javascript">
+    //#{series.inspect}
+        $('.report').show();
+        $.plot($("##{graph_name}"), [
+            {
+                data: [#{data.join(",")}],
+                #{graph_type}: { show: true, fill: true }
+            }
+        ]);
+        $('.report').hide();
+        show_report('overview');
+    </script>
+GRAPH_HTML
+    html
+  end
+
+  def self.header_html
+    html = <<HEADER_HTML
+    <script type="text/javascript" src="http://127.0.0.1:1234/jquery.js"></script>
+    <script type="text/javascript" src="http://127.0.0.1:1234/jquery.flot.js"></script>
+HEADER_HTML
+  end
+
+private
+  def format_file_name(desired_name)
+    desired_name.to_s.gsub("/","_").gsub("=","_").gsub("?","_")
+  end
+
+  def graph_name
+    @graph_name ||= "graph_#{format_file_name(path || 'overview')}_#{(rand * 100).to_i}"
+  end
+end

data/lib/autograph/graph_renderers/gchart_renderer.rb

@@ -1,12 +1,12 @@
 require 'gchart'
 
 class GChartRenderer < BaseRenderer
-  
+
   def to_html
-    #"<img src='#{render_graph.to_url}'/>"
-    render_graph.to_url
+    render_graph
+    "<img src='#{render_graph.to_url}'/>"
   end
-  
+
 private
   def available_colors
     [:red, :yellow, :green, :blue, :black]
@@ -15,16 +15,16 @@ private
   def render_graph
     chart_type = series[0].type.to_s
     chart_type = 'line' if chart_type == 'area'
-    
+
     chart = GChart.send(chart_type) do |g|
 
       x_values = series[0].x_values
       y_values = series[0].y_values
 
       x_values = series.map{|s| s.x_values} if chart_type.to_sym == :bar
-      
+
       series_data = series.map{|s| s.y_values}
-    
+
       g.data   = series_data
 
       # chg, grid lines
@@ -41,9 +41,9 @@ private
                 :chm => "o,0066FF,0,-1.0,6",
                 :chma => "20,20,20,30|80,20",
                 :chdlp => "bv"}
-                  
-      if chart_type.to_sym == :bar    
-        extras = extras.merge({:chm => '', :chbh => 'a,20,20'}) 
+
+      if chart_type.to_sym == :bar
+        extras = extras.merge({:chm => '', :chbh => 'a,20,20'})
         # chm=N*f0*,000000,1,-1,11|N*f0*,000000,2,-1,11|N*f1*,000000,3,-1,11|N*f2*,FF0000,0,0,18
         g.grouped = true
       end
@@ -61,15 +61,15 @@ private
         a.labels = (0..(y_values.max.to_i)).to_a.select{|y| y % interval == 0}
         a.text_color = :black
       end
-      
+
       if chart_type.to_sym == :bar
-        g.orientation = :vertical 
-      end  
-        
+        g.orientation = :vertical
+      end
+
       colors = available_colors
       g.colors = series.map{|s| colors.pop}
 
-      g.legend = series.map{|s| s.label}
+      g.legend = series.map{|s| s.label.gsub("'", "")}
 
       g.title = title
 

data/lib/autograph/graph_renderers/scruffy_renderer.rb

@@ -1,15 +1,21 @@
 require 'scruffy'
 
 class ScruffyRenderer < BaseRenderer
-  
+  SCRUFFY_HEIGHT=360
+  SCRUFFY_WIDTH=600
+
   def to_html
     render_graph
-    "<img src='#{@file_name}'/>"
+    "<iframe width=\"#{SCRUFFY_WIDTH}\" height=\"#{SCRUFFY_HEIGHT}\" src=\"./#{graph_file_name}\"></iframe>"
   end
-  
+
 private
   def format_file_name(desired_name)
-    desired_name.gsub("/","_").gsub("=","_").gsub("?","_")
+    desired_name.to_s.gsub("/","_").gsub("=","_").gsub("?","_")
+  end
+
+  def graph_file_name
+    @graph_name ||= "graph_#{format_file_name(path || 'overview')}_#{(rand * 100).to_i}.svg"
   end
 
   def render_graph
@@ -17,15 +23,13 @@ private
     graph.title = title
     graph.renderer = Scruffy::Renderers::Standard.new(:values => series[0].x_values.size + 1)
     graph.point_markers = series[0].x_values
-    
+
     series.each do |s|
       graph.add s.type.to_sym, s.label, s.y_values
     end
-    
-    @file_name = format_file_name("request_graph_#{path}.svg")
-    
-    graph.render :to => @file_name, :min_value => 0, :max_value => find_max_y_value
-    
+
+    graph.render :to => graph_file_name, :min_value => 0, :max_value => find_max_y_value, :width => SCRUFFY_WIDTH, :height => SCRUFFY_HEIGHT
+
     graph
   end
 end

data/lib/autograph/html_report.rb

@@ -9,6 +9,7 @@ class HtmlReport
     command_run = configuration["command_run"]
     notes = configuration["notes"]
     summary_graph = graphs['summary_graph']
+    graph_header_html = configuration.graph_renderer_class.header_html
 
     output_file = HtmlReport.determine_output_file(configuration['output_file'], configuration['output_dir'])
 

data/lib/autograph/report.html.erb

@@ -4,6 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title><%= title %></title>
+  <%=  graph_header_html %>
   <style type="text/css">
   body,
   html {
@@ -132,7 +133,7 @@
     <h2>Report Detail</h2>
 
 <div id="overview" class='report'>
-<img src="<%= summary_graph.to_html %>"/>
+  <%= summary_graph.to_html %>
 </div>
 
 <div id="graph_discussion" class='report' style="display:none;">
@@ -151,7 +152,7 @@ Discussion on what these graphs mean.
       <div id="page_<%= uri %>" class='report' style="display:none;">
         <p>Report for <%= "http://#{host}#{uri}" %></p>
         <% graphs[uri].each do |graph| %>
-        <img src="<%= graph %>"/>
+          <%= graph.to_html %>
         <% end %>
 <pre>
 <%= report.to_s %>

data/lib/autograph.rb

@@ -13,3 +13,4 @@ require 'autograph/configuration'
 require 'autograph/graph_renderers/base_renderer'
 require 'autograph/graph_renderers/gchart_renderer'
 require 'autograph/graph_renderers/scruffy_renderer'
+require 'autograph/graph_renderers/flot_renderer'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nick Stielau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -07:00
+date: 2010-05-25 00:00:00 -07:00
 default_executable: autograph
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 6
-        version: 0.2.6
+        - 5
+        version: 0.2.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - lib/autograph/autoperf.rb
 - lib/autograph/configuration.rb
 - lib/autograph/graph_renderers/base_renderer.rb
+- lib/autograph/graph_renderers/flot_renderer.rb
 - lib/autograph/graph_renderers/gchart_renderer.rb
 - lib/autograph/graph_renderers/rasterized_scruffy_renderer.rb
 - lib/autograph/graph_renderers/scruffy_renderer.rb