gemfile: rails to 3.2.21, haml-rails to 0.4, disable coffee-rails, bootswatch-rails, haml, and json.

2 files changed, 91 insertions, 102 deletions

diff --git a/Gemfile b/Gemfile
index 62ba3e8..d43102a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,11 +2,11 @@ source 'https://rubygems.org'
 
 require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
 
-gem "rails", "~> 3.2.18"
+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"
+#gem "json"
 
 # user management
 gem "ruby-srp", "~> 0.2.1"
@@ -19,13 +19,13 @@ gem 'debugger', :platforms => :mri_19
 # ruby 1.8 is not supported anymore
 # gem 'ruby-debug', :platforms => :mri_18
 
-gem "haml", "~> 3.1.7"
+#gem "haml", "~> 3.1.7"
 gem "bootstrap-sass", "= 2.3.2.2"
 gem "jquery-rails"
 gem "simple_form"
 gem 'client_side_validations'
 gem 'client_side_validations-simple_form'
-gem "bootswatch-rails", "~> 0.5.0"
+#gem "bootswatch-rails", "~> 0.5.0"
 
 gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be
                          # issues with 0.14.0 when using couchrest
@@ -66,9 +66,9 @@ group :test, :development do
 end
 
 group :assets do
-  gem "haml-rails", "~> 0.3.4"
+  gem "haml-rails", "= 0.4.0"
   gem "sass-rails", "~> 3.2.5"
-  gem "coffee-rails", "~> 3.2.2"
+  #gem "coffee-rails", "~> 3.2.2"
   gem "uglifier", "~> 1.2.7"
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
diff --git a/Gemfile.lock b/Gemfile.lock
index c14847f..346155a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/cchandler/certificate_authority.git
-  revision: 58161e4552cc1aeca846da3e25ed66721354ee11
+  revision: 050f2829ed12b6c257e24f4c8077c6e1b38bd979
   specs:
     certificate_authority (0.2.0)
       activemodel (>= 3.0.6)
+      activesupport (>= 3.0.6)
 
 PATH
   remote: engines/billing
@@ -20,12 +21,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    actionmailer (3.2.18)
-      actionpack (= 3.2.18)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -33,30 +34,28 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.18)
-      activesupport (= 3.2.18)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-    activesupport (3.2.18)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
+    addressable (2.3.6)
     arel (3.0.3)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    bootswatch-rails (0.5.0)
-      railties (>= 3.1)
-    braintree (2.27.1)
+    braintree (2.38.0)
       builder (>= 2.0.0)
     builder (3.0.4)
-    capybara (2.2.0)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -67,19 +66,12 @@ GEM
       client_side_validations (~> 3.2.5)
       simple_form (~> 2.1.0)
     cliver (0.3.2)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.6.3)
-    columnize (0.8.9)
+    columnize (0.9.0)
     couchrest (1.1.3)
       mime-types (~> 1.15)
       multi_json (~> 1.0)
       rest-client (~> 1.6.1)
-    couchrest_model (2.0.1)
+    couchrest_model (2.0.0)
       activemodel (>= 3.0)
       couchrest (~> 1.1.3)
       mime-types (>= 1.15)
@@ -88,16 +80,16 @@ GEM
       actionpack
       couchrest
       couchrest_model
-    cucumber (1.3.15)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
-    cucumber-rails (1.4.1)
+    cucumber-rails (1.4.2)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 2)
-      mime-types (~> 1.16)
+      mime-types (>= 1.16, < 3)
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
     daemons (1.1.9)
@@ -106,41 +98,39 @@ GEM
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
+    debugger-ruby_core_source (1.3.7)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (2.0.2)
-    factory_girl (4.3.0)
+    execjs (2.2.2)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.3.0)
-      factory_girl (~> 4.3.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    fake_braintree (0.4)
+    fake_braintree (0.6.0)
       activesupport
-      braintree (~> 2.5)
-      capybara
-      i18n
+      braintree (~> 2.32)
+      capybara (>= 2.0.3)
       sinatra
-      thin
-    faker (1.2.0)
+    faker (1.4.3)
       i18n (~> 0.5)
-    ffi (1.9.3)
+    ffi (1.9.6)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    haml (3.1.8)
-    haml-rails (0.3.5)
+    haml (4.0.6)
+      tilt
+    haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
-      haml (~> 3.1)
+      haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
     hike (1.2.3)
-    http_accept_language (2.0.0)
-    i18n (0.6.9)
-    i18n-missing_translations (0.0.2)
-      i18n (~> 0.6.0)
+    http_accept_language (2.0.2)
+    i18n (0.7.0)
+    i18n-missing_translations (0.0.1)
     journey (1.0.4)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -148,81 +138,82 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    launchy (2.4.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.3.10.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    minitest-stub-const (0.1)
+    mini_portile (0.6.1)
+    minitest-stub-const (0.2)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     multi_test (0.1.1)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    phantomjs-binaries (1.9.2.3)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    phantomjs-binaries (1.9.2.4)
       sys-uname (= 0.9.0)
-    poltergeist (1.5.0)
+    poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.4)
-    quiet_assets (1.0.2)
+    polyglot (0.3.5)
+    quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.5.1)
+    rack-protection (1.5.3)
       rack
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.18)
-      actionmailer (= 3.2.18)
-      actionpack (= 3.2.18)
-      activerecord (= 3.2.18)
-      activeresource (= 3.2.18)
-      activesupport (= 3.2.18)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.18)
-    rails-i18n (3.0.0)
+      railties (= 3.2.21)
+    rails-i18n (3.0.1)
       i18n (~> 0.5)
       rails (>= 3.0.0, < 4.0.0)
-    rails_warden (0.5.7)
+    rails_warden (0.5.8)
       warden (>= 1.0.0)
-    railties (3.2.18)
-      actionpack (= 3.2.18)
-      activesupport (= 3.2.18)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.1)
-    rdiscount (2.0.7)
+    rake (10.4.2)
+    rdiscount (2.1.7.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
     ruby-srp (0.2.1)
-    sass (3.2.13)
+    sass (3.4.9)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simple_form (2.1.1)
+    simple_form (2.1.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -231,22 +222,24 @@ GEM
       ffi (>= 1.0.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (0.3.42)
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
     warden (1.2.3)
       rack (>= 1.0)
-    websocket-driver (0.3.1)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -256,12 +249,10 @@ PLATFORMS
 DEPENDENCIES
   SyslogLogger (~> 2.0)
   bootstrap-sass (= 2.3.2.2)
-  bootswatch-rails (~> 0.5.0)
   capybara
   certificate_authority!
   client_side_validations
   client_side_validations-simple_form
-  coffee-rails (~> 3.2.2)
   couchrest (~> 1.1.3)
   couchrest_model (~> 2.0.0)
   couchrest_session_store (~> 0.2.4)
@@ -270,12 +261,10 @@ DEPENDENCIES
   factory_girl_rails
   fake_braintree
   faker
-  haml (~> 3.1.7)
-  haml-rails (~> 0.3.4)
+  haml-rails (= 0.4.0)
   http_accept_language
   i18n-missing_translations
   jquery-rails
-  json
   kaminari (= 0.13.0)
   launchy
   leap_web_billing!
@@ -285,7 +274,7 @@ DEPENDENCIES
   phantomjs-binaries
   poltergeist
   quiet_assets
-  rails (~> 3.2.18)
+  rails (~> 3.2.21)
   rails-i18n
   rails_warden
   rdiscount