Permalink
Browse files

Update to Ruby 1.9.2 and rvm

  • Loading branch information...
1 parent 8cc53fd commit 0be15979d5acc2cf08cf5cf22c7ee4d8db696ff5 @luigi luigi committed Jan 29, 2012
Showing with 16 additions and 31 deletions.
  1. +1 −0 .rvmrc
  2. +4 −4 Gemfile
  3. +10 −26 Gemfile.lock
  4. +1 −1 config/deploy.rb
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm 1.9.2
View
@@ -5,7 +5,7 @@ gem 'rails', '~> 3.0'
gem "fastercsv"
gem "json"
gem "bson_ext"
-gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
+gem "mongoid"
gem "twitter", "~> 0.9.0"
gem "httparty"
gem "hashie", "~> 0.4.0"
@@ -20,11 +20,11 @@ gem "thin"
gem "http_router"
group :test, :development do
- gem "rspec-rails", "~> 2.5"
- gem "steak", "~> 1.0"
+ gem "rspec-rails"
+ gem "steak"
gem "autotest"
gem "capybara"
gem "rr"
- gem "mongoid-rspec", :git => 'git://github.com/jyn/mongoid-rspec.git'
+ #gem "mongoid-rspec", :git => 'git://github.com/jyn/mongoid-rspec.git'
gem "database_cleaner", "~> 0.6"
end
View
@@ -1,12 +1,4 @@
GIT
- remote: git://github.com/jyn/mongoid-rspec.git
- revision: 675faf571706bda7ae701aeebb515f110e8ad100
- specs:
- mongoid-rspec (1.3.3)
- mongoid (= 2.0.0.rc.7)
- rspec (~> 2)
-
-GIT
remote: git://github.com/lifo/cramp.git
revision: 415d4b0f66fa8375ecb444aeac9524d3cad07273
specs:
@@ -15,16 +7,6 @@ GIT
eventmachine (~> 0.12.10)
rack (~> 1.2.1)
-GIT
- remote: git://github.com/mongoid/mongoid.git
- revision: 888b9aecbffba8a8cee2af056aa38eb109db989b
- specs:
- mongoid (2.0.0.rc.7)
- activemodel (~> 3.0)
- mongo (~> 1.2)
- tzinfo (~> 0.3.22)
- will_paginate (~> 3.0.pre)
-
GEM
remote: http://rubygems.org/
specs:
@@ -59,7 +41,7 @@ GEM
arel (2.0.9)
autotest (4.4.6)
ZenTest (>= 4.4.1)
- bson (1.2.4)
+ bson (1.5.2)
bson_ext (1.2.4)
builder (2.1.2)
capybara (0.4.1.2)
@@ -101,8 +83,12 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mongo (1.2.4)
- bson (>= 1.2.4)
+ mongo (1.5.2)
+ bson (= 1.5.2)
+ mongoid (2.2.5)
+ activemodel (~> 3.0)
+ mongo (~> 1.3)
+ tzinfo (~> 0.3.22)
monster_mash (0.2.3)
typhoeus (>= 0.2.4)
typhoeus (>= 0.2.4)
@@ -176,7 +162,6 @@ GEM
user-agent (1.0.0)
usher (0.8.3)
fuzzyhash (>= 0.0.11)
- will_paginate (3.0.pre2)
xpath (0.1.3)
nokogiri (~> 1.3)
@@ -194,15 +179,14 @@ DEPENDENCIES
http_router
httparty
json
- mongoid!
- mongoid-rspec!
+ mongoid
monster_mash (~> 0.2.0)
rack-openid
rails (~> 3.0)
rr
- rspec-rails (~> 2.5)
+ rspec-rails
ruby-openid
- steak (~> 1.0)
+ steak
thin
twitter (~> 0.9.0)
user-agent
View
@@ -5,7 +5,7 @@
set :deploy_to, "/projects/streamcongress/www"
if environment == 'production'
- set :domain, "streamcongress.com"
+ set :domain, "ec2-107-20-76-29.compute-1.amazonaws.com"
else
set :domain, "staging.streamcongress.com"
end

0 comments on commit 0be1597

Please sign in to comment.