blitz 0.1.8 → 0.1.9

data/blitz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
-  s.date = %q{2011-07-13}
+  s.date = %q{2011-07-14}
   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

@@ -5,7 +5,7 @@ require 'pp'
 
 class Blitz # :nodoc:
     require 'blitz/helper'
-    Version = "0.1.8"
+    Version = "0.1.9"
         
     extend Blitz::Helper
     

data/lib/blitz/command/curl.rb

@@ -152,6 +152,8 @@ class Curl < Command # :nodoc:
         duration = recent.duration * 1000
         if duration >= 0
             output << "%13u " % duration
+        else
+            output << "%13s " % 'no data'
         end
         
         output << "%7u " % recent.errors
@@ -180,7 +182,8 @@ class Curl < Command # :nodoc:
             { :short => '-T', :long => '--timeout', :value => '<ms>', :help => 'Wait time for both connect and responses' },
             { :short => '-u', :long => '--user', :value => '<user[:pass]>', :help => 'User and password for authentication' },
             { :short => '-X', :long => '--request', :value => '<string>', :help => 'Request method to use (GET, HEAD, PUT, etc.)' },
-            { :short => '-v', :long => '--verbose', :value => '', :help => 'Print the request/response headers' },
+            { :short => '-v', :long => '--variable', :value => '<string>', :help => 'Define a variable to use' },
+            { :short => '-V', :long => '--verbose', :value => '', :help => 'Print the request/response headers' },
             { :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)' }
@@ -199,6 +202,8 @@ class Curl < Command # :nodoc:
 
     def parse_cli argv
         hash = Hash.new
+        hash['text'] = argv.join(' ')
+
         while not argv.empty?
             break if argv.first[0,1] != '-'
 
@@ -289,7 +294,43 @@ class Curl < Command # :nodoc:
                 next
             end
             
-            if [ '-v', '--verbose' ].member? k
+            if /-v:(\S+)/ =~ k or /--variable:(\S+)/ =~ k 
+                variable_name = $1
+                variable_parameter = shift(k, argv)
+
+                assert_match(/^[a-zA-Z][a-zA-Z0-9]*$/, variable_name, "variable name must be alphanumeric: #{variable_name}")
+
+                hash['variables'] ||= Hash.new
+
+                parameter_hash = {}
+                if variable_parameter.match(/^(list)?\[([^\]]+)\]$/)
+                    parameter_hash['type'] = 'list'
+                    parameter_hash['entries'] = $2.split(',')
+                elsif variable_parameter.match(/^(a|alpha)$/) 
+                    parameter_hash['type'] = 'alpha'
+                elsif variable_parameter.match(/^(a|alpha)\[(\d+)(,(\d+)(,(\d+))?)?\]$/)
+                    parameter_hash['type'] = 'alpha'
+                    parameter_hash['min'] = $2.to_i
+                    parameter_hash['max'] = $3.to_i
+                    parameter_hash['count'] = $4 ? $4 : 1000
+                elsif variable_parameter.match(/^(n|number)$/)
+                    parameter_hash['type'] = 'number'
+                elsif variable_parameter.match(/^(n|number)\[(-?\d+),(-?\d+)(,(\d+))?\]$/)
+                    parameter_hash['type'] = 'number'
+                    parameter_hash['min'] = $2.to_i
+                    parameter_hash['max'] = $3.to_i
+                    parameter_hash['count'] = $4 ? $4.to_i : 1000
+                elsif variable_parameter.match(/^(u|udid)$/)
+                    parameter_hash['type'] = 'udid'
+                else
+                    raise ArgumentError, "Invalid variable parameter to #{variable_name}: #{variable_parameter}"
+                end
+
+                hash['variables'][variable_name] = parameter_hash
+                next
+            end
+
+            if [ '-V', '--verbose' ].member? k
                 hash['verbose'] = true
                 next
             end

metadata

@@ -2,7 +2,7 @@
 name: blitz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - pcapr
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 -07:00
+date: 2011-07-14 00:00:00 -07:00
 default_executable: blitz
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 848882337
+      hash: 63947055
       segments: 
       - 0
       version: "0"