nethttp_ab 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,3 @@
+v0.0.2 deleted trollop gem as a requirement, added nokogiri dependency to gemspec, added MIT license file, fixed small issue with benchmarked site's url, added wrong site address handling  [06-04-2011]
+
+v0.0.1. first release [05-04-2011]

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 by Dmitrii Samoilov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Manifest

@@ -1,3 +1,6 @@
+CHANGELOG
+LICENSE
+Manifest
 README
 Rakefile
 bin/nethttp_ab
@@ -5,8 +8,8 @@ lib/net.rb
 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/index.html
 test/simple_requests_queue_test.rb
-Manifest

data/Rakefile

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

data/bin/nethttp_ab

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'trollop'
 require File.dirname(File.expand_path(__FILE__)) + '/../lib/requester.rb'
 
 # SIMPLE USAGE:
@@ -10,19 +9,39 @@ require File.dirname(File.expand_path(__FILE__)) + '/../lib/requester.rb'
 # OR simulate user and follow all local links on the page
 # nethttp_ab -f http://localhost:3000
 
-opts = Trollop::options do
-  opt :concurrent_threads, "Number of concurrent threads", :default => 3, :short => 'c'
-  opt :requests, "Total number of requests", :default => 10, :short => 'n'
-  opt :follow_links, "Whether to follow links from received pages (emulating real user)", :default => false, :short => 'f'  
+opts = {}
+
+if ARGV.include?('--follow_links') || ARGV.include?('-f')
+  opts[:follow_links] = true
+else
+  opts[:follow_links] = false
+end
+
+if ARGV.include?('-c')
+  opts[:concurrent_threads] = ARGV[ARGV.index('-c') + 1].to_i
+  ARGV.delete('-c')
+  ARGV.delete(opts[:concurrent_threads])
+else
+  opts[:concurrent_threads] = 3
+end
+
+if ARGV.include?('-n')
+  opts[:requests] = ARGV[ARGV.index('-n') + 1].to_i
+  ARGV.delete('-n')
+  ARGV.delete(opts[:requests])
+else
+  opts[:requests] = 10
 end
 
 url_to_benchmark = "http://localhost:3000/"
+
 # search for the url to perform benchmarking on
-# we don't use trollop here since I don't like to specify --url=http://mysite.com to get the url
 ARGV.each do |arg|
-  url_to_benchmark = arg if arg =~ /https?:\/\/|www\./
+  url_to_benchmark = arg if arg =~ /^(https?:\/\/)?([\w\.]+)\.([a-z]{2,6}\.?)(\/[\w\.]*)*\/?$/
 end
 
+url_to_benchmark = "http://" + url_to_benchmark if url_to_benchmark !~ /^https?:\/\//
+
 requester = NethttpAb::Requester.new
 requester.concurrent_users  = opts[:concurrent_threads]
 requester.num_of_requests   = opts[:requests]

data/lib/requester.rb

@@ -1,6 +1,5 @@
 require 'benchmark'
 require 'thread'
-require 'nokogiri' # we could follow links on the pages if there's --follow-links=2 option
 
 require File.dirname(File.expand_path(__FILE__)) + '/requests_queue'
 require File.dirname(File.expand_path(__FILE__)) + '/simple_requests_queue'
@@ -33,6 +32,8 @@ module NethttpAb
 
     def follow_links=(flag)
       @follow_links = flag
+      # we could follow links on the pages if there's --follow-links=2 option
+      require 'nokogiri'  if @follow_links
     end
 
     def url=(link)
@@ -72,6 +73,9 @@ module NethttpAb
           rescue Errno::ECONNREFUSED => e
             puts("Connection error, please check your internet connection or make sure the server is running (it's local)")
             exit
+          rescue SocketError => e
+            puts e.message
+            exit
           end
 
           req = Net::HTTP::Get.new(@url.path)
@@ -93,10 +97,13 @@ module NethttpAb
           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")
+            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 running (it's local)")
+            puts "Connection error, please check your internet connection or make sure the server is running (it's local)"
+            exit
+          rescue SocketError => e
+            puts e.message
             exit
           end
 

data/nethttp_ab.gemspec

@@ -2,26 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nethttp_ab}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitrii Samoilov"]
-  s.cert_chain = ["/home/german/.ssh/gem-public_cert.pem"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-04-06}
   s.default_executable = %q{nethttp_ab}
-  s.description = %q{Simple tool to benchmark sites}
+  s.description = %q{Simple tool to test and benchmark sites}
   s.email = %q{germaninthetown@gmail.com}
   s.executables = ["nethttp_ab"]
-  s.extra_rdoc_files = ["README", "bin/nethttp_ab", "lib/net.rb", "lib/requester.rb", "lib/requests_queue.rb", "lib/simple_requests_queue.rb"]
-  s.files = ["README", "Rakefile", "bin/nethttp_ab", "lib/net.rb", "lib/requester.rb", "lib/requests_queue.rb", "lib/simple_requests_queue.rb", "test/nethttp_ab_test.rb", "test/requests_queue_test.rb", "test/resources/index.html", "test/simple_requests_queue_test.rb", "Manifest", "nethttp_ab.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/nethttp_ab", "lib/net.rb", "lib/requester.rb", "lib/requests_queue.rb", "lib/simple_requests_queue.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/nethttp_ab", "lib/net.rb", "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/index.html", "test/simple_requests_queue_test.rb"]
   s.homepage = %q{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.signing_key = %q{/home/german/.ssh/gem-private_key.pem}
-  s.summary = %q{Simple tool to benchmark sites}
-  s.test_files = ["test/simple_requests_queue_test.rb", "test/requests_queue_test.rb", "test/nethttp_ab_test.rb"]
+  s.summary = %q{Simple tool to test and benchmark sites}
+  s.test_files = ["test/nethttp_ab_test.rb", "test/requests_queue_test.rb", "test/simple_requests_queue_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,54 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nethttp_ab
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Dmitrii Samoilov
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQUFADBGMRgwFgYDVQQDDA9nZXJt
-  YW5pbnRoZXRvd24xFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
-  ARkWA2NvbTAeFw0xMTA0MDUwOTM4NTRaFw0xMjA0MDQwOTM4NTRaMEYxGDAWBgNV
-  BAMMD2dlcm1hbmludGhldG93bjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYK
-  CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  wgFgELrtM2WGMHb0Tbd0mHzzd1O7begCVLUVqTfULTWxRyfa1xlPYGOkprxwfQE0
-  e1TLzhgtzrwPtKm0+IWlz0yiDdcP+/vORNYGJn0hlVMIyoh/Gjvy9tg+lAZHHzyW
-  P08b83YCvTAsfmYwj1gCVERJcTNYoqerpTX711+qYYAm4KMEXOlk3w6vOSXSgioH
-  qT3hlHivuRnLO8ASv2dC0Xpej0wUqtFx+h6FkYzrs5PFp5r9Ccste/vTonP5sWX3
-  FlXZaqawuFqlYbkVEjIZyE5smYeBR3NJsNjIpcdpInWaYul631yIEy5UiPucGlnQ
-  LSqxi4knbIeA0S58KgRvtQIDAQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQR
-  MgXYASGhr6Z27DY6DTOu66QfKjALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQAD
-  ggEBADkXRjtNXe+PCTkBpODetl9Mgrw3vxmQbpaQFeV0IPMiav+6m48/ai0p9zxF
-  JpjN7GPHzy8LJQGmwOOrpDwU7JsX6hlXtXToKM/RcStUqm1v+8GLE/K777Foq4T+
-  6QmqCPwYdpN1hijiEM4miV9osuZYTAnR9IKBakY3tRE1Q7aTTyT4tMmS/GrwY+IB
-  qih6K+1QUvvm0euQNIlHfM0RQ+cgISMezNJRmDtldZTLI5NbSnbO6mW+QoFcKmXz
-  +Zut89O9LtR+kOHx2W1p7eHudOUB4L6lCafXA1O54piyMbYsde8oHmAjW39hKaUo
-  r061XXjdbf9qKeUjTZ6lmWaQMjM=
-  -----END CERTIFICATE-----
-
-date: 2011-04-05 00:00:00 +03:00
+cert_chain: []
+date: 2011-04-06 00:00:00.000000000 +03:00
 default_executable: 
 dependencies: []
-
-description: Simple tool to benchmark sites
+description: Simple tool to test and benchmark sites
 email: germaninthetown@gmail.com
-executables: 
+executables:
 - nethttp_ab
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- CHANGELOG
+- LICENSE
 - README
 - bin/nethttp_ab
 - lib/net.rb
 - lib/requester.rb
 - lib/requests_queue.rb
 - lib/simple_requests_queue.rb
-files: 
+files:
+- CHANGELOG
+- LICENSE
+- Manifest
 - README
 - Rakefile
 - bin/nethttp_ab
@@ -56,46 +37,43 @@ files:
 - 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/index.html
 - test/simple_requests_queue_test.rb
-- Manifest
-- nethttp_ab.gemspec
 has_rdoc: true
 homepage: http://github.com/german/nethttp_ab
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Nethttp_ab
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: nethttp_ab
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Simple tool to benchmark sites
-test_files: 
-- test/simple_requests_queue_test.rb
-- test/requests_queue_test.rb
+summary: Simple tool to test and benchmark sites
+test_files:
 - test/nethttp_ab_test.rb
+- test/requests_queue_test.rb
+- test/simple_requests_queue_test.rb

data.tar.gz.sig

@@ -1 +0,0 @@
-��5�\',�-�Oº� �ۓ���s�*��HKȴH��!�o��>:�=�h�|C�'�\��Ws��s���)
���bâΘU�>���o_�uT�Sm/�;��9S�����^�)�
�P����KO‰�v�o�g���^ը����L��wU������<cHb��u�*�t0M�u��\�