Merge branch 'master' of github.com:diaspora/diaspora into import

README.md

@@ -3,37 +3,39 @@
 The privacy aware, personally controlled, do-it-all, open source social
 network.
 
-**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
+**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**
 
-Initial installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
+Installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
 
-We are continuing to build features and improve the code base.
-When we think it is ready for general use, we will post more final
-instructions.  Issue tracking is at [bugs.joindiaspora.com](bugs.joindiaspora.com).
+Please report any bugs you see.  Issue tracking is at [bugs.joindiaspora.com](http://bugs.joindiaspora.com).
 
-## Commit Guidelines
+## Contributing to Diaspora
 
-You are welcome to contribute, add to and extend Diaspora however you see fit.  We
-will do our best to incorporate everything that meets our guidelines.
+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).  Here are a few good places to start:
 
-You can find an introduction to the source code [here](http://github.com/diaspora/diaspora/wiki/An-Introduction-to-the-Diaspora-Source).  For an idea of where to start, look at our [issue tracker](bugs.joindiaspora.com).
+- Run "rake spec" to run our [Rspec](http://blog.davidchelimsky.net/2007/05/14/an-introduction-to-rspec-part-i/) 
+unit test suite.  Take a look at the pending specs, make one pass!
 
-Make a topic branch.  By making your changes in a topic branch, you ensure that new commits to your master are not included in the pull request, and it's easier for us to merge your commits.
+- 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.
 
-Patches must be tested, and all your tests should be green
-before a pull request is sent.  Please write your tests in Rspec.
-
-GEMS: We would like to keep external dependencies unduplicated.  We're using
-Nokogiri, Mongomapper, and EM::HttpRequest as much as possible.  We have a few
-gems in the project we'd rather not use, but if you can, use dependencies we
-already have.
-
 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

ci.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo "*************************************************************************************************" &&
+echo "*                                  ruby 1.8.7-p249 build                                        *" &&
+echo "*************************************************************************************************" &&
+echo "" &&
+source /usr/local/rvm/scripts/rvm &&
+rvm use ruby-1.8.7-p249 &&
+bundle install &&
+bundle exec rake ci &&
+echo "" &&
+echo "*************************************************************************************************" &&
+echo "*                                   ruby 1.9.2-p0 build                                         *" &&
+echo "*************************************************************************************************" &&
+echo "" &&
+source /usr/local/rvm/scripts/rvm &&
+rvm use ruby-1.9.2-p0 &&
+bundle install &&
+bundle exec rake ci &&
+rm Gemfile.lock

lib/tasks/db.rake

@@ -67,13 +67,14 @@ namespace :db do
   end
 
   task :move_private_key do
+    require File.dirname(__FILE__) + '/../../config/environment'
     User.all.each do |user|
-      if user.private_key.nil?
-        user.private_key = user.person.serialized_key
+      if user.serialized_private_key.nil?
+        user.serialized_private_key = user.person.serialized_key
         user.save
         person = user.person
         person.serialized_key = nil
-        person.serialized_public_key = user.encryption_key.public_key
+        person.serialized_public_key = user.encryption_key.public_key.to_s
         person.save
       end
     end

spec/models/user/receive_spec.rb

@@ -81,7 +81,7 @@ describe User do
       user.raw_visible_posts.count.should == 1
 
       person = user2.person
-      user2.destroy
+      user2.delete
       user.unfriend(person)
 
       user.reload