blitz 0.1.11 → 0.1.12

data/Rakefile

@@ -46,7 +46,7 @@ task :spec do
     RSpec::Core::Runner.run [ *Dir.glob('spec/**/*.rb') ]
 end
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/blitz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
-  s.date = %q{2011-07-19}
+  s.date = %q{2011-10-05}
   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.11"
+    Version = "0.1.12"
         
     extend Blitz::Helper
     

data/lib/blitz/command/curl.rb

@@ -30,6 +30,18 @@ class Curl < Command # :nodoc:
         error ""
         error "#{base_url}/#{e.uuid}"
         error ""
+        if e.checks
+            error "We tried checking the following URLs and got this"
+            error ""
+            e.checks.each do |check|
+                bytes = ''
+                if check['bytes']
+                    bytes = '| ' + check['bytes']
+                end
+                error "#{check['code']} | #{check['url']} #{bytes}"
+            end
+            error ''
+        end
         error "If your app is RESTfully built with sinatra or rails, simply add this route:"
         error ""
         error "get '/#{e.uuid}' do"
@@ -109,10 +121,14 @@ class Curl < Command # :nodoc:
             job = ::Blitz::Curl::Rush.queue args
             border = "+-----------+----------+----------+------------+--------------+--------+----------+\n"
             msg "rushing from #{job.region}..."
-            msg border
-            msg "|  time (s) |    users | hits/sec | kbytes/sec | latency (ms) | errors | timeouts |\n"
-            msg border
+            header = true
             job.result do |result|
+                if header
+                    header = nil
+                    msg border
+                    msg "|  time (s) |    users | hits/sec | kbytes/sec | latency (ms) | errors | timeouts |\n"
+                    msg border
+                end
                 print_rush_result result
                 sleep 1.0 if not continue
                 continue
@@ -346,7 +362,7 @@ class Curl < Command # :nodoc:
             end
 
             if [ '-3', '--sslv3' ].member? k
-                hash['ssl'] = 'sslv2'
+                hash['ssl'] = 'sslv3'
                 next
             end
 

data/lib/blitz/curl/error.rb

@@ -18,12 +18,16 @@ class Error < StandardError # :nodoc:
         
         # The unique ID to use a URL path in your app for authorization to succeed
         attr_reader :uuid
+        
+        # The set of checks performed if the app was reachable
+        attr_reader :checks
 
         def initialize json
             @scheme = json['scheme']
             @host   = json['host']
             @port   = json['port']
             @uuid   = json['uuid']
+            @checks = json['checks']
             super
         end
     end

data/spec/command/curl_spec.rb

@@ -52,14 +52,14 @@ describe "arg parsing" do
         end
 
         @command_args = [ 
-            { :short => '-A', :long => '--user-agent', :params => '"TEST STRING"', :blitz_key => 'user-agent' },
+            { :short => '-A', :long => '--user-agent', :params => '"TEST STRING"' },
             { :short => '-b', :long => '--cookie', :params => 'name=somecookie' }, 
             { :short => '-d', :long => '--data', :params => '"data for post"'}, 
-            { :short => '-D', :long => '--dump-header', :params => '"somefile.out"' }, 
-            { :short => '-e', :long => '--referer', :params => '"http://google.com"' }, 
+            { :short => '-D', :long => '--dump-header', :params => '"somefile.out"' },
+            { :short => '-e', :long => '--referer', :params => '"http://google.com"' },
             { :short => '-H', :long => '--header', :params => 'some_header' }, 
-            { :short => '-s', :long => '--status', :params => '500' }, 
-            { :short => '-T', :long => '--timeout', :params => '750' }, 
+            { :short => '-s', :long => '--status', :params => '500', :return_type => Integer },
+            { :short => '-T', :long => '--timeout', :params => '750', :return_type => Integer }, 
             { :short => '-u', :long => '--user', :params => 'foo:bar' }, 
             { :short => '-X', :long => '--request', :params => 'GET' }, 
             { :short => '-V', :long => '--verbose' }, 
@@ -78,8 +78,24 @@ describe "arg parsing" do
                     it "#{test[flag]} should not raise an error and populate the hash properly" do
                         lambda { curl.__send__ :parse_cli, argv.dup }.should_not raise_error
                         parsed_args = curl.__send__ :parse_cli, argv
-                        if test[:blitz_key]
-                            parsed_args[ test[:blitz_key] ].should == test[:params]
+                        # special checks for cookies and headers, as their structure in the return data is different
+                        if test_name == 'cookie' || test_name == 'header'
+                            return_key = "#{test_name}s"
+                            parsed_args[return_key].should be_an(Array)
+                            parsed_args[return_key][0].should == test[:params]
+                        # special checks for data, as its structure in the return data is different
+                        elsif test_name == 'data'
+                            parsed_args['content'].should be_a(Hash)
+                            parsed_args['content']['data'].should be_an(Array)
+                            parsed_args['content']['data'][0].should == test[:params]
+                        # special checks for ssl params
+                        elsif test_name.match(/^ssl|tls/)
+                            parsed_args['ssl'].should == test_name
+                        # for integer params, make sure the test returns correct quoting
+                        elsif test[:return_type] == Integer
+                            parsed_args[test_name].should == test[:params].to_i
+                        elsif test[:params].is_a?(String)
+                            parsed_args[test_name].should == test[:params]
                         end
                     end
                 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blitz
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
-  version: 0.1.11
+  segments: 
+  - 0
+  - 1
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - pcapr
@@ -10,107 +15,152 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -07:00
+date: 2011-10-05 00:00:00 -07:00
 default_executable: blitz
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: couchrest
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-  type: :runtime
-  prerelease: false
+  name: couchrest
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
-  type: :runtime
-  prerelease: false
+  name: rest-client
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-  type: :runtime
-  prerelease: false
+  name: json
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-  type: :runtime
-  prerelease: false
+  name: json_pure
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hexy
+  prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-  type: :runtime
-  prerelease: false
+  name: hexy
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-  type: :runtime
-  prerelease: false
+  name: rspec
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec-core
+  prerelease: false
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 6
+        - 4
         version: 2.6.4
-  type: :runtime
-  prerelease: false
+  name: rspec-core
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  prerelease: false
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
-  prerelease: false
+  name: bundler
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  prerelease: false
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-  type: :development
-  prerelease: false
+  name: jeweler
   version_requirements: *id009
 description: Make load and performance testing a fun sport
 email: support@blitz.io
@@ -158,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 109260913
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -167,6 +217,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []