Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

change Gemfile to adapt railstutorials

  • Loading branch information...
commit cd12d7aeb6ada8235975f479046fe1fb45f13b89 1 parent 6b8701f
@brownman authored
Showing with 183 additions and 127 deletions.
  1. +25 −22 Gemfile
  2. +82 −0 Gemfile.backup
  3. +51 −83 Gemfile.lock
  4. +25 −22 Gemfile~
View
47 Gemfile
@@ -5,10 +5,21 @@ source 'https://rubygems.org'
#ruby '1.9.3'
#gem 'bundler', '1.2.0.pre'
-gem 'rails', '3.2.3'
+#gem 'rails', '3.2.3'
+gem 'rails', '3.2.8'
+gem 'bootstrap-sass', '2.0.4'
+gem 'bcrypt-ruby', '3.0.1'
+gem 'faker', '1.0.1'
+gem 'will_paginate', '3.0.3'
+gem 'bootstrap-will_paginate', '0.0.6'
+gem 'jquery-rails', '2.0.2'
+#gem 'twitter-bootstrap-rails'
+#gem 'rails-backbone', '0.7.0'
+
+#gem 'thin'
@@ -18,31 +29,19 @@ gem 'rails', '3.2.3'
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-group :production do
- gem "heroku"
- gem 'pg'
-end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'less-rails'
- gem 'therubyracer'
- gem 'libv8', '3.3.10.4'
-
- gem 'sass-rails', '~> 3.2.3'
- gem 'coffee-rails', '~> 3.2.1'
-
- # See https://github.com/sstephenson/execjs#readme for more supported runtimes
- # gem 'therubyracer'
-
- gem 'uglifier', '>= 1.0.3'
+ gem 'sass-rails', '3.2.5'
+ gem 'coffee-rails', '3.2.2'
+ gem 'uglifier', '1.2.3'
end
-gem 'jquery-rails'
+#gem 'jquery-rails'
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
@@ -59,16 +58,14 @@ gem 'jquery-rails'
# To use debugger
# gem 'ruby-debug19', :require => 'ruby-debug'
-gem 'twitter-bootstrap-rails'
-gem 'rails-backbone', '0.7.0'
-gem 'thin'
-gem 'jasmine'
-gem 'jasminerice'
+
group :development, :test do
#gem 'activerecord-sqlite3-adapter'
gem 'sqlite3', '1.3.5'
+gem 'jasmine'
+gem 'jasminerice'
gem 'guard'
gem 'guard-jasmine'
gem 'guard-coffeescript'
@@ -77,4 +74,10 @@ group :development, :test do
gem 'rb-inotify', '~> 0.8.8'
end
+group :production do
+
+ #gem "heroku"
+ #gem 'pg'
+ gem 'pg', '0.12.2'
+end
View
82 Gemfile.backup
@@ -0,0 +1,82 @@
+source 'https://rubygems.org'
+
+
+
+#ruby '1.9.3'
+
+#gem 'bundler', '1.2.0.pre'
+gem 'rails', '3.2.3'
+
+
+
+
+
+
+
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+
+group :production do
+
+ #gem "heroku"
+ #gem 'pg'
+
+ gem 'pg', '0.12.2'
+end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+
+ gem 'less-rails'
+ gem 'therubyracer'
+ gem 'libv8', '3.3.10.4'
+
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
+
+ # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+ # gem 'therubyracer'
+
+ gem 'uglifier', '>= 1.0.3'
+
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+gem 'twitter-bootstrap-rails'
+gem 'rails-backbone', '0.7.0'
+
+gem 'thin'
+gem 'jasmine'
+gem 'jasminerice'
+
+group :development, :test do
+#gem 'activerecord-sqlite3-adapter'
+ gem 'sqlite3', '1.3.5'
+ gem 'guard'
+ gem 'guard-jasmine'
+ gem 'guard-coffeescript'
+ gem 'guard-livereload'
+
+ gem 'rb-inotify', '~> 0.8.8'
+end
+
+
View
134 Gemfile.lock
@@ -1,35 +1,39 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
+ bcrypt-ruby (3.0.1)
+ bootstrap-sass (2.0.4.0)
+ bootstrap-will_paginate (0.0.6)
+ will_paginate
builder (3.0.4)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
@@ -41,18 +45,16 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.4.0)
- commonjs (0.2.6)
- daemons (1.1.9)
diff-lcs (1.1.3)
- ejs (1.0.0)
em-websocket (0.3.8)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (1.0.0)
- excon (0.16.7)
execjs (1.4.0)
multi_json (~> 1.0)
+ faker (1.0.1)
+ i18n (~> 0.4)
ffi (1.1.5)
guard (1.5.3)
listen (>= 0.4.2)
@@ -72,14 +74,6 @@ GEM
guard (>= 1.5.0)
multi_json (~> 1.0)
haml (3.1.7)
- heroku (2.33.0)
- heroku-api (~> 0.3.5)
- launchy (>= 0.3.2)
- netrc (~> 0.7.7)
- rest-client (~> 1.6.1)
- rubyzip
- heroku-api (0.3.6)
- excon (~> 0.16.7)
hike (1.2.1)
i18n (0.6.1)
jasmine (1.2.1)
@@ -92,18 +86,10 @@ GEM
coffee-rails
haml
journey (1.0.4)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
- launchy (2.1.2)
- addressable (~> 2.3)
- less (2.2.2)
- commonjs (~> 0.2.6)
- less-rails (2.2.6)
- actionpack (>= 3.1)
- less (~> 2.2.0)
- libv8 (3.3.10.4)
libwebsocket (0.1.5)
addressable
listen (0.5.3)
@@ -115,8 +101,7 @@ GEM
method_source (0.8.1)
mime-types (1.19)
multi_json (1.3.7)
- netrc (0.7.7)
- pg (0.14.1)
+ pg (0.12.2)
polyglot (0.3.3)
pry (0.9.10)
coderay (~> 1.0.5)
@@ -129,32 +114,26 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
+ rails (3.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
bundler (~> 1.0)
- railties (= 3.2.3)
- rails-backbone (0.7.0)
- coffee-script (~> 2.2.0)
- ejs (~> 1.0.0)
- railties (>= 3.1.0)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (= 3.2.8)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
- rest-client (1.6.7)
- mime-types (>= 1.16)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
@@ -180,48 +159,37 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
- therubyracer (0.10.2)
- libv8 (~> 3.3.10)
- thin (1.5.0)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
- thor (0.14.6)
+ thor (0.16.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.1.6)
- actionpack (>= 3.1)
- execjs
- railties (>= 3.1)
tzinfo (0.3.34)
- uglifier (1.3.0)
+ uglifier (1.2.3)
execjs (>= 0.3.0)
- multi_json (~> 1.0, >= 1.0.2)
+ multi_json (>= 1.0.2)
+ will_paginate (3.0.3)
PLATFORMS
ruby
DEPENDENCIES
- coffee-rails (~> 3.2.1)
+ bcrypt-ruby (= 3.0.1)
+ bootstrap-sass (= 2.0.4)
+ bootstrap-will_paginate (= 0.0.6)
+ coffee-rails (= 3.2.2)
+ faker (= 1.0.1)
guard
guard-coffeescript
guard-jasmine
guard-livereload
- heroku
jasmine
jasminerice
- jquery-rails
- less-rails
- libv8 (= 3.3.10.4)
- pg
- rails (= 3.2.3)
- rails-backbone (= 0.7.0)
+ jquery-rails (= 2.0.2)
+ pg (= 0.12.2)
+ rails (= 3.2.8)
rb-inotify (~> 0.8.8)
- sass-rails (~> 3.2.3)
+ sass-rails (= 3.2.5)
sqlite3 (= 1.3.5)
- therubyracer
- thin
- twitter-bootstrap-rails
- uglifier (>= 1.0.3)
+ uglifier (= 1.2.3)
+ will_paginate (= 3.0.3)
View
47 Gemfile~
@@ -5,10 +5,21 @@ source 'https://rubygems.org'
#ruby '1.9.3'
#gem 'bundler', '1.2.0.pre'
-gem 'rails', '3.2.3'
+#gem 'rails', '3.2.3'
+gem 'rails', '3.2.8'
+gem 'bootstrap-sass', '2.0.4'
+gem 'bcrypt-ruby', '3.0.1'
+gem 'faker', '1.0.1'
+gem 'will_paginate', '3.0.3'
+gem 'bootstrap-will_paginate', '0.0.6'
+gem 'jquery-rails', '2.0.2'
+#gem 'twitter-bootstrap-rails'
+#gem 'rails-backbone', '0.7.0'
+
+#gem 'thin'
@@ -18,27 +29,15 @@ gem 'rails', '3.2.3'
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-group :production do
- gem "heroku"
- gem 'pg'
-end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'less-rails'
- gem 'therubyracer'
- gem 'libv8', '3.3.10.4'
-
- gem 'sass-rails', '~> 3.2.3'
- gem 'coffee-rails', '~> 3.2.1'
-
- # See https://github.com/sstephenson/execjs#readme for more supported runtimes
- # gem 'therubyracer'
-
- gem 'uglifier', '>= 1.0.3'
+ gem 'sass-rails', '3.2.5'
+ gem 'coffee-rails', '3.2.2'
+ gem 'uglifier', '1.2.3'
end
@@ -59,16 +58,14 @@ gem 'jquery-rails'
# To use debugger
# gem 'ruby-debug19', :require => 'ruby-debug'
-gem 'twitter-bootstrap-rails'
-gem 'rails-backbone', '0.7.0'
-gem 'thin'
-gem 'jasmine'
-gem 'jasminerice'
+
group :development, :test do
#gem 'activerecord-sqlite3-adapter'
-gem 'sqlite3', '1.3.5'
+ gem 'sqlite3', '1.3.5'
+gem 'jasmine'
+gem 'jasminerice'
gem 'guard'
gem 'guard-jasmine'
gem 'guard-coffeescript'
@@ -77,4 +74,10 @@ gem 'sqlite3', '1.3.5'
gem 'rb-inotify', '~> 0.8.8'
end
+group :production do
+
+ #gem "heroku"
+ #gem 'pg'
+ gem 'pg', '0.12.2'
+end
Please sign in to comment.
Something went wrong with that request. Please try again.