blitz 0.1.21 → 0.1.22

data/blitz.gemspec

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

@@ -6,7 +6,7 @@ require 'pp'
 
 class Blitz # :nodoc:
     require 'blitz/helper'
-    Version = "0.1.21"
+    Version = "0.1.22"
         
     extend Blitz::Helper
     

data/lib/blitz/command/curl.rb

@@ -78,6 +78,35 @@ class Curl < Command # :nodoc:
 			rtt = ("%.2f" % rtt) + ' sec';
 		end
     end
+    
+    def print_sprint_content content
+        if not content.empty?
+            if /^[[:print:]]+$/ =~ content
+                puts content
+            else
+                puts Hexy.new(content).to_s
+            end
+            puts
+        end
+    end
+    
+    def print_sprint_header obj, path, symbol, mode
+        if path == "-"
+            puts symbol + obj.line
+            obj.headers.each_pair { |k, v| puts "#{symbol}#{k}: #{v}\r\n" }
+            puts
+        else
+            begin
+                File.open(path, mode) do |myfile|
+                    myfile.puts ""
+                    myfile.puts obj.line
+                    obj.headers.each_pair { |k, v| myfile.puts("#{k}: #{v}") }    
+                end
+            rescue Exception => e
+                msg "#{red(e.message)}"
+            end
+        end
+    end
 
     def print_sprint_result args, result
         if result.respond_to? :duration
@@ -88,34 +117,21 @@ class Curl < Command # :nodoc:
         
         result.steps.each do |step|
             req, res = step.request, step.response
-            if args['dump-header'] or args['verbose']
-                puts "> " + req.line
-                req.headers.each_pair { |k, v| puts "> #{k}: #{v}\r\n" }
-                puts
-
-                content = req.content
-                if not content.empty?
-                    if /^[[:print:]]+$/ =~ content
-                        puts content
-                    else
-                        puts Hexy.new(content).to_s
-                    end
-                    puts
-                end
-
+            dump_header = args['dump-header']
+            verbose  = args['verbose']
+            if dump_header and verbose
+                print_sprint_header req, dump_header, "> ", 'w'
+                print_sprint_content req.content
                 if res
-                    puts "< " + res.line
-                    res.headers.each_pair { |k, v| puts "< #{k}: #{v}\r\n" }
-                    puts
-                    content = res.content
-                    if not content.empty?
-                        if /^[[:print:]]+$/ =~ content
-                            puts content
-                        else
-                            puts Hexy.new(content).to_s
-                        end
-                    end
+                    print_sprint_header res, dump_header, "< ", 'a'
+                    print_sprint_content res.content
                 end
+            elsif dump_header.nil? and verbose
+                print_sprint_content req.content
+                print_sprint_content res.content if res
+            elsif dump_header and verbose.nil?
+                print_sprint_header req, dump_header, "> ", 'w'
+                print_sprint_header res, dump_header, "< ", 'a' if res
             else
                 puts "> " + req.method + ' ' + req.url
                 if res

data/lib/blitz/curl.rb

@@ -71,7 +71,7 @@ class Curl
                 end
 
                 if [ '-D', '--dump-header' ].member? k
-                    hash['dump-header'] = shift(k, argv)
+                    hash['dump-header'] = argv[0]=="-" ?  argv.shift : shift(k, argv)
                     next
                 end
 

data/lib/blitz/utils.rb

@@ -27,7 +27,6 @@ end
 class Blitz
 module Utils
     include Test::Unit::Assertions
-
     def shift key, argv
         val = argv.shift
         assert_not_nil(val, "missing value for #{key}")

data/spec/blitz/command/curl_spec.rb

@@ -1,4 +1,140 @@
 require 'spec_helper'
 
 describe Blitz::Command::Curl do
+    
+    let(:sprint_data)  { 
+        {
+            'line'=>"GET / HTTP/1.1", 
+            'method'=>"GET", 
+            'url'=>"www.example.com", 
+            'content'=>"",
+            'status'=>200, 
+            'message'=>"OK", 
+            'headers'=> {
+                "User-Agent"=>"blitz.io; 5f691b@11.22.33.250", 
+                "Host"=>"blitz.io", 
+                "X-Powered-By"=>"blitz.io", 
+                "X-User-ID"=>"5f6938a60e", 
+                "X-User-IP"=>"44.55.66.250"
+            }
+        }
+    }
+    
+    def mocked_sprint_request
+        Blitz::Curl::Sprint::Request.new(sprint_data)
+    end
+    
+    def mocked_sprint_args
+        {
+            "steps"=>[{"url"=>"http://blitz.io"}], 
+            "region"=>"california", 
+            "dump-header"=>"/mocked/path/head.txt", 
+            "verbose"=>true
+        }
+    end
+    
+    def mocked_sprint
+        sprint = {
+         'result' => {
+             'region'=>"california", 
+             'duration'=> 0.39443,
+             'steps'=>[
+                  'connect'=>0.117957, 
+                  'duration'=>0.394431, 
+                  'request' => sprint_data,
+                  'response' => sprint_data
+              ]  
+         } 
+        }
+        Blitz::Curl::Sprint::Result.new(sprint)
+    end
+    
+    context "#print_sprint_header" do
+        def check_print_sprint_header path="/mocked/path/head.txt"
+            myfile = StringIO.new
+            request = mocked_sprint_request
+            symbol = "> "
+            mode = 'w'
+            obj = Blitz::Command::Curl.new
+            yield(obj, path, mode)
+            obj.send(:print_sprint_header, request, path, symbol, mode)
+        end
+        it "should prints header to console when path is '-'" do
+            check_print_sprint_header("-") {|obj, path, mode|
+                obj.should_receive(:puts).with("> GET / HTTP/1.1")
+                obj.should_receive(:puts).with("> User-Agent: blitz.io; 5f691b@11.22.33.250\r\n")
+                obj.should_receive(:puts).with("> Host: blitz.io\r\n")
+                obj.should_receive(:puts).with("> X-Powered-By: blitz.io\r\n")
+                obj.should_receive(:puts).with("> X-User-ID: 5f6938a60e\r\n")
+                obj.should_receive(:puts).with("> X-User-IP: 44.55.66.250\r\n")
+                obj.should_receive(:puts).with()
+            }
+        end
+        it "should warn user if it can not open the file" do
+            check_print_sprint_header() {|obj, path, mode|
+                File.should_receive(:open).with(path, mode).and_raise("No such file or directory - #{path}")
+                obj.should_receive(:puts).with("\e[31mNo such file or directory - #{path}\e[0m")
+            }
+        end
+        it "should print request headers to file" do
+            check_print_sprint_header() {|obj, path, mode|
+                file = mock('file')
+                File.should_receive(:open).with(path, mode).and_yield(file)
+                file.should_receive(:puts).with("")
+                file.should_receive(:puts).with("GET / HTTP/1.1")
+                file.should_receive(:puts).with("User-Agent: blitz.io; 5f691b@11.22.33.250")
+                file.should_receive(:puts).with("Host: blitz.io")
+                file.should_receive(:puts).with("X-Powered-By: blitz.io")
+                file.should_receive(:puts).with("X-User-ID: 5f6938a60e")
+                file.should_receive(:puts).with("X-User-IP: 44.55.66.250")
+            }
+        end
+    end
+    
+    context "#print_sprint_result" do
+        def check_print_sprint_result args
+            result = mocked_sprint
+            obj = Blitz::Command::Curl.new
+            yield(obj, result)
+            obj.send(:print_sprint_result, args, result)
+        end
+        it "should not dump-header and verbose when they are not available" do
+            args = mocked_sprint_args
+            args.delete "verbose"
+            args.delete "dump-header"
+            check_print_sprint_result(args){|obj, result|
+                obj.should_receive(:puts).with("Transaction time \e[32m394 ms\e[0m")
+                obj.should_receive(:puts).with()
+                obj.should_receive(:puts).with("> GET www.example.com")
+                obj.should_receive(:puts).with("< 200 OK in \e[32m394 ms\e[0m")
+                obj.should_receive(:puts).with()
+            }
+        end
+        it "should dump-header and verbose when both are available" do
+            check_print_sprint_result(mocked_sprint_args){|obj, result|
+                obj.should_receive(:print_sprint_header).twice.and_return(true)
+                obj.should_receive(:print_sprint_content).twice.and_return(true)
+                result.should_receive(:respond_to?).with(:duration).and_return(false)
+            }
+        end
+        it "should only do verbose when dump-header is not available" do
+            args = mocked_sprint_args
+            args.delete "dump-header"
+            check_print_sprint_result(args){|obj, result|
+                obj.should_not_receive(:print_sprint_header)
+                obj.should_receive(:print_sprint_content).twice.and_return(true)
+                result.should_receive(:respond_to?).with(:duration).and_return(false)
+            }
+        end
+        it "should only do dump-header when verbose is not available" do
+            args = mocked_sprint_args
+            args.delete "verbose"
+            check_print_sprint_result(args){|obj, result|
+                obj.should_receive(:print_sprint_header).twice.and_return(true)
+                obj.should_not_receive(:print_sprint_content)
+                result.should_receive(:respond_to?).with(:duration).and_return(false)
+            }
+        end
+    end
+    
 end

data/spec/spec_helper.rb

@@ -10,4 +10,5 @@ end
 require 'rspec/core'
 require 'blitz'
 require 'rake'
-require 'blitz/command/curl'
+require 'blitz/command/curl'
+require 'stringio'

metadata

@@ -2,7 +2,7 @@
 name: blitz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors: 
 - pcapr
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 -08:00
+date: 2012-02-17 00:00:00 -08:00
 default_executable: blitz
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 824321089
+      hash: -600337631
       segments: 
       - 0
       version: "0"