nethttp_ab 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.0.7 [06-02-2011]
+* added SSL support (nethttp_ab now accepts https:// in url)
+
 v0.0.6 [09-05-2011]
 * added an ability to set a follow_links depth level to simulate a real user
 * added verbose option

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('nethttp_ab', '0.0.6') do |p|
+Echoe.new('nethttp_ab', '0.0.7') do |p|
   p.description    = "Simple tool to test and benchmark sites"
   p.url            = "http://github.com/german/nethttp_ab"
   p.author         = "Dmitrii Samoilov"

data/lib/requester.rb

@@ -176,26 +176,15 @@ module NethttpAb
 
       def start_threads
         @concurrent_users.times do
-          #begin
-          #  http_opened_session = get_http_session(@url)
-          #rescue OpenSSL::SSL::SSLError => e
-          #  puts "The url you provided is wrong, please check is it really ssl encrypted"
-          #  exit
-          #rescue Errno::ECONNREFUSED => e
-          #  puts "Connection error, please check your internet connection or make sure the server is responding"
-          #  exit
-          #rescue SocketError => e
-          #  puts e.message
-          #  exit
-          #end
-
           @threads << Thread.new do
             while !@requests_queue.empty? do
               # lock request in order to avoid sharing same request by two threads and making more requests then specified
               if next_url = @requests_queue.lock_next_request
                 req = if @follow_links
                   next_url_parsed = URI.parse(next_url)
-                  next_url_parsed.path = '/' if next_url_parsed.path == "" # ensure we requesting main page (if url is like http://google.com)
+
+                  # ensure that we are requesting main page (if url is like http://google.com)
+                  next_url_parsed.path = '/' if next_url_parsed.path == ""
                   next_url_parsed
                 else
                   @url
@@ -206,13 +195,21 @@ module NethttpAb
 
                 @total_time += Benchmark.realtime do
                   begin
-                    response = Net::HTTP.get_response(req) #http_opened_session.request(req)
-                    response = case response
+                    response_object = if 443 == req.port
+                      http = Net::HTTP.new(req.host, req.port)
+                      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+                      http.use_ssl = true
+                      http.start{|agent| agent.get(req.path)}
+                    else
+                      Net::HTTP.get_response(req)
+                    end
+
+                    response = case response_object
                       when Net::HTTPSuccess
-                        response
+                        response_object
                       when Net::HTTPRedirection
-                        print "redirected to #{response['location']}\n"
-                        Net::HTTP.get_response(URI.parse(response['location']))
+                        print "redirected to #{response_object['location']}\n"
+                        Net::HTTP.get_response(URI.parse(response_object['location']))
                     end
                     
                     print '.' # show progress while processing queue

data/nethttp_ab.gemspec

@@ -1,25 +1,24 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{nethttp_ab}
-  s.version = "0.0.6"
+  s.name = "nethttp_ab"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitrii Samoilov"]
-  s.date = %q{2011-05-09}
-  s.default_executable = %q{nethttp_ab}
-  s.description = %q{Simple tool to test and benchmark sites}
-  s.email = %q{germaninthetown@gmail.com}
+  s.date = "2012-02-06"
+  s.description = "Simple tool to test and benchmark sites"
+  s.email = "germaninthetown@gmail.com"
   s.executables = ["nethttp_ab"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/nethttp_ab", "lib/requester.rb", "lib/requests_queue.rb", "lib/simple_requests_queue.rb"]
   s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README", "Rakefile", "bin/nethttp_ab", "lib/requester.rb", "lib/requests_queue.rb", "lib/simple_requests_queue.rb", "nethttp_ab.gemspec", "test/nethttp_ab_test.rb", "test/requests_queue_test.rb", "test/resources/depth2/links1.html", "test/resources/depth2/links2.html", "test/resources/depth2/links3.html", "test/resources/depth2/links_11.html", "test/resources/depth2/links_12.html", "test/resources/depth2/links_21.html", "test/resources/depth2/links_31.html", "test/resources/depth2/links_32.html", "test/resources/depth2/links_33.html", "test/resources/index.html", "test/resources/links.html", "test/resources/links1.html", "test/resources/links2.html", "test/resources/links3.html", "test/resources/links4.html", "test/resources/links5.html", "test/resources/links_depth_2.html", "test/simple_requests_queue_test.rb", "test/url_regexp_test.rb"]
-  s.homepage = %q{http://github.com/german/nethttp_ab}
+  s.homepage = "http://github.com/german/nethttp_ab"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Nethttp_ab", "--main", "README"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{nethttp_ab}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Simple tool to test and benchmark sites}
-  s.test_files = ["test/url_regexp_test.rb", "test/nethttp_ab_test.rb", "test/requests_queue_test.rb", "test/simple_requests_queue_test.rb"]
+  s.rubyforge_project = "nethttp_ab"
+  s.rubygems_version = "1.8.14"
+  s.summary = "Simple tool to test and benchmark sites"
+  s.test_files = ["test/simple_requests_queue_test.rb", "test/url_regexp_test.rb", "test/requests_queue_test.rb", "test/nethttp_ab_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nethttp_ab
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-09 00:00:00.000000000 +03:00
-default_executable: 
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &82350330 !ruby/object:Gem::Requirement
+  requirement: &17373460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *82350330
+  version_requirements: *17373460
 description: Simple tool to test and benchmark sites
 email: germaninthetown@gmail.com
 executables:
@@ -69,7 +68,6 @@ files:
 - test/resources/links_depth_2.html
 - test/simple_requests_queue_test.rb
 - test/url_regexp_test.rb
-has_rdoc: true
 homepage: http://github.com/german/nethttp_ab
 licenses: []
 post_install_message: 
@@ -96,12 +94,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: nethttp_ab
-rubygems_version: 1.6.2
+rubygems_version: 1.8.14
 signing_key: 
 specification_version: 3
 summary: Simple tool to test and benchmark sites
 test_files:
+- test/simple_requests_queue_test.rb
 - test/url_regexp_test.rb
-- test/nethttp_ab_test.rb
 - test/requests_queue_test.rb
-- test/simple_requests_queue_test.rb
+- test/nethttp_ab_test.rb