blitz 0.1.10 → 0.1.11

data/Gemfile

@@ -8,6 +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.0'
+gem 'rspec-core', '2.6.4'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -15,3 +17,4 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
 end
+

data/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
       json (>= 1.4.6)
       mime-types (>= 1.15)
       rest-client (>= 1.5.1)
+    diff-lcs (1.1.2)
     git (1.2.5)
     hexy (0.1.1)
     jeweler (1.5.1)
@@ -17,6 +18,14 @@ GEM
     rake (0.8.7)
     rest-client (1.6.1)
       mime-types (>= 1.16)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
@@ -29,3 +38,5 @@ DEPENDENCIES
   json (~> 1.5.1)
   json_pure (~> 1.5.1)
   rest-client (~> 1.6.1)
+  rspec (= 2.6.0)
+  rspec-core (= 2.6.4)

data/Rakefile

@@ -39,6 +39,13 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+desc "Run all the specs"
+task :spec do
+    require 'rspec/core'
+    require 'blitz'
+    RSpec::Core::Runner.run [ *Dir.glob('spec/**/*.rb') ]
+end
+
 task :default => :test
 
 require 'rake/rdoctask'

data/blitz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blitz}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pcapr"]
-  s.date = %q{2011-07-15}
+  s.date = %q{2011-07-19}
   s.default_executable = %q{blitz}
   s.description = %q{Make load and performance testing a fun sport}
   s.email = %q{support@blitz.io}
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/blitz/curl/rush.rb",
     "lib/blitz/curl/sprint.rb",
     "lib/blitz/helper.rb",
+    "spec/command/curl_spec.rb",
     "test/helper.rb",
     "test/test_blitz.rb"
   ]
@@ -47,6 +48,7 @@ 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",
     "test/helper.rb",
     "test/test_blitz.rb"
   ]
@@ -60,6 +62,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.0"])
+      s.add_runtime_dependency(%q<rspec-core>, ["= 2.6.4"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
     else
@@ -68,6 +72,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.0"])
+      s.add_dependency(%q<rspec-core>, ["= 2.6.4"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     end
@@ -77,6 +83,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.0"])
+    s.add_dependency(%q<rspec-core>, ["= 2.6.4"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
   end

data/lib/blitz.rb

@@ -5,7 +5,7 @@ require 'pp'
 
 class Blitz # :nodoc:
     require 'blitz/helper'
-    Version = "0.1.10"
+    Version = "0.1.11"
         
     extend Blitz::Helper
     

data/lib/blitz/command/curl.rb

@@ -355,7 +355,9 @@ class Curl < Command # :nodoc:
 
         if not hash['help']
             url = argv.shift
-            assert_not_nil(url, 'no URL specified!')
+            if not url
+                raise ArgumentError, "no URL specified!"
+            end
             hash['url'] = url
         end
         

data/spec/command/curl_spec.rb

@@ -0,0 +1,232 @@
+describe "arg parsing" do
+
+    TEST_URL = "http://foo.com"
+    VAR = 'foo'
+    TEST_VAR_URL = 'http://foo.com?var=#{foo}'
+    MIN = 10
+    MAX = 30
+    # because of 1.8.7 and 1.9.2 differences, maintain both LIST and LIST_AS_STRING constants
+    LIST = [ 'a', 'b', 'c', '1', '2', '3']
+    LIST_AS_STRING = "[a,b,c,1,2,3]" 
+    COUNT = 60
+    COUNT_DEFAULT = 1000
+    DURATION = 100
+    REGION = 'california'
+
+    curl = ::Blitz::Command::Curl.new
+    describe "basic args" do
+
+        describe "pattern and region" do
+            @args = { 
+                "expanded parameters" => [ '--pattern', '1-250:60', "--region", "#{REGION}", "#{TEST_URL}" ],
+                "short parameters"    => [ '-p', '1-250:60', "--region", "#{REGION}", "#{TEST_URL}" ]
+            }
+
+            @args.each do |name, argv|
+                parsed_args = curl.__send__ :parse_cli, argv
+
+                it "should return a hash from the method when sending #{name}" do
+                    parsed_args.should be_a(Hash)
+                end
+
+                it "should populate the URL into the url key when sending #{name}" do
+                    parsed_args['url'].should be_a(String)
+                    parsed_args['url'].should == TEST_URL
+                end
+
+                it "should put --pattern arguments in the correct structure when sending #{name}" do
+                    parsed_args['pattern'].should be_a(Hash)
+                    parsed_args['pattern']['iterations'].should be_equal 1
+                    parsed_args['pattern']['intervals'].should be_a(Array)
+                    parsed_args['pattern']['intervals'][0].should be_a(Hash)
+                    parsed_args['pattern']['intervals'][0]['start'].should be_equal 1
+                    parsed_args['pattern']['intervals'][0]['end'].should be_equal 250
+                    parsed_args['pattern']['intervals'][0]['duration'].should be_equal 60
+                end
+
+                it "should allow a specific region to be passed when sending #{name}" do
+                    parsed_args['region'].should be_a(String)
+                    parsed_args['region'].should == REGION
+                end
+            end
+        end
+
+        @command_args = [ 
+            { :short => '-A', :long => '--user-agent', :params => '"TEST STRING"', :blitz_key => 'user-agent' },
+            { :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 => '-H', :long => '--header', :params => 'some_header' }, 
+            { :short => '-s', :long => '--status', :params => '500' }, 
+            { :short => '-T', :long => '--timeout', :params => '750' }, 
+            { :short => '-u', :long => '--user', :params => 'foo:bar' }, 
+            { :short => '-X', :long => '--request', :params => 'GET' }, 
+            { :short => '-V', :long => '--verbose' }, 
+            { :short => '-1', :long => '--tlsv1' }, 
+            { :short => '-2', :long => '--sslv2' }, 
+            { :short => '-3', :long => '--sslv3' }, 
+        ]
+        @command_args.each do |test| 
+            test_name = /--(.*)/.match(test[:long])[1]
+            describe "#{test_name}" do
+                [ :short, :long ].each do |flag|
+                    argv = []
+                    argv << test[flag]
+                    argv << test[:params] if test[:params]
+                    argv << "#{TEST_URL}"
+                    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]
+                        end
+                    end
+                end
+            end
+        end
+    end
+
+    describe "help" do
+        @args = { 
+            "expanded parameters" => [ '--help' ],
+            "short parameters"    => [ '-h' ]
+        }
+        @args.each do |name, argv|
+            it "should return boolean help flag in hash for #{name}" do
+                parsed_args = curl.__send__ :parse_cli, argv
+                parsed_args.should be_a(Hash)
+                parsed_args['help'].should be_true
+            end
+        end
+    end
+
+    describe "Usage errors" do
+        describe "no arguments" do
+            it "should throw an error when no arguments are given" do
+                lambda { curl.__send__ :parse_cli }.should raise_error(ArgumentError, /wrong number of arg/)
+            end
+        end
+        describe "no URL" do
+            @args = { 
+                "expanded parameters" => [ '--pattern', '1-250:60', "--variable:#{VAR}", "udid", "--region", "#{REGION}" ],
+                "short parameters" => [ '-p', '1-250:60', "-v:#{VAR}", "u", "-r", "#{REGION}" ]
+            }
+            @args.each do |name, argv|
+                it "should throw an error when no URL is given for #{name}" do
+                    lambda { curl.__send__ :parse_cli, argv}.should raise_error(ArgumentError, /URL/)
+                end
+            end
+        end
+        describe "bad arguments" do
+            @args = { 
+                "double dash on short param" => [ '--p', '1-250:60', "--variable:#{VAR}", "udid", "--region", "#{REGION}", "#{TEST_URL}" ],
+                "single dash on long param" => [ '-pattern', '1-250:60', "-v:#{VAR}", "u", "-r", "#{REGION}", "#{TEST_URL}" ],
+                "unsupported option, short format" => [ '-z', "#{TEST_URL}" ],
+                "unsupported option, long format" => [ '--foobar', "#{TEST_URL}" ]
+            }
+            @args.each do |name, argv|
+                it "should throw an error when bad arguments are passed for #{name}" do
+                    lambda { curl.__send__ :parse_cli, argv}.should raise_error(ArgumentError, /Unknown option/)
+                end
+            end
+        end
+    end
+
+    describe "variable support" do
+        describe "number and alpha" do
+            @args = { 
+                "number, expanded parameters, no values given" => 
+                    [ '--pattern', '1-250:60', "--variable:#{VAR}", "number", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "number, short parameters, no values given" => 
+                    [ '-p', '1-250:60', "-v:#{VAR}", "n", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "number, expanded parameters, no count given" =>
+                    [ '--pattern', '1-250:60', "--variable:#{VAR}", "number[#{MIN},#{MAX}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "number, short parameters, no count given" => 
+                    [ '-p', '1-250:60', "-v:#{VAR}", "n[#{MIN},#{MAX}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "number, expanded parameters, count given" =>
+                    [ '--pattern', '1-250:60', "--variable:#{VAR}", "number[#{MIN},#{MAX},#{COUNT}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "number, short parameters, count given" => 
+                    [ '-p', '1-250:60', "-v:#{VAR}", "n[#{MIN},#{MAX},#{COUNT}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "alpha, expanded parameters, no values given" => 
+                    [ '--pattern', '1-250:60', "--variable:#{VAR}", "alpha", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "alpha, short parameters, no values given" => 
+                    [ '-p', '1-250:60', "-v:#{VAR}", "a", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "alpha, expanded parameters, no count given" =>
+                    [ '--pattern', '1-250:60', "--variable:#{VAR}", "alpha[#{MIN},#{MAX}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "alpha, short parameters, no count given" => 
+                    [ '-p', '1-250:60', "-v:#{VAR}", "a[#{MIN},#{MAX}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "alpha, expanded parameters, count given" =>
+                    [ '--pattern', '1-250:60', "--variable:#{VAR}", "alpha[#{MIN},#{MAX},#{COUNT}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ],
+                "alpha, short parameters, count given" => 
+                    [ '-p', '1-250:60', "-v:#{VAR}", "a[#{MIN},#{MAX},#{COUNT}]", "--region", "#{REGION}", "#{TEST_VAR_URL}" ]
+            }
+
+            @args.each do |name, argv|
+                parsed_args = curl.__send__ :parse_cli, argv
+                it "should work with #{name}" do
+                    parsed_args['variables'].should be_a(Hash)
+                    parsed_args['variables'][VAR].should be_a(Hash)
+
+                    if name.match(/^number/)
+                        parsed_args['variables'][VAR]['type'].should == "number"
+                    elsif name.match(/^alpha/)
+                        parsed_args['variables'][VAR]['type'].should == "alpha"
+                    end
+
+                    if name.match(/no values given/)
+                        parsed_args['variables'][VAR]['min'].should be_nil
+                        parsed_args['variables'][VAR]['max'].should be_nil
+                        parsed_args['variables'][VAR]['count'].should be_nil
+                    elsif name.match(/no count given/)
+                        parsed_args['variables'][VAR]['min'].should be_an(Integer)
+                        parsed_args['variables'][VAR]['min'].should == MIN
+                        parsed_args['variables'][VAR]['max'].should be_an(Integer)
+                        parsed_args['variables'][VAR]['max'].should == MAX
+                        parsed_args['variables'][VAR]['count'].should be_an(Integer)
+                        parsed_args['variables'][VAR]['count'].should == COUNT_DEFAULT
+                    else
+                        parsed_args['variables'][VAR]['min'].should be_an(Integer)
+                        parsed_args['variables'][VAR]['min'].should == MIN
+                        parsed_args['variables'][VAR]['max'].should be_an(Integer)
+                        parsed_args['variables'][VAR]['max'].should == MAX
+                        parsed_args['variables'][VAR]['count'].should be_an(Integer)
+                        parsed_args['variables'][VAR]['count'].should == COUNT
+                    end
+
+                end
+            end
+        end
+
+        describe "list parameter" do
+            @args = { 
+                "expanded parameters" => [ '--pattern', '1-250:60', "--variable:#{VAR}", "list#{LIST_AS_STRING}", "--region", "#{REGION}", "#{TEST_URL}" ],
+                "short parameters" => [ '-p', '1-250:60', "-v:#{VAR}", "#{LIST_AS_STRING}", "-r", "#{REGION}", "#{TEST_URL}" ]
+            }
+            @args.each do |name, argv|
+                it "should allow lists to be sent as a variable type for #{name}" do
+                    parsed_args = curl.__send__ :parse_cli, argv
+                    parsed_args['variables'][VAR].should be_a(Hash)
+                    parsed_args['variables'][VAR]['type'].should == 'list'
+                    parsed_args['variables'][VAR]['entries'].should be_an(Array)
+                    parsed_args['variables'][VAR]['entries'].should == LIST
+                end
+            end
+        end
+
+        describe "udid parameter" do
+            @args = { 
+                "expanded parameters" => [ '--pattern', '1-250:60', "--variable:#{VAR}", "udid", "--region", "#{REGION}", "#{TEST_URL}" ],
+                "short parameters" => [ '-p', '1-250:60', "-v:#{VAR}", "u", "-r", "#{REGION}", "#{TEST_URL}" ]
+            }
+            @args.each do |name, argv|
+                parsed_args = curl.__send__ :parse_cli, argv
+                it "should allow udid to be sent as a variable type" do
+                    parsed_args['variables'][VAR].should be_a(Hash)
+                    parsed_args['variables'][VAR]['type'].should == 'udid'
+                end
+            end
+        end
+    end
+end 
+

metadata

@@ -2,7 +2,7 @@
 name: blitz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - pcapr
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -07:00
+date: 2011-07-19 00:00:00 -07:00
 default_executable: blitz
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,8 +69,30 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec-core
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +100,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,7 +111,7 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 description: Make load and performance testing a fun sport
 email: support@blitz.io
 executables: 
@@ -119,6 +141,7 @@ files:
 - lib/blitz/curl/rush.rb
 - lib/blitz/curl/sprint.rb
 - lib/blitz/helper.rb
+- spec/command/curl_spec.rb
 - test/helper.rb
 - test/test_blitz.rb
 has_rdoc: true
@@ -135,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -193852493
+      hash: 109260913
       segments: 
       - 0
       version: "0"
@@ -153,5 +176,6 @@ signing_key:
 specification_version: 3
 summary: Make load and performance testing a fun sport
 test_files: 
+- spec/command/curl_spec.rb
 - test/helper.rb
 - test/test_blitz.rb