clean up gemfile and remove vendored aruba gem

Gemfile

@@ -10,24 +10,17 @@ gem 'rails', '3.2.3'
 gem "sqlite3"
 gem "mysql2"
 
-gem "highline", "~>1.5.0"
+# gem "highline", "~>1.5.0"
 gem "RedCloth"
 gem "formatize"
-gem "sanitize", "~>1.2.1"
+gem "sanitize"
 gem "will_paginate"
-gem "acts_as_list", "~>0.1.4"
-gem "aasm", "~>2.2.0"
-gem 'htmlentities', '~> 4.3.0'
-gem "mail"
+gem "acts_as_list"
+gem "aasm"
+gem "htmlentities"
 gem "swf_fu"
 gem "rails_autolink"
 
-if RUBY_VERSION.to_f >= 1.9
-	gem "soap4r-ruby1.9"
-else
-	gem "soap4r", "~>1.5.8"
-end
-
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
@@ -72,13 +65,13 @@ group :test do
 #   gem "hpricot"
 #   gem "hoe"
 #   gem "rspec-rails", "~>1.3.3"
-# # TODO: gem "thoughtbot-factory_girl"
 #   gem 'memory_test_fix', '~>0.1.3'
-#   gem "capybara", ">=0.3.5"
-#   gem "selenium-webdriver" # Note that > 2.14 has problems: https://code.google.com/p/selenium/issues/detail?id=3075
-#   gem "database_cleaner", ">=0.5.0"
-#   gem "cucumber-rails", "~>0.3.2"
-#   gem "aruba", "0.2.2", :path => "vendor/gems/aruba-0.2.2"
+  gem "factory_girl_rails"
+  gem "capybara"
+  gem "selenium-webdriver" # Note that > 2.14 has problems: https://code.google.com/p/selenium/issues/detail?id=3075
+  gem "database_cleaner"
+  gem "cucumber-rails"
+  gem "aruba"
 
   # uncomment to use the webkit option. This depends on Qt to be installed
   #gem "capybara-webkit"

Gemfile.lock

@@ -2,7 +2,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    aasm (2.2.1)
+    aasm (3.0.5)
+      activerecord
     actionmailer (3.2.3)
       actionpack (= 3.2.3)
       mail (~> 2.4.4)
@@ -30,28 +31,62 @@ GEM
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    acts_as_list (0.1.5)
+    acts_as_list (0.1.6)
+    addressable (2.2.7)
     arel (3.0.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
     builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.2)
+      ffi (~> 1.0.6)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.3.1)
+    cucumber (1.1.9)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.9.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.3.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.8)
+      nokogiri (>= 1.5.0)
     daemons (1.0.10)
+    database_cleaner (0.7.2)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.3.1)
       multi_json (~> 1.0)
+    factory_girl (3.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (3.2.0)
+      factory_girl (~> 3.2.0)
+      railties (>= 3.0.0)
+    ffi (1.0.11)
     formatize (1.1.0)
       RedCloth (~> 4.2)
       actionpack (~> 3.0)
       bluecloth (~> 2.2)
     gem_plugin (0.2.3)
-    highline (1.5.2)
+    gherkin (2.9.3)
+      json (>= 1.4.6)
     hike (1.2.1)
     htmlentities (4.3.1)
     i18n (0.6.0)
@@ -60,6 +95,8 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.6.6)
+    libwebsocket (0.1.3)
+      addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -70,7 +107,7 @@ GEM
       gem_plugin (~> 0.2.3)
     multi_json (1.3.2)
     mysql2 (0.3.11)
-    nokogiri (1.4.7)
+    nokogiri (1.5.2)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -99,22 +136,37 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    sanitize (1.2.1)
-      nokogiri (~> 1.4.1)
-    sass (3.1.15)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rubyzip (0.9.8)
+    sanitize (2.0.3)
+      nokogiri (>= 1.4.4, < 1.6)
+    sass (3.1.16)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    soap4r-ruby1.9 (2.0.5)
-    sprockets (2.1.2)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    swf_fu (2.0.1)
+    swf_fu (2.0.2)
       coffee-script
-      rails (~> 3.1)
+      rails (>= 3.1)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -125,29 +177,34 @@ GEM
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     will_paginate (3.0.3)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
     yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
-  aasm (~> 2.2.0)
-  acts_as_list (~> 0.1.4)
+  aasm
+  acts_as_list
+  aruba
   bcrypt-ruby (~> 3.0.0)
+  capybara
   coffee-rails (~> 3.2.1)
+  cucumber-rails
+  database_cleaner
+  factory_girl_rails
   formatize
-  highline (~> 1.5.0)
-  htmlentities (~> 4.3.0)
+  htmlentities
   jquery-rails
-  mail
   mongrel (= 1.2.0.pre2)
   mysql2
   rails (= 3.2.3)
   rails_autolink
-  sanitize (~> 1.2.1)
+  sanitize
   sass-rails (~> 3.2.3)
-  soap4r-ruby1.9
+  selenium-webdriver
   sqlite3
   swf_fu
   uglifier (>= 1.0.3)