Skip to content

Commit

Permalink
Upgrading app to use Ruby 1.9.3. Fixes issue with Rakefile. Updates t…
Browse files Browse the repository at this point in the history
…herubyracer gem version
  • Loading branch information
simaob committed Feb 26, 2015
1 parent f610f3d commit fe238a6
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 41 deletions.
1 change: 1 addition & 0 deletions .ruby-version
@@ -0,0 +1 @@
1.9.3-p551
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,7 +1,7 @@
source 'http://rubygems.org'

gem 'bundler'
gem 'rails', '~> 3.2.2'
gem 'rails', '~> 3.2.21'
gem 'pg', '0.13.2'

gem 'awesome_print', :require => 'ap'
Expand All @@ -23,7 +23,7 @@ gem "typhoeus", "0.6.7"
group :assets do
gem 'sass-rails', "~> 3.2.6"
gem 'uglifier', "~> 1.3.0"
gem 'therubyracer', "~> 0.9.10"
gem 'therubyracer', "~> 0.12.1"
gem 'compass-rails', "~> 1.0.3"
gem 'chunky_png', "~> 1.2.9"
gem 'oily_png', "~> 1.1.0"
Expand Down
78 changes: 40 additions & 38 deletions Gemfile.lock
Expand Up @@ -2,31 +2,31 @@ GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.9)
actionmailer (3.2.16)
actionpack (= 3.2.16)
actionmailer (3.2.21)
actionpack (= 3.2.21)
mail (~> 2.5.4)
actionpack (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
actionpack (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
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.16)
activesupport (= 3.2.16)
activemodel (3.2.21)
activesupport (= 3.2.21)
builder (~> 3.0.0)
activerecord (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
activerecord (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
activesupport (3.2.16)
activeresource (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
activesupport (3.2.21)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
Expand Down Expand Up @@ -90,12 +90,12 @@ GEM
multi_json (~> 1.8.2)
hike (1.2.3)
htmlentities (4.3.1)
i18n (0.6.9)
i18n (0.7.0)
journey (1.0.4)
json (1.8.1)
json (1.8.2)
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.3.10.4)
libv8 (3.16.14.7)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand All @@ -115,36 +115,37 @@ GEM
biodiversity (~> 3.1)
redis (~> 3.0)
pg (0.13.2)
polyglot (0.3.3)
polyglot (0.3.5)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.16)
actionmailer (= 3.2.16)
actionpack (= 3.2.16)
activerecord (= 3.2.16)
activeresource (= 3.2.16)
activesupport (= 3.2.16)
rails (3.2.21)
actionmailer (= 3.2.21)
actionpack (= 3.2.21)
activerecord (= 3.2.21)
activeresource (= 3.2.21)
activesupport (= 3.2.21)
bundler (~> 1.0)
railties (= 3.2.16)
railties (= 3.2.21)
rails_legacy_mapper (1.1.0)
actionpack (~> 3.1)
railties (3.2.16)
actionpack (= 3.2.16)
activesupport (= 3.2.16)
railties (3.2.21)
actionpack (= 3.2.21)
activesupport (= 3.2.21)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.1)
rake (10.4.2)
rchardet19 (1.3.5)
rdoc (3.12.2)
json (~> 1.4)
redis (3.0.7)
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec-core (2.14.7)
Expand All @@ -165,7 +166,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -176,17 +177,18 @@ GEM
term-ansicolor
term-ansicolor (1.2.2)
tins (~> 0.8)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
thor (0.18.1)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
tilt (1.4.1)
tins (0.13.2)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
typhoeus (0.6.7)
ethon (~> 0.6.2)
tzinfo (0.3.38)
tzinfo (0.3.43)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -216,11 +218,11 @@ DEPENDENCIES
oily_png (~> 1.1.0)
parsley-store (~> 0.3.2)
pg (= 0.13.2)
rails (~> 3.2.2)
rails (~> 3.2.21)
rails_legacy_mapper
rchardet19
rspec-rails
sass-rails (~> 3.2.6)
therubyracer (~> 0.9.10)
therubyracer (~> 0.12.1)
typhoeus (= 0.6.7)
uglifier (~> 1.3.0)
12 changes: 11 additions & 1 deletion Rakefile
Expand Up @@ -4,4 +4,14 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'

Rails::Application.load_tasks
module ::GeocatApp
class Application
include Rake::DSL
end
end

module ::RakeFileUtils
extend Rake::FileUtilsExt
end

GeocatApp::Application.load_tasks

0 comments on commit fe238a6

Please sign in to comment.