bump to 0.5.1.2

Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+[{Gemfile,Rakefile,Guardfile,Procfile}]
+trim_trailing_whitespace = true
+
+[*.{js,hbs,rb,rake,ru,erb,haml,scss,sh,md}]
+trim_trailing_whitespace = true
+
+[*.yml]
+trim_trailing_whitespace = false

.foreman

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

.gitignore

@@ -1,6 +1,11 @@
+# xmpp certificates, keys and user data
+config/vines/*.crt
+config/vines/*.key
+
 #trademark sillyness
 app/views/home/_show.*
-app/assets/images/custom/*
+app/views/terms/terms.*
+app/assets/images/custom/
 
 
 # Configuration files
@@ -9,9 +14,10 @@ config/heroku.yml
 config/initializers/secret_token.rb
 config/redis.conf
 config/deploy_config.yml
+config/schedule.rb
 .bundle
-vendor/bundle/*
-vendor/cache/*
+vendor/bundle/
+vendor/cache/
 config/database.yml
 .rvmrc_custom
 .rvmrc.local
@@ -21,29 +27,38 @@ config/email_offset
 config/mailing_list.csv
 
 # Generated files
-log/*
+log/
 public/stylesheets/*.css
 public/diaspora
 spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
-coverage/*
-xml_locales/*
+coverage/
+xml_locales/
+public/404.html
+public/422.html
+public/500.html
+
+# Sprites
+app/assets/images/branding-*.png
+app/assets/images/branding/logos-*.png
+app/assets/images/icons-*.png
+app/assets/images/social_media_logos-*.png
 
 #Documentation
 .yardoc/
 doc/
 
 # Uploaded files and local files
-public/uploads/*
-public/assets/*
+public/uploads/
+public/assets/
 public/source.tar*
 public/.well-known
-tmp/**/*
-tmp/*
+tmp/**/
+tmp/
 *.sqlite3
 
 # Temporary files of every sort
-.sass-cache/*
+.sass-cache/
 .DS_Store
 .idea
 .redcar
@@ -54,7 +69,6 @@ tmp/*
 *.swp
 *~
 *#
-bin/*
 nbproject
 patches-*
 capybara-*.html
@@ -63,6 +77,8 @@ dump.rdb
 #Rubinius's JIT
 *.rbc
 
-# Ignore precompiled assets
-# Heroku or Capistrano can and should regenerate them on every deploy
-public/assets
+#IDE
+diaspora.iml
+
+# Dolphin's directory's preferences files
+*.directory

.hound.yml

@@ -0,0 +1,9 @@
+java_script:
+  enabled: true
+  config_file: config/.jshint.json
+  ignore_file: config/.jshint_ignore
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
+scss:
+  enabled: false

.jshintignore

@@ -0,0 +1 @@
+config/.jshint_ignore

.jshintrc

@@ -0,0 +1 @@
+config/.jshint.json

.pairs

@@ -1,15 +0,0 @@
-pairs:
-  dg: Daniel Grippi; daniel
-  rs: Raphael Sofaer; raphael
-  iz: Ilya Zhitomirskiy; ilya
-  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

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

.powrc

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

.rspec

@@ -3,4 +3,3 @@
 --color
 --tag ~performance
 --order random
---drb

.rubocop.yml

@@ -0,0 +1,137 @@
+AllCops:
+  RunRailsCops: true
+
+# Commonly used screens these days easily fit more than 80 characters.
+Metrics/LineLength:
+  Max: 120
+
+# Too short methods lead to extraction of single-use methods, which can make
+# the code easier to read (by naming things), but can also clutter the class
+Metrics/MethodLength: 
+  Max: 20
+
+# The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
+Metrics/ClassLength:
+  Max: 1500
+
+# No space makes the method definition shorter and differentiates
+# from a regular assignment.
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+# Single quotes being faster is hardly measurable and only affects parse time.
+# Enforcing double quotes reduces the times where you need to change them
+# when introducing an interpolation. Use single quotes only if their semantics
+# are needed.
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# We do not need to support Ruby 1.9, so this is good to use.
+Style/SymbolArray:
+  Enabled: true
+
+# Most readable form.
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+# Mixing the styles looks just silly.
+Style/HashSyntax:
+ EnforcedStyle: ruby19_no_mixed_keys
+
+# has_key? and has_value? are far more readable than key? and value?
+Style/DeprecatedHashMethods:
+  Enabled: false
+
+# String#% is by far the least verbose and only object oriented variant.
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/CollectionMethods:
+  Enabled: true
+  PreferredMethods:
+    # inject seems more common in the community.
+    reduce: "inject"
+
+
+# Either allow this style or don't. Marking it as safe with parenthesis
+# is silly. Let's try to live without them for now.
+Style/ParenthesesAroundCondition:
+  AllowSafeAssignment: false
+Lint/AssignmentInCondition:
+  AllowSafeAssignment: false
+
+# A specialized exception class will take one or more arguments and construct the message from it.
+# So both variants make sense. 
+Style/RaiseArgs:
+  Enabled: false
+
+# Indenting the chained dots beneath each other is not supported by this cop,
+# see https://github.com/bbatsov/rubocop/issues/1633
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
+# The argument that fail should be used to abort the program is wrong too,
+# there's Kernel#abort for that.
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+# Suppressing exceptions can be perfectly fine, and be it to avoid to
+# explicitly type nil into the rescue since that's what you want to return,
+# or suppressing LoadError for optional dependencies
+Lint/HandleExceptions:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  # The space here provides no real gain in readability while consuming
+  # horizontal space that could be used for a better parameter name.
+  # Also {| differentiates better from a hash than { | does.
+  SpaceBeforeBlockParameters: false
+
+# No trailing space differentiates better from the block:
+# foo} means hash, foo } means block.
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
+# https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
+Style/BlockDelimiters:
+  Enabled: false
+
+# do / end blocks should be used for side effects,
+# methods that run a block for side effects and have
+# a useful return value are rare, assign the return
+# value to a local variable for those cases.
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+
+# Enforcing the names of variables? To single letter ones? Just no.
+Style/SingleLineBlockParams:
+  Enabled: false
+
+# Shadowing outer local variables with block parameters is often useful
+# to not reinvent a new name for the same thing, it highlights the relation
+# between the outer variable and the parameter. The cases where it's actually
+# confusing are rare, and usually bad for other reasons already, for example
+# because the method is too long.
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+
+# Check with yard instead.
+Style/Documentation:
+  Enabled: false 
+
+# This is just silly. Calling the argument `other` in all cases makes no sense.
+Style/OpMethod:
+  Enabled: false 
+
+# There are valid cases, for example debugging Cucumber steps,
+# also they'll fail CI anyway
+Lint/Debugger:
+  Enabled: false
+
+
+# Reset some HoundCI changes back to Rubocop defaults
+Style/DotPosition:
+  EnforcedStyle: leading

.ruby-gemset

@@ -0,0 +1 @@
+diaspora

.ruby-version

@@ -0,0 +1 @@
+2.1

.rvmrc

@@ -1,19 +0,0 @@
-#!/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

.travis.yml

@@ -1,12 +1,8 @@
-branches:
-  only:
-    - 'master'
-    - 'develop'
-
 language: ruby
-rvm:
-  - 1.9.3
 
+rvm:
+  - 2.1
+  - 2.0
 
 env:
   - DB=postgres BUILD_TYPE=other
@@ -14,12 +10,23 @@ env:
   - DB=postgres BUILD_TYPE=cucumber
   - DB=mysql BUILD_TYPE=cucumber
 
+sudo: false
+cache:
+  bundler: true
+  directories:
+    - app/assets/images
+
+branches:
+  only:
+    - 'master'
+    - 'stable'
+    - 'develop'
+
+before_install: gem install bundler
+bundler_args: "--without development production heroku --jobs 3 --retry 3"
 
-bundler_args: "--without development production heroku"
-before_install: "./script/ci/before_install.sh"
 script: "./script/ci/build.sh"
 
-
 notifications:
   irc:
     channels:

COPYRIGHT

@@ -21,3 +21,8 @@ exception to your version of the file(s), but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement from your
 version.  If you delete this exception statement from all source files in the
 program, then also delete it here.
+
+Social Media Icons
+------------------
+Some icons are used from https://github.com/paulrobertlloyd/socialmediaicons
+Licensed under a Creative Commons Attribution-Share Alike 3.0 license

Capfile

@@ -1,11 +0,0 @@
-#   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

Gemfile

@@ -1,170 +1,295 @@
-source 'http://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rails', '3.2.10'
+gem "rails", "4.2.2"
 
-gem 'foreman', '0.60.2'
+# Legacy Rails features, remove me!
 
-gem 'unicorn', '4.4.0', :require => false
+# caches_page
+gem "actionpack-action_caching"
+gem "actionpack-page_caching"
 
-gem 'rails_autolink', '1.0.9'
+# responders (class level)
+gem "responders", "2.1.0"
 
-# cross-origin resource sharing
+# Appserver
 
-gem 'rack-cors', '0.2.7', :require => 'rack/cors'
+gem "unicorn", "4.9.0", require: false
 
-# click-jacking protection
+# API and JSON
 
-gem 'rack-protection', '1.2'
+gem "acts_as_api", "0.4.2"
+gem "json",        "1.8.2"
 
-# authentication
+# Authentication
 
-gem 'devise', '2.1.2'
+gem "devise", "3.4.1"
+gem "devise_lastseenable", "0.0.4"
+gem "devise-token_authenticatable", "~> 0.3.0"
 
-gem 'remotipart', '1.0.2'
+# Captcha
 
-gem 'omniauth', '1.1.1'
-gem 'omniauth-facebook', '1.4.1'
-gem 'omniauth-tumblr', '1.1'
-gem 'omniauth-twitter', '0.0.13'
+gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
-gem 'twitter', '4.2.0'
+# Background processing
 
-# mail
+gem "sidekiq", "3.3.4"
+gem "sinatra", "1.4.6"
 
-gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
-gem 'messagebus_ruby_api', '1.0.3'
+# Scheduled processing
 
-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
+gem "sidetiq", "0.6.3"
 
-  # analytics
-  gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
-  gem 'rack-piwik', '0.1.3', :require => 'rack/piwik', :require => false
-  
+# Compression
+
+gem "uglifier", "2.7.1"
+
+# Configuration
+
+gem "configurate", "0.3.1"
+
+# Cross-origin resource sharing
+
+gem "rack-cors", "0.4.0", require: "rack/cors"
+
+# CSS
+
+gem "bootstrap-sass", "2.3.2.2"
+gem "compass-rails",  "2.0.4"
+gem "sass-rails",     "5.0.1"
+gem "autoprefixer-rails", "5.1.11"
+
+# Database
+
+ENV["DB"] ||= "mysql"
+
+gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem "pg",     "0.18.1" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+
+gem "activerecord-import", "0.7.0"
+
+# File uploading
+
+gem "carrierwave", "0.10.0"
+gem "fog",         "1.30.0"
+gem "mini_magick", "4.2.3"
+gem "remotipart",  "1.2.1"
+
+# GUID generation
+gem "uuid", "2.3.7"
+
+# Icons
+
+gem "entypo-rails", "2.2.3"
+
+# JavaScript
+
+gem "backbone-on-rails",                                "1.1.2.1"
+gem "handlebars_assets",                                "0.20.1"
+gem "jquery-rails",                                     "4.0.4"
+gem "jquery-ui-rails",                                  "5.0.3"
+gem "js_image_paths",                                   "0.0.2"
+gem "js-routes",                                        "1.0.1"
+
+source "https://rails-assets.org" do
+  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails
+
+  gem "rails-assets-markdown-it",                         "4.2.1"
+  gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
+  gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
+  gem "rails-assets-markdown-it-sanitizer",               "0.3.1"
+  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
+  gem "rails-assets-markdown-it-sub",                     "1.0.0"
+  gem "rails-assets-markdown-it-sup",                     "1.0.0"
+  gem "rails-assets-highlightjs",                         "8.5.0"
+
+  # jQuery plugins
+
+  gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
+  gem "rails-assets-jquery-idletimer",              "1.0.1"
+  gem "rails-assets-jquery-placeholder",            "2.1.1"
+  gem "rails-assets-jquery-textchange",             "0.2.3"
+  gem "rails-assets-perfect-scrollbar",             "0.5.9"
+  gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
 end
 
+gem "facebox-rails", "0.2.0"
 
-# database
+# Localization
 
-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'
+gem "http_accept_language", "2.0.5"
+gem "i18n-inflector-rails", "1.0.7"
+gem "rails-i18n",           "4.0.4"
 
-# file uploading
+# Mail
 
-gem 'carrierwave', '0.7.1'
-gem 'fog', '1.6.0'
-gem 'mini_magick', '3.4'
+gem "markerb",             "1.0.2"
+gem "messagebus_ruby_api", "1.0.3"
 
-# JSON and API
+# Parsing
 
-gem 'json', '1.7.5'
-gem 'acts_as_api', '0.4.1 '
+gem "nokogiri",          "1.6.6.2"
+gem "redcarpet",         "3.2.3"
+gem "twitter-text",      "1.12.0"
+gem "roxml",             "3.1.6"
+gem "ruby-oembed",       "0.8.14"
+gem "open_graph_reader", "0.6.1"
 
-# localization
+# Services
 
-gem 'i18n-inflector-rails', '~> 1.0'
-gem 'rails-i18n', '0.7.0'
+gem "omniauth",           "1.2.2"
+gem "omniauth-facebook",  "2.0.1"
+gem "omniauth-tumblr",    "1.1"
+gem "omniauth-twitter",   "1.2.0"
+gem "twitter",            "5.14.0"
+gem "omniauth-wordpress", "0.2.2"
 
-# parsing
+# Serializers
 
-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'
+gem "active_model_serializers", "0.9.3"
 
-# queue
+# XMPP chat dependencies
+gem "diaspora-vines",             "~> 0.1.27"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
 
-gem 'resque', '1.23.0'
-gem 'resque-timeout', '1.0.0'
+# Tags
 
-# tags
-
-gem 'acts-as-taggable-on', '2.3.3'
+gem "acts-as-taggable-on", "3.5.0"
 
 # URIs and HTTP
 
-gem 'addressable', '2.3.2', :require => 'addressable/uri'
-gem 'http_accept_language', '1.0.2'
-gem 'typhoeus', '0.3.3'
+gem "addressable",        "2.3.8", require: "addressable/uri"
+gem "faraday",            "0.9.1"
+gem "faraday_middleware", "0.9.1"
+gem "faraday-cookie_jar", "0.0.6"
+gem "typhoeus",           "0.7.1"
 
-# views
+# Views
 
-gem 'haml', '3.1.7'
-gem 'mobile-fu', '1.1.0'
+gem "gon",                     "5.2.3"
+gem "haml",                    "4.0.6"
+gem "mobile-fu",               "1.3.1"
+gem "will_paginate",           "3.0.7"
+gem "rails-timeago",           "2.11.0"
 
-gem 'will_paginate', '3.0.3'
-gem 'client_side_validations', '3.2.1'
-gem 'gon', '4.0.1'
+# Logging
 
-# assets
+gem "logging-rails", "0.5.0", require: "logging/rails"
 
-group :assets do
-  gem 'bootstrap-sass', '2.1.1.0'
-  gem 'sass-rails', '3.2.5'
+# Reading and writing zip files
 
-  # 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 "rubyzip", "1.1.7"
 
-  # gem 'therubyracer', :platform => :ruby
+# Prevent occasions where minitest is not bundled in
+# packaged versions of ruby. See following issues/prs:
+# https://github.com/gitlabhq/gitlabhq/issues/3826
+# https://github.com/gitlabhq/gitlabhq/pull/3852
+# https://github.com/discourse/discourse/pull/238
+gem "minitest"
 
-  gem 'handlebars_assets', '0.6.6'
-  gem 'uglifier', '1.3.0'
+# 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 "asset_sync", '0.5.0', :require => false
-end
+# gem "therubyracer", :platform => :ruby
 
-gem 'jquery-rails', '2.1.3'
+group :production do # we don"t install these on travis to speed up test runs
+  # Administration
 
-# web
+  gem "rails_admin", "0.6.7"
 
-gem 'faraday', '0.8.4'
-gem 'faraday_middleware', '0.9.0'
+  # Analytics
 
+  gem "rack-google-analytics", "1.2.0"
+  gem "rack-piwik",            "0.3.0",  require: "rack/piwik"
 
-gem 'jasmine', '1.2.1'
+  # Click-jacking protection
 
-### GROUPS ####
+  gem "rack-protection", "1.5.3"
 
-group :test do
+  # Process management
 
+  gem "eye", "0.7.pre"
 
-  gem 'capybara', '1.1.3'
-  gem 'cucumber-rails', '1.3.0', :require => false
-  gem 'database_cleaner', '0.9.1'
+  # Redirects
 
-  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 "rack-rewrite", "1.5.1", require: false
+  gem "rack-ssl",     "1.4.1", require: "rack/ssl"
 
-  gem 'webmock', '1.8.11', :require => false
+  # Third party asset hosting
 
-  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 :test, :development do
-  gem 'debugger', '1.2.1'
-  gem "rspec-rails", "2.11.4" 
+  gem "asset_sync", "1.1.0", require: false
 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
+  # Automatic test runs
+  gem "guard-cucumber", "1.5.4"
+  gem "guard-jshintrb", "1.1.1"
+  gem "guard-rspec",    "4.5.0"
+  gem "guard-rubocop",  "1.2.0"
+  gem "guard",          "2.12.5", require: false
+  gem "rb-fsevent",     "0.9.4", require: false
+  gem "rb-inotify",     "0.9.5", require: false
+
+  # Linters
+  gem "jshintrb", "0.3.0"
+  gem "rubocop",  "0.31.0"
+
+  # Preloading environment
+
+  gem "spring", "1.3.5"
+  gem "spring-commands-rspec", "1.0.4"
+  gem "spring-commands-cucumber", "1.0.1"
+
+  # Debugging
+  gem "pry"
+  gem "pry-debundle"
+  gem "pry-byebug"
+
+  # test coverage
+  gem "simplecov", "0.10.0", require: false
+end
+
+group :test do
+  # RSpec (unit tests, some integration tests)
+
+  gem "fixture_builder",   "0.4.1"
+  gem "fuubar",            "2.0.0"
+  gem "rspec-instafail",   "0.2.6", require: false
+  gem "test_after_commit", "0.4.1"
+
+  # Cucumber (integration tests)
+
+  gem "capybara",           "2.4.4"
+  gem "database_cleaner" ,  "1.4.1"
+  gem "selenium-webdriver", "2.45.0"
+
+  source "https://rails-assets.org" do
+    gem "rails-assets-jquery-simulate",     "1.0.1"
+    gem "rails-assets-jquery-simulate-ext", "1.3.0"
+  end
+
+  # General helpers
+
+  gem "factory_girl_rails", "4.5.0"
+  gem "timecop",            "0.7.3"
+  gem "webmock",            "1.21.0", require: false
+  gem "shoulda-matchers",   "2.8.0", require: false
+end
+
+group :development, :test do
+  # RSpec (unit tests, some integration tests)
+  gem "rspec-rails",     "3.2.1"
+
+  # Cucumber (integration tests)
+  gem "cucumber-rails",     "1.4.2", require: false
+
+  # Jasmine (client side application tests (JS))
+  gem "jasmine",                   "2.2.0"
+  gem "jasmine-jquery-rails",      "2.0.3"
+  gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
+  gem "sinon-rails",               "1.10.3"
+
+  # silence assets
+  gem "quiet_assets", "1.1.0"
 end

Guardfile

@@ -1,38 +1,45 @@
-# 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" }
+guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^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(/^spec\/.+_spec\.rb$/)
+  watch(/^app\/(.+)\.rb$/)                            {|m| "spec/#{m[1]}_spec.rb" }
+  watch(/^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" }
+  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" }
+  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 }
+guard(:cucumber,
+      command_prefix: "bin/spring",
+      bundler:        false,
+      all_on_start:   false,
+      all_after_pass: false) do
+  watch(/^features\/.+\.feature$/)
+  watch(%r{^features/support/.+$})          { "features" }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) {|m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "features"
+  }
 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' }
+guard :rubocop, all_on_start: false, keep_failed: false do
+  watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
+  watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
+end
+
+guard :jshintrb do
+  watch(/^app\/assets\/javascripts\/.+\.js$/)
+  watch(/^lib\/assets\/javascripts\/.+\.js$/)
+  watch(/^spec\/javascripts\/.+\.js$/)
 end

Procfile

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

README.md

@@ -1,65 +1,38 @@
-Diaspora*
+# diaspora* 
+### a privacy-aware, distributed, 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).
+**master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
+**stable:** [![Build Status stable](https://secure.travis-ci.org/diaspora/diaspora.png?branch=stable)](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/github/diaspora/diaspora.png)](https://codeclimate.com/github/diaspora/diaspora)
 
-* **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)
+[Project site](https://diasporafoundation.org) |
+[Wiki](https://wiki.diasporafoundation.org) |
+[Bugtracker](http://github.com/diaspora/diaspora/issues) |
+[Discussions](https://www.loomio.org/groups/194) |
+[Mailing lists](https://wiki.diasporafoundation.org/How_We_Communicate#Mailing_Lists) |
+[License](/COPYRIGHT) |
+[Authors](https://github.com/diaspora/diaspora/contributors)
+
+## Installation
 
 
-With Diaspora you can:
+You don't have to install diaspora* to use the network. There are many servers connected to diaspora*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our [tips for finding a home](https://wiki.diasporafoundation.org/Choosing_a_pod), or you can just go straight to the [list of open servers](http://podupti.me) to sign up.
 
-- Make cool stuff
-- Share it across the web
-- Own your own data
+Want to own your data and install diaspora*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our [installation guides](https://wiki.diasporafoundation.org/Installation) will get you started!
 
+## Questions?
 
-## Quick Start:
+Have a look at our FAQs [for users](https://wiki.diasporafoundation.org/FAQ_for_users), [for pod administrators](https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers) or [for developers](https://wiki.diasporafoundation.org/FAQ_for_developers).
 
-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).
+Still haven't found an answer? Talk to us! Read [how we communicate](https://wiki.diasporafoundation.org/How_we_communicate). We're here to answer all your questions.
 
-### Step 1: Run the script and follow the on screen instructions.
-```
-  bash <(curl https://raw.github.com/diaspora/diaspora/master/script/install.sh)
-```
+## Contribute
 
+To keep diaspora*  growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
 
-### Step 2: Run the development server
-```
-  rails s
-```
+## Security
 
-then visit 'http://localhost:3000' in your browser.
+Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org](mailto:security@diasporafoundation.org). The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A](http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x6F70243F27AD886A)
 
-### 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

@@ -7,7 +7,6 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'resque/tasks'
 
 # for rake 0.9.0
 module Diaspora