Skip to content

Commit 9fa5ad3

Browse files
committed
Merge pull request #136 from shakacode/improve-gemfile-readability
updates for readability
2 parents 3be407e + db2b1ba commit 9fa5ad3

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

Gemfile

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@ ruby "2.2.2"
44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
66
gem "rails", "~>4.2"
7-
# Use sqlite3 as the database for Active Record
8-
gem "sqlite3", group: :development
9-
gem "pg", group: :production
7+
8+
# Note: We're using sqllite3 for development and testing
9+
gem "sqlite3", group: [:development, :test]
10+
11+
group :production do
12+
# Pg is used for Heroku
13+
gem "pg"
14+
gem "rails_12factor" # Never include this for development or tests
15+
end
1016

1117
# Use SCSS for stylesheets
1218
gem "sass-rails"
@@ -15,17 +21,13 @@ gem "bootstrap-sass", "~> 3.3"
1521
gem "uglifier"
1622
# Use CoffeeScript for .js.coffee assets and views
1723
gem "coffee-rails"
18-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
19-
# gem "therubyracer", platforms: :ruby
20-
21-
# jquery as the JavaScript library has been moved under /client and managed by npm.
22-
# It is critical to not include any of the jquery gems when following this pattern or
23-
# else you might have multiple jQuery versions.
2424

2525
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
2626
gem "turbolinks"
27+
2728
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
2829
gem "jbuilder"
30+
2931
# bundle exec rake doc:rails generates the API under doc/api.
3032
gem "sdoc", group: :doc
3133

@@ -39,42 +41,41 @@ gem "rails-html-sanitizer"
3941
gem "unicorn"
4042

4143
gem "react_on_rails", "~> 1.0.0.pre"
44+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4245
gem "therubyracer"
4346

4447
gem "autoprefixer-rails"
4548

4649
gem "awesome_print"
4750

48-
# Use Capistrano for deployment
49-
# gem "capistrano-rails", group: :development
50-
group :production do
51-
gem "rails_12factor"
52-
end
51+
# jquery as the JavaScript library has been moved under /client and managed by npm.
52+
# It is critical to not include any of the jquery gems when following this pattern or
53+
# else you might have multiple jQuery versions.
5354

5455
group :development, :test do
5556
# Access an IRB console on exceptions page and /console in development
5657
gem "web-console"
5758

59+
################################################################################
5860
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
5961
gem "spring"
60-
6162
gem "spring-commands-rspec"
6263

64+
################################################################################
6365
# Manage application processes
6466
gem "foreman"
65-
6667
gem "factory_girl_rails"
6768

69+
################################################################################
6870
# Linters and Security
6971
gem "rubocop", require: false
7072
gem "ruby-lint", require: false
73+
# Critical that require: false be set! https://github.com/brigade/scss-lint/issues/278
7174
gem "scss_lint", require: false
7275
gem "brakeman", require: false
7376
gem "bundler-audit", require: false
7477

75-
# Allow printing with colors to terminal
76-
gem "rainbow"
77-
78+
################################################################################
7879
# Favorite debugging gems
7980
gem "pry"
8081
gem "pry-doc"

Gemfile.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ DEPENDENCIES
350350
rails (~> 4.2)
351351
rails-html-sanitizer
352352
rails_12factor
353-
rainbow
354353
react_on_rails (~> 1.0.0.pre)
355354
rspec-rails
356355
rubocop

config/database.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Ensure the SQLite 3 gem is defined in your Gemfile
55
# gem "sqlite3"
66
#
7+
# NOTE: Real world apps would not have a different DB for development
78
default: &default
89
adapter: sqlite3
910
pool: 5

0 commit comments

Comments
 (0)