Upgrade to rails 3

* Update all gems / remove vendored hoptoad_notifier * Remove rspec integration tests in preparation for replacement with cucumber. * Regenerate rails and rspec
veezus · May 8, 2011 · f3a225f · f3a225f
1 parent 3c90b6e
commit f3a225f
Show file tree

Hide file tree

Showing 105 changed files with 4,349 additions and 6,737 deletions.
diff --git a/.rspec b/.rspec
@@ -0,0 +1 @@
+--colour
diff --git a/Gemfile b/Gemfile
@@ -1,32 +1,31 @@
 source :gemcutter
 
 gem "mysql"
-gem "rails", "2.3.5"
+gem "rails", "3.0.7"
 
-gem "authlogic", "2.1.5"
-gem "decent_exposure", "0.2.3"
-gem "haml", "3.0.6"
-gem "newrelic_rpm", "2.9.8"
-gem "paperclip", "2.3.3"
-gem "resque", "1.9.7"
-gem "sitemap_generator", "0.2.2", :require => false
-gem "state_machine", "0.9.3"
-gem "twitter", "0.9.12"
+gem "authlogic", "3.0.2"
+gem "decent_exposure", "1.0.1"
+gem "haml", "3.1.1"
+gem "hoptoad_notifier", "2.4.9"
+gem "newrelic_rpm", "2.14.1"
+gem "paperclip", "2.3.11"
+gem "resque", "1.15.0"
+gem "sitemap_generator", "1.5.2", :require => false
+gem "state_machine", "0.10.4"
+gem "twitter", "1.4.1"
 
 group :development do
-  gem "capistrano", "2.5.19"
-  gem "eycap", "0.5.9"
+  gem "capistrano", "2.6.0"
+  gem "eycap", "0.5.17"
   gem "launchy"
   gem "ruby-debug19"
 end
 
 group :test do
-  gem "akephalos", "0.2.2"
-  gem "capybara", "0.3.8"
+  gem "akephalos", "0.2.5"
+  gem "capybara", "0.4.1.2"
   gem "fabrication", "0.9.5"
-  gem "rspec-rails", "1.3.2"
-  gem "shoulda", "2.10.3"
-  gem "test-unit", "1.2.3"
-  gem "unencumbered"
-  gem "watchr"
+  gem "rspec-rails", "2.5.0"
+  gem "shoulda", "2.11.3"
+  gem "unencumbered", "0.2.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,101 +1,162 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.5)
-      actionpack (= 2.3.5)
-    actionpack (2.3.5)
-      activesupport (= 2.3.5)
-      rack (~> 1.0.0)
-    activerecord (2.3.5)
-      activesupport (= 2.3.5)
-    activeresource (2.3.5)
-      activesupport (= 2.3.5)
-    activesupport (2.3.5)
-    akephalos (0.2.2)
-      capybara (~> 0.3.8)
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    addressable (2.2.5)
+    akephalos (0.2.5)
+      capybara (~> 0.4.0)
       jruby-jars
     archive-tar-minitar (0.5.2)
-    authlogic (2.1.5)
-      activesupport
-    capistrano (2.5.19)
+    arel (2.0.9)
+    authlogic (3.0.2)
+      activerecord (~> 3.0.7)
+      activerecord (~> 3.0.7)
+    builder (2.1.2)
+    capistrano (2.6.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.0.0)
-    capybara (0.3.8)
+      net-ssh-gateway (>= 1.1.0)
+    capybara (0.4.1.2)
+      celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
-      rack-test (>= 0.5.2)
-      selenium-webdriver (>= 0.0.3)
-    childprocess (0.1.4)
-      ffi (~> 0.6.3)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+    celerity (0.8.9)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
     columnize (0.3.2)
     configuration (1.2.0)
-    crack (0.1.8)
-    culerity (0.2.12)
-    decent_exposure (0.2.3)
-    eycap (0.5.9)
+    culerity (0.2.15)
+    decent_exposure (1.0.1)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    eycap (0.5.17)
       capistrano (>= 2.2.0)
+      hoe (>= 1.5.1)
     fabrication (0.9.5)
-    ffi (0.6.3)
+    faraday (0.6.1)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    faraday_middleware (0.6.3)
+      faraday (~> 0.6.0)
+    ffi (1.0.7)
       rake (>= 0.8.7)
-    haml (3.0.6)
-    hashie (0.4.0)
+    haml (3.1.1)
+    hashie (1.0.0)
     highline (1.6.1)
     hoe (2.9.4)
       rake (>= 0.8.7)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    jruby-jars (1.5.5)
+    hoptoad_notifier (2.4.9)
+      activesupport
+      builder
+    i18n (0.5.0)
+    jruby-jars (1.6.1)
     json (1.4.6)
-    json_pure (1.4.6)
-    launchy (0.3.7)
+    json_pure (1.5.1)
+    launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (0.0.5)
+    multi_json (1.0.1)
+    multi_xml (0.2.2)
+    multipart-post (1.1.0)
     mysql (2.8.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.0)
-    net-ssh-gateway (1.0.1)
+    net-ssh (2.1.4)
+    net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    newrelic_rpm (2.9.8)
+    newrelic_rpm (2.14.1)
     nokogiri (1.4.4)
-    oauth (0.4.4)
-    paperclip (2.3.3)
-      activerecord
-      activesupport
-    rack (1.0.1)
-    rack-test (0.5.6)
+    paperclip (2.3.11)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (2.3.5)
-      actionmailer (= 2.3.5)
-      actionpack (= 2.3.5)
-      activerecord (= 2.3.5)
-      activeresource (= 2.3.5)
-      activesupport (= 2.3.5)
-      rake (>= 0.8.3)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    redis (2.1.1)
-    redis-namespace (0.7.0)
+    rash (0.3.0)
+      hashie (~> 1.0.0)
+    redis (2.2.0)
+    redis-namespace (0.10.0)
       redis (< 3.0.0)
-    resque (1.9.7)
-      json (>= 1.1.0)
-      redis-namespace (~> 0.7.0)
+    resque (1.15.0)
+      json (~> 1.4.6)
+      redis-namespace (>= 0.10.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (1.3.1)
-    rspec-rails (1.3.2)
-      rack (>= 1.0.0)
-      rspec (>= 1.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -107,52 +168,61 @@ GEM
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.0)
-      childprocess (= 0.1.4)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.0)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
-    shoulda (2.10.3)
-    sinatra (1.0)
-      rack (>= 1.0)
-    sitemap_generator (0.2.2)
-    state_machine (0.9.3)
-    test-unit (1.2.3)
-      hoe (>= 1.5.1)
-    twitter (0.9.12)
-      hashie (~> 0.4.0)
-      httparty (~> 0.6.1)
-      multi_json (~> 0.0.4)
-      oauth (~> 0.4.3)
-    unencumbered (0.1.1)
+    shoulda (2.11.3)
+    simple_oauth (0.1.5)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    sitemap_generator (1.5.2)
+    state_machine (0.10.4)
+    thor (0.14.6)
+    tilt (1.3)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    twitter (1.4.1)
+      faraday (~> 0.6.1)
+      faraday_middleware (~> 0.6.3)
+      hashie (~> 1.0.0)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.2.0)
+      rash (~> 0.3.0)
+      simple_oauth (~> 0.1.4)
+    tzinfo (0.3.27)
+    unencumbered (0.2.0)
+      rspec (>= 2.0.0.beta.19)
     vegas (0.1.8)
       rack (>= 1.0.0)
-    watchr (0.7)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  akephalos (= 0.2.2)
-  authlogic (= 2.1.5)
-  capistrano (= 2.5.19)
-  capybara (= 0.3.8)
-  decent_exposure (= 0.2.3)
-  eycap (= 0.5.9)
+  akephalos (= 0.2.5)
+  authlogic (= 3.0.2)
+  capistrano (= 2.6.0)
+  capybara (= 0.4.1.2)
+  decent_exposure (= 1.0.1)
+  eycap (= 0.5.17)
   fabrication (= 0.9.5)
-  haml (= 3.0.6)
+  haml (= 3.1.1)
+  hoptoad_notifier (= 2.4.9)
   launchy
   mysql
-  newrelic_rpm (= 2.9.8)
-  paperclip (= 2.3.3)
-  rails (= 2.3.5)
-  resque (= 1.9.7)
-  rspec-rails (= 1.3.2)
+  newrelic_rpm (= 2.14.1)
+  paperclip (= 2.3.11)
+  rails (= 3.0.7)
+  resque (= 1.15.0)
+  rspec-rails (= 2.5.0)
   ruby-debug19
-  shoulda (= 2.10.3)
-  sitemap_generator (= 0.2.2)
-  state_machine (= 0.9.3)
-  test-unit (= 1.2.3)
-  twitter (= 0.9.12)
-  unencumbered
-  watchr
+  shoulda (= 2.11.3)
+  sitemap_generator (= 1.5.2)
+  state_machine (= 0.10.4)
+  twitter (= 1.4.1)
+  unencumbered (= 0.2.0)