Skip to content

Commit

Permalink
Upgrade to use Ruby 2.0 & Rails 4.0
Browse files Browse the repository at this point in the history
Have converted just enough of the sources that the console loads. I've
renamed the original config files to xxx.rails2 for future reference.
  • Loading branch information
nathanstitt committed Jul 16, 2013
1 parent 3a5d428 commit 4b76e17
Show file tree
Hide file tree
Showing 57 changed files with 2,797 additions and 590 deletions.
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.0
60 changes: 30 additions & 30 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
source 'https://rubygems.org'

gem 'rails', '~>2.3.18'
gem 'rake'

gem 'json', '>= 1.7.7'
gem 'nokogiri', '1.5.5' # only pegged because nokogiri 1.5.9 installation fucking up on OSX
gem 'curb'
gem 'calais', '>= 0.0.11'
gem 'rest-client', '>= 1.0.3', :require => 'rest_client'
gem 'bcrypt-ruby', '>= 2.1.2', :require => 'bcrypt'
gem 'rubyzip', '>= 0.9.1', :require => 'zip/zip'
gem 'right_aws', '>= 2.0.1' # Our patched version.
gem 'aws-sdk', '>= 1.7.1'
gem 'pg', '>= 0.11.0'
gem 'jammit'
gem 'iconv'
gem 'rails', '~>4.0'
gem 'curb', '~>0.8.4'
gem 'calais', '~> 0.0.13'
gem 'rest-client', '~> 1.6.7'
gem 'bcrypt-ruby', '~> 3.1.1'
gem 'rubyzip', '~> 0.9.9'
gem 'aws-sdk', '~> 1.11.1'
gem 'pg', '~> 0.15.1'
gem 'closure-compiler'
gem 'docsplit', '>= 0.6.4'
gem 'sunspot_rails', '>= 1.3.3'
# running a pre-release to fix rake sunspot:solr:stop task bug
# https://github.com/sunspot/sunspot/pull/221
gem 'sunspot_solr', '>= 2.0.0.pre.120925'
gem 'rdiscount', '>= 1.6.5'
gem 'fastercsv', '>= 1.5.3'

gem 'omniauth', '>= 1.0'
gem 'omniauth-twitter', '>= 0.0.13'
gem 'omniauth-facebook', '>= 1.4.0'
gem 'omniauth-google-oauth2', '>= 0.1.13'
gem 'sanitize'
gem 'docsplit', '>= 0.6.4'
gem 'sunspot_rails', '~> 2.0'
gem 'cloud-crowd', '~> 0.3.3'
gem 'sqlite3', '~> 1.3.7'

gem 'omniauth', '~> 1.1.4'
gem 'omniauth-twitter', '~> 1.0'
gem 'omniauth-facebook', '~> 1.4.1'
gem 'omniauth-google-oauth2', '~> 0.2.0'
gem 'sanitize', '~> 2.0.6'
gem 'sunspot_solr', '~> 2.0.0'
gem 'rdiscount', '~> 2.1.6'

gem 'right_http_connection'
gem 'rake'
gem 'jammit', '0.6.6', :git=>'https://github.com/documentcloud/jammit.git'
gem 'nokogiri', '1.5.6' # only pegged because nokogiri 1.5.9 installation fucking up on OSX
gem 'right_aws', '2.0.1', :git=>'https://github.com/documentcloud/right_aws.git' # Our patched version.

gem 'cloud-crowd'
gem 'sqlite3'
group :test do
gem 'minitest-spec-rails'
end
217 changes: 144 additions & 73 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,138 +1,209 @@
GIT
remote: https://github.com/documentcloud/jammit.git
revision: 332eebc9bd4507b1ed94816acaa0740fbe2a9b36
specs:
jammit (0.6.6)
cssmin (>= 1.0.3)
jsmin (>= 1.0.1)

GIT
remote: https://github.com/documentcloud/right_aws.git
revision: 57beab61fac4a621614b67f2014ec879bac25890
specs:
right_aws (2.0.1)

GEM
remote: https://rubygems.org/
specs:
actionmailer (2.3.18)
actionpack (= 2.3.18)
actionpack (2.3.18)
activesupport (= 2.3.18)
rack (~> 1.1.0)
activerecord (2.3.18)
activesupport (= 2.3.18)
activeresource (2.3.18)
activesupport (= 2.3.18)
activesupport (2.3.18)
aws-sdk (1.11.0)
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.10)
aws-sdk (1.11.3)
json (~> 1.4)
nokogiri (>= 1.4.4)
nokogiri (< 1.6.0)
uuidtools (~> 2.1)
bcrypt-ruby (3.0.1)
builder (3.2.1)
bcrypt-ruby (3.1.1)
builder (3.1.4)
calais (0.0.13)
json (>= 1.1.3)
nokogiri (>= 1.3.3)
closure-compiler (1.1.10)
cloud-crowd (0.6.2)
activerecord (~> 2.3)
cloud-crowd (0.3.3)
activerecord (>= 2.3.3)
json (>= 1.1.7)
rest-client (>= 1.4)
sinatra (~> 0.9)
rest-client (>= 1.0.3)
right_aws (>= 1.10.0)
sinatra (>= 0.9.4)
thin (>= 1.2.4)
cssmin (1.0.3)
curb (0.8.4)
daemons (1.1.9)
docsplit (0.7.2)
erubis (2.7.0)
eventmachine (1.0.3)
faraday (0.8.7)
multipart-post (~> 1.1)
fastercsv (1.5.5)
hashie (2.0.5)
hike (1.2.3)
httpauth (0.2.0)
jammit (0.6.6)
cssmin (>= 1.0.3)
jsmin (>= 1.0.1)
i18n (0.6.4)
iconv (1.0.3)
jsmin (1.0.1)
json (1.8.0)
jwt (0.1.8)
multi_json (>= 1.5)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
multi_json (1.7.4)
minitest (4.7.5)
minitest-rails (0.9.2)
minitest (~> 4.7)
rails (>= 3.0)
multi_json (1.7.7)
multipart-post (1.2.0)
nokogiri (1.5.5)
nokogiri (1.5.6)
oauth (0.4.7)
oauth2 (0.6.1)
faraday (~> 0.7)
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
multi_json (~> 1.3)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
omniauth-facebook (1.4.0)
omniauth-oauth2 (~> 1.0.2)
omniauth-google-oauth2 (0.1.17)
omniauth-facebook (1.4.1)
omniauth-oauth2 (~> 1.1.0)
omniauth-google-oauth2 (0.2.0)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.0.2)
oauth2 (~> 0.6.0)
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-twitter (0.0.16)
omniauth-twitter (1.0.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pg (0.15.1)
polyglot (0.3.3)
pr_geohash (1.0.0)
rack (1.1.6)
rails (2.3.18)
actionmailer (= 2.3.18)
actionpack (= 2.3.18)
activerecord (= 2.3.18)
activeresource (= 2.3.18)
activesupport (= 2.3.18)
rake (>= 0.8.3)
rake (10.0.4)
rack (1.5.2)
rack-protection (1.5.0)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rdiscount (2.1.6)
rest-client (1.6.7)
mime-types (>= 1.16)
right_aws (3.0.5)
right_http_connection (>= 1.2.5)
right_http_connection (1.3.0)
right_http_connection (1.4.0)
rsolr (1.0.9)
builder (>= 2.1.2)
rubyzip (0.9.9)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sinatra (0.9.6)
rack (>= 0.9.1)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
sinatra (1.4.3)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sprockets (2.10.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
sunspot (2.0.0)
pr_geohash (~> 1.0)
rsolr (~> 1.0.7)
sunspot_rails (2.0.0)
nokogiri
sunspot (= 2.0.0)
sunspot_solr (2.0.0.pre.130115)
sunspot_solr (2.0.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.0)
atomic
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
uuidtools (2.1.4)

PLATFORMS
ruby

DEPENDENCIES
aws-sdk (>= 1.7.1)
bcrypt-ruby (>= 2.1.2)
calais (>= 0.0.11)
aws-sdk (~> 1.11.1)
bcrypt-ruby (~> 3.1.1)
calais (~> 0.0.13)
closure-compiler
cloud-crowd
curb
cloud-crowd (~> 0.3.3)
curb (~> 0.8.4)
docsplit (>= 0.6.4)
fastercsv (>= 1.5.3)
jammit
json (>= 1.7.7)
nokogiri (= 1.5.5)
omniauth (>= 1.0)
omniauth-facebook (>= 1.4.0)
omniauth-google-oauth2 (>= 0.1.13)
omniauth-twitter (>= 0.0.13)
pg (>= 0.11.0)
rails (~> 2.3.18)
iconv
jammit (= 0.6.6)!
minitest-rails
nokogiri (= 1.5.6)
omniauth (~> 1.1.4)
omniauth-facebook (~> 1.4.1)
omniauth-google-oauth2 (~> 0.2.0)
omniauth-twitter (~> 1.0)
pg (~> 0.15.1)
rails (~> 4.0)
rake
rdiscount (>= 1.6.5)
rest-client (>= 1.0.3)
right_aws (>= 2.0.1)
rubyzip (>= 0.9.1)
sanitize
sqlite3
sunspot_rails (>= 1.3.3)
sunspot_solr (>= 2.0.0.pre.120925)
rdiscount (~> 2.1.6)
rest-client (~> 1.6.7)
right_aws (= 2.0.1)!
right_http_connection
rubyzip (~> 0.9.9)
sanitize (~> 2.0.6)
sqlite3 (~> 1.3.7)
sunspot_rails (~> 2.0)
sunspot_solr (~> 2.0.0)
8 changes: 2 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require(File.join(File.dirname(__FILE__), 'config', 'boot'))
require File.expand_path('../config/application', __FILE__)

require 'rake'
require 'rake/testtask'
#require 'rdoc/task'

require 'tasks/rails'
DC::Application.load_tasks
Empty file added app/assets/images/.keep
Empty file.
16 changes: 16 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .
13 changes: 13 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_tree .
*/
Loading

0 comments on commit 4b76e17

Please sign in to comment.