tourbus 2.0.1 → 2.0.2

data/README.rdoc

@@ -46,7 +46,7 @@ better name, these are called Tours.
   it write:
 
       class Simple < Tourist
-        def test_homepage
+        def tour_homepage
           visit "http://#{@host}/"
           assert_contain "My Home Page"
         end
@@ -55,9 +55,12 @@ better name, these are called Tours.
 * Files in ./tours should have classes that match their names. E.g.
   "class BigHairyTest < Tourist" belongs in ./tours/big_hairy_test.rb
 
-* Think Test::Unit. test_* methods will be found automagically.
-  setup() and teardown() methods will be executed at the appropriate
-  times.
+* Like how Test::Unit finds test_* methods automagically, TourBus will
+  make each tourist run any tour_* methods. setup() and teardown()
+  methods will be executed at the appropriate times.
+
+* Two more magic methods: +before_tours+ and +after_tours+ will be run
+  before any tours and after all tours, respectively.
 
 === Example TourBus Run
 

data/lib/tourist.rb

@@ -3,6 +3,7 @@ require 'monitor'
 require 'common'
 require 'webrat'
 require 'webrat/adapters/mechanize'
+require 'webrat_headers_patch' # must come after webrat requires
 require 'test/unit/assertions'
 
 # A tourist is essentially a test suite file. A Tourist subclass
@@ -21,30 +22,30 @@ class Tourist
   include Webrat::Matchers
   include Webrat::SaveAndOpenPage
   include Test::Unit::Assertions
-  
+
   attr_reader :host, :tours, :number, :tour_type, :tourist_id
-  
+
   def initialize(host, tours, number, tourist_id)
     @host, @tours, @number, @tourist_id = host, tours, number, tourist_id
     @tour_type = self.send(:class).to_s
   end
- 
+
   # before_tour runs once per tour, before any tours get run
   def before_tours; end
-  
+
   # after_tour runs once per tour, after all the tours have run
   def after_tours; end
-  
+
   def setup
   end
-  
+
   def teardown
   end
-  
+
   def wait(time)
     sleep time.to_i
   end
-  
+
   # Lists tourists in tours folder. If a string is given, filters the
   # list by that string. If an array of filter strings is given,
   # returns items that match ANY filter string in the array.
@@ -57,28 +58,28 @@ class Tourist
     # 3. If you passed in any filters, these basenames are rejected unless they match at least one filter
     # 4. The filenames remaining are then checked to see if they define a class of the same name that inherits from Tourist
     Dir[File.join('.', 'tours', '**', '*.rb')].map {|fn| File.basename(fn, ".rb")}.select {|fn| filter.size.zero? || filter.any?{|f| fn =~ /#{f}/}}.select {|tour| Tourist.tourist? tour }
-  end 
-  
+  end
+
   def self.tours(tourist_name)
     Tourist.make_tourist(tourist_name).tours
   end
-  
+
   # Returns true if the given tourist name can be found in the tours folder, and defines a similarly-named subclass of Tourist
   def self.tourist?(tourist_name)
     Object.const_defined?(tourist_name.classify) && tourist_name.classify.constantize.ancestors.include?(Tourist)
   end
-  
+
   # Factory method, creates the named child class instance
   def self.make_tourist(tourist_name,host="http://localhost:3000",tours=[],number=1,tourist_id=nil)
     tourist_name.classify.constantize.new(host,tours,number,tourist_id)
   end
-  
+
   # Returns list of tours this tourist knows about. (Meant to be run on a subclass
   # instance; returns the list of tours available).
   def tours
-    methods.grep(/^tour_/).map {|m| m.sub(/^tour_/,'')}
+    methods.map(&:to_s).grep(/^tour_/).map {|m| m.sub(/^tour_/,'')}
   end
-  
+
   def run_tour(tour_name)
     @current_tour = "tour_#{tour_name}"
     raise TourBusException.new("run_tour couldn't run tour '#{tour_name}' because this tourist did not respond to :#{@current_tour}") unless respond_to? @current_tour
@@ -86,16 +87,16 @@ class Tourist
     send @current_tour
     teardown
   end
-  
+
   protected
-  
+
   def session
     @session ||= Webrat::MechanizeSession.new
   end
-  
+
   def log(message)
     puts "#{Time.now.strftime('%F %H:%M:%S')} Tourist ##{@tourist_id}: (#{@current_tour}) #{message}"
   end
-  
+
 end
 

data/lib/webrat_headers_patch.rb

@@ -0,0 +1,17 @@
+class Webrat::MechanizeAdapter
+  # Replace the Webrat version of get with one that doesn't drop the
+  # headers param. Headers can be set using Webrat::Session#header
+  # (#header is available in your Tourist sublasses). For example:
+  #
+  # class MyTests < Tourist
+  #   def before_tours
+  #     header 'X-My-Header', 'something'
+  #   end
+  #
+  def get_with_headers(url, data, headers = nil)
+    @response = mechanize.get({url: url, headers: headers}, data)
+  end
+
+  alias_method :get_without_headers, :get
+  alias_method :get, :get_with_headers
+end

metadata

@@ -1,101 +1,130 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tourbus
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.0.2
   prerelease: 
-  version: 2.0.1
 platform: ruby
-authors: 
+authors:
 - David Brady
 - James Britt
 - JT Zemp
 - Tim Harper
 - Joe Tanner
+- Chris Bailey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-23 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mechanize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: faker
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webrat
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrat
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id006
-description: TourBus, a web load-testing tool that combines complex 'tour' definitions with scalable, concurrent testing
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+description: TourBus, a web load-testing tool that combines complex 'tour' definitions
+  with scalable, concurrent testing
 email: github@shinybit.com
-executables: 
+executables:
 - tourbus
 - tourwatch
 - tourproxy
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
 - examples/contact_app/README.rdoc
-files: 
+files:
 - bin/tourbus
 - bin/tourproxy
 - bin/tourwatch
@@ -111,42 +140,39 @@ files:
 - lib/tour_rat.rb
 - lib/tour_watch.rb
 - lib/tourist.rb
+- lib/webrat_headers_patch.rb
 - spec/lib/tourproxy_spec.rb
 - spec/spec_helper.rb
 - README.rdoc
 - MIT-LICENSE
-has_rdoc: true
 homepage: http://github.com/dbrady/tourbus/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
 - README.rdoc
 - --title
 - Tourbus - Web Load Testing in Ruby
-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: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: TourBus web stress-testing tool
 test_files: []
-