diff --git a/Gemfile.lock b/Gemfile.lock index d68bf5ce1..c92fae55d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM activemodel (= 3.0.0) activesupport (= 3.0.0) activesupport (3.0.0) - addressable (2.2.1) + addressable (2.2.2) arel (1.0.1) activesupport (~> 3.0.0) aws (2.3.21) @@ -172,7 +172,7 @@ GEM mini_fb (1.1.3) hashie rest-client - mini_magick (2.1) + mini_magick (2.3) subexec (~> 0.0.4) mocha (0.9.8) rake diff --git a/app/models/person.rb b/app/models/person.rb index 2798ac3fb..8382c9d34 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -34,6 +34,7 @@ class Person /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix def self.search(query) + return Person.all if query.to_s.empty? qTokens = query.to_s.strip.split(" ") fullQueryText = Regexp.escape( query.to_s.strip ) p = [] diff --git a/ci.sh b/ci.sh index e631517e1..dd78a9b2c 100755 --- a/ci.sh +++ b/ci.sh @@ -4,6 +4,7 @@ echo "************************************************************************** echo "* ruby 1.8.7-p249 build *" && echo "*************************************************************************************************" && echo "" && +rm Gemfile.lock && source /usr/local/rvm/scripts/rvm && rvm use ruby-1.8.7-p249 && bundle install && @@ -13,8 +14,8 @@ echo "************************************************************************** echo "* ruby 1.9.2-p0 build *" && echo "*************************************************************************************************" && echo "" && +rm Gemfile.lock && source /usr/local/rvm/scripts/rvm && rvm use ruby-1.9.2-p0 && bundle install && -bundle exec rake ci && -rm Gemfile.lock \ No newline at end of file +bundle exec rake ci diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec index ba2456a43..b4bd62b5d 100644 --- a/pkg/fedora/diaspora.spec +++ b/pkg/fedora/diaspora.spec @@ -1,9 +1,9 @@ %global debug_package %{nil} -%define git_release HEAD +%define git_release 1010092232_b313272 Summary: A social network server Name: diaspora -Version: 0.0.1 +Version: 0.0 Release: 1.%{git_release}%{?dist} License: AGPLv3 Group: Applications/Communications @@ -19,7 +19,7 @@ BuildRoot: %{_rmpdir}/not-used-in-fedora/ Requires: mongodb-server Requires: ruby(abi) = 1.8 -Requires: diaspora-bundle = %{version} +Requires: diaspora-bundle = 0.0-1.1010081636_d1a4ee0.fc13 %description @@ -34,10 +34,6 @@ find . -perm /u+x -type f -exec \ %build rm -rf master/vendor/bundle -<<<<<<< HEAD -mkdir master/tmp || : -======= ->>>>>>> upstream/master %install rm -fr $RPM_BUILD_ROOT @@ -59,14 +55,7 @@ cp %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora -<<<<<<< HEAD -cp -ar master/.bundle $RPM_BUILD_ROOT/%{_datadir}/diaspora/master -cp diaspora-setup $RPM_BUILD_ROOT/%{_datadir}/diaspora -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/tmp -======= cp %SOURCE2 $RPM_BUILD_ROOT/%{_datadir}/diaspora ->>>>>>> upstream/master mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads @@ -91,25 +80,8 @@ sed -i -e '\|.*/master/config.ru"$|d' \ %post -<<<<<<< HEAD -rm -f %{_datadir}/diaspora/master/vendor/bundle -rm -f %{_datadir}/diaspora/master/log -rm -f %{_datadir}/diaspora/master/public/uploads -rm -rf %{_datadir}/diaspora/master/tmp - -ln -s %{_localstatedir}/log/diaspora \ - %{_datadir}/diaspora/master/log || : -ln -s %{_libdir}/diaspora-bundle/master/vendor/bundle \ - %{_datadir}/diaspora/master/vendor || : -ln -s %{_localstatedir}/lib/diaspora/uploads \ - %{_datadir}/diaspora/master/public/uploads || : -ln -s %{_localstatedir}/lib/diaspora/tmp \ - %{_datadir}/diaspora/master/tmp || : -/sbin/chkconfig --add diaspora-ws || : -======= /sbin/chkconfig --add diaspora-wsd ->>>>>>> upstream/master %preun if [ $1 -eq 0 ] ; then @@ -124,27 +96,21 @@ rm -fr $RPM_BUILD_ROOT %files -f files %defattr(-, root, root, 0755) -<<<<<<< HEAD -%doc README.md GNU-AGPL-3.0 -======= %doc AUTHORS README.md GNU-AGPL-3.0 COPYRIGHT README-Fedora.md ->>>>>>> upstream/master %attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config.ru %attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config/environment.rb %attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora %attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads %attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/tmp -<<<<<<< HEAD -======= %{_datadir}/diaspora/master/tmp %{_datadir}/diaspora/master/public/uploads %{_datadir}/diaspora/master/log ->>>>>>> upstream/master %config(noreplace) %{_sysconfdir}/logrotate.d/diaspora %{_sysconfdir}/init.d/diaspora-wsd %changelog -* Fri Sep 24 2010 Alec Leamas 0.0-1.1009280542_859ec2d +* Fri Sep 24 2010 Alec Leamas 0.0-1.1010092232_b313272.fc13 + - Initial attempt to create a spec fi+le # rubygem-term-ansicolor in repo (1.0.5) diff --git a/pkg/ubuntu/README.md b/pkg/ubuntu/README.md index bbf70362a..f50897b24 100644 --- a/pkg/ubuntu/README.md +++ b/pkg/ubuntu/README.md @@ -66,8 +66,13 @@ dependencies lives in the nothing is insalled by user or on system level. make-dist.sh accepts arguments to get a specified commit and/or use another repo. -This has been tested on a Ubuntu 32-bit 10.10 , clean server. Since this -is a very small dist, the dependencies should possibly be complete. +This has been tested on a Ubuntu 32-bit 10.10 , clean server and on 10.04 +Lucid desktop, also clean installation. + +mongodb is having problems occasionally. Sometimes the dependencies are not +installed, and mongod refuses to start. invoke /usr/bin/mongod -f /etc/mongodb.conf +fo test. The lockfile /var/lib/mongodb/mongod.conf is also a potential +problem. Remove to make it start again. The diaspora-wsd is just placeholder FTM, it does **not** work. diff --git a/pkg/ubuntu/diaspora-install-deps b/pkg/ubuntu/diaspora-install-deps index f4fd6be8b..e3a307ef7 100755 --- a/pkg/ubuntu/diaspora-install-deps +++ b/pkg/ubuntu/diaspora-install-deps @@ -15,7 +15,7 @@ grep -v '^#' /etc/apt/sources.list | grep -q universe || { sudo apt-get update sudo apt-get install -qy --ignore-missing build-essential libxslt1-dev \ libxml2 ruby-full mongodb rake python-software-properties git-core \ - imagemagick libmagick9-dev + imagemagick libmagick9-dev xulrunner-1.9 sudo add-apt-repository ppa:maco.m/ruby sudo apt-get update sudo apt-get install -qy rubygems diff --git a/pkg/ubuntu/diaspora-setup b/pkg/ubuntu/diaspora-setup index 56940491f..9e7da6fc2 100755 --- a/pkg/ubuntu/diaspora-setup +++ b/pkg/ubuntu/diaspora-setup @@ -14,7 +14,9 @@ test -n "$services" && { echo " $services" } -/usr/sbin/service mongodb start || : +service mongodb stop || : +rm -f /var/lib/mongodb/mongod.lock +service mongodb start || : cd /usr/share/diaspora/master @@ -26,11 +28,13 @@ if rake db:seed:dev; then else cat <<- EOF - Database config failed. You might want to remove all db files with - 'rm -rf /var/lib/mongodb/*' and/or resetting the config file by - 'cp config/app_config.yml.example config/app_config.yml' before - making a new try. Also, make sure the mongodb server is running - e. g., using '/sbin/service mongod status'. + Database config failed. You might want to + - Just remove the db lock file: rm /var/lib/mongodb/mongod.lock + - Remove all db files: rm -rf /var/lib/mongodb/* + - Reset the config file by + cp config/app_config.yml.example config/app_config.yml + Also, make sure the mongodb server is running e. g., using + 'service mongod status'. EOF exit 1 fi diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 93f2efcf0..6bacdffbb 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -196,7 +196,7 @@ li.message { font-weight: bold; } li.message .content div.info { color: #444444; - font-size: 14px; } + font-size: 13px; } li.message .content div.info a { color: #cccccc; } li.message .content div.info .time { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 1691755b3..c70992407 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -267,7 +267,7 @@ li.message div.info :color #444 - :font-size 14px + :font-size 13px a :color #ccc .time diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb index e5ff6ad77..d2070a2f9 100644 --- a/spec/models/user/user_friending_spec.rb +++ b/spec/models/user/user_friending_spec.rb @@ -166,19 +166,22 @@ describe User do describe 'unfriending' do before do friend_users(user,aspect, user2, aspect2) + user.reload + user2.reload end it 'should unfriend the other user on the same seed' do - user.friends(true).count.should == 1 - user2.friends(true).count.should == 1 + user.friends.count.should == 1 + user2.friends.count.should == 1 user2.unfriend user.person + user2.reload - user2.friends(true).count.should == 0 + user2.friends.count.should == 0 user.unfriended_by user2.person - aspect.reload.people(true).count.should == 0 - aspect2.reload.people(true).count.should == 0 + aspect.reload.people.count.should == 0 + aspect2.reload.people.count.should == 0 end context 'with a post' do @@ -189,10 +192,10 @@ describe User do user.unfriended_by user2.person end it "deletes the unfriended user's posts from visible_posts" do - user.raw_visible_posts(true).include?(@message.id).should be_false + user.reload.raw_visible_posts.include?(@message.id).should be_false end it "deletes the unfriended user's posts from the aspect's posts" do - aspect2.posts(true).include?(@message).should be_false + aspect2.posts.include?(@message).should be_false end end end