Merge remote branch 'lowellk/master'

README.rdoc

@@ -45,15 +45,15 @@ 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"
         end
       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

build.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-sudo gem uninstall tourbus 
+gem uninstall tourbus
 gem build tourbus.gemspec
-sudo gem install $(ls tourbus*.gem|tail -n 1)
+gem install $(ls tourbus*.gem|tail -n 1)

lib/common.rb

@@ -13,7 +13,11 @@
 
 # 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'