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

pkg/fedora/README.md

@@ -1,5 +1,9 @@
 ## Diaspora RPM tools
 
+NOTE: This does not work ATM, see discussions on Gemfile.lock in
+attached to a  commit 12/10 (yea, I know, you calll it 10/12, but you
+are wrong ;)
+
 Creates diaspora source tarballs and RPM packages
 
 An alternative to the capistrano system, providing classic, binary RPM

pkg/ubuntu/README.md

@@ -1,5 +1,10 @@
 ## Package-oriented install for ubuntu.
 
+NOTE: This does not work ATM, see discussions on Gemfile.lock in
+attached to a  commit 12/10 (yea, I know, you calll it 10/12, but you
+are wrong ;)
+
+
 Here are somediaspora-installdiaspora-install scripts to install diaspora on Ubuntu. They are designed to
 work as a first step towards packaging, but should be usable as is.
 

script/server

@@ -7,20 +7,20 @@
 PORT=3000
 while getopts ":p:" OPTION
 do
-  if OPTION='p'
+  if [ $OPTION == 'p' ]
   then
     PORT=$OPTARG
   fi
 done
 
-services=$( netstat -nl | grep '[^:]:'$PORT'[ \t]')
+services=$( netstat -nl | grep ":$PORT[ \t]")
+
 test -n "$services" && {
     echo "Warning: something is already using port "$PORT
     echo "     $services"
     exit
 }
 
-
 # Check if Mongo is running
 
 if ! ps ax | grep -v grep | grep mongod >/dev/null

spec/models/user_spec.rb

@@ -22,6 +22,20 @@ describe User do
       user.valid?
       user.username.should == "someuppercase"
     end
+
+    it "confirms the password" do
+      pending "I cannot figure out why this doesn't work. --Raphael"
+      user = User.instantiate!( 
+        :email => "tom@tom.joindiaspora.com",
+        :username => "tom",
+        :password => "evankorth",
+        :password_confirmation => "potatoes",
+        :person => Person.new(
+          :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" ))
+                  )
+      user.created_at.should be_nil
+      user.valid?.should be_false
+    end
   end
 
   describe '#diaspora_handle' do