Permalink
Browse files

update rails to 3.2.0rc2, add default rake task

  • Loading branch information...
1 parent 1a99501 commit c9391c927aaf69481ef5c80531014ef4d2c77087 @nashby nashby committed Jan 19, 2012
Showing with 59 additions and 51 deletions.
  1. +3 −1 Gemfile
  2. +50 −50 Gemfile.lock
  3. +6 −0 Rakefile
View
@@ -1,6 +1,8 @@
source 'http://rubygems.org'
-gem 'rails'
+gem 'rails', '3.2.0.rc2'
+
+gem 'rack', :git => 'https://github.com/rack/rack.git'
gem 'thin'
View
@@ -11,42 +11,45 @@ GIT
specs:
gravtastic (2.1.3)
+GIT
+ remote: https://github.com/rack/rack.git
+ revision: 247331ef1437267cdabc11d4d756a55d253b4eb7
+ specs:
+ rack (1.4.0)
+
GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.8)
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.2.0.rc2)
+ actionpack (= 3.2.0.rc2)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.2.0.rc2)
+ activemodel (= 3.2.0.rc2)
+ activesupport (= 3.2.0.rc2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
- rack-mount (~> 0.8.2)
+ journey (~> 1.0.0.rc1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.1)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.0.rc2)
+ activesupport (= 3.2.0.rc2)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- arel (~> 2.2.1)
+ activerecord (3.2.0.rc2)
+ activemodel (= 3.2.0.rc2)
+ activesupport (= 3.2.0.rc2)
+ arel (~> 3.0.0.rc1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.2.0.rc2)
+ activemodel (= 3.2.0.rc2)
+ activesupport (= 3.2.0.rc2)
+ activesupport (3.2.0.rc2)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
- arel (2.2.1)
- bcrypt-ruby (3.0.1)
+ arel (3.0.0)
blankslate (2.1.2.4)
bson (1.5.2)
bson_ext (1.3.1)
@@ -95,7 +98,7 @@ GEM
nokogiri (~> 1.0)
pygments.rb (~> 0.1)
redcarpet (~> 1.17)
- haml (3.1.2)
+ haml (3.1.4)
hashie (1.2.0)
hashr (0.0.11)
hike (1.2.1)
@@ -105,10 +108,11 @@ GEM
httparty (0.2.2)
json (~> 1.1)
i18n (0.6.0)
+ journey (1.0.0)
jquery-rails (1.0.7)
railties (~> 3.0)
thor (~> 0.14)
- json (1.5.1)
+ json (1.6.5)
kramdown (0.13.3)
launchy (0.4.0)
configuration (>= 0.0.5)
@@ -145,32 +149,29 @@ GEM
omniauth-oauth2 (1.0.0)
oauth2 (~> 0.5.0)
omniauth (~> 1.0)
- polyglot (0.3.2)
+ polyglot (0.3.3)
pygments.rb (0.1.2)
rubypython (>= 0.5.1)
- rack (1.3.6)
- rack-cache (1.0.3)
+ rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rack-webconsole (0.1.2)
json
rack
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.2.0.rc2)
+ actionmailer (= 3.2.0.rc2)
+ actionpack (= 3.2.0.rc2)
+ activerecord (= 3.2.0.rc2)
+ activeresource (= 3.2.0.rc2)
+ activesupport (= 3.2.0.rc2)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.2.0.rc2)
+ railties (3.2.0.rc2)
+ actionpack (= 3.2.0.rc2)
+ activesupport (= 3.2.0.rc2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -200,21 +201,19 @@ GEM
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
rubyzip (0.9.5)
- sass (3.1.7)
- sass-rails (3.1.2)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (>= 3.1.4)
- sprockets (~> 2.0.0)
- tilt (~> 1.3.2)
+ sass (3.1.12)
+ sass-rails (3.2.3)
+ railties (~> 3.2.0.beta)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
selenium-webdriver (2.17.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
shoulda-matchers (1.0.0.beta3)
spork (0.9.0.rc7)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -270,8 +269,9 @@ DEPENDENCIES
mongoid_slug
omniauth
omniauth-github
+ rack!
rack-webconsole
- rails
+ rails (= 3.2.0.rc2)
rpm_contrib
rspec-rails
sass-rails
View
@@ -4,6 +4,7 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'
+require 'rspec/core/rake_task'
Codebrawl::Application.load_tasks
@@ -46,6 +47,11 @@ namespace :codebrawl do
end
end
+desc 'Run all specs in spec directory'
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+
def table(title, content)
output = line
output += content title

0 comments on commit c9391c9

Please sign in to comment.