blitz 0.1.20 → 0.1.21

data/Gemfile

@@ -8,9 +8,8 @@ gem "rest-client", "~> 1.6.1"
 gem "json", "~> 1.5.1"
 gem "json_pure", "~> 1.5.1"
 gem "hexy", "~> 0.1.1"
-gem 'rspec', '~> 2.6'
-gem 'rspec-core', '~> 2.6'
 gem 'term-ansicolor', '1.0.5'
+gem 'rake', '0.9.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -19,3 +18,9 @@ group :development do
   gem "jeweler", "~> 1.5.1"
 end
 
+group :test do
+    gem 'rspec', '~> 2.6'
+    gem 'rspec-core', '~> 2.6'
+    gem 'simplecov', '>= 0.4.2'
+end
+

data/Gemfile.lock

@@ -15,7 +15,8 @@ GEM
     json (1.5.1)
     json_pure (1.5.1)
     mime-types (1.16)
-    rake (0.8.7)
+    multi_json (1.0.4)
+    rake (0.9.0)
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rspec (2.6.0)
@@ -26,6 +27,10 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     term-ansicolor (1.0.5)
 
 PLATFORMS
@@ -38,7 +43,9 @@ DEPENDENCIES
   jeweler (~> 1.5.1)
   json (~> 1.5.1)
   json_pure (~> 1.5.1)
+  rake (= 0.9.0)
   rest-client (~> 1.6.1)
   rspec (~> 2.6)
   rspec-core (~> 2.6)
+  simplecov (>= 0.4.2)
   term-ansicolor (= 1.0.5)

data/README.md

@@ -33,4 +33,30 @@ will generate tests like this:
 which you can simply copy/paste to the [blitz.io](http://blitz.io). Your
 CouchDB must be on the public cloud though.
 
+## Using blitz gem on your application
+
+You can integrate blitz gem to your application and run tests whenever you want.
+
+### Sprint
+
+```ruby
+require 'blitz'
+
+...
+
+result = Blitz::Curl.parse('-r california www.example.com').execute
+```
+
+### Rush
+
+```ruby
+require 'blitz'
+
+...
+
+result = Blitz::Curl.parse('-r california -p 10-50:30 www.example.com').execute do |partial|
+    pp [ partial.region, partial.timeline.last.hits ]
+end
+```
+
 Copyright (c) 2011 Mu Dynamics. See LICENSE.txt for further details.

data/Rakefile

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :development, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -32,11 +32,11 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+require 'rspec/core/rake_task'
 desc "Run all the specs"
-task :spec do
-    require 'rspec/core'
-    require 'blitz'
-    RSpec::Core::Runner.run [ *Dir.glob('spec/**/*.rb') ]
+RSpec::Core::RakeTask.new do |t|
+    t.pattern = ENV['file'] || 'spec/**/*_spec.rb'
+    t.rspec_opts = ["--color"]
 end
 
 task :default => :spec

data/blitz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
-  s.date = %q{2012-01-09}
+  s.date = %q{2012-02-07}
   s.default_executable = %q{blitz}
   s.description = %q{Make load and performance testing a fun sport}
   s.email = %q{support@blitz.io}
@@ -37,13 +37,21 @@ Gem::Specification.new do |s|
     "lib/blitz/command/help.rb",
     "lib/blitz/command/traceroute.rb",
     "lib/blitz/command/version.rb",
+    "lib/blitz/curl.rb",
     "lib/blitz/curl/error.rb",
     "lib/blitz/curl/rush.rb",
     "lib/blitz/curl/sprint.rb",
     "lib/blitz/helper.rb",
     "lib/blitz/traceroute.rb",
     "lib/blitz/traceroute/error.rb",
-    "spec/command/curl_spec.rb",
+    "lib/blitz/utils.rb",
+    "spec/blitz/client_spec.rb",
+    "spec/blitz/command/api_spec.rb",
+    "spec/blitz/command/curl_spec.rb",
+    "spec/blitz/curl/rush_spec.rb",
+    "spec/blitz/curl/sprint_spec.rb",
+    "spec/blitz/curl_spec.rb",
+    "spec/spec_helper.rb",
     "test/helper.rb",
     "test/test_blitz.rb"
   ]
@@ -53,7 +61,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Make load and performance testing a fun sport}
   s.test_files = [
-    "spec/command/curl_spec.rb",
+    "spec/blitz/client_spec.rb",
+    "spec/blitz/command/api_spec.rb",
+    "spec/blitz/command/curl_spec.rb",
+    "spec/blitz/curl/rush_spec.rb",
+    "spec/blitz/curl/sprint_spec.rb",
+    "spec/blitz/curl_spec.rb",
+    "spec/spec_helper.rb",
     "test/helper.rb",
     "test/test_blitz.rb"
   ]
@@ -67,9 +81,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, ["~> 1.5.1"])
       s.add_runtime_dependency(%q<json_pure>, ["~> 1.5.1"])
       s.add_runtime_dependency(%q<hexy>, ["~> 0.1.1"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 2.6"])
-      s.add_runtime_dependency(%q<rspec-core>, ["~> 2.6"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["= 1.0.5"])
+      s.add_runtime_dependency(%q<rake>, ["= 0.9.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
     else
@@ -78,9 +91,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, ["~> 1.5.1"])
       s.add_dependency(%q<json_pure>, ["~> 1.5.1"])
       s.add_dependency(%q<hexy>, ["~> 0.1.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.6"])
-      s.add_dependency(%q<rspec-core>, ["~> 2.6"])
       s.add_dependency(%q<term-ansicolor>, ["= 1.0.5"])
+      s.add_dependency(%q<rake>, ["= 0.9.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     end
@@ -90,9 +102,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, ["~> 1.5.1"])
     s.add_dependency(%q<json_pure>, ["~> 1.5.1"])
     s.add_dependency(%q<hexy>, ["~> 0.1.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.6"])
-    s.add_dependency(%q<rspec-core>, ["~> 2.6"])
     s.add_dependency(%q<term-ansicolor>, ["= 1.0.5"])
+    s.add_dependency(%q<rake>, ["= 0.9.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
   end

data/lib/blitz.rb

@@ -6,7 +6,7 @@ require 'pp'
 
 class Blitz # :nodoc:
     require 'blitz/helper'
-    Version = "0.1.20"
+    Version = "0.1.21"
         
     extend Blitz::Helper
     
@@ -32,6 +32,7 @@ require 'blitz/client'
 require 'blitz/curl/error'
 require 'blitz/curl/sprint'
 require 'blitz/curl/rush'
+require 'blitz/curl'
 require 'blitz/traceroute'
 require 'blitz/traceroute/error'
 require 'blitz/command'

data/lib/blitz/command.rb

@@ -1,40 +1,10 @@
-require 'test/unit/assertions'
-
-# The default template string contains what was sent and received. Strip 
-# these out since we don't need them
-unless RUBY_VERSION =~ /^1.9/
-    module Test # :nodoc:
-        module Unit # :nodoc:
-            module Assertions # :nodoc:
-                class AssertionMessage # :nodoc:
-                    alias :old_template :template
-
-                    def template
-                        @template_string = ''
-                        @parameters = []
-                        old_template
-                    end
-                end
-            end
-        end
-    end
-else
-    module ::Test::Unit # :nodoc:
-        AssertionFailedError = MiniTest::Assertion
-    end
-end
+require 'blitz/utils'
 
 class Blitz
 class Command # :nodoc:
-    include Test::Unit::Assertions
     include Helper
     include Term::ANSIColor
-    
-    def shift key, argv
-        val = argv.shift
-        assert_not_nil(val, "missing value for #{key}")
-        val
-    end
+    include Blitz::Utils
 end
 end # Blitz
 

data/lib/blitz/command/curl.rb

@@ -6,16 +6,15 @@ class Curl < Command # :nodoc:
     end
 
     def cmd_run argv
-        args = parse_cli argv
-        if args['help']
+        begin
+            test = Blitz::Curl.parse argv
+        rescue "help"
             return help
         end
-
-        if not args['pattern']
-            sprint args
-            return
+        if test.class == Blitz::Curl::Sprint
+            sprint test
         else
-            rush args
+            rush test
         end
     end
     
@@ -52,18 +51,18 @@ class Curl < Command # :nodoc:
         puts
     end
 
-    def sprint args
+    def sprint job
         begin
-            job = ::Blitz::Curl::Sprint.queue args
+            job.queue
             error "sprinting from #{yellow(job.region)}"
             result = job.result
-            print_sprint_result args, result
+            print_sprint_result job.args, result
         rescue ::Blitz::Curl::Error::Authorize => e
             authorize_error e
         rescue ::Blitz::Curl::Error::Step => e
             error "#{red(e.message)} in step #{e.step}"
             puts
-            print_sprint_result args, e
+            print_sprint_result job.args, e
         rescue ::Blitz::Curl::Error::Region => e
             error "#{red(e.message)}"
         rescue ::Blitz::Curl::Error => e
@@ -131,18 +130,18 @@ class Curl < Command # :nodoc:
         end
     end
 
-    def rush args
+    def rush job
         continue = true
         last_index = nil
         begin
             [ 'INT', 'STOP', 'HUP' ].each do |s| 
                 trap(s) { continue = false }
             end
-            job = ::Blitz::Curl::Rush.queue args
+            job.queue
             msg "rushing from #{yellow(job.region)}..."
             puts
             job.result do |result|
-                print_rush_result args, result, last_index
+                print_rush_result job.args, result, last_index
                 if not result.timeline.empty?
                     last_index = result.timeline.size
                 end
@@ -230,187 +229,6 @@ class Curl < Command # :nodoc:
         puts
     end
 
-    def parse_cli argv
-        hash = { 'steps' => [] }
-        
-        while not argv.empty?
-            hash['steps'] << Hash.new
-            step = hash['steps'].last
-            
-            while not argv.empty?
-                break if argv.first[0,1] != '-'
-
-                k = argv.shift
-                if [ '-A', '--user-agent' ].member? k
-                    step['user-agent'] = shift(k, argv)
-                    next
-                end
-
-                if [ '-b', '--cookie' ].member? k
-                    step['cookies'] ||= []
-                    step['cookies'] << shift(k, argv)
-                    next
-                end
-
-                if [ '-d', '--data' ].member? k
-                    step['content'] ||= Hash.new
-                    step['content']['data'] ||= []
-                    v = shift(k, argv)
-                    v = File.read v[1..-1] if v =~ /^@/
-                    step['content']['data'] << v
-                    next
-                end
-
-                if [ '-D', '--dump-header' ].member? k
-                    hash['dump-header'] = shift(k, argv)
-                    next
-                end
-
-                if [ '-e', '--referer'].member? k
-                    step['referer'] = shift(k, argv)
-                    next
-                end
-
-                if [ '-h', '--help' ].member? k
-                    hash['help'] = true
-                    next
-                end
-
-                if [ '-H', '--header' ].member? k
-                    step['headers'] ||= []
-                    step['headers'].push shift(k, argv)
-                    next
-                end
-
-                if [ '-p', '--pattern' ].member? k
-                    v = shift(k, argv)
-                    v.split(',').each do |vt|
-                        unless /^(\d+)-(\d+):(\d+)$/ =~ vt
-                            raise Test::Unit::AssertionFailedError, "invalid ramp pattern"
-                        end
-                        hash['pattern'] ||= { 'iterations' => 1, 'intervals' => [] }
-                        hash['pattern']['intervals'] << {
-                            'iterations' => 1,
-                            'start' => $1.to_i,
-                            'end' => $2.to_i,
-                            'duration' => $3.to_i
-                        }
-                    end
-                    next
-                end
-
-                if [ '-r', '--region' ].member? k
-                    v = shift(k, argv)
-                    assert_match(/^california|oregon|virginia|singapore|ireland|japan$/, v, 'region must be one of california, oregon, virginia, singapore, japan or ireland')
-                    hash['region'] = v
-                    next
-                end
-
-                if [ '-s', '--status' ].member? k
-                    step['status'] = shift(k, argv).to_i
-                    next
-                end
-
-                if [ '-T', '--timeout' ].member? k
-                    step['timeout'] = shift(k, argv).to_i
-                    next
-                end
-
-                if [ '-u', '--user' ].member? k
-                    step['user'] = shift(k, argv)
-                    next
-                end
-
-                if [ '-X', '--request' ].member? k
-                    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
-                    vargs = shift(k, argv)
-
-                    assert_match /^[a-zA-Z][a-zA-Z0-9]*$/, vname, "variable name must be alphanumeric: #{vname}"
-
-                    step['variables'] ||= Hash.new
-                    vhash = step['variables'][vname] = Hash.new
-                    if vargs.match /^(list)?\[([^\]]+)\]$/
-                        vhash['type'] = 'list'
-                        vhash['entries'] = $2.split(',')
-                    elsif vargs.match /^(a|alpha)$/
-                        vhash['type'] = 'alpha'
-                    elsif vargs.match /^(a|alpha)\[(\d+),(\d+)(,(\d+))??\]$/
-                        vhash['type'] = 'alpha'
-                        vhash['min'] = $2.to_i
-                        vhash['max'] = $3.to_i
-                        vhash['count'] = $5 ? $5.to_i : 1000
-                    elsif vargs.match /^(n|number)$/
-                        vhash['type'] = 'number'
-                    elsif vargs.match /^(n|number)\[(-?\d+),(-?\d+)(,(\d+))?\]$/
-                        vhash['type'] = 'number'
-                        vhash['min'] = $2.to_i
-                        vhash['max'] = $3.to_i
-                        vhash['count'] = $5 ? $5.to_i : 1000
-                    elsif vargs.match /^(u|udid)$/
-                        vhash['type'] = 'udid'
-                    else
-                        raise ArgumentError, "Invalid variable args for #{vname}: #{vargs}"
-                    end
-                    next
-                end
-
-                if [ '-V', '--verbose' ].member? k
-                    hash['verbose'] = true
-                    next
-                end
-
-                if [ '-1', '--tlsv1' ].member? k
-                    step['ssl'] = 'tlsv1'
-                    next
-                end
-
-                if [ '-2', '--sslv2' ].member? k
-                    step['ssl'] = 'sslv2'
-                    next
-                end
-
-                if [ '-3', '--sslv3' ].member? k
-                    step['ssl'] = 'sslv3'
-                    next
-                end
-
-                raise ArgumentError, "Unknown option #{k}"
-            end
-
-            if step.member? 'content'
-                data_size = step['content']['data'].inject(0) { |m, v| m + v.size }
-                assert(data_size < 10*1024, "POST content must be < 10K")
-            end
-            
-            break if hash['help']
-            
-            url = argv.shift
-            raise ArgumentError, "no URL specified!" if not url
-            step['url'] = url
-        end
-        
-        if not hash['help']
-            if hash['steps'].empty?
-                raise ArgumentError, "no URL specified!"
-            end
-        end
-
-        hash
-    end
 end # Curl
 end # Command
 end # Blitz