started rails3 upgrade

trustthevote · Apr 15, 2013 · 797de87 · 797de87
1 parent 72f2167
commit 797de87
Show file tree

Hide file tree

Showing 65 changed files with 3,349 additions and 1,040 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,23 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+
+
 .DS_Store
 .idea
-.rvmrc
+.rvmrc*
 .vimrc
 config/mobile.yml
 config/states_with_online_registration.yml
@@ -22,4 +39,5 @@ public/pdf/*
 public/system/*
 reg_colorado.yml
 db/*.sqlite3
-rocky_test
+rocky_test
+*.rails2
diff --git a/Gemfile b/Gemfile
@@ -1,11 +1,15 @@
-source 'http://gems.github.com'
-source 'http://gems.rubyforge.org'
-
-gem "rake", "0.8.7"
-gem "rails", "= 2.3.3"
-gem "aasm", "= 2.0.5"
-gem "authlogic", "= 2.1.1"
-gem "fastercsv", "= 1.5.0"
+source 'http://rubygems.org'
+
+
+gem "rake", "10.0.3"
+
+
+gem "rails", "= 3.2.13"
+gem "aasm", "= 3.0.16"
+
+
+gem "authlogic", "= 3.3.0"
+#gem "fastercsv", "= 1.5.0"
 gem "daemons", "= 1.0.10"
 gem "paperclip", "= 2.3.1.1"
 gem "mysql"
@@ -16,25 +20,24 @@ group :development, :test do
   gem "rspec", "= 1.2.7"
   gem "rr", "= 0.10.11"
   gem "rspec-rails", "= 1.2.7"
-  gem "thoughtbot-factory_girl", "= 1.2.1"
-  #gem "pivotal-webrat", "= 0.4.4"
+  #gem "thoughtbot-factory_girl", "= 1.2.1"
+  gem "factory_girl_rails" #, :require=>false
   gem "webrat", "= 0.4.4"
-  #gem "pivotal-webrat-rspec-rails", "= 0.4.4"
   gem "cucumber", "= 0.3.11"
   gem "treetop", "= 1.4.10"
   gem "selenium-client", "= 1.2.16"
   gem "capistrano", "= 2.11.2"
   # Pito:
   gem "hpricot", "0.8.6"
-  gem "mongrel", "= 1.1.5"
 	gem "sqlite3"
 end
 
 gem "nokogiri", "= 1.3.2"
 gem "mechanize", "= 1.0.0"
-gem "newrelic_rpm", "= 2.11.1"
+gem "newrelic_rpm", "= 3.6.0.83"
 gem "hoptoad_notifier", "= 2.2.2"
 gem "ledermann-rails-settings", :require => "rails-settings"
 
 gem 'json'
 
+gem "delayed_job_active_record"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,118 +1,169 @@
 GEM
-  remote: http://gems.github.com/
-  remote: http://gems.rubyforge.org/
+  remote: http://rubygems.org/
   specs:
-    aasm (2.0.5)
-    actionmailer (2.3.3)
-      actionpack (= 2.3.3)
-    actionpack (2.3.3)
-      activesupport (= 2.3.3)
-      rack (~> 1.0.0)
-    activerecord (2.3.3)
-      activesupport (= 2.3.3)
-    activeresource (2.3.3)
-      activesupport (= 2.3.3)
-    activesupport (2.3.3)
-    authlogic (2.1.1)
-      activesupport
-    builder (3.1.4)
+    aasm (3.0.16)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    authlogic (3.3.0)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+    builder (3.0.4)
     capistrano (2.11.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    cgi_multipart_eof_fix (2.5.0)
     cucumber (0.3.11)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       polyglot (>= 0.2.5)
       term-ansicolor (>= 1.0.3)
       treetop (>= 1.2.5)
     daemons (1.0.10)
-    diff-lcs (1.2.0)
-    fastercsv (1.5.0)
-    fastthread (1.0.7)
-    gem_plugin (0.2.3)
-    highline (1.6.15)
+    delayed_job (3.0.5)
+      activesupport (~> 3.0)
+    delayed_job_active_record (0.4.4)
+      activerecord (>= 2.1.0, < 4)
+      delayed_job (~> 3.0)
+    diff-lcs (1.2.3)
+    erubis (2.7.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+    highline (1.6.16)
+    hike (1.2.2)
     hoptoad_notifier (2.2.2)
       activesupport
     hpricot (0.8.6)
-    json (1.7.6)
-    ledermann-rails-settings (1.2.0)
-      activerecord (>= 2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.7)
+    ledermann-rails-settings (2.0.2)
+      activerecord (~> 3.1)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mechanize (1.0.0)
       nokogiri (>= 1.2.1)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
-    mysql (2.9.0)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.3)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    newrelic_rpm (2.11.1)
+    mime-types (1.22)
+    multi_json (1.7.2)
+    mysql (2.9.1)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    newrelic_rpm (3.6.0.83)
     nokogiri (1.3.2)
     paperclip (2.3.1.1)
     polyglot (0.3.3)
-    rack (1.0.1)
-    rails (2.3.3)
-      actionmailer (= 2.3.3)
-      actionpack (= 2.3.3)
-      activerecord (= 2.3.3)
-      activeresource (= 2.3.3)
-      activesupport (= 2.3.3)
-      rake (>= 0.8.3)
-    rake (0.8.7)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
     rr (0.10.11)
     rspec (1.2.7)
     rspec-rails (1.2.7)
       rack (>= 0.4.0)
       rspec (>= 1.2.7)
     rubyzip (0.9.9)
     selenium-client (1.2.16)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    term-ansicolor (1.0.7)
-    thoughtbot-factory_girl (1.2.1)
+    term-ansicolor (1.1.4)
+    thor (0.18.1)
+    tilt (1.3.7)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
     webrat (0.4.4)
       nokogiri (>= 1.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aasm (= 2.0.5)
-  authlogic (= 2.1.1)
+  aasm (= 3.0.16)
+  authlogic (= 3.3.0)
   capistrano (= 2.11.2)
   cucumber (= 0.3.11)
   daemons (= 1.0.10)
-  fastercsv (= 1.5.0)
+  delayed_job_active_record
+  factory_girl_rails
   hoptoad_notifier (= 2.2.2)
   hpricot (= 0.8.6)
   json
   ledermann-rails-settings
   mechanize (= 1.0.0)
-  mongrel (= 1.1.5)
   mysql
-  newrelic_rpm (= 2.11.1)
+  newrelic_rpm (= 3.6.0.83)
   nokogiri (= 1.3.2)
   paperclip (= 2.3.1.1)
-  rails (= 2.3.3)
-  rake (= 0.8.7)
+  rails (= 3.2.13)
+  rake (= 10.0.3)
   rr (= 0.10.11)
   rspec (= 1.2.7)
   rspec-rails (= 1.2.7)
   rubyzip
   selenium-client (= 1.2.16)
   sqlite3
-  thoughtbot-factory_girl (= 1.2.1)
   treetop (= 1.4.10)
   webrat (= 0.4.4)