Merge branch 'master' of github.com:Bushido/Kandan

Gemfile

@@ -1,58 +1,40 @@
 source 'https://rubygems.org'
 
+# Core gems
 gem 'rails', '3.2.2'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
 gem 'sqlite3'
+
+# Auth/Bushido gems
 gem 'devise'
 gem 'devise_bushido_authenticatable'
 gem 'bushido'
+
+# Server/transport gems
 gem 'thin'
 gem 'faye'
+
+# Helper gems
 gem 'kaminari'
 gem 'aws-sdk'
 gem 'paperclip'
 gem 'remotipart'
-
+gem 'jquery-rails'
 
 # 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 'bourbon'
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'execjs'
+  gem 'execjs'   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'eco'
-  gem 'therubyracer'
-
   gem 'uglifier', '>= 1.0.3'
 end
 
-gem 'jquery-rails'
-
-# gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]
-
+# Test gems, obviously
 group :test do
   gem 'rspec-rails'
   gem 'shoulda-matchers'
   gem 'factory_girl_rails'
-  gem 'capybara'
+  # gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]
 end
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'

Gemfile.lock

@@ -44,15 +44,6 @@ GEM
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
       rest-client (>= 1.6.1)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -99,7 +90,6 @@ GEM
       yajl-ruby (>= 1.0.0)
     faye-websocket (0.4.4)
       eventmachine (>= 0.12.0)
-    ffi (1.0.11)
     highline (1.6.11)
     hike (1.2.1)
     httparty (0.8.1)
@@ -115,7 +105,6 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    libv8 (3.3.10.4)
     mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -174,25 +163,17 @@ GEM
       rspec (~> 2.8.0)
     rubycas-client (2.3.8)
       activesupport
-    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.20.0)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
-      multi_json (~> 1.0)
-      rubyzip
     shoulda-matchers (1.0.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
-    therubyracer (0.9.10)
-      libv8 (~> 3.3.10)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -209,8 +190,6 @@ GEM
     uuidtools (2.1.2)
     warden (1.1.1)
       rack (>= 1.0)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -220,7 +199,6 @@ DEPENDENCIES
   aws-sdk
   bourbon
   bushido
-  capybara
   coffee-rails (~> 3.2.1)
   devise
   devise_bushido_authenticatable
@@ -237,6 +215,5 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   shoulda-matchers
   sqlite3
-  therubyracer
   thin
   uglifier (>= 1.0.3)