* Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58)

* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.

.foreman

@@ -0,0 +1,2 @@
+port: 3000
+formation: web=1,worker=0

.gitignore

@@ -1,37 +1,68 @@
+#trademark sillyness
+app/views/home/_show.*
+app/assets/images/custom/*
+
+
 # Configuration files
-config/app_config.yml
-config/fb_config.yml
-config/oauth_keys.yml
+config/diaspora.yml
+config/heroku.yml
 config/initializers/secret_token.rb
+config/redis.conf
+config/deploy_config.yml
 .bundle
 vendor/bundle/*
+vendor/cache/*
+config/database.yml
+.rvmrc_custom
+.rvmrc.local
+
+#Mailing list stuff
+config/email_offset
+config/mailing_list.csv
 
 # Generated files
 log/*
-public/stylesheets/application.css
-public/stylesheets/sessions.css
-public/stylesheets/ui.css
-spec/fixtures/users.yaml
+public/stylesheets/*.css
+public/diaspora
+spec/fixtures/*.y*ml
+spec/fixtures/*.fixture.*
+coverage/*
+xml_locales/*
 
-# Uploded files and local files
+#Documentation
+.yardoc/
+doc/
+
+# Uploaded files and local files
 public/uploads/*
 public/assets/*
 public/source.tar*
+public/.well-known
 tmp/**/*
 tmp/*
-db/*.sqlite3
-.redcar
+*.sqlite3
 
 # Temporary files of every sort
+.sass-cache/*
 .DS_Store
 .idea
+.redcar
 .rvmrc
 .stgit*
 *.swap
 *.swo
 *.swp
 *~
+*#
 bin/*
 nbproject
 patches-*
 capybara-*.html
+dump.rdb
+
+#Rubinius's JIT
+*.rbc
+
+# Ignore precompiled assets
+# Heroku or Capistrano can and should regenerate them on every deploy
+public/assets

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "pkg"]
-	path = pkg
-	url = http://github.com/diaspora/diaspora-packages.git

.pairs

@@ -5,6 +5,11 @@ pairs:
   ms: Maxwell Salzberg; maxwell
   dh: Dan Hansen; ohaibbq
   sm: Sarah Mei; sarah
+  mjs: Michael Sofaer; michael
+  jd: Jeff Dickey; dickeytk
+  dc: Dennis Collinson
+  tf: Tim Frazer
+  kf: Kevin Fitzpatrick
 email:
   prefix: pair
   domain: joindiaspora.com

.powenv

@@ -0,0 +1 @@
+export NEW_HOTNESS=yessir

.powrc

@@ -0,0 +1,4 @@
+if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ]; then
+  source "$rvm_path/scripts/rvm"
+  source ".rvmrc"
+fi

.rspec

@@ -1,3 +1,6 @@
+--format Fuubar
+--profile
 --color
---require rspec/instafail
---format RSpec::Instafail
+--tag ~performance
+--order random
+--drb

.rvmrc

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. ./script/env/ruby_env
+
+if [ -e '.rvmrc.local' ]; then
+  . .rvmrc.local;
+elif [ -e '.rvmrc_custom' ] ; then
+  . .rvmrc_custom;
+else
+  if rvm list strings | grep -q "$ruby_version" ; then
+    rvm --create use "$ruby_version@$gemset"
+  else
+    printf "\e[00;31mPLEASE INSTALL RUBY $ruby_version WITH \`rvm install $ruby_version\`"
+    printf "Don't forget to run \`cd .. && cd -\` afterwards!\e[00m"
+    return 1
+  fi
+fi
+
+. ./script/env/ensure_right_rubygems

.slugignore

@@ -0,0 +1,12 @@
+features
+spec
+tmp
+log
+public/uploads
+graphics
+Capfile
+multi-server-spec-Procfile
+ci-*
+config/deploy
+config/ci
+config/environments/integration*

.travis.yml

@@ -0,0 +1,26 @@
+branches:
+  only:
+    - 'master'
+    - 'develop'
+
+language: ruby
+rvm:
+  - 1.9.3
+
+
+env:
+  - DB=postgres BUILD_TYPE=other
+  - DB=mysql BUILD_TYPE=other
+  - DB=postgres BUILD_TYPE=cucumber
+  - DB=mysql BUILD_TYPE=cucumber
+
+
+bundler_args: "--without development production heroku"
+before_install: "./script/ci/before_install.sh"
+script: "./script/ci/build.sh"
+
+
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org:6667#diaspora-dev"

Capfile

@@ -1,8 +1,11 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+# Precompile assets in deployment (for Capistrano >= 2.8.0)
+load 'deploy/assets' if respond_to?(:namespace)
+
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
 load 'config/deploy' # remove this line to skip loading any of the default tasks

Changelog.md

@@ -0,0 +1,181 @@
+# 0.0.2.5
+
+* Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58)
+* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
+* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
+
+# 0.0.2.4
+
+* Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. [#3948](https://github.com/diaspora/diaspora/issues/3948)
+
+# 0.0.2.3
+
+* Upgrade to Devise 2.1.3 [Read more](http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/)
+
+# 0.0.2.2
+
+* Upgrade to Rails 3.2.11 (CVE-2012-0155, CVE-2012-0156). [Read more](http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/)
+
+# 0.0.2.1
+
+* Upgrade to Rails 3.2.10 as per CVE-2012-5664. [Read more](https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53)
+
+# 0.0.2.0
+
+## Refactor
+
+### script/server
+
+* Uses foreman now
+* Reduce startup time by reducing calls to `script/get_config.rb`
+* `config/script_server.yml` is removed and replaced by the `server` section in `config/diaspora.yml`
+  Have a look at the updated example!
+* Thin is dropped in favour of unicorn
+* Already set versions of `RAILS_ENV` and `DB` are now prefered over those set in `config/diaspora.yml`
+* **Heroku setups:** `ENVIRONMENT_UNICORN_EMBED_RESQUE_WORKER` got renamed to `SERVER_EMBED_RESQUE_WORKER`
+
+### Other
+
+* MessagesController. [#3657](https://github.com/diaspora/diaspora/pull/3657)
+* **Fixed setting:** `follow_diasporahq` has now to be set to `true` to enable following the DiasporaHQ account. Was `false`
+* Removal of some bash-/linux-isms from most of the scripts, rework of 'script/install.sh' output methods. [#3679](https://github.com/diaspora/diaspora/pull/3679)
+
+## Features
+
+* Add "My Activity" icon mobile -[Author Icon](http://www.gentleface.com/free_icon_set.html)-. [#3687](https://github.com/diaspora/diaspora/pull/3687)
+* Add password_confirmation field to registration page. [#3647](https://github.com/diaspora/diaspora/pull/3647)
+* When posting to Twitter, behaviour changed so that URL to post will only be added to the post when length exceeds 140 chars or post contains uploaded photos.
+* Remove markdown formatting from post message when posting to Facebook or Twitter.
+
+## Bug Fixes
+
+* Fix missing X-Frame headers [#3739](https://github.com/diaspora/diaspora/pull/3739)
+* Fix image path for padlocks [#3682](https://github.com/diaspora/diaspora/pull/3682)
+* Fix posting to Facebook and Tumblr. Have a look at the updated [services guide](https://github.com/diaspora/diaspora/wiki/Howto-setup-services) for new Facebook instructions.
+* Fix overflow button in mobile reset password. [#3697](https://github.com/diaspora/diaspora/pull/3697)
+* Fix issue with interacted_at in post fetcher. [#3607](https://github.com/diaspora/diaspora/pull/3607)
+* Fix error with show post Community Spotlight. [#3658](https://github.com/diaspora/diaspora/pull/3658)
+* Fix javascripts problem with read/unread notifications. [#3656](https://github.com/diaspora/diaspora/pull/3656)
+* Fix error with open/close registrations. [#3649](https://github.com/diaspora/diaspora/pull/3649)
+* Fix javascripts error in invitations facebox. [#3638](https://github.com/diaspora/diaspora/pull/3638)
+* Fix css overflow problem in aspect dropdown on welcome page. [#3637](https://github.com/diaspora/diaspora/pull/3637)
+* Fix empty page after authenticating with other services. [#3693](https://github.com/diaspora/diaspora/pull/3693)
+* Fix posting public posts to Facebook. [#2882](https://github.com/diaspora/diaspora/issues/2882), [#3650](https://github.com/diaspora/diaspora/issues/3650)
+* Fix error with invite link box shows on search results page even if invites have been turned off. [#3708](https://github.com/diaspora/diaspora/pull/3708)
+* Fix misconfiguration of Devise to allow the session to be remembered. [#3472](https://github.com/diaspora/diaspora/issues/3472)
+* Fix problem with show reshares_count in stream. [#3700](https://github.com/diaspora/diaspora/pull/3700)
+* Fix error with notifications count in mobile. [#3721](https://github.com/diaspora/diaspora/pull/3721)
+* Fix conversation unread message count bug. [#2321](https://github.com/diaspora/diaspora/issues/2321)
+
+## Gem updates
+
+* bootstrap-sass 2.1.0.0 -> 2.1.1.0
+* capybara 1.1.2 -> 1.1.3
+* carrierwave 0.6.2 -> 0.7.1
+* client\_side_validations 3.1.4 -> 3.2.1
+* database_cleaner 0.8 -> 0.9.1
+* faraday_middleware 0.8.8 -> 0.9.0
+* foreman 0.59 -> 0.60.2
+* fuubar 1.0.0 -> 1.1.0
+* debugger 1.2.0 -> 1.2.1
+* gon 4.0.0 -> 4.0.1
+* guard
+    * guard-cucumber 1.0.0 -> 1.2.2
+    * guard-rspec 0.7.3 -> 2.1.1
+    * guard-spork 0.8.0 -> 1.2.3
+    * rb-inotify -> 0.8.8, new dependency
+* handlebars_assets 0.6.5 -> 0.6.6
+* omniauth-facebook 1.3.0 -> 1.4.1
+* omniauth-twitter 0.0.11 -> 0.0.13
+* rails_admin 0.1.1 -> 0.2.0
+* rails-i18n -> 0.7.0
+* rack-rewrite 1.2.1 -> 1.3.1
+* redcarpet 2.1.1 -> 2.2.2
+* resque 1.22.0 -> 1.23.0
+* rspec-rails 2.11.0, 2.11.4
+* selenium-webdriver 2.25.0 -> 2.26.0
+* timecop 0.5.1 -> 0.5.3
+* twitter 2.0.2 -> 4.2.0
+* unicorn 4.3.1 -> 4.4.0, now default
+* webmock 1.8.10 -> 1.8.11
+
+And their dependencies.
+
+# 0.0.1.2
+
+Fix exception when the root of a reshare of a reshare got deleted [#3546](https://github.com/diaspora/diaspora/issues/3546)
+
+# 0.0.1.1
+
+* Fix syntax error in French Javascript pluralization rule.
+
+# 0.0.1.0
+
+## New configuration system!
+
+Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](https://github.com/diaspora/diaspora/wiki/Installing-on-heroku).
+
+The new configuration system allows all possible settings to be overriden by environment variables. This makes it possible to deploy heroku without checking any credentials into git. Read the top of `config/diaspora.yml.example` for an explanation on how to convert the setting names to environment variables.
+
+### Environment variable changes:
+
+#### deprectated
+
+* REDISTOGO_URL in favour of REDIS_URL or ENVIRONMENT_REDIS
+
+#### removed
+
+*  application_yml - Obsolete, all settings are settable via environment variables now
+
+#### renamed
+
+* SINGLE_PROCESS_MODE -> ENVIRONMENT_SINGLE_PROCESS_MODE
+* SINGLE_PROCESS -> ENVIRONMENT_SINGLE_PROCESS_MODE
+* NO_SSL -> ENVIRONMENT_REQUIRE_SSL
+* ASSET_HOST -> ENVIRONMENT_ASSETS_HOST
+
+
+## Gem changes
+
+### Updated gems
+
+* omniauth-tumblr 1.0 -> 1.1
+* rails_admin git -> 0.1.1
+* activerecord-import 0.2.10 -> 0.2.11
+* fog 1.4.0 -> 1.6.0
+* asset_sync 0.4.2 -> 0.5.0
+* jquery-rails 2.0.2 -> 2.1.3
+
+### Removed gems
+
+The following gems and their related files were removed as they aren't widely enough used to justify maintenance for them by the core developers. If you use them please maintain them in your fork.
+
+* airbrake
+* newrelic_rpm
+* rpm_contrib
+* heroku_san
+
+The following gems were removed because their are neither used in daily development or are just CLI tools that aren't required to be loaded from the code:
+
+* heroku
+* oink
+* yard
+
+
+## Publisher
+
+Refactoring of the JavaScript code; it is now completely rewritten to make use of Backbone.js.
+This paves the way for future improvements such as post preview or edit toolbar/help.
+
+
+## Removal of 'beta' code
+
+The feature-flag on users and all the code in connection with experimental UX changes got removed/reverted. Those are the parts that became Makr.io.
+The single-post view will also be revamped/reverted, but that didn't make it into this release.
+
+
+## JS lib updates
+
+
+## Cleanup in maintenance scripts and automated build environment
+

FederationProcfile

@@ -0,0 +1,6 @@
+web1: env RAILS_ENV=integration1 bundle exec rails s -p 3001
+worker1: env RAILS_ENV=integration1 VVERBOSE=1 QUEUE=* bundle exec rake resque:work
+redis1: env RAILS_ENV=integration1 redis-server ./redis-integration1.conf
+web2: env RAILS_ENV=integration2 bundle exec rails s -p 3002
+worker2: env RAILS_ENV=integration2 VVERBOSE=1 QUEUE=* bundle exec rake resque:work
+redis2: env RAILS_ENV=integration2 redis-server ./redis-integration2.conf

Gemfile

@@ -1,77 +1,170 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.1'
+gem 'rails', '3.2.12'
 
-gem 'bundler', '>= 1.0.0'
-gem "chef", :require => false
+gem 'foreman', '0.60.2'
 
-gem "nokogiri", "1.4.3.1"
+gem 'unicorn', '4.4.0', :require => false
 
-#Security
-gem 'devise', '1.1.3'
-gem 'devise-mongo_mapper', :git => 'git://github.com/collectiveidea/devise-mongo_mapper'
-gem 'devise_invitable','0.3.5'
+gem 'rails_autolink', '1.0.9'
 
-#Authentication
-gem 'omniauth'
-gem 'twitter', '0.9.12'
+# cross-origin resource sharing
 
-#Mongo
-gem 'mongo_mapper', :branch => 'rails3', :git => 'git://github.com/jnunemaker/mongomapper.git'
-gem 'bson_ext', '1.1'
-gem 'bson', '1.1'
+gem 'rack-cors', '0.2.7', :require => 'rack/cors'
 
-#Views
-gem 'haml'
-gem 'will_paginate', '3.0.pre2'
+# click-jacking protection
 
-#Uncatagorized
-gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
-gem 'addressable', :require => 'addressable/uri'
-gem 'json'
-gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.git'
+gem 'rack-protection', '1.2'
 
-#Standards
-gem 'pubsubhubbub'
+# authentication
 
-#EventMachine
-gem 'em-http-request',:ref => 'bf62d67fc72d6e701be5',  :git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'thin'
+gem 'devise', '2.1.3'
 
-#Websocket
-gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket'
-gem 'magent', :git => 'git://github.com/dcu/magent.git'
+gem 'remotipart', '1.0.2'
 
-#File uploading
-gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
-gem 'mini_magick'
-gem 'aws'
-gem 'fastercsv', :require => false
-gem 'jammit'
+gem 'omniauth', '1.1.1'
+gem 'omniauth-facebook', '1.4.1'
+gem 'omniauth-tumblr', '1.1'
+gem 'omniauth-twitter', '0.0.13'
 
-#Backups
-gem "cloudfiles", :require => false
+gem 'twitter', '4.2.0'
 
-group :test, :development do
-  gem 'factory_girl_rails'
-  gem 'ruby-debug19' if RUBY_VERSION.include? "1.9"
-  gem 'ruby-debug' if RUBY_VERSION.include? "1.8"
-  gem 'launchy'
+# mail
+
+gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
+gem 'messagebus_ruby_api', '1.0.3'
+
+group :production do # we don't install these on travis to speed up test runs
+  gem 'rails_admin', '0.2.0'
+  gem 'fastercsv', '1.5.5', :require => false
+  gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
+  gem 'rack-rewrite', '1.3.1', :require => false
+
+  # analytics
+  gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
+  gem 'rack-piwik', '0.1.3', :require => 'rack/piwik', :require => false
+  
 end
 
+
+# database
+
+gem "activerecord-import", "0.2.11"
+gem 'foreigner', '1.2.1'
+gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
+gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
+gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
+
+# file uploading
+
+gem 'carrierwave', '0.7.1'
+gem 'fog', '1.6.0'
+gem 'mini_magick', '3.4'
+
+# JSON and API
+
+gem 'json', '1.7.7'
+gem 'acts_as_api', '0.4.1 '
+
+# localization
+
+gem 'i18n-inflector-rails', '~> 1.0'
+gem 'rails-i18n', '0.7.0'
+
+# parsing
+
+gem 'nokogiri', '1.5.5'
+gem 'redcarpet', "2.2.2"
+gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
+gem 'ruby-oembed', '0.8.7'
+
+# queue
+
+gem 'resque', '1.23.0'
+gem 'resque-timeout', '1.0.0'
+
+# tags
+
+gem 'acts-as-taggable-on', '2.3.3'
+
+# URIs and HTTP
+
+gem 'addressable', '2.3.2', :require => 'addressable/uri'
+gem 'http_accept_language', '1.0.2'
+gem 'typhoeus', '0.3.3'
+
+# views
+
+gem 'haml', '3.1.7'
+gem 'mobile-fu', '1.1.0'
+
+gem 'will_paginate', '3.0.3'
+gem 'client_side_validations', '3.2.1'
+gem 'gon', '4.0.1'
+
+# assets
+
+group :assets do
+  gem 'bootstrap-sass', '2.1.1.0'
+  gem 'sass-rails', '3.2.5'
+
+  # Windows and OSX have an execjs compatible runtime built-in, Linux users should
+  # install Node.js or use 'therubyracer'.
+  #
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+
+  # gem 'therubyracer', :platform => :ruby
+
+  gem 'handlebars_assets', '0.6.6'
+  gem 'uglifier', '1.3.0'
+
+  gem "asset_sync", '0.5.0', :require => false
+end
+
+gem 'jquery-rails', '2.1.3'
+
+# web
+
+gem 'faraday', '0.8.4'
+gem 'faraday_middleware', '0.9.0'
+
+
+gem 'jasmine', '1.2.1'
+
+### GROUPS ####
+
 group :test do
-  gem 'capybara', '~> 0.3.9'
-  gem 'cucumber-rails', '0.3.2'
-  gem 'rspec', '>= 2.0.0'
-  gem 'rspec-rails', '>= 2.0.0'
-  gem 'mocha'
-  gem 'database_cleaner', '0.5.2'
-  gem 'webmock', :require => false
-  gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
-  gem 'mongrel', :require => false if RUBY_VERSION.include? "1.8"
-  gem 'rspec-instafail', :require => false
+
+
+  gem 'capybara', '1.1.3'
+  gem 'cucumber-rails', '1.3.0', :require => false
+  gem 'database_cleaner', '0.9.1'
+
+  gem 'timecop', '0.5.3'
+  gem 'factory_girl_rails', '4.1.0'
+  gem 'fixture_builder', '0.3.4'
+  gem 'fuubar', '1.1.0'
+  gem 'rspec-instafail', '0.2.4', :require => false
+  gem 'selenium-webdriver', '2.26.0'
+
+  gem 'webmock', '1.8.11', :require => false
+
+  gem 'spork', '1.0.0rc3'
+  gem 'guard-rspec', '2.1.1'
+  gem 'guard-spork', '1.2.3'
+  gem 'guard-cucumber', '1.2.2'
+  gem 'rb-inotify', '0.8.8', :require => false
+  gem 'rb-fsevent', '0.9.2', :require => false
+
 end
 
-group :deployment do
-  #gem 'sprinkle', :git => 'git://github.com/rsofaer/sprinkle.git'
+group :test, :development do
+  gem 'debugger', '1.2.1'
+  gem "rspec-rails", "2.11.4" 
+end
+
+group :development do
+  gem 'capistrano', '2.12.0', :require => false
+  gem 'capistrano_colors', '0.5.5', :require => false
+  gem 'capistrano-ext', '1.2.1', :require => false
 end

Gemfile.lock

@@ -1,404 +1,499 @@
 GIT
-  remote: git://github.com/Empact/roxml.git
+  remote: https://github.com/Empact/roxml.git
   revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
+  ref: 7ea9a9ffd2338aaef5b0
   specs:
     roxml (3.1.6)
       activesupport (>= 2.3.0)
       nokogiri (>= 1.3.3)
 
 GIT
-  remote: git://github.com/collectiveidea/devise-mongo_mapper
-  revision: fa2f20310e0988295adc192255d3b1cedee1b412
+  remote: https://github.com/plataformatec/markerb.git
+  revision: 93b1e8bea9b8fa89ef930f78ba562f596c022198
   specs:
-    devise-mongo_mapper (0.0.1)
-      devise (~> 1.1.0)
-
-GIT
-  remote: git://github.com/dcu/magent.git
-  revision: 663d493e0058901d8a2baec00e4d20e867b1359d
-  specs:
-    magent (0.5.2)
-      em-websocket
-      mongo
-      uuidtools
-
-GIT
-  remote: git://github.com/iain/http_accept_language.git
-  revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d
-  specs:
-    http_accept_language (1.0.1)
-
-GIT
-  remote: git://github.com/igrigorik/em-http-request.git
-  revision: bf62d67fc72d6e701be5037e239dd470194b8e45
-  ref: bf62d67fc72d6e701be5
-  specs:
-    em-http-request (0.2.13)
-      addressable (>= 2.0.0)
-      eventmachine (>= 0.12.9)
-
-GIT
-  remote: git://github.com/igrigorik/em-websocket
-  revision: e278f5a1c4db60be7485859520a069e08bfe1247
-  specs:
-    em-websocket (0.2.0)
-      addressable (>= 2.1.1)
-      eventmachine (>= 0.12.9)
-
-GIT
-  remote: git://github.com/jnunemaker/mongomapper.git
-  revision: de8f8f3171f687f8d65b87ba7c7d3b1cb6e3bbe6
-  branch: rails3
-  specs:
-    mongo_mapper (0.8.6)
-      activemodel (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      plucky (~> 0.3.6)
-
-GIT
-  remote: git://github.com/rsofaer/carrierwave.git
-  revision: c3dfbdda2fa227af91fe383bb126f59b991a318f
-  branch: master
-  specs:
-    carrierwave (0.5.0)
-      activesupport (~> 3.0)
-
-PATH
-  remote: vendor/gems/jasmine
-  specs:
-    jasmine (1.0.1)
-      json_pure (>= 1.4.3)
-      rack (>= 1.0.0)
-      rake (>= 0.8.7)
-      rspec (>= 1.1.5)
-      selenium-client (>= 1.2.17)
-      selenium-rc (>= 2.1.0)
+    markerb (1.0.0)
+      redcarpet (>= 2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    addressable (2.2.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    aws (2.3.26)
-      activesupport
-      http_connection
-      uuidtools
-      xml-simple
-    bcrypt-ruby (2.1.2)
-    bson (1.1)
-    bson_ext (1.1)
-    builder (2.1.2)
-    bunny (0.6.0)
-    capybara (0.3.9)
-      culerity (>= 0.2.4)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
+      mail (~> 2.4.4)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-import (0.2.11)
+      activerecord (~> 3.0)
+      activerecord (~> 3.0)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    acts-as-taggable-on (2.3.3)
+      rails (~> 3.0)
+    acts_as_api (0.4.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      rack (>= 1.1.0)
+    addressable (2.3.2)
+    arel (3.0.2)
+    asset_sync (0.5.0)
+      activemodel
+      fog
+    bcrypt-ruby (3.0.1)
+    bootstrap-sass (2.1.1.0)
+    builder (3.0.4)
+    capistrano (2.12.0)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    capistrano-ext (1.2.1)
+      capistrano (>= 1.0.0)
+    capistrano_colors (0.5.5)
+    capybara (1.1.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.3)
-    cgi_multipart_eof_fix (2.5.0)
-    chef (0.9.12)
-      bunny (>= 0.6.0)
-      erubis
-      extlib
-      highline
-      json (>= 1.4.4, <= 1.4.6)
-      mixlib-authentication (>= 1.1.0)
-      mixlib-cli (>= 1.1.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.2.0)
-      moneta
-      ohai (>= 0.5.7)
-      rest-client (>= 1.0.4, < 1.7.0)
-      uuidtools
-    childprocess (0.1.4)
-      ffi (~> 0.6.3)
-    closure-compiler (0.3.3)
-    cloudfiles (1.4.10)
-      mime-types (>= 1.16)
-    columnize (0.3.2)
-    configuration (1.2.0)
-    crack (0.1.8)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    culerity (0.2.12)
-    daemons (1.1.0)
-    database_cleaner (0.5.2)
-    devise (1.1.3)
-      bcrypt-ruby (~> 2.1.2)
-      warden (~> 0.10.7)
-    devise_invitable (0.3.5)
-      devise (~> 1.1.0)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    eventmachine (0.12.10)
-    extlib (0.9.15)
-    factory_girl (1.3.2)
-    factory_girl_rails (1.0)
-      factory_girl (~> 1.3)
-      rails (>= 3.0.0.beta4)
-    faraday (0.5.3)
-      addressable (~> 2.2.2)
-      multipart-post (~> 1.0.1)
-      rack (>= 1.1.0, < 2)
-    fastercsv (1.5.3)
-    fastthread (1.0.7)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    gem_plugin (0.2.3)
-    gherkin (2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    haml (3.0.24)
-    hashie (0.4.0)
-    highline (1.6.1)
-    http_connection (1.4.0)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    i18n (0.4.2)
-    jammit (0.5.4)
-      closure-compiler (>= 0.1.0)
-      yui-compressor (>= 0.9.1)
-    json (1.4.6)
-    json_pure (1.4.6)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    linecache (0.43)
-    mail (2.2.10)
-      activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    carrierwave (0.7.1)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    client_side_validations (3.2.1)
+    coderay (1.0.8)
+    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.4.0)
+    columnize (0.3.6)
+    crack (0.3.1)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    cucumber-rails (1.3.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.8)
+      nokogiri (>= 1.5.0)
+    database_cleaner (0.9.1)
+    debugger (1.2.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.4)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.4)
+    devise (2.1.3)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    excon (0.16.7)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.1.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.1.0)
+      factory_girl (~> 4.1.0)
+      railties (>= 3.0.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
+    fastercsv (1.5.5)
+    ffi (1.1.5)
+    fixture_builder (0.3.4)
+      activerecord (>= 2)
+      activesupport (>= 2)
+    fog (1.6.0)
+      builder
+      excon (~> 0.14)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    font-awesome-sass-rails (2.0.0.0)
+      railties (>= 3.1.1)
+      sass-rails (>= 3.1.1)
+    foreigner (1.2.1)
+      activerecord (>= 3.0.0)
+    foreman (0.60.2)
+      thor (>= 0.13.6)
+    formatador (0.2.4)
+    fuubar (1.1.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 1.0.0)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    gon (4.0.1)
+      actionpack (>= 2.3.0)
+      json
+    guard (1.5.4)
+      listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-cucumber (1.2.2)
+      cucumber (>= 1.2.0)
+      guard (>= 1.1.0)
+    guard-rspec (2.1.1)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    guard-spork (1.2.3)
+      childprocess (>= 0.2.3)
+      guard (>= 1.1)
+      spork (>= 0.8.4)
+      sys-proctable
+    haml (3.1.7)
+    handlebars_assets (0.6.6)
+      execjs (>= 1.2.9)
+      sprockets (>= 2.0.3)
+      tilt
+    hashie (1.2.0)
+    highline (1.6.12)
+    hike (1.2.1)
+    http_accept_language (1.0.2)
+    httpauth (0.2.0)
+    i18n (0.6.1)
+    i18n-inflector (2.6.6)
+      i18n (>= 0.4.1)
+    i18n-inflector-rails (1.0.6)
+      actionpack (~> 3.0)
+      i18n-inflector (~> 2.6)
+      railties (~> 3.0)
+    jasmine (1.2.1)
+      jasmine-core (>= 1.2.0)
+      rack (~> 1.0)
+      rspec (>= 1.3.1)
+      selenium-webdriver (>= 0.1.3)
+    jasmine-core (1.2.0)
+    journey (1.0.4)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
+    jquery-ui-rails (2.0.2)
+      jquery-rails
+      railties (>= 3.1.0)
+    jruby-pageant (1.1.1)
+    json (1.7.7)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
+    kaminari (0.14.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    kgio (2.7.4)
+    libwebsocket (0.1.5)
+      addressable
+    listen (0.5.3)
+    lumberjack (1.0.2)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mini_magick (3.1)
-      subexec (~> 0.0.4)
-    mixlib-authentication (1.1.4)
-      mixlib-log
-    mixlib-cli (1.2.0)
-    mixlib-config (1.1.2)
-    mixlib-log (1.2.0)
-    mocha (0.9.10)
-      rake
-    moneta (0.6.0)
-    mongo (1.1)
-      bson (>= 1.0.5)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
-    multi_json (0.0.5)
-    multipart-post (1.0.1)
-    net-ldap (0.1.1)
-    nokogiri (1.4.3.1)
-    oa-basic (0.1.6)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.1.6)
-      rest-client (~> 1.6.0)
-    oa-core (0.1.6)
-      rack (~> 1.1)
-    oa-enterprise (0.1.6)
-      net-ldap (~> 0.1.1)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.1.6)
-      pyu-ruby-sasl (~> 0.0.3.1)
-      rubyntlm (~> 0.1.1)
-    oa-oauth (0.1.6)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.1.6)
-      oauth (~> 0.4.0)
-      oauth2 (~> 0.1.0)
-    oa-openid (0.1.6)
-      oa-core (= 0.1.6)
-      rack-openid (~> 1.2.0)
-      ruby-openid-apps-discovery
-    oauth (0.4.4)
-    oauth2 (0.1.0)
-      faraday (~> 0.5.0)
-      multi_json (~> 0.0.4)
-    ohai (0.5.8)
-      extlib
-      json (>= 1.4.4, <= 1.4.6)
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      systemu
-    omniauth (0.1.6)
-      oa-basic (= 0.1.6)
-      oa-core (= 0.1.6)
-      oa-enterprise (= 0.1.6)
-      oa-oauth (= 0.1.6)
-      oa-openid (= 0.1.6)
-    plucky (0.3.6)
-      mongo (~> 1.1)
-    polyglot (0.3.1)
-    pubsubhubbub (0.1.1)
-      em-http-request (>= 0.1.5)
-      eventmachine (>= 0.12.9)
-    pyu-ruby-sasl (0.0.3.2)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-openid (1.2.0)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.5.6)
+    messagebus_ruby_api (1.0.3)
+    method_source (0.8.1)
+    mime-types (1.21)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
+    mobile-fu (1.1.0)
+      rack-mobile-detect
+      rails
+    multi_json (1.5.1)
+    multipart-post (1.1.5)
+    mysql2 (0.3.11)
+    nested_form (0.2.3)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.0)
+      jruby-pageant (>= 1.1.1)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    nokogiri (1.5.5)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
+    omniauth (1.1.1)
+      hashie (~> 1.2)
+      rack
+    omniauth-facebook (1.4.1)
+      omniauth-oauth2 (~> 1.1.0)
+    omniauth-oauth (1.0.1)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.1)
+      oauth2 (~> 0.8.0)
+      omniauth (~> 1.0)
+    omniauth-tumblr (1.1)
+      omniauth-oauth (~> 1.0)
+    omniauth-twitter (0.0.13)
+      multi_json (~> 1.3)
+      omniauth-oauth (~> 1.0)
+    orm_adapter (0.4.0)
+    polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-cors (0.2.7)
+      rack
+    rack-google-analytics (0.11.0)
+    rack-mobile-detect (0.4.0)
+      rack
+    rack-piwik (0.1.3)
+    rack-pjax (0.6.0)
+      nokogiri (~> 1.5)
+      rack (~> 1.3)
+    rack-protection (1.2.0)
+      rack
+    rack-rewrite (1.3.1)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
-      diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.5)
-    rspec-mocks (2.2.0)
-    rspec-rails (2.2.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.2.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-openid (2.1.8)
-    ruby-openid-apps-discovery (1.2.0)
-      ruby-openid (>= 2.1.7)
-    rubyntlm (0.1.1)
-    rubyzip (0.9.4)
-    selenium-client (1.2.18)
-    selenium-rc (2.2.4)
-      selenium-client (>= 1.2.18)
-    selenium-webdriver (0.1.1)
-      childprocess (= 0.1.4)
-      ffi (~> 0.6.3)
-      json_pure
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
+      bundler (~> 1.0)
+      railties (= 3.2.12)
+    rails-i18n (0.7.0)
+      i18n (~> 0.5)
+    rails_admin (0.2.0)
+      bootstrap-sass (~> 2.1)
+      builder (~> 3.0)
+      coffee-rails (~> 3.1)
+      font-awesome-sass-rails (~> 2.0)
+      haml (~> 3.1)
+      jquery-rails (~> 2.1)
+      jquery-ui-rails (~> 2.0)
+      kaminari (~> 0.14)
+      nested_form (~> 0.2.3)
+      rack-pjax (~> 0.6)
+      rails (~> 3.1)
+      remotipart (~> 1.0)
+      sass-rails (~> 3.1)
+    rails_autolink (1.0.9)
+      rails (~> 3.1)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    raindrops (0.10.0)
+    rake (10.0.3)
+    rb-fsevent (0.9.2)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    redcarpet (2.2.2)
+    redis (3.0.2)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
+    remotipart (1.0.2)
+    resque (1.23.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-timeout (1.0.0)
+      resque (~> 1.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-instafail (0.2.4)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    ruby-hmac (0.4.0)
+    ruby-oembed (0.8.7)
+    ruby-progressbar (1.0.2)
+    rubyzip (0.9.9)
+    sass (3.2.3)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.26.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    subexec (0.0.4)
-    systemu (1.2.0)
-    term-ansicolor (1.0.5)
-    thin (1.2.7)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.14.6)
-    treetop (1.4.9)
+    simple_oauth (0.1.9)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slop (3.3.3)
+    spork (1.0.0rc3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    subexec (0.2.2)
+    sys-proctable (0.9.2)
+    thor (0.17.0)
+    tilt (1.3.3)
+    timecop (0.5.3)
+    treetop (1.4.12)
+      polyglot
       polyglot (>= 0.3.1)
-    twitter (0.9.12)
-      hashie (~> 0.4.0)
-      httparty (~> 0.6.1)
-      multi_json (~> 0.0.4)
-      oauth (~> 0.4.3)
-    tzinfo (0.3.23)
-    uuidtools (2.1.1)
-    warden (0.10.7)
+    twitter (4.2.0)
+      faraday (~> 0.8)
+      multi_json (~> 1.3)
+      simple_oauth (~> 0.1.6)
+    typhoeus (0.3.3)
+      mime-types
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    unicorn (4.4.0)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+    vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.6.1)
-      addressable (>= 2.2.2)
+    warden (1.2.1)
+      rack (>= 1.0)
+    webmock (1.8.11)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    will_paginate (3.0.pre2)
-    xml-simple (1.0.12)
-    yui-compressor (0.9.1)
+    will_paginate (3.0.3)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable
-  aws
-  bson (= 1.1)
-  bson_ext (= 1.1)
-  bundler (>= 1.0.0)
-  capybara (~> 0.3.9)
-  carrierwave!
-  chef
-  cloudfiles
-  cucumber-rails (= 0.3.2)
-  database_cleaner (= 0.5.2)
-  devise (= 1.1.3)
-  devise-mongo_mapper!
-  devise_invitable (= 0.3.5)
-  em-http-request!
-  em-websocket!
-  factory_girl_rails
-  fastercsv
-  haml
-  http_accept_language!
-  jammit
-  jasmine!
-  json
-  launchy
-  magent!
-  mini_magick
-  mocha
-  mongo_mapper!
-  mongrel
-  nokogiri (= 1.4.3.1)
-  omniauth
-  pubsubhubbub
-  rails (= 3.0.1)
+  activerecord-import (= 0.2.11)
+  acts-as-taggable-on (= 2.3.3)
+  acts_as_api (= 0.4.1)
+  addressable (= 2.3.2)
+  asset_sync (= 0.5.0)
+  bootstrap-sass (= 2.1.1.0)
+  capistrano (= 2.12.0)
+  capistrano-ext (= 1.2.1)
+  capistrano_colors (= 0.5.5)
+  capybara (= 1.1.3)
+  carrierwave (= 0.7.1)
+  client_side_validations (= 3.2.1)
+  cucumber-rails (= 1.3.0)
+  database_cleaner (= 0.9.1)
+  debugger (= 1.2.1)
+  devise (= 2.1.3)
+  factory_girl_rails (= 4.1.0)
+  faraday (= 0.8.4)
+  faraday_middleware (= 0.9.0)
+  fastercsv (= 1.5.5)
+  fixture_builder (= 0.3.4)
+  fog (= 1.6.0)
+  foreigner (= 1.2.1)
+  foreman (= 0.60.2)
+  fuubar (= 1.1.0)
+  gon (= 4.0.1)
+  guard-cucumber (= 1.2.2)
+  guard-rspec (= 2.1.1)
+  guard-spork (= 1.2.3)
+  haml (= 3.1.7)
+  handlebars_assets (= 0.6.6)
+  http_accept_language (= 1.0.2)
+  i18n-inflector-rails (~> 1.0)
+  jasmine (= 1.2.1)
+  jquery-rails (= 2.1.3)
+  json (= 1.7.7)
+  markerb!
+  messagebus_ruby_api (= 1.0.3)
+  mini_magick (= 3.4)
+  mobile-fu (= 1.1.0)
+  mysql2 (= 0.3.11)
+  nokogiri (= 1.5.5)
+  omniauth (= 1.1.1)
+  omniauth-facebook (= 1.4.1)
+  omniauth-tumblr (= 1.1)
+  omniauth-twitter (= 0.0.13)
+  rack-cors (= 0.2.7)
+  rack-google-analytics (= 0.11.0)
+  rack-piwik (= 0.1.3)
+  rack-protection (= 1.2)
+  rack-rewrite (= 1.3.1)
+  rack-ssl (= 1.3.2)
+  rails (= 3.2.12)
+  rails-i18n (= 0.7.0)
+  rails_admin (= 0.2.0)
+  rails_autolink (= 1.0.9)
+  rb-fsevent (= 0.9.2)
+  rb-inotify (= 0.8.8)
+  redcarpet (= 2.2.2)
+  remotipart (= 1.0.2)
+  resque (= 1.23.0)
+  resque-timeout (= 1.0.0)
   roxml!
-  rspec (>= 2.0.0)
-  rspec-instafail
-  rspec-rails (>= 2.0.0)
-  ruby-debug
-  thin
-  twitter (= 0.9.12)
-  webmock
-  will_paginate (= 3.0.pre2)
+  rspec-instafail (= 0.2.4)
+  rspec-rails (= 2.11.4)
+  ruby-oembed (= 0.8.7)
+  sass-rails (= 3.2.5)
+  selenium-webdriver (= 2.26.0)
+  spork (= 1.0.0rc3)
+  timecop (= 0.5.3)
+  twitter (= 4.2.0)
+  typhoeus (= 0.3.3)
+  uglifier (= 1.3.0)
+  unicorn (= 4.4.0)
+  webmock (= 1.8.11)
+  will_paginate (= 3.0.3)

Guardfile

@@ -0,0 +1,38 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+# also, http://asciicasts.com/episodes/264-guard
+guard 'rspec', :all_on_start => false do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
+
+guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' }, :all_on_start => false , :wait => 70 do
+  watch('config/application.rb')
+  watch('config/environment.rb')
+  watch(%r{^config/environments/.+\.rb$})
+  watch(%r{^config/initializers/.+\.rb$})
+  watch('Gemfile')
+  watch('Gemfile.lock')
+  watch('spec/spec_helper.rb') { :rspec }
+  watch('test/test_helper.rb') { :test_unit }
+  watch(%r{features/support/}) { :cucumber }
+end
+
+guard 'cucumber', :all_on_start => false do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end

Procfile

@@ -0,0 +1,2 @@
+web: bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
+worker: env QUEUE=* bundle exec rake resque:work

README.md

@@ -1,74 +1,65 @@
-# Diaspora
+Diaspora*
 
-The privacy aware, personally controlled, do-it-all, open source social
-network.
+Diaspora is a privacy-aware, personally-controlled, do-it-all open source social network. Check out our [project site](http://diasporaproject.org).
 
-**THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
-**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
-TO BE BROKEN.**
-
-## Installation instructions
-
-Installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
-
-Thanks for helping battle test Diaspora.
-Please report any bugs you see at [bugs.joindiaspora.com](http://bugs.joindiaspora.com).
-
-## Contributing to Diaspora
-
-You can find an introduction to the source code [here](http://github.com/diaspora/diaspora/wiki/An-Introduction-to-the-Diaspora-Source).
-Bugs and pending features are on our [issue tracker](http://bugs.joindiaspora.com). 
-A step-by-step guide to development using git can be found [here](http://github.com/diaspora/diaspora/wiki/Git-Workflow).
-
-Here are a few good places to start:
-
-- Run "rake spec" to run our [Rspec](http://blog.davidchelimsky.net/2007/05/14/an-introduction-to-rspec-part-i/) 
-unit test suite. [Here](http://github.com/diaspora/diaspora/wiki/Introduction-to-Our-Rspec-Convention) is an introduction to our Rspec convention.  Take a look at the pending specs, make one pass!
-
-- Run "rake cucumber" to run our [Cucumber](http://rubylearning.com/blog/2010/10/05/outside-in-development/)
-integration test suite.  As you can see, we need more integration tests.  Pick a feature and write one!
-
-- Take a look at the [issue tracker](http://bugs.joindiaspora.com) and pick a bug.
-Write a spec for it, so it's easy for another developer to fix it.
-
-Patches must be tested, and all your tests should be green, 
-unless you're marking an existing bug, before a pull request is sent.
-Unit tests should be in Rspec, and integration tests should be in Cucumber.
-
-Please make your changes in a branch to ensure that new commits to your master are 
-not included in the pull request, and to make it easier for us to merge your commits.
-
-Please do not rebase our tree into yours.
-See [here](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html)
-for when to rebase.
-
-We need you to fill out a
-[contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq)
-before we can accept your patches.  The agreement gives Diaspora joint
-ownership of the patch so the copyright isn't scattered.  You can find it
-[here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq).
-We're currently working on revising it more details on what we're going for can be found [here](http://joindiaspora.com/licensing.html).
-
-## Resources
-
-Here is our [bug tracker](http://bugs.joindiaspora.com) and our
-[roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can
-find see what the core team is upto [here](http://www.pivotaltracker.com/projects/61641).
+* **master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
+* **develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.png?branch=develop)](http://travis-ci.org/diaspora/diaspora)
+* [![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
+* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/diaspora/diaspora)
 
 
-Ongoing discussion:
+With Diaspora you can:
 
-- [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
-- [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
-- [Diaspora Q&A site](http://diaspora.shapado.com/)
-- [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev)
-  ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev))
+- Make cool stuff
+- Share it across the web
+- Own your own data
 
-More general info and updates about the project can be found on
-[our blog](http://joindiaspora.com),
-[and on Twitter](http://twitter.com/joindiaspora).
-Also, be sure to join the official [mailing list](http://eepurl.com/Vebk).
 
-If you wish to contact us privately about any exploits in Diaspora you may
-find, you can email
-[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com).
+## Quick Start:
+
+Here's how you can get a **[development](http://guides.rubyonrails.org/getting_started.html)** environment up and running.  This is where any new pod runner should start, as well as people
+looking to contribute to D*.  This script assumes you have [a basic Rails setup installed](http://railsapps.github.com/installing-rails-3-1.html).
+
+### Step 1: Run the script and follow the on screen instructions.
+```
+  bash <(curl https://raw.github.com/diaspora/diaspora/master/script/install.sh)
+```
+
+
+### Step 2: Run the development server
+```
+  rails s
+```
+
+then visit 'http://localhost:3000' in your browser.
+
+### Step 3 (for developers): Run tests
+```
+  rake
+```
+
+### Step 4 (for everyone): Party.
+
+
+### Want a production setup? Having trouble with install script? Want to install D* the slow way?
+  Look to more specific install guides [here](https://github.com/diaspora/diaspora/wiki/Installation-Guides).
+
+## Contributing
+We love community contributions, and we work extra hard to make sure every code contribution is looked at and given feedback. 
+To help everyone involved, please review our [Pull Request Guidelines](https://github.com/diaspora/diaspora/wiki/Pull-Request-Guidelines)
+to make sure all contributions are submitted smoothly.
+
+Documentation is available on our [wiki](https://github.com/diaspora/diaspora/wiki)
+
+Also, feel free to jump in and check things that need to be done in our [Community Pivotal Tracker](https://www.pivotaltracker.com/projects/61641#)
+
+Before submitting code, please sign our [Contributor License Agreement](https://github.com/diaspora/diaspora/wiki/New-CLA--12-13-10) [Sign Here](https://spreadsheets.google.com/a/joindiaspora.com/spreadsheet/viewform?formkey=dFdRTnY0TGtfaklKQXZNUndsMlJ2eGc6MQ)
+
+## More Resources:
+
+- [Wiki](https://github.com/diaspora/diaspora/wiki)
+- [Podmin Resources](https://github.com/diaspora/diaspora/wiki/Podmin-Resources)
+- [Contributing](https://github.com/diaspora/diaspora/wiki/Getting-Started-With-Contributing)
+- [Dev List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-dev)
+- [Discuss List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-discuss)
+- [IRC](https://github.com/diaspora/diaspora/wiki/How-we-use-IRC)

Rakefile

@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
@@ -7,5 +7,13 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
+require 'resque/tasks'
+
+# for rake 0.9.0
+module Diaspora
+  class Application
+    include Rake::DSL
+  end
+end
 
 Diaspora::Application.load_tasks