blitz 0.1.26 → 0.1.27

data/blitz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.26"
+  s.version = "0.1.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
-  s.date = %q{2012-07-05}
+  s.date = %q{2012-08-29}
   s.default_executable = %q{blitz}
   s.description = %q{Make load and performance testing a fun sport}
   s.email = %q{support@blitz.io}

data/lib/blitz.rb

@@ -3,6 +3,7 @@ require 'term/ansicolor'
 require 'couchrest'
 require 'hexy'
 require 'pp'
+require 'csv'
 
 class Blitz # :nodoc:
     require 'blitz/helper'

data/lib/blitz/command/curl.rb

@@ -157,8 +157,18 @@ class Curl < Command # :nodoc:
             job.queue
             msg "rushing from #{yellow(job.region)}..."
             puts
+
+            if job.args.member?('output')
+                file = CSV.open(job.args['output'] || 'blitz.csv', 'w')
+            end
+
             job.result do |result|
-                print_rush_result job.args, result, last_index
+                if file
+                    csv_rush_result file, result, last_index
+                else
+                    print_rush_result job.args, result, last_index
+                end
+
                 if not result.timeline.empty?
                     last_index = result.timeline.size
                 end
@@ -173,9 +183,11 @@ class Curl < Command # :nodoc:
             error "#{yellow(e.region)}: #{red(e.message)}"
         rescue ::Blitz::Curl::Error => e
             error red(e.message)
+        ensure
+            file.close if file
         end
     end
-    
+
     def print_rush_result args, result, last_index
         if last_index.nil?
             print yellow("%6s " % "Time")
@@ -188,11 +200,11 @@ class Curl < Command # :nodoc:
             print "%s" % "Mbps"
             puts
         end
-        
+
         if last_index and result.timeline.size == last_index
             return
         end
-        
+
         last = result.timeline[-2]
         curr = result.timeline[-1]
         print yellow("%5.1fs " % curr.timestamp)
@@ -201,7 +213,7 @@ class Curl < Command # :nodoc:
         print green("%8d " % curr.hits)
         print magenta("%8d " % curr.timeouts)
         print red("%8d " % curr.errors)
-        
+
         if last
             elapsed = curr.timestamp - last.timestamp
             mbps = ((curr.txbytes + curr.rxbytes) - (last.txbytes + last.rxbytes))/elapsed/1024.0/1024.0
@@ -209,10 +221,35 @@ class Curl < Command # :nodoc:
             print green(" %7.2f " % htps)
             print "%.2f" % mbps
         end
-        
+
         print "\n"
     end
 
+    def csv_rush_result file, result, last_index
+        if last_index.nil?
+            file << ["Time", "Users", "Response", "Hits", "Timeouts", "Errors", "Hits/s", "Mbps"]
+        end
+
+        if last_index and result.timeline.size == last_index
+            return
+        end
+
+        last = result.timeline[-2]
+        curr = result.timeline[-1]
+        arr  = [curr.timestamp, curr.volume, curr.duration, curr.hits, curr.timeouts, curr.errors ]
+
+        if last
+            elapsed = curr.timestamp - last.timestamp
+            mbps = ((curr.txbytes + curr.rxbytes) - (last.txbytes + last.rxbytes))/elapsed/1024.0/1024.0
+            htps = (curr.hits - last.hits)/elapsed
+            arr << htps
+            arr << mbps
+        end
+
+        file << arr
+        file.flush
+    end
+
     def help
         helps = [
             { :short => '-A', :long => '--user-agent', :value => '<string>', :help => 'User-Agent to send to server' },
@@ -230,6 +267,7 @@ class Curl < Command # :nodoc:
             { :short => '-X', :long => '--request', :value => '<string>', :help => 'Request method to use (GET, HEAD, PUT, etc.)' },
             { :short => '-v', :long => '--variable', :value => '<string>', :help => 'Define a variable to use' },
             { :short => '-V', :long => '--verbose', :value => '', :help => 'Print the request/response headers' },
+            { :short => '-o', :long => '--output', :value => '<filename>', :help => 'Output to file (CSV)' },
             { :short => '-1', :long => '--tlsv1', :value => '', :help => 'Use TLSv1 (SSL)' },
             { :short => '-2', :long => '--sslv2', :value => '', :help => 'Use SSLv2 (SSL)' },
             { :short => '-3', :long => '--sslv3', :value => '', :help => 'Use SSLv3 (SSL)' }

data/lib/blitz/curl.rb

@@ -200,6 +200,11 @@ class Curl
                     next
                 end
 
+                if [ '-o', '--output'].member? k
+                    hash['output'] = shift(k, argv)
+                    next
+                end
+
                 raise ArgumentError, "Unknown option #{k}"
             end
 

data/spec/blitz/command/curl_spec.rb

@@ -19,7 +19,7 @@ describe Blitz::Command::Curl do
             }
         }
     }
-    
+
     def mocked_sprint_request
         Blitz::Curl::Sprint::Request.new(sprint_data)
     end
@@ -48,6 +48,30 @@ describe Blitz::Command::Curl do
         }
         Blitz::Curl::Sprint::Result.new(sprint)
     end
+
+    def mocked_rush
+      rush = {
+        'result' => {
+            'region' => 'california',
+            'timeline' => [
+                  'timestamp' => 1.50353,
+                  'volume' => 2,
+                  'duration' => 0.42632,
+                  'executed' => 2,
+                  'timeouts' => 0,
+                  'errors' => 0,
+                  'steps' => [
+                    'duration' => 0.0,
+                    'connect' => 0.0,
+                    'errors' => 0,
+                    'timeouts' => 5,
+                    'asserts' => 0
+                  ]
+            ]
+        }
+      }
+      Blitz::Curl::Rush::Result.new(rush)
+    end
     
     context "#print_sprint_header" do
         def check_print_sprint_header path="/mocked/path/head.txt"
@@ -90,7 +114,31 @@ describe Blitz::Command::Curl do
             }
         end
     end
-    
+
+    context "#csv_rush_result" do
+
+      it "should check if the rush results get dumped in csv format" do
+        file = CSV.open('blitztest.csv', 'w')
+
+        result = mocked_rush
+        obj = Blitz::Command::Curl.new
+        obj.send(:csv_rush_result, file, result, nil)
+        file.close
+
+        file = CSV.open('blitztest.csv', 'r').read()
+        output = file.last
+        timeline = result.timeline.last
+
+        output[0].to_f.should eq(timeline.timestamp)
+        output[1].to_f.should eq(timeline.volume)
+        output[2].to_f.should eq(timeline.duration)
+        output[3].to_f.should eq(timeline.hits)
+        output[4].to_f.should eq(timeline.timeouts)
+
+        File.delete('blitztest.csv')
+      end
+    end
+
     context "#print_sprint_result" do
         def check_print_sprint_result args
             result = mocked_sprint
@@ -98,6 +146,7 @@ describe Blitz::Command::Curl do
             yield(obj, result)
             obj.send(:print_sprint_result, args, result)
         end
+
         it "should not dump-header and verbose when they are not available" do
             args = mocked_sprint_args
             args.delete "verbose"
@@ -136,5 +185,5 @@ describe Blitz::Command::Curl do
             }
         end
     end
-    
-end
+
+end

data/spec/blitz/curl_spec.rb

@@ -238,6 +238,17 @@ describe Blitz::Curl do
                 hash['steps'][1]['request'] == 'POST'
             end
         end
+
+        context "output" do
+            it "should check that a output is given" do
+                lambda { Blitz::Curl.parse_cli %w[--output] }.should raise_error(MiniTest::Assertion, /missing value/)
+            end
+
+            it "should support export to output file" do
+                hash = Blitz::Curl.parse_cli %w[-o test.csv /faq]
+                hash['output'].should == 'test.csv'
+            end
+        end
     end
     
     describe "xargv" do
@@ -270,4 +281,4 @@ describe Blitz::Curl do
             end
         end
     end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blitz
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest