blitz 0.1.20 → 0.1.21

data/lib/blitz/curl.rb

@@ -0,0 +1,226 @@
+require 'blitz/utils'
+
+class Blitz
+class Curl    
+    extend Blitz::Utils
+    
+    RE_WS = /^\s+/.freeze
+    RE_NOT_WS = /^[^\s]+/.freeze
+    RE_DQ_STRING = /^"[^"\\\r\n]*(?:\\.[^"\\\r\n]*)*"/.freeze
+    RE_SQ_STRING = /^'[^'\\\r\n]*(?:\\.[^'\\\r\n]*)*'/.freeze
+    
+    def self.parse arguments
+        argv = arguments.is_a?(Array) ? arguments : xargv(arguments)
+        args = parse_cli argv
+        raise "help" if args['help'] 
+        if not args['pattern']
+            Blitz::Curl::Sprint.new args
+        else
+            Blitz::Curl::Rush.new args
+        end
+    end
+    
+    private
+    
+    def self.xargv text
+        argv = []
+        while not text.empty?
+            if text.match RE_WS
+                text = $'
+            elsif text.match RE_DQ_STRING or text.match RE_SQ_STRING or text.match RE_NOT_WS
+                text = $'
+                argv << strip_quotes($&)
+            end
+        end
+        argv
+    end
+    
+    def self.strip_quotes text
+        text[1, (text.size - 2)]
+    end
+    
+    def self.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
+                    hash['region'] = shift(k, argv)
+                    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
+end

data/lib/blitz/curl/error.rb

@@ -1,5 +1,5 @@
 class Blitz
-module Curl
+class Curl
 class Error < StandardError # :nodoc:
     def initialize json={}
         super json['reason'] || "Hmmm, something went wrong. Try again in a little bit?"

data/lib/blitz/curl/rush.rb

@@ -1,5 +1,5 @@
 class Blitz
-module Curl # :nodoc:
+class Curl # :nodoc:
 # Use this to run a rush (a load test) against your app. The return values
 # include the entire timeline containing the average duration, the concurrency,
 # the bytes sent/received, etc.
@@ -99,41 +99,34 @@ class Rush
     # the pattern. If a block is given, it's invoked periodically with the
     # partial results of the run (to report progress, perhaps)
     #
-    #  args = { 
-    #      :url => 'http://www.mudynamics.com',
-    #      :headers => [ 'X-API-Token: foo' ],
-    #      :region => 'california',
-    #      :pattern => {
-    #          :intervals => [{ :start => 1, :end => 10000, :duration => 60 }]
-    #      }
-    #  }
-    #
-    #  result = Blitz::Curl::Sprint.execute args do |partial|
+    #  result = Blitz::Curl.parse('-r california -p 10-50:30 www.example.com').execute do |partial|
     #      pp [ partial.region, partial.timeline.last.hits ]
     #  end
     #
     # You can easily export the result to JSON, XML or compute the various 
     # rates, etc.
-    def self.execute args, &block # |result|
-        self.queue(args).result &block
+    def execute &block # |result|
+        queue
+        result &block
     end
     
-    def self.queue args # :nodoc:
+    def queue # :nodoc:
         if not args.member? 'pattern' and not args.member? :pattern
             raise ArgumentError, 'missing pattern'
         end
 
         res = Command::API.client.curl_execute args
         raise Error.new(res) if res['error']
-        return self.new res
+        @job_id = res['job_id']
+        @region = res['region']
     end
     
     attr_reader :job_id # :nodoc:
     attr_reader :region # :nodoc:
+    attr_reader :args # :nodoc:
     
-    def initialize json # :nodoc:
-        @job_id = json['job_id']
-        @region = json['region']
+    def initialize args # :nodoc:
+        @args = args
     end
     
     def result &block # :nodoc:
@@ -180,7 +173,7 @@ class Rush
     
     def abort! # :nodoc:
         Command::API.client.abort_job job_id rescue nil
-    end    
+    end   
 end
 end # Curl
 end # Blitz

data/lib/blitz/curl/sprint.rb

@@ -1,5 +1,5 @@
 class Blitz
-module Curl # :nodoc:
+class Curl # :nodoc:
 # Use this to run a sprint against your app. The return values include the response
 # time, the region from which the sprint was run along with the full request
 # and response headers and the response body.
@@ -104,38 +104,34 @@ class Sprint
     # The primary method to execute a sprint from region. This method supports
     # all of the arguments that the blitz bar supports. For example:
     #
-    #  args = { 
-    #      :url => 'http://www.mudynamics.com',
-    #      :headers => [ 'X-API-Token: foo' ],
-    #      :region => 'california'
-    #  }
-    #
-    #  result = Blitz::Curl::Sprint.execute args
-    def self.execute args
-        self.queue(args).result
+    #  result = Blitz::Curl.parse('-r california www.example.com').execute
+    def execute
+        queue
+        result
     end
     
-    def self.queue args # :nodoc:
+    def queue # :nodoc:
         args.delete 'pattern'
         args.delete :pattern
 
         res = Command::API.client.curl_execute args
         raise Error.new(res) if res['error']
-        return self.new res
+        @job_id = res['job_id']
+        @region = res['region']
     end
     
     attr_reader :job_id # :nodoc:
     attr_reader :region # :nodoc:
+    attr_reader :args # :nodoc:
     
-    def initialize json # :nodoc:
-        @job_id = json['job_id']
-        @region = json['region']
+    def initialize args # :nodoc:
+        @args = args
     end
     
     def result # :nodoc:
         while true
             sleep 2.0
-
+            
             job = Command::API.client.job_status job_id
             if job['error']
                 raise Error
@@ -170,7 +166,7 @@ class Sprint
     
     def abort # :nodoc:
         Command::API.client.abort_job job_id rescue nil
-    end    
+    end
 end
 end # Curl
 end # Blitz

data/lib/blitz/utils.rb

@@ -0,0 +1,38 @@
+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
+
+class Blitz
+module Utils
+    include Test::Unit::Assertions
+
+    def shift key, argv
+        val = argv.shift
+        assert_not_nil(val, "missing value for #{key}")
+        assert_no_match(/^-.*$/, val, "missing value for #{key}")
+        val
+    end
+end
+end

data/spec/blitz/client_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Blitz::Client do
+    before :each do
+        @resource = mock RestClient::Resource
+        RestClient::Resource.stub!(:new).and_return @resource
+        @client = Blitz::Client.new "test@example.com", '123456'
+    end
+    
+    after :each do
+        RestClient::Resource.unstub!(:new)
+    end
+    
+    context "#login" do
+        before :each do
+            @resource.should_receive(:[]).with('/login/api').and_return @resource
+            @resource.should_receive(:get).and_return "{\"api_key\":\"abc123\"}"
+        end
+        
+        it "should return an api_key" do
+            result = @client.login
+            result.should_not be_nil
+            result['api_key'].should == 'abc123'
+        end
+    end
+    
+    context "#account_about" do
+        before :each do
+            json = "{\"api_key\":\"abc123\", \"profile\":{\"email\":\"test@example.com\"}}"
+            @resource.should_receive(:[]).with('/api/1/account/about').and_return @resource
+            @resource.should_receive(:get).and_return json
+        end
+        
+        it "should return a profile" do
+            result = @client.account_about
+            result.should_not be_nil
+            result['profile'].should_not be_nil
+            result['profile']['email'].should == "test@example.com"
+        end
+    end
+    
+    context "#curl_execute" do
+        before :each do
+            json = "{\"ok\":true, \"job_id\":\"j123\", \"status\":\"queued\"}"
+            @resource.should_receive(:[]).with('/api/1/curl/execute').and_return @resource
+            @resource.should_receive(:post).and_return json
+        end
+        
+        it "should return a profile" do
+            result = @client.curl_execute "{\"url\":\"wwwexample.com\"}"
+            result.should_not be_nil
+            result['ok'].should be_true
+            result['status'].should == "queued"
+        end
+        
+    end
+end