blitz 0.1.14 → 0.1.15

data/blitz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
-  s.date = %q{2011-10-11}
+  s.date = %q{2011-10-13}
   s.default_executable = %q{blitz}
   s.description = %q{Make load and performance testing a fun sport}
   s.email = %q{support@blitz.io}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/blitz/command/couch.rb",
     "lib/blitz/command/curl.rb",
     "lib/blitz/command/help.rb",
+    "lib/blitz/command/version.rb",
     "lib/blitz/curl/error.rb",
     "lib/blitz/curl/rush.rb",
     "lib/blitz/curl/sprint.rb",

data/lib/blitz.rb

@@ -6,7 +6,7 @@ require 'pp'
 
 class Blitz # :nodoc:
     require 'blitz/helper'
-    Version = "0.1.14"
+    Version = "0.1.15"
         
     extend Blitz::Helper
     

data/lib/blitz/command.rb

@@ -28,6 +28,7 @@ class Blitz
 class Command # :nodoc:
     include Test::Unit::Assertions
     include Helper
+    include Term::ANSIColor
 end
 end # Blitz
 

data/lib/blitz/command/curl.rb

@@ -1,8 +1,6 @@
 class Blitz
 class Command
 class Curl < Command # :nodoc:
-    include Term::ANSIColor
-    
     def cmd_help argv
         help
     end
@@ -57,16 +55,17 @@ class Curl < Command # :nodoc:
     def sprint args
         begin
             job = ::Blitz::Curl::Sprint.queue args
+            error "sprinting from #{yellow(job.region)}"
             result = job.result
             print_sprint_result args, result
         rescue ::Blitz::Curl::Error::Authorize => e
             authorize_error e
         rescue ::Blitz::Curl::Error::Step => e
-            error "#{yellow(e.region)}: #{red(e.message)} in step #{e.step}"
+            error "#{red(e.message)} in step #{e.step}"
             puts
             print_sprint_result args, e
         rescue ::Blitz::Curl::Error::Region => e
-            error "#{yellow(e.region)}: #{red(e.message)}"
+            error "#{red(e.message)}"
         rescue ::Blitz::Curl::Error => e
             error red(e.message)
         end
@@ -84,7 +83,7 @@ class Curl < Command # :nodoc:
     def print_sprint_result args, result
         if result.respond_to? :duration
             rtt = pretty_print_duration result.duration
-            msg "#{yellow(result.region)}: Transaction time #{green(rtt)}"
+            msg "Transaction time #{green(rtt)}"
             puts
         end
         
@@ -105,17 +104,19 @@ class Curl < Command # :nodoc:
                     puts
                 end
 
-                puts "< " + res.line
-                res.headers.each_pair { |k, v| puts "< #{k}: #{v}\r\n" }
-                puts
-                content = res.content
-                if not content.empty?
-                    if /^[[:print:]]+$/ =~ content
-                        puts content
-                    else
-                        puts Hexy.new(content).to_s
+                if res
+                    puts "< " + res.line
+                    res.headers.each_pair { |k, v| puts "< #{k}: #{v}\r\n" }
+                    puts
+                    content = res.content
+                    if not content.empty?
+                        if /^[[:print:]]+$/ =~ content
+                            puts content
+                        else
+                            puts Hexy.new(content).to_s
+                        end
                     end
-                end                
+                end
             else
                 puts "> " + req.method + ' ' + req.url
                 if res
@@ -322,6 +323,15 @@ class Curl < Command # :nodoc:
                     step['request'] = shift(k, argv)
                     next
                 end
+                
+                if /-x:c/ =~ k or /--xtract:cookie/ =~ k
+                    xname = shift(k, argv)
+                    assert_match /^[a-zA-Z_][a-zA-Z_0-9]*$/, xname, "cookie name must be alphanumeric: #{xname}"
+                    
+                    step['xtracts'] ||= Hash.new
+                    xhash = step['xtracts'][xname] = { 'type' => 'cookie' }
+                    next
+                end
             
                 if /-v:(\S+)/ =~ k or /--variable:(\S+)/ =~ k 
                     vname = $1

data/lib/blitz/command/help.rb

@@ -7,9 +7,10 @@ class Help < Command # :nodoc:
         helps = [
             { :cmd => 'help', :help => "Display this help" },
             { :cmd => 'api:init', :help => 'Validate your API key' },
+            { :cmd => 'couch:fuzz', :help => 'Auto generate blitz tests from CouchDB' },
             { :cmd => 'curl', :help => 'Run a sprint or a rush' },
             { :cmd => 'curl:help', :help => 'Show help on sprint and rushing' },
-            { :cmd => 'couch:fuzz', :help => 'Auto generate blitz tests from CouchDB' }
+            { :cmd => 'version', :help => 'Show the version of this Ruby gem' }
         ]
         
         max_cmd_size = helps.inject(0) { |memo, obj| [ obj[:cmd].size, memo ].max } + 4

data/lib/blitz/command/version.rb

@@ -0,0 +1,9 @@
+class Blitz
+class Command
+class Version < Command # :nodoc:
+    def cmd_default argv
+        msg "v#{::Blitz::Version}"
+    end
+end
+end # Command
+end # Blitz

data/lib/blitz/curl/sprint.rb

@@ -121,13 +121,15 @@ class Sprint
 
         res = Command::API.client.curl_execute args
         raise Error.new(res) if res['error']
-        return self.new res['job_id']
+        return self.new res
     end
     
     attr_reader :job_id # :nodoc:
+    attr_reader :region # :nodoc:
     
-    def initialize job_id # :nodoc:
-        @job_id = job_id
+    def initialize json # :nodoc:
+        @job_id = json['job_id']
+        @region = json['region']
     end
     
     def result # :nodoc:

metadata

@@ -2,7 +2,7 @@
 name: blitz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - pcapr
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 -07:00
+date: 2011-10-13 00:00:00 -07:00
 default_executable: blitz
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,6 +148,7 @@ files:
 - lib/blitz/command/couch.rb
 - lib/blitz/command/curl.rb
 - lib/blitz/command/help.rb
+- lib/blitz/command/version.rb
 - lib/blitz/curl/error.rb
 - lib/blitz/curl/rush.rb
 - lib/blitz/curl/sprint.rb
@@ -169,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -276665869
+      hash: 510668115
       segments: 
       - 0
       version: "0"