gemfile: move things around, but same gems. added debug group to travis doesn't try to install debugger.

3 files changed, 44 insertions, 37 deletions

diff --git a/.travis.yml b/.travis.yml
index 3bd8ba1..69981b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,3 +10,4 @@ before_script:
   - "mv test/config/couchdb.yml.user config/couchdb.yml"
 after_script:
   - "cat tmp/*.test*.log" # printing logs from the failed integration tests
+bundler_args: --without development debug
\ No newline at end of file
diff --git a/DEVELOP.md b/DEVELOP.md
index 64c8771..991218e 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -1,6 +1,10 @@
 # Development #
 
-## Hacking ##
+## Continuous Integration ##
+
+See https://travis-ci.org/leapcode/leap_web for CI reports.
+
+## Views ##
 
 Some tips on modifying the views:
 
diff --git a/Gemfile b/Gemfile
index d43102a..e54ec6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,43 +2,57 @@ source 'https://rubygems.org'
 
 require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
 
+## CORE
 gem "rails", "~> 3.2.21"
 gem "couchrest", "~> 1.1.3"
 gem "couchrest_model", "~> 2.0.0"
 gem "couchrest_session_store", "~> 0.2.4"
-#gem "json"
 
-# user management
+## AUTHENTICATION
 gem "ruby-srp", "~> 0.2.1"
 gem "rails_warden"
 
+## LOCALIZATION
 gem 'http_accept_language'
+gem 'rails-i18n'  # locale files for built-in validation messages and times
+                  # https://github.com/svenfuchs/rails-i18n
+                  # for a list of keys:
+                  # https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
 
-# To use debugger
-gem 'debugger', :platforms => :mri_19
-# ruby 1.8 is not supported anymore
-# gem 'ruby-debug', :platforms => :mri_18
+## VIEWS
+gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be
+                         # issues with 0.14.0 when using couchrest
+gem 'rdiscount'   # for rendering .md templates
 
-#gem "haml", "~> 3.1.7"
-gem "bootstrap-sass", "= 2.3.2.2"
+## ASSETS
 gem "jquery-rails"
 gem "simple_form"
 gem 'client_side_validations'
 gem 'client_side_validations-simple_form'
-#gem "bootswatch-rails", "~> 0.5.0"
+group :assets do
+  gem "bootstrap-sass", "= 2.3.2.2" # The last 2.x version. Bootstrap-sass versions
+                                    # tracks the version of Bootstrap. We currently require
+                                    # Bootstrap v2 because client side validations is incompatible
+                                    # with Bootstrap v3. When upgrading to Rails 4, see
+                                    # https://github.com/twbs/bootstrap-sass
+  gem "haml-rails", "= 0.4.0"   # The last version of haml-rails to support Rails 3.
+  gem "sass-rails", "~> 3.2.5"  # Only version supported by bootstrap-sass 2.3.2.2
+  gem "uglifier", "~> 1.2.7"    # javascript compression https://github.com/lautis/uglifier
+  gem 'quiet_assets'            # stops logging all the asset requests
+  gem 'therubyracer', "~> 0.10.2", :platforms => :ruby
+  #   ^^ See https://github.com/sstephenson/execjs#readme
+  #      for list of supported runtimes.
+end
 
-gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be
-                         # issues with 0.14.0 when using couchrest
+## MISC
+gem 'certificate_authority', # unreleased so far ... but leap_web_certs need it
+  :git => 'https://github.com/cchandler/certificate_authority.git'
 
-gem 'rails-i18n'  # locale files for built-in validation messages and times
-                  # https://github.com/svenfuchs/rails-i18n
-                  # for a list of keys:
-                  # https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
-
-gem 'rdiscount'   # for rendering .md templates
+##
+## ENVIRONMENT SPECIFIC GEMS
+##
 
 group :test do
-
   # integration testing
   gem 'capybara', require: false
   gem 'poltergeist'         # headless js
@@ -65,28 +79,17 @@ group :test, :development do
   gem 'i18n-missing_translations'
 end
 
-group :assets do
-  gem "haml-rails", "= 0.4.0"
-  gem "sass-rails", "~> 3.2.5"
-  #gem "coffee-rails", "~> 3.2.2"
-  gem "uglifier", "~> 1.2.7"
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', "~> 0.10.2", :platforms => :ruby
-  gem 'quiet_assets'       # stops logging all the asset requests
-end
-
-
 group :production do
   gem 'SyslogLogger', '~> 2.0'
 end
 
-# unreleased so far ... but leap_web_certs need it
-gem 'certificate_authority', :git => 'https://github.com/cchandler/certificate_authority.git'
+group :debug do
+  gem 'debugger', :platforms => :mri_19
+end
 
-#
-# include optional gems and engines
-#
+##
+## OPTIONAL GEMS AND ENGINES
+##
 
 group :test do
   enabled_engines('test').each do |gem_name, gem_dir|
@@ -109,4 +112,3 @@ end
 custom_gems.each do |gem_name, gem_dir|
   gem gem_name, :path => gem_dir
 end
-