blitz 0.1.0 → 0.1.1

data/blitz.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/blitz/command/curl.rb",
     "lib/blitz/command/help.rb",
     "lib/blitz/curl/error.rb",
+    "lib/blitz/curl/rush.rb",
     "lib/blitz/curl/sprint.rb",
     "lib/blitz/helper.rb",
     "test/helper.rb",

data/lib/blitz.rb

@@ -1,9 +1,10 @@
 require 'rubygems'
 require 'hexy'
+require 'pp'
 
 class Blitz
     require 'blitz/helper'
-    Version = "0.1.0".freeze
+    Version = "0.1.1".freeze
         
     extend Blitz::Helper
     
@@ -28,4 +29,5 @@ end
 require 'blitz/client'
 require 'blitz/curl/error'
 require 'blitz/curl/sprint'
+require 'blitz/curl/rush'
 require 'blitz/command'

data/lib/blitz/command/curl.rb

@@ -15,7 +15,7 @@ class Curl < Command
             sprint args
             return
         else
-            error "Rushing not supported yet, but coming soon"
+            rush args
         end
     end
     
@@ -25,19 +25,18 @@ class Curl < Command
     def authorize_error e
         base_url = "#{e.scheme}://#{e.host}:#{e.port}"
         puts
-        error "You haven't verified that you are the devops dude for #{e.host}"
+        error "You haven't verified that you are the devops dude for #{e.host}. Make"
+        error "sure the following URL is reachable and returns the string '42'."
         error ""
-        error "Make sure the following URL is reachable by us and returns the value 42."
         error "#{base_url}/#{e.uuid}"
         error ""
-        error "If your app is RESTfully built with sinatra or rails, simply"
-        error "add a route like so:"
+        error "If your app is RESTfully built with sinatra or rails, simply add this route:"
         error ""
         error "get '/#{e.uuid}' do"
         error "    '42'"
         error "end"
         error ""
-        error "And we'll be on our merry way to blitz #{e.host}"
+        error "Once this is done, you can blitz #{e.host} all you want."
         puts
     end
 
@@ -101,6 +100,50 @@ class Curl < Command
         end
     end
 
+    def rush args
+        continue = true
+        begin
+            [ 'INT', 'STOP', 'HUP' ].each do |s| 
+                trap(s) { continue = false }
+            end
+            job = ::Blitz::Curl::Rush.execute args
+            msg "rushing from #{job.region}..."
+            job.result do |result|
+                print_rush_result result
+                sleep 1.0 if not continue
+                continue
+            end
+            puts
+            msg "[aborted]" if not continue
+        rescue ::Blitz::Curl::Error::Authorize => e
+            authorize_error e
+        rescue ::Blitz::Curl::Error::Region => e
+            error "#{e.region}: #{e.message}"
+        rescue ::Blitz::Curl::Error => e
+            error e.message
+        end
+    end
+    
+    def print_rush_result result
+        recent = result.timeline[-1]
+        hits = "%u hits" % recent.hits
+        errors = recent.errors ? ", %u errors" % recent.errors : ''
+        timeouts = recent.timeouts ? ", %u timeouts" % recent.timeouts : ''
+        bandwidth = ''
+        if result.timeline.size > 1
+            last = result.timeline[-2]
+            elapsed = recent.timestamp - last.timestamp
+            bps = (recent.rxbytes + recent.txbytes) - (last.rxbytes + last.txbytes)/elapsed
+            bandwidth = " - %.2f bytes/sec" % bps
+        else
+            bps = (recent.rxbytes + recent.txbytes)/recent.timestamp
+            bandwidth = " - %.2f bytes/sec" % bps
+        end
+        duration = recent.duration >= 0 ? " @ %.2f sec" % recent.duration : ''
+        $stdout.print "#{hits}#{errors}#{timeouts}#{bandwidth}#{duration}\n"
+        $stdout.flush
+    end
+
     def help
         helps = [
             { :short => '-A', :long => '--user-agent', :value => '<string>', :help => 'User-Agent to send to server' },
@@ -111,7 +154,7 @@ class Curl < Command
             { :short => '-h', :long => '--help', :value => '', :help => 'Help on command line options' },
             { :short => '-H', :long => '--header', :value => '<string>', :help => 'Custom header to pass to server' },
             { :short => '-p', :long => '--pattern', :value => '<s>-<e>:<d>', :help => 'Ramp from s to e concurrent requests in d secs' },
-            { :short => '-r', :long => '--region', :value => '<string>', :help => 'Choose one of california, virginia, singapore or ireland' },
+            { :short => '-r', :long => '--region', :value => '<string>', :help => 'california|virginia|singapore|ireland|japan' },
             { :short => '-s', :long => '--status', :value => '<number>', :help => 'Assert on the HTTP response status code' },
             { :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' },

data/lib/blitz/curl/rush.rb

@@ -0,0 +1,102 @@
+class Blitz
+module Curl 
+class Rush
+    class Point
+        attr_reader :timestamp
+        attr_reader :duration
+        attr_reader :total
+        attr_reader :hits
+        attr_reader :errors
+        attr_reader :timeouts
+        attr_reader :volume
+        attr_reader :txbytes
+        attr_reader :rxbytes
+        
+        def initialize json
+            @timestamp = json['timestamp']
+            @duration = json['duration']
+            @total = json['total']
+            @hits = json['executed']
+            @errors = json['errors']
+            @timeouts = json['timeouts']
+            @volume = json['volume']
+            @txbytes = json['txbytes']
+            @rxbytes = json['rxbytes']
+        end
+    end
+    
+    class Result
+        attr_reader :region
+        attr_reader :timeline
+        
+        def initialize json
+            result = json['result']
+            @region = result['region']
+            @timeline = result['timeline'].map { |p| Point.new p }
+        end        
+    end
+    
+    def self.execute args
+        if 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
+    end
+    
+    attr_reader :job_id
+    attr_reader :region
+    
+    def initialize json
+        @job_id = json['job_id']
+        @region = json['region']
+    end
+    
+    def result
+        last = nil
+        while true
+            sleep 2.0
+
+            job = Command::API.client.job_status job_id
+            if job['error']
+                raise Error
+            end
+            
+            result = job['result']
+            next if job['status'] == 'queued'
+            next if job['status'] == 'running' and not result
+
+            raise Error if not result
+
+            error = result['error']
+            if error
+                if error == 'dns'
+                    raise Error::DNS.new(result)
+                elsif error == 'authorize'
+                    raise Error::Authorize.new(result)
+                else
+                    raise Error
+                end
+            end
+            
+            last = Result.new(job)
+            continue = yield last rescue false
+            if not continue
+                abort!
+                break
+            end
+            
+            break if job['status'] == 'completed'
+        end
+        
+        return last
+    end
+    
+    def abort!
+        Command::API.client.abort_job job_id rescue nil
+    end    
+end
+end # Curl
+end # Blitz

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blitz
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - pcapr
@@ -139,6 +139,7 @@ files:
 - lib/blitz/command/curl.rb
 - lib/blitz/command/help.rb
 - lib/blitz/curl/error.rb
+- lib/blitz/curl/rush.rb
 - lib/blitz/curl/sprint.rb
 - lib/blitz/helper.rb
 - test/helper.rb