autoperf 1.0.4 → 1.1.0beta1

data/Gemfile

@@ -2,8 +2,13 @@ source "https://rubygems.org"
 
 gemspec
 
+if RUBY_VERSION < "1.9.0"
+  gem 'json'
+end
+
 group :development do
-  gem 'rake'
   gem 'pry'
   gem 'pry-doc'
 end
+
+# vim: filetype=ruby:

data/lib/autoperf.rb

@@ -6,22 +6,26 @@ require 'autoperf/display'
 
 class Autoperf
   def initialize(config_file, opts = {})
-    @conf = parse_config(config_file).merge(opts)
-    @perf = HTTPerf.new(@conf)
+    @conf       = parse_config(config_file).merge(opts)
+    @perf       = HTTPerf.new(@conf)
     @perf.parse = true
-    @perf.tee = true if @tee
+    @perf.tee   = true if @tee
   end
 
   def parse_config(config_file)
     raise Errno::EACCES, "#{config_file} is not readable" unless File.readable?(config_file)
     config = YAML::load(File.open(config_file, 'r'))
-    @rates = {
+
+    @rates  = {
       :low_rate  => config.delete('low_rate'),
       :high_rate => config.delete('high_rate'),
       :rate_step => config.delete('rate_step')
     }
-    @cols  = config.delete('display_columns') if config.has_key?('display_columns')
-    @tee   = config.delete('tee')||false
+
+    @cols   = config.delete('display_columns')        if config.has_key?('display_columns')
+    @tee    = config.delete('tee')||false
+    @format = config.delete('display_format').to_sym  if config.has_key?('display_format')
+
     return config
   end
 
@@ -34,21 +38,28 @@ class Autoperf
     return @results
   end
 
-  def display
+  def display(type=@format)
     @results ||= {}
-    if @cols
-      Autoperf::Display.new(@results, @cols)
+    @cols    ||= nil
+    case type
+    when :csv
+      Autoperf::Display::CSV.new(@results, @cols)
+    when :json
+      Autoperf::Display::JSON.new(@results, @cols)
     else
-      Autoperf::Display.new(@results)
+      Autoperf::Display::Console.new(@results, @cols)
     end
   end
 
   def to_s
-    display.to_s
+    display(:console).to_s
+  end
+
+  def to_csv
+    display(:csv).to_csv
   end
 
   def to_json
-    @results ||= {}
-    @results.to_json
+    display(:json).to_json
   end
 end

data/lib/autoperf/display.rb

@@ -1,40 +1,22 @@
 require 'ruport'
+require 'json'
+require 'autoperf/display/console'
+require 'autoperf/display/csv'
+require 'autoperf/display/json'
 class Autoperf
   class Display
-    def initialize results, report=nil
-      @table = if report.kind_of?(Array)
-                 table_from_array(report)
-               elsif report.kind_of?(Ruport::Data::Table)
-                 report
-               else
-                 # ignore input and use defaults
-                 table_from_array([
-                     :rate,
-                     :connection_rate_per_sec,
-                     :request_rate_per_sec,
-                     :connection_time_avg,
-                     :errors_total,
-                     :reply_status_5xx,
-                     :net_io_kb_sec
-                   ])
-               end
-      results.each do |rate, result|
-        result.merge!(:rate => rate) if @table.column_names.include?(:rate)
-        @table << result
-      end
-    end
+    DEFAULT_FIELDS = [
+      :rate,
+      :connection_rate_per_sec,
+      :request_rate_per_sec,
+      :connection_time_avg,
+      :errors_total,
+      :reply_status_5xx,
+      :net_io_kb_sec
+    ]
 
-    def to_s
-      @table.to_s
-    end
-
-    def print
-      puts to_s
-    end
-
-    def table_from_array report
-      Table(:column_names => report)
-    end
+    # class Console # display/console
+    # class CSV     # display/csv
+    # class JSON    # display/json
   end
 end
-

data/lib/autoperf/display/console.rb

@@ -0,0 +1,35 @@
+class Autoperf::Display
+  class Console
+    def initialize results, report=nil
+      @table = if report.kind_of?(Array)
+                 table_from_array(report)
+               elsif report.kind_of?(Ruport::Data::Table)
+                 report
+               else
+                 # ignore input and use defaults
+                 table_from_array(::Autoperf::Display::DEFAULT_FIELDS)
+               end
+      results.each do |rate, result|
+        result.merge!(:rate => rate) if @table.column_names.include?(:rate)
+        @table << result
+      end
+      @table
+    end
+
+    def table
+      @table
+    end
+
+    def to_s
+      @table.to_s
+    end
+
+    def print
+      puts to_s
+    end
+
+    def table_from_array report
+      Table(:column_names => report)
+    end
+  end
+end

data/lib/autoperf/display/csv.rb

@@ -0,0 +1,19 @@
+class Autoperf::Display
+  class CSV
+    def initialize results, report=nil
+      @table = ::Autoperf::Display::Console.new(results, report).table
+    end
+
+    def to_s
+      @table.to_csv
+    end
+
+    def to_csv
+      to_s
+    end
+
+    def print
+      puts to_s
+    end
+  end
+end

data/lib/autoperf/display/json.rb

@@ -0,0 +1,25 @@
+class Autoperf::Display
+  class JSON
+    def initialize(results, fields=nil)
+      @results = []
+      fields ||= ::Autoperf::Display::DEFAULT_FIELDS
+      results.each do |rate, result|
+        result.keep_if { |k,v| fields.include?(k) }
+        result.merge!(:rate => rate) if fields.include?(:rate)
+        @results.push(result)
+      end
+    end
+
+    def to_s
+      to_json
+    end
+
+    def to_json
+      @results.to_json
+    end
+
+    def print
+      puts ::JSON.pretty_generate(@results)
+    end
+  end
+end

data/lib/autoperf/version.rb

@@ -1,3 +1,3 @@
 class Autoperf
-  VERSION = "1.0.4"
+  VERSION = "1.1.0beta1"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: autoperf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0beta1
+  prerelease: 5
 platform: ruby
 authors:
 - Joshua Mervine
@@ -10,30 +10,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.1
 - !ruby/object:Gem::Dependency
   name: httperfrb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.11
   type: :runtime
@@ -41,7 +57,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.11
 - !ruby/object:Gem::Dependency
@@ -49,17 +65,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3
 description: Autoperf is a ruby driver for httperf, designed to help you automate
   load and performance testing of any web application - for a single end point, or
   through log replay.
@@ -73,6 +89,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/autoperf/display.rb
+- lib/autoperf/display/csv.rb
+- lib/autoperf/display/json.rb
+- lib/autoperf/display/console.rb
 - lib/autoperf/version.rb
 - lib/replay_log.rb
 - lib/autoperf.rb
@@ -95,9 +114,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24