From 0c5d197295d81084e97fb735f63f35f5bbf4b888 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Wed, 13 Oct 2010 22:40:49 +0200 Subject: [PATCH 1/4] README update on Gemfile.lock problem, blocking. --- pkg/fedora/README.md | 4 ++++ pkg/ubuntu/README.md | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md index c0b29d3d2..346730a3a 100644 --- a/pkg/fedora/README.md +++ b/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 diff --git a/pkg/ubuntu/README.md b/pkg/ubuntu/README.md index f50897b24..b676ebf0c 100644 --- a/pkg/ubuntu/README.md +++ b/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. From 51a02409c867eb0e7e3965f13a48e7fb6b154bcd Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 13 Oct 2010 15:18:27 -0700 Subject: [PATCH 2/4] Another try at script server fix --- script/server | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/script/server b/script/server index 42238e052..c60add75c 100755 --- a/script/server +++ b/script/server @@ -7,19 +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 } - +exit # Check if Mongo is running From fd88e24a55fc5d3f14abd6c5a10e405b7f3be5ff Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 13 Oct 2010 16:16:22 -0700 Subject: [PATCH 3/4] Forgot to commit a line --- script/server | 1 - 1 file changed, 1 deletion(-) diff --git a/script/server b/script/server index c60add75c..2649ed677 100755 --- a/script/server +++ b/script/server @@ -20,7 +20,6 @@ test -n "$services" && { echo " $services" exit } -exit # Check if Mongo is running From 3fb2ee6e1b833abb35ac77a6d1941a825762f9aa Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 13 Oct 2010 16:28:56 -0700 Subject: [PATCH 4/4] adding spec for password confirmation fail --- spec/models/user_spec.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index dfb0f685c..8da51bc4a 100644 --- a/spec/models/user_spec.rb +++ b/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