Megacommit.

.rvmrc

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p290"
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    exit 1
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]]
+# then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
+# If you use bundler, this might be useful to you:
+# if command -v bundle && [[ -s Gemfile ]]
+# then
+#   bundle install
+# fi
+
+

Gemfile

@@ -14,35 +14,40 @@ gem 'sass', :require => 'sass'
 gem 'compass'
 gem "sprockets", '~> 2.4.0'
 gem "sprockets-sass"
-gem 'sprockets-commonjs'
-gem 'alphasights-sinatra-sprockets', path: '../sinatra-sprockets', require: 'sinatra/sprockets'
+gem 'sprockets-commonjs', require: 'sprockets/commonjs'
+gem 'alphasights-sinatra-sprockets', require: 'sinatra/sprockets'
 
 gem "i18n"
 gem "ohm"
-
-gem "libv8"
-gem 'coffee-script-source', '1.1.3'
-gem 'coffee-script', :require => "coffee_script"
-gem 'uglifier'
-gem "closure"
-gem 'yui-compressor', :require => "yui/compressor"
-gem 'therubyracer'
+gem "ohm-contrib"
+
+group :development do
+  gem "libv8"
+  gem 'coffee-script-source', '1.1.3'
+  gem 'coffee-script', :require => "coffee_script"
+  gem 'uglifier'
+  gem "closure"
+  gem 'yui-compressor', :require => "yui/compressor"
+  gem 'therubyracer'
+end
 
 # Users
 
 gem "omniauth"
-gem 'omniauth-facebook'
+# gem 'omniauth-facebook'
+gem 'omniauth-identity'
+gem 'bcrypt-ruby', require: 'bcrypt'
 
+gem 'faye'
 gem 'foreman'
 gem "unicorn"
 
 group :push do
   gem 'thin'
-  gem 'faye'
 end
 
 group :test, :development do
-  gem 'guard-sprockets2', path: '../guard-sprockets2'
+  gem 'guard-sprockets2' # , path: '../guard-sprockets2'
   gem 'rb-fsevent'
   gem 'growl_notify'
-end
+end

Gemfile.lock

@@ -1,16 +1,3 @@
-PATH
-  remote: ../guard-sprockets2
-  specs:
-    guard-sprockets2 (0.0.6)
-      guard
-      sprockets (~> 2.0)
-
-PATH
-  remote: ../sinatra-sprockets
-  specs:
-    alphasights-sinatra-sprockets (0.1.1)
-      sprockets (~> 2.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -22,10 +9,13 @@ GEM
       activesupport (= 3.0.0)
     activesupport (3.0.0)
     addressable (2.2.7)
+    alphasights-sinatra-sprockets (0.1.1)
+      sprockets (~> 2.0)
     async_sinatra (1.0.0)
       rack (>= 1.4.1)
       sinatra (>= 1.3.2)
     backports (2.5.1)
+    bcrypt-ruby (3.0.1)
     builder (3.0.0)
     chunky_png (1.2.0)
     closure (1.4.3)
@@ -48,10 +38,6 @@ GEM
     eventmachine (0.12.10)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
     faye (0.8.2)
       cookiejar (>= 0.3.0)
       em-http-request (>= 0.3.0)
@@ -71,30 +57,26 @@ GEM
     guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
+    guard-sprockets2 (0.0.6)
+      guard
+      sprockets (~> 2.0)
     haml (3.1.4)
     hashie (1.2.0)
     hike (1.2.1)
-    httpauth (0.1)
     i18n (0.6.0)
     kgio (2.7.4)
     libv8 (3.3.10.4)
     multi_json (1.2.0)
-    multipart-post (1.1.5)
     nest (1.1.1)
       redis
-    oauth2 (0.6.0)
-      faraday (~> 0.7)
-      httpauth (~> 0.1)
-      multi_json (~> 1.0)
     ohm (0.1.5)
       nest (~> 1.0)
+    ohm-contrib (0.1.2)
+      ohm
     omniauth (1.1.0)
       hashie (~> 1.2)
       rack
-    omniauth-facebook (1.2.0)
-      omniauth-oauth2 (~> 1.0.0)
-    omniauth-oauth2 (1.0.1)
-      oauth2 (~> 0.6.0)
+    omniauth-identity (1.0.0)
       omniauth (~> 1.0)
     open4 (1.3.0)
     rabl (0.6.9)
@@ -157,8 +139,9 @@ PLATFORMS
 
 DEPENDENCIES
   active_support
-  alphasights-sinatra-sprockets!
+  alphasights-sinatra-sprockets
   async_sinatra
+  bcrypt-ruby
   builder
   closure
   coffee-script
@@ -167,13 +150,14 @@ DEPENDENCIES
   faye
   foreman
   growl_notify
-  guard-sprockets2!
+  guard-sprockets2
   haml
   i18n
   libv8
   ohm
+  ohm-contrib
   omniauth
-  omniauth-facebook
+  omniauth-identity
   rabl
   rake
   rb-fsevent