tourbus 0.1.5 → 2.0.1

data/README.rdoc

@@ -45,7 +45,7 @@ better name, these are called Tours.
 * Make a folder called tours and put a file in it called simple.rb. In
   it write:
 
-      class Simple < Tour
+      class Simple < Tourist
         def test_homepage
           visit "http://#{@host}/"
           assert_contain "My Home Page"
@@ -53,7 +53,7 @@ better name, these are called Tours.
       end
 
 * Files in ./tours should have classes that match their names. E.g.
-  "class BigHairyTest < Tour" belongs in ./tours/big_hairy_test.rb
+  "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

data/bin/tourbus

@@ -18,15 +18,15 @@ config[:rand] ||= nil
 
 opts = Trollop.options do
   opt :host, "Remote hostname to test", :default => config[:host]
-  opt :concurrency, "Number of simultaneous runs to perform", :type => :integer, :default => config[:concurrency]
-  opt :number, "Number of times to run the tour (in each concurrent step, so -c 10 -n 10 will run the tour 100 times)", :type => :integer, :default => config[:number]
-  opt :list, "List tours and runs available. If tours or runs are included, filters the list", :type => :boolean, :default => nil
+  opt :concurrency, "Number of simultaneous tourists to run", :type => :integer, :default => config[:concurrency]
+  opt :number, "Number of times to run the tourist (in each concurrent step, so -c 10 -n 10 will run the tourist 100 times)", :type => :integer, :default => config[:number]
+  opt :list, "List tourists and tours available. If tourists or tours are included, filters the list", :type => :boolean, :default => nil
   opt :rand, "Random seed", :type => :integer, :default => config[:rand]
   opt :tests, "Test name(s) filter. The name of the test to run (use --list to see the test names). Use commas, no spaces, for mulitple names",  :type => :string, :default => nil
 end
 
-tours = if ARGV.empty?
-          Tour.tours
+tourists = if ARGV.empty?
+          Tourist.tourists
          else
            ARGV
          end
@@ -34,13 +34,13 @@ tours = if ARGV.empty?
 srand opts[:rand] || Time.now.to_i
 
 if opts[:list]
-  Tour.tours(ARGV).each do |tour|
-    puts tour
-    puts Tour.tests(tour).map {|test| "  #{test}"}
+  Tourist.tourists(ARGV).each do |tourist|
+    puts tourist
+    puts Tourist.tours(tourist).map {|test| "  #{test}"}
   end
 else
   opts[:tests] = opts[:tests].split(',') if opts[:tests]
   
-  TourBus.new(opts[:host], opts[:concurrency], opts[:number], tours, opts[:tests]).run
+  TourBus.new(opts[:host], opts[:concurrency], opts[:number], tourists, opts[:tests]).run
 end
 

data/bin/tourproxy

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# This proxy logger logs x-amf traffic, and is stolen with gratitude from http://altentee.com/2008/performance-testing-flex-remoting-amf-with-jmeter/
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'tour_proxy'))
+
+options = {}
+
+proxy = TourProxy.new options
+trap "INT" do proxy.shutdown end
+proxy.start

data/examples/contact_app/README.rdoc

@@ -7,7 +7,7 @@ Silly little contact app to show you how to tour a website.
 In addition to tourbus, you will need Sinatra to run
 this app.
 
-  sudo gem install sinatra
+  gem install sinatra
 
 = Contact App
 

data/examples/contact_app/tours/simple.rb

@@ -1,19 +1,20 @@
-class Simple < Tour
-  def test_home
-    visit "/"
+require 'ruby-debug'
+class Simple < Tourist
+  def tour_home
+    visit "#{@host}/"
     assert_contain "If you click this"
 
     click_link "Enter Contact"
-    assert_match /\/contacts/, current_page.url
+    assert_match /\/contacts/, current_url
   end
 
-  def test_contacts
-    visit "/contacts"
-    
+  def tour_contacts
+    visit "#{@host}/contacts"
+
     fill_in "first_name", :with => "Joe"
     fill_in "last_name", :with => "Tester"
-    click_button 
-    
+    click_button
+
     assert_contain "Tester, Joe"
   end
 end

data/lib/common.rb

@@ -13,16 +13,25 @@ gem 'faker', '>= 0.3.1'
 
 # TODO: I'd like to remove dependency on Rails. Need to see what all
 # we're using (like classify) and remove each dependency individually.
-require 'activesupport'
+begin
+  require 'activesupport'
+rescue Exception
+  require 'active_support/all'
+end
 
 require 'monitor'
 require 'faker'
 require 'tour_bus'
 require 'runner'
-require 'tour'
+require 'tourist'
 
+# Our common base class for exceptions
 class TourBusException < Exception; end
 
+# The common base class for all exceptions raised by Webrat.
+class WebratError < StandardError ; end
+
+
 def require_all_files_in_folder(folder, extension = "*.rb")
   for file in Dir[File.join('.', folder, "**/#{extension}")]
     require file

data/lib/file.rb

@@ -0,0 +1,11 @@
+class File
+  # Hides all that lovely expand/join/dirname(__FILE__, path) crap
+  # 
+  # E.g.: require File.here("../lib/pants")
+  # 
+  # Splatty version for the OS Agnosts out there:
+  # require File.here(%w[.. lib pants])
+  def self.here(*args)
+    p = File.expand_path(File.join(File.dirname(caller.first.split(':')[0]), *args))
+  end
+end

data/lib/runner.rb

@@ -1,40 +1,37 @@
 require 'monitor'
 require 'common'
 
-# The common base class for all exceptions raised by Webrat.
-class WebratError < StandardError ; end
-
 class Runner
-  attr_reader :host, :tours, :number, :runner_type, :runner_id
+  attr_reader :host, :tourists, :number, :runner_type, :runner_id
   
-  def initialize(host, tours, number, runner_id, test_list)
-    @host, @tours, @number, @runner_id, @test_list = host, tours, number, runner_id, test_list
+  def initialize(host, tourists, number, runner_id, tour_list)
+    @host, @tourists, @number, @runner_id, @tour_list = host, tourists, number, runner_id, tour_list
     @runner_type = self.send(:class).to_s
     log("Ready to run #{@runner_type}")
   end
   
   # Dispatches to subclass run method
-  def run_tours 
-    log "Filtering on tests #{@test_list.join(', ')}" unless @test_list.to_a.empty?
-    tours,tests,passes,fails,errors = 0,0,0,0,0
+  def run_tourists 
+    log "Filtering on tours #{@tour_list.join(', ')}" unless @tour_list.to_a.empty?
+    tourists,tours,passes,fails,errors = 0,0,0,0,0
     1.upto(number) do |num|
       log("Starting #{@runner_type} run #{num}/#{number}")
-      @tours.each do |tour_name|
+      @tourists.each do |tourist_name|
         
-        log("Starting run #{num}/#{number} of Tour #{tour_name}")
-        tours += 1
-        tour = Tour.make_tour(tour_name,@host,@tours,@number,@runner_id)
-        tour.before_tour
+        log("Starting run #{num}/#{number} of Tourist #{tourist_name}")
+        tourists += 1
+        tourist = Tourist.make_tourist(tourist_name,@host,@tourists,@number,@runner_id)
+        tourist.before_tours
         
-        tour.tests.each do |test|
+        tourist.tours.each do |tour|
           times = Hash.new {|h,k| h[k] = {}}
           
-          next if test_limited_to(test) #  test_list && !test_list.empty? && !test_list.include?(test.to_s) 
+          next if tour_limited_to(tour)
 
           begin
-            tests += 1
-            times[test][:started] = Time.now
-            tour.run_test test
+            tours += 1
+            times[tour][:started] = Time.now
+            tourist.run_tour tour
             passes += 1
           rescue TourBusException, WebratError => e
             log("********** FAILURE IN RUN! **********")
@@ -53,18 +50,18 @@ class Runner
             end
             errors += 1
           ensure
-            times[test][:finished] = Time.now
-            times[test][:elapsed] = times[test][:finished] - times[test][:started]
+            times[tour][:finished] = Time.now
+            times[tour][:elapsed] = times[tour][:finished] - times[tour][:started]
           end 
-          log("Finished run #{num}/#{number} of Tour #{tour_name}")
+          log("Finished run #{num}/#{number} of Tourist #{tourist_name}")
         end
         
-        tour.after_tour
+        tourist.after_tours
       end
       log("Finished #{@runner_type} run #{num}/#{number}")
     end
-    log("Finished all #{@runner_type} tours.")
-    [tours,tests,passes,fails,errors]
+    log("Finished all #{@runner_type} tourists.")
+    [tourists,tours,passes,fails,errors]
   end
   
   protected
@@ -73,8 +70,8 @@ class Runner
     puts "#{Time.now.strftime('%F %H:%M:%S')} Runner ##{@runner_id}: #{message}"
   end
 
-  def test_limited_to(test_name)
-    @test_list && !@test_list.empty? && !@test_list.include?(test_name.to_s) 
+  def tour_limited_to(tour_name)
+    @tour_list && !@tour_list.empty? && !@tour_list.include?(tour_name.to_s) 
   end
 end
 

data/lib/tour_bus.rb

@@ -1,10 +1,10 @@
 require 'benchmark'
 
 class TourBus < Monitor
-  attr_reader :host, :concurrency, :number, :tours, :runs, :tests, :passes, :fails, :errors, :benchmarks
+  attr_reader :host, :concurrency, :number, :tourists, :runs, :tests, :passes, :fails, :errors, :benchmarks
   
-  def initialize(host="localhost", concurrency=1, number=1, tours=[], test_list=nil)
-    @host, @concurrency, @number, @tours, @test_list = host, concurrency, number, tours, test_list
+  def initialize(host="localhost", concurrency=1, number=1, tourists=[], test_list=nil)
+    @host, @concurrency, @number, @tourists, @test_list = host, concurrency, number, tourists, test_list
     @runner_id = 0
     @runs, @tests, @passes, @fails, @errors = 0,0,0,0,0
     super()
@@ -38,7 +38,7 @@ class TourBus < Monitor
   end
   
   def total_runs
-    tours.size * concurrency * number    
+    tourists.size * concurrency * number    
   end
   
   def run
@@ -46,10 +46,10 @@ class TourBus < Monitor
     threads_ready = 0
     start_running = false
     mutex = Mutex.new
-    tour_name = "#{total_runs} runs: #{concurrency}x#{number} of #{tours * ','}"
+    tourist_name = "#{total_runs} runs: #{concurrency}x#{number} of #{tourists * ','}"
     started = Time.now.to_f
     concurrency.times do |conc|
-      log "Starting #{tour_name}"
+      log "Starting #{tourist_name}"
       threads << Thread.new do
         runner_id = next_runner_id
         mutex.lock
@@ -62,8 +62,8 @@ class TourBus < Monitor
         sleep 0.05 until start_running
         runs,tests,passes,fails,errors,start = 0,0,0,0,0,Time.now.to_f
         bm = Benchmark.measure do
-          runner = Runner.new(@host, @tours, @number, runner_id, @test_list)
-          runs,tests,passes,fails,errors = runner.run_tours
+          runner = Runner.new(@host, @tourists, @number, runner_id, @test_list)
+          runs,tests,passes,fails,errors = runner.run_tourists
           update_stats runs, tests, passes, fails, errors
         end
         log "Runner Finished!"
@@ -76,9 +76,9 @@ class TourBus < Monitor
     threads.each {|t| t.join }
     finished = Time.now.to_f
     log '-' * 80
-    log tour_name
+    log tourist_name
     log "All Runners finished."
-    log "Total Tours: #{@runs}"
+    log "Total Tourists: #{@runs}"
     log "Total Tests: #{@tests}"
     log "Total Passes: #{@passes}"
     log "Total Fails: #{@fails}"

data/lib/tour_proxy.rb

@@ -0,0 +1,82 @@
+require 'webrick/httpproxy'
+require 'ruby-debug'
+
+class TourProxy
+  # Initialize the proxy object.
+  # 
+  # @param [Hash] options list of options to configure the proxy.
+  # @option options [Fixnum] :port Port number to listen on
+  # @option options [Hash] :hostnames hostnames by name => url
+  # @option options [IO] :output_buffer IO object to write output to
+  def initialize(options={})
+    @server = nil
+    @output_buffer = options[:output_buffer] || STDOUT
+    @server = WEBrick::HTTPProxyServer.new(
+                                           :Port => options[:port] || 8080,
+                                           :RequestCallback => Proc.new do |req,res|
+                                             log_request_as_webrat(req)
+                                             # dump_request(req)
+                                             # puts(("<" * 100) + " END CALLBACK")
+                                           end
+                                           )
+  end
+
+  def log_request_as_webrat(request)
+    return unless @output_buffer
+#    puts "> log_request_as_webrat"
+    body = request.body
+    if body
+      items = body.split(/&/)
+      pairs = items.map{ |e| e.split(/=/,2)}
+      hash = Hash[pairs]
+      @output_buffer.puts "visit '#{request.request_uri}', :#{request.request_method.downcase}, #{hash.inspect}"
+    else
+      @output_buffer.puts "visit '#{request.request_uri}', :#{request.request_method.downcase}"
+    end
+#    puts "< log_request_as_webrat"
+  end
+  
+  # Dumps an HTTPRequest object
+  def dump_request(request)
+    return unless @output_buffer
+    puts "> dump_request"
+    terms = %w(request_uri request_line raw_header body)
+    longest = terms.map(&:size).max
+    
+    @output_buffer.puts '-' * 80
+    @output_buffer.puts "Request:"
+    terms.each do |term|
+      @output_buffer.puts "    %#{longest}s:" % [term] # , request.send(term).to_s.length]
+    end
+    @output_buffer.puts '-' * 80
+    @output_buffer.flush
+    puts "< dump_request"
+  end
+  
+  # Dumps an HTTPResponse object
+  def dump_response(response)
+    return unless @output_buffer
+    puts "> dump_response"
+    terms = %w()
+    longest = terms.map(&:size).max
+    
+    @output_buffer.puts '-' * 80
+    @output_buffer.puts "Response:"
+    terms.each do |term|
+      @output_buffer.puts "    %#{longest}s: %s" % [term, response.send(term).to_s]
+    end
+    @output_buffer.puts '-' * 80
+    @output_buffer.flush
+    puts "< dump_response"
+  end
+  
+  def start
+    @server.start
+  end
+  
+  def shutdown
+    @server.shutdown
+  end
+end
+
+

data/lib/tour_rat.rb

@@ -0,0 +1,70 @@
+require 'forwardable'
+require 'webrat'
+
+module TourRat
+  module ClassMethods
+    
+  end
+  
+  module InstanceMethods
+    
+  end
+  
+  def self.included(receiver)
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+end
+
+# Webrat::Scope
+#  1. attach_file
+#  2. check
+#  3. choose
+#  4. click_area
+#  5. click_button
+#  6. click_link
+#  7. fill_in
+#  8. select
+#  9. select_date
+# 10. select_datetime
+# 11. select_time
+# 12. set_hidden_field
+# 13. submit_form
+# 14. uncheck
+# 
+# 
+# Webrat::Session
+#  1. automate
+#  2. basic_auth
+#  3. check_for_infinite_redirects
+#  4. click_link_within
+#  5. dom
+#  6. header
+#  7. http_accept
+#  8. infinite_redirect_limit_exceeded?
+#  9. internal_redirect?
+# 10. redirected_to
+# 11. reload
+# 12. simulate
+# 13. visit
+# 14. within
+# 15. xml_content_type?
+# 
+# Webrat::HaveTagMatcher
+# 1. assert_have_no_tag
+# 2. assert_have_tag
+# 3. have_tag
+# 4. match_tag
+# 
+# Webrat::Matchers
+#  1. assert_contain
+#  2. assert_have_no_selector
+#  3. assert_have_no_xpath
+#  4. assert_have_selector
+#  5. assert_have_xpath
+#  6. assert_not_contain
+#  7. contain
+#  8. have_selector
+#  9. have_xpath
+# 10. match_selector
+# 11. match_xpath

data/lib/tour_watch.rb

@@ -29,10 +29,10 @@ class TourWatch
     @mac ? fields_mac(parts) : fields_linux(parts)
   end
   
-  # Note: MacOSX is so awesome I just cacked. Top will report 0.0% cpu
-  # the first time you run top, every time. The only way to get actual
-  # CPU% here is to wait for it to send another page and then throw
-  # away the first page. Isn't that just awesome?!? I KNOW!!!
+  # Note: MacOSX is so laaaame. Top will report 0.0% cpu the first
+  # time you run top, every time. The only way to get actual CPU% here
+  # is to wait for it to send another page and then throw away the
+  # first page. Isn't that just awesome?!? I KNOW!!!
   def top_mac
     top = `top -l 1 | grep -E '(#{@processes})'`
   end

data/lib/tourist.rb

@@ -0,0 +1,101 @@
+require 'forwardable'
+require 'monitor'
+require 'common'
+require 'webrat'
+require 'webrat/adapters/mechanize'
+require 'test/unit/assertions'
+
+# A tourist is essentially a test suite file. A Tourist subclass
+# encapsulates a set of tours that can be done, and may contain helper
+# and support methods for a given task. If you have a two or three
+# paths through a specific area of your website, define a tourist for
+# that area and create tour_ methods for each type of tour to be done.
+
+Webrat.configure do |config|
+  config.mode = :mechanize
+end
+
+class Tourist
+  extend Forwardable
+  include Webrat::Methods
+  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.
+  def self.tourists(filter=[])
+    filter = [filter].flatten
+    # All files in tours folder, stripped to basename, that match any item in filter
+    # I do loves me a long chain. This returns an array containing
+    # 1. All *.rb files in tour folder (recursive)
+    # 2. Each filename stripped to its basename
+    # 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 
+  
+  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_/,'')}
+  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
+    setup
+    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/spec/lib/tourproxy_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe TourProxy do
+  it "should replace known hostnames"
+    # given a list of known hostnames,
+    # when I process a request matching a hosts,
+    # then the request uri should be rewritten with the variable's expansion
+  
+  it "should emit AMF blobs"
+  it "should emit get/post blobs for unrecognized types"
+  
+  # when doing an html get
+      # with no params
+          # it should log "visit 'url'"
+          # and should not log "visit 'url', :get" etc
+  
+  
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+# This file is copied to ~/spec when you run 'ruby script/generate rspec'
+# from the project root directory.
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/file'))
+require 'spec/autorun'
+require 'ruby-debug'
+# require File.here('../features/factories/fixjour_definitions')
+# require File.here('../test/bdrb_test_helper')
+
+# Requires all files in a folder relative to .. (project root).
+def require_all_files_in_folder(folder, extension = '*.rb')
+  for file in Dir[File.join(File.expand_path(File.dirname(__FILE__)), '..', folder, "**/#{extension}")]
+    require file
+  end
+end
+
+# Uncomment the next line to use webrat's matchers
+#require 'webrat/integrations/rspec-rails'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+require_all_files_in_folder "spec/support"
+require_all_files_in_folder "lib"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tourbus
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors: 
 - David Brady
@@ -18,20 +14,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -06:00
+date: 2010-09-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -39,11 +32,10 @@ dependencies:
   name: trollop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,11 +43,10 @@ dependencies:
   name: faker
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -63,11 +54,10 @@ dependencies:
   name: hpricot
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -75,21 +65,30 @@ dependencies:
   name: webrat
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
         version: 0.7.0
   type: :runtime
   version_requirements: *id005
-description: TourBus, a web stress-testing tool that combines complex 'tour' definitions with scalable concurrent testing
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    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
 email: github@shinybit.com
 executables: 
 - tourbus
 - tourwatch
+- tourproxy
 extensions: []
 
 extra_rdoc_files: 
@@ -98,16 +97,22 @@ extra_rdoc_files:
 - examples/contact_app/README.rdoc
 files: 
 - bin/tourbus
+- bin/tourproxy
 - bin/tourwatch
 - examples/contact_app/README.rdoc
 - examples/contact_app/contact_app.rb
 - examples/contact_app/tours/simple.rb
 - examples/contact_app/tours/tourbus.yml
 - lib/common.rb
+- lib/file.rb
 - lib/runner.rb
-- lib/tour.rb
 - lib/tour_bus.rb
+- lib/tour_proxy.rb
+- lib/tour_rat.rb
 - lib/tour_watch.rb
+- lib/tourist.rb
+- spec/lib/tourproxy_spec.rb
+- spec/spec_helper.rb
 - README.rdoc
 - MIT-LICENSE
 has_rdoc: true
@@ -121,27 +126,25 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- Tourbus - Web Stress Testing in Ruby
+- Tourbus - Web Load Testing in Ruby
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: TourBus web stress-testing tool

data/lib/tour.rb

@@ -1,100 +0,0 @@
-require 'forwardable'
-require 'monitor'
-require 'common'
-require 'webrat'
-require 'webrat/adapters/mechanize'
-require 'test/unit/assertions'
-
-# A tour is essentially a test suite file. A Tour subclass
-# encapsulates a set of tests that can be done, and may contain helper
-# and support methods for a given task. If you have a two or three
-# paths through a specific area of your website, define a tour for
-# that area and create test_ methods for each type of test to be done.
-
-Webrat.configure do |config|
-  config.mode = :mechanize
-end
-
-class Tour
-  extend Forwardable
-  include Webrat::Methods
-  include Webrat::Matchers
-  include Webrat::SaveAndOpenPage
-  include Test::Unit::Assertions
-  
-  attr_reader :host, :tours, :number, :tour_type, :tour_id
-  
-  def initialize(host, tours, number, tour_id)
-    @host, @tours, @number, @tour_id = host, tours, number, tour_id
-    @tour_type = self.send(:class).to_s
-  end
- 
-  # before_tour runs once per tour, before any tests get run
-  def before_tour; end
-  
-  # after_tour runs once per tour, after all the tests have run
-  def after_tour; end
-  
-  def setup
-  end
-  
-  def teardown
-  end
-  
-  def wait(time)
-    sleep time.to_i
-  end
-  
-  # Lists tours 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.
-  def self.tours(filter=[])
-    filter = [filter].flatten
-    # All files in tours folder, stripped to basename, that match any item in filter
-    # I do loves me a long chain. This returns an array containing
-    # 1. All *.rb files in tour folder (recursive)
-    # 2. Each filename stripped to its basename
-    # 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 Tour
-    Dir[File.join('.', 'tours', '**', '*.rb')].map {|fn| File.basename(fn, ".rb")}.select {|fn| filter.size.zero? || filter.any?{|f| fn =~ /#{f}/}}.select {|tour| Tour.tour? tour }
-  end 
-  
-  def self.tests(tour_name)
-    Tour.make_tour(tour_name).tests
-  end
-  
-  def self.tour?(tour_name)
-    Object.const_defined?(tour_name.classify) && tour_name.classify.constantize.ancestors.include?(Tour)
-  end
-  
-  # Factory method, creates the named child class instance
-  def self.make_tour(tour_name,host="http://localhost:3000",tours=[],number=1,tour_id=nil)
-    tour_name.classify.constantize.new(host,tours,number,tour_id)
-  end
-  
-  # Returns list of tests in this tour. (Meant to be run on a subclass
-  # instance; returns the list of tests available).
-  def tests
-    methods.grep(/^test_/).map {|m| m.sub(/^test_/,'')}
-  end
-  
-  def run_test(test_name)
-    @test = "test_#{test_name}"
-    raise TourBusException.new("run_test couldn't run test '#{test_name}' because this tour did not respond to :#{@test}") unless respond_to? @test
-    setup
-    send @test
-    teardown
-  end
-  
-  protected
-  
-  def session
-    @session ||= Webrat::MechanizeSession.new
-  end
-  
-  def log(message)
-    puts "#{Time.now.strftime('%F %H:%M:%S')} Tour ##{@tour_id}: (#{@test}) #{message}"
-  end
-  
-end
-