***** Version 2.0 Work Begins HERE ****

- Renamed Tour -> Tourist
- Renamed test_ methods to tour_ methods
- Bumped gemfile version to 0.9.00

Author: David Brady

TODO

@@ -34,4 +34,6 @@ Tourbus 2.0 Todo
 - Make sure this plays well with latest JRuby
 
 
+runners -> tourist_names
+
 

bin/tourbus

@@ -18,29 +18,29 @@ 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
 
 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.tests(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
 

examples/contact_app/.gitignore

@@ -0,0 +1 @@
+webrat.log

examples/contact_app/tours/simple.rb

@@ -1,13 +1,13 @@
-class Simple < Tour
-  def test_home
+class Simple < Tourist
+  def tour_home
     visit "#{@host}/"
     assert_contain "If you click this"
 
     click_link "Enter Contact"
     assert_match /\/contacts/, current_url
   end
 
-  def test_contacts
+  def tour_contacts
     visit "/contacts"
 
     fill_in "first_name", :with => "Joe"

lib/common.rb

@@ -19,7 +19,7 @@
 require 'faker'
 require 'tour_bus'
 require 'runner'
-require 'tour'
+require 'tourist'
 
 class TourBusException < Exception; end
 

lib/runner.rb

@@ -5,36 +5,36 @@
 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 +53,18 @@ def run_tours
             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 +73,8 @@ def log(message)
     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
 

lib/tour.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,18 +38,18 @@ def runners(filter=[])
   end
 
   def total_runs
-    tours.size * concurrency * number    
+    tourists.size * concurrency * number    
   end
 
   def run
     threads = []
     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 @@ def run
         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 @@ def run
     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}"