Skip to content

Commit

Permalink
upgrade all gems
Browse files Browse the repository at this point in the history
  • Loading branch information
@flyerhzm
flyerhzm committed Feb 26, 2012
1 parent fbbe797 commit 41791fb
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 90 deletions.
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'rails', '3.2.1'
gem 'mysql2'
gem 'rails_best_practices', :git => "git://github.com/railsbp/rails_best_practices.git"
gem 'haml'
gem 'simple_form', :git => "git://github.com/plataformatec/simple_form.git"
gem 'simple_form'
gem 'omniauth'
gem 'omniauth-github'
gem 'devise'
Expand All @@ -31,9 +31,9 @@ gem 'css_sprite'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end

gem 'jquery-rails'
Expand Down Expand Up @@ -69,7 +69,7 @@ group :develop do
end

group :test do
gem 'spork', '0.9.0.rc9'
gem 'spork', '1.0.0.rc2'
gem 'mocha'
gem 'rspec'
gem 'rspec-rails'
Expand Down
167 changes: 82 additions & 85 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
GIT
remote: git://github.com/ctran/annotate_models.git
revision: 032565653b98e0790ddd8a070579566eb60a850c
revision: a43c08f0eb4d69a48c6830630ebb60e35ccb2d2d
specs:
annotate (2.4.1.beta1)

GIT
remote: git://github.com/plataformatec/simple_form.git
revision: 2296d25ce36d41f31b72638d9f0fdb92ffc3d513
specs:
simple_form (2.0.0.dev)
actionpack (~> 3.0)
activemodel (~> 3.0)

GIT
remote: git://github.com/railsbp/rails_best_practices.git
revision: d16382b4c84f06c86f69c00ed04d94cd0477abce
Expand Down Expand Up @@ -44,7 +36,7 @@ GIT
GEM
remote: http://rubygems.org/
specs:
aasm (3.0.0)
aasm (3.0.3)
activerecord
actionmailer (3.2.1)
actionpack (= 3.2.1)
Expand Down Expand Up @@ -73,14 +65,14 @@ GEM
activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
addressable (2.2.7)
arel (3.0.2)
bbenezech-nested_form (0.0.5)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.1)
builder (3.0.0)
cancan (1.6.7)
capistrano (2.9.0)
capistrano (2.11.2)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
Expand All @@ -89,7 +81,7 @@ GEM
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
capistrano_colors (0.5.5)
capybara (1.1.1)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
Expand All @@ -99,7 +91,7 @@ GEM
cells (3.8.2)
actionpack (~> 3.0)
railties (~> 3.0)
childprocess (0.2.2)
childprocess (0.3.1)
ffi (~> 1.0.6)
ckeditor (3.6.3)
mime-types (~> 1.16)
Expand All @@ -117,28 +109,27 @@ GEM
mocha
rmagick
rspec
cucumber (1.1.0)
cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.5.0)
gherkin (~> 2.9.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (1.1.1)
capybara (>= 1.1.1)
cucumber (>= 1.1.0)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
daemons (1.1.4)
database_cleaner (0.6.7)
delayed_job (2.1.4)
daemons (1.1.8)
database_cleaner (0.7.1)
delayed_job (3.0.1)
activesupport (~> 3.0)
daemons
devise (2.0.0)
devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
railties (~> 3.1)
warden (~> 1.1)
warden (~> 1.1.1)
diff-lcs (1.1.3)
em-websocket (0.3.5)
em-websocket (0.3.6)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
email_spec (1.2.1)
Expand All @@ -150,49 +141,51 @@ GEM
actionmailer (>= 3.0.4)
execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.5.0)
activesupport
factory_girl_rails (1.6.0)
factory_girl (~> 2.5.0)
factory_girl (2.6.0)
activesupport (>= 2.3.9)
factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
fakefs (0.4.0)
faraday (0.7.5)
addressable (~> 2.2.6)
multipart-post (~> 1.1.3)
rack (>= 1.1.0, < 2)
faraday_middleware (0.7.0)
faraday (~> 0.7.3)
ffi (1.0.9)
gherkin (2.5.2)
faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1)
rack (~> 1.1)
faraday_middleware (0.8.4)
faraday (>= 0.7.4, < 0.9)
ffi (1.0.11)
gherkin (2.9.0)
json (>= 1.4.6)
git (1.2.5)
gravtastic (3.0.0)
gravtastic (3.2.6)
growl (1.0.3)
guard (0.8.8)
guard (1.0.0)
ffi (>= 0.5.0)
thor (~> 0.14.6)
guard-annotate (0.9.2)
annotate (>= 2.4.0)
guard (>= 0.2.2)
guard-bundler (0.1.3)
bundler (>= 1.0.0)
guard (>= 0.2.2)
guard-delayed (0.1.1)
guard-delayed (0.1.2)
daemons
delayed_job
guard (~> 0.3)
guard-livereload (0.3.1)
guard (> 0.3)
guard-livereload (0.4.2)
em-websocket (>= 0.2.0)
guard (>= 0.4.0)
multi_json (~> 1.0.3)
guard-rails (0.0.3)
guard (>= 0.10.0)
multi_json (~> 1.0)
guard-rails (0.1.0)
guard (>= 0.2.2)
guard-rspec (0.5.5)
guard (>= 0.8.4)
guard-spork (0.3.2)
guard (>= 0.8.4)
guard-rspec (0.6.0)
guard (>= 0.10.0)
guard-spork (0.5.2)
guard (>= 0.10.0)
spork (>= 0.8.4)
haml (3.1.4)
hashie (1.2.0)
highline (1.6.2)
highline (1.6.11)
hike (1.2.1)
hpricot (0.8.6)
i18n (0.6.0)
Expand All @@ -201,7 +194,7 @@ GEM
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
json (1.6.5)
json_pure (1.6.1)
json_pure (1.6.5)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -217,33 +210,33 @@ GEM
actionpack
metaclass (0.0.1)
mime-types (1.17.2)
mocha (0.10.0)
mocha (0.10.4)
metaclass (~> 0.0.1)
multi_json (1.0.4)
multipart-post (1.1.3)
multi_json (1.1.0)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.2.1)
net-ssh (2.3.0)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
oa-core (0.3.0)
oauth2 (0.5.1)
faraday (~> 0.7.4)
multi_json (~> 1.0.3)
octokit (0.6.5)
addressable (~> 2.2.6)
faraday (~> 0.7.4)
faraday_middleware (~> 0.7.0)
hashie (~> 1.2.0)
multi_json (~> 1.0.2)
omniauth (1.0.0)
oa-core (0.3.2)
oauth2 (0.5.2)
faraday (~> 0.7)
multi_json (~> 1.0)
octokit (1.0.0)
addressable (~> 2.2)
faraday (~> 0.7)
faraday_middleware (~> 0.8)
hashie (~> 1.2)
multi_json (~> 1.0)
omniauth (1.0.2)
hashie (~> 1.2)
rack
omniauth-github (1.0.0)
omniauth-github (1.0.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-oauth2 (1.0.0)
Expand Down Expand Up @@ -283,7 +276,7 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rb-fsevent (0.4.3.1)
rb-fsevent (0.9.0)
rdoc (3.12)
json (~> 1.4)
remotipart (1.0.2)
Expand All @@ -292,7 +285,8 @@ GEM
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-cells (0.1.0)
rspec-cells (0.1.2)
cells (~> 3.4)
rails (~> 3.0)
rspec-rails (~> 2.2)
rspec-core (2.8.0)
Expand All @@ -304,30 +298,33 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
rubyzip (0.9.4)
rubyzip (0.9.6.1)
sass (3.1.15)
sass-rails (3.2.4)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.8.0)
selenium-webdriver (2.13.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
ffi (~> 1.0.9)
json_pure
rubyzip
sexp_processor (3.0.10)
shoulda-matchers (1.0.0)
simplecov (0.5.4)
multi_json (~> 1.0.3)
simple_form (2.0.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
simplecov (0.6.1)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
spork (0.9.0.rc9)
spork (1.0.0rc2)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7)
therubyracer (0.9.9)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
thin (1.3.1)
daemons (>= 1.0.9)
Expand All @@ -344,10 +341,10 @@ GEM
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.1.0)
warden (1.1.1)
rack (>= 1.0)
webmock (1.7.8)
addressable (~> 2.2, > 2.2.5)
webmock (1.8.0)
addressable (>= 2.2.7)
crack (>= 0.1.7)
xpath (0.1.4)
nokogiri (~> 1.3)
Expand All @@ -366,7 +363,7 @@ DEPENDENCIES
capybara
cells
ckeditor
coffee-rails (~> 3.2.1)
coffee-rails
css_sprite
cucumber
cucumber-rails
Expand Down Expand Up @@ -408,13 +405,13 @@ DEPENDENCIES
rspec
rspec-cells
rspec-rails
sass-rails (~> 3.2.3)
sass-rails
shoulda-matchers
simple_form!
simple_form
simplecov
spork (= 0.9.0.rc9)
spork (= 1.0.0.rc2)
therubyracer
thin
typhoeus
uglifier (>= 1.0.3)
uglifier
webmock

0 comments on commit 41791fb

Please sign in to comment.