social_stream 0.14.1 → 0.15.0

data/presence/lib/tasks/presence/installer.rake

@@ -0,0 +1,100 @@
+namespace :presence do
+  desc 'Copy ejabberd files to the xmpp server and write configuration files'
+  task :install => [ 'presence:install:copy_xmpp_server_files', 'presence:install_xmpp_server' , 'presence:autoconfigure_xmpp_server' ]
+
+  namespace :install do
+
+    desc "Copy ejabberd files to the xmpp server"
+    task :copy_xmpp_server_files => :environment do
+      puts "Starting presence:install:copy_xmpp_server_files"
+      
+      presence_root = File.expand_path("../../../../", __FILE__)
+      opath = presence_root + "/ejabberd";
+      dpath = SocialStream::Presence.scripts_path + "/sstream_ejabberd_files";
+      
+      #Cleaning dpath
+      SocialStream::Presence::XmppServerOrder::executeCommands(["rm -r " + dpath,"mkdir -p " + dpath])
+      #Copy folders
+      SocialStream::Presence::XmppServerOrder::copyFolder(opath,dpath)
+      
+      puts "Social Stream Ejabberd files copied to " + dpath + " in Xmpp Server"
+      puts "Copy_xmpp_server_files: Task complete"
+    end
+
+
+    desc "Copy ejabberd files to the xmpp server and write configuration files" 
+    task :xmpp_server, [:sudo_password] => :environment do |t, args| 
+        puts "Starting presence:install_xmpp_server"
+        
+        user = SocialStream::Presence::XmppServerOrder::getExecutorUser 
+        unless user
+            puts "Specify ssh_user for remote access!"
+            exit 0
+        end
+        
+        #Get password
+        if args[:sudo_password]
+          password = args[:sudo_password]
+        else
+          puts "[sudo] password for " + user + ":\n"
+          system "stty -echo"
+          password = STDIN.gets.chomp
+          system "stty echo"
+          
+          if password.gsub(" ","")==""
+            puts "Please specify [sudo] password for " + user + " to execute the installer"
+            puts "You can provided it from keyboard input or execute the task as presence:install:xmpp_server[sudo_password]"
+            exit 0
+          end        
+        end
+        
+        #Copy files
+        Rake::Task["presence:install:copy_xmpp_server_files"].execute
+        
+        commands = []
+        
+        #Give permissions to installation script
+        commands << "chmod +x " + SocialStream::Presence.scripts_path + "/sstream_ejabberd_files/installer.sh"     
+
+        #Get autoconfiguration values
+        options = SocialStream::Presence::XmppServerOrder::autoconf([])
+
+        #Execute installation script
+        commands << "echo " + password + " | sudo -S " + SocialStream::Presence.scripts_path + "/sstream_ejabberd_files/installer.sh \"ejabberd_module_path=" + SocialStream::Presence.ejabberd_module_path + "\" \"scripts_path=" + SocialStream::Presence.scripts_path + "\" \"" + options + "\""
+        
+        #Execution order
+        output = SocialStream::Presence::XmppServerOrder::executeCommands(commands)
+        
+        puts output
+        puts "Installation complete"
+    end
+    
+    
+    desc "Autoconfigure options"
+    task :autoconfigure_xmpp_server, [:options] => :environment do |t, args|
+      puts "Starting presence:install:autoconfigure_xmpp_server"
+      
+      if args[:options]
+        manual_options = args[:options].split(';') 
+        manual_options.each do |option|
+          if option.split('=').length != 2
+            puts "Syntax error: presence:install:autoconfigure_xmpp_server[key1=value1;key2=value2;removeThiskey=remove]"
+          end
+        end
+      else
+        manual_options = []
+      end
+      
+      commands = []
+      options = SocialStream::Presence::XmppServerOrder::autoconf(manual_options)
+      commands << SocialStream::Presence.scripts_path + "/sstream_ejabberd_files/installer.sh \"onlyconf=true\" \"" + options + "\"" 
+      
+      #Execution order
+      output = SocialStream::Presence::XmppServerOrder::executeCommands(commands)
+      
+      puts output
+      puts "Autoconfigure complete"
+    end
+    
+  end
+end

data/presence/social_stream-presence.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "xmpp4r"
 
   s.add_runtime_dependency "net-ssh"
+
+  s.add_runtime_dependency "net-sftp"
   
   s.add_development_dependency "ruby-debug19"
   

data/social_stream.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.5')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.5.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.1.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.0.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.6')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.5.1')
+  s.add_runtime_dependency('social_stream-events', '~> 0.2.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.0.2')
  
   # Development Gem dependencies
   #

data/spec/dummy/config/relations.yml

@@ -37,16 +37,3 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
-
-event:
-  member:
-    name: member
-    permissions:
-      - [ represent ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-      - [ read,    tie ]
-  partner:
-    name: partner
-    permissions:
-      - [ read,    activity ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 0
-  - 14
-  - 1
-  version: 0.14.1
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 59
         segments: 
         - 0
         - 10
-        - 5
-        version: 0.10.5
+        - 6
+        version: 0.10.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -266,6 +266,7 @@ files:
 - base/app/assets/images/btn/btn_page_link.png
 - base/app/assets/images/btn/btn_partner.png
 - base/app/assets/images/btn/btn_photo.png
+- base/app/assets/images/btn/btn_play.png
 - base/app/assets/images/btn/btn_printer.png
 - base/app/assets/images/btn/btn_profile.png
 - base/app/assets/images/btn/btn_rank.png
@@ -1005,96 +1006,11 @@ files:
 - documents/vendor/assets/stylesheets/jquery.lightbox.css
 - documents/vendor/assets/stylesheets/pbar-ani.gif
 - events/.gitignore
-- events/GPL Affero license
 - events/Gemfile
 - events/README.rdoc
 - events/Rakefile
-- events/app/assets/images/btn/btn_certificate.png
-- events/app/assets/images/btn/btn_certificates.png
-- events/app/assets/images/btn/btn_edit.png
-- events/app/assets/images/btn/btn_embebed.png
-- events/app/assets/images/btn/btn_event.png
-- events/app/assets/images/btn/btn_outline.png
-- events/app/assets/images/btn/event.png
-- events/app/assets/images/btn/flyer.png
-- events/app/assets/images/btn/keynote.png
-- events/app/assets/images/btn/live.png
-- events/app/assets/images/btn/time.png
-- events/app/assets/images/btn/trash.png
-- events/app/assets/images/frontpage/thumbs/tvideo_1_happy.jpg
-- events/app/assets/images/frontpage/thumbs/tvideo_2_kostas.jpg
-- events/app/assets/images/frontpage/thumbs/tvideo_3_colin.jpg
-- events/app/assets/images/frontpage/thumbs/tvideo_4_romilla.jpg
-- events/app/assets/images/frontpage/video_1_happy.jpg
-- events/app/assets/images/frontpage/video_2_kostas.jpg
-- events/app/assets/images/frontpage/video_3_colin.jpg
-- events/app/assets/images/frontpage/video_4_romilla.jpg
-- events/app/assets/images/icons/IconsByGlyphish.txt
-- events/app/assets/images/icons/down.png
-- events/app/assets/images/icons/search.png
-- events/app/assets/images/icons/up.png
-- events/app/assets/images/logos/actor/event.png
-- events/app/assets/images/logos/contact/event.png
-- events/app/assets/images/logos/original/event.png
-- events/app/assets/images/logos/profile/event.png
-- events/app/assets/images/logos/representation/event.png
-- events/app/assets/images/tab_bottom.png
-- events/app/assets/javascripts/schedule.js
 - events/app/assets/javascripts/social_stream-events.js
 - events/app/assets/stylesheets/social_stream-events.css
-- events/app/controllers/agendas_controller.rb
-- events/app/controllers/events_controller.rb
-- events/app/controllers/sessions_controller.rb
-- events/app/helpers/event_helper.rb
-- events/app/models/agenda.rb
-- events/app/models/event.rb
-- events/app/models/session.rb
-- events/app/views/agendas/_agenda.html.erb
-- events/app/views/agendas/_edit.html.erb
-- events/app/views/agendas/_schedule.html.erb
-- events/app/views/agendas/_show.html.erb
-- events/app/views/agendas/_show_day.html.erb
-- events/app/views/agendas/edit.html.erb
-- events/app/views/agendas/event.html.erb
-- events/app/views/agendas/index.html.erb
-- events/app/views/agendas/show.html.erb
-- events/app/views/documents/_mediawall.html.erb
-- events/app/views/events/_event.html.erb
-- events/app/views/events/_event_focus_search.html.erb
-- events/app/views/events/_event_global_search.html.erb
-- events/app/views/events/_event_with_details.html.erb
-- events/app/views/events/_form.html.erb
-- events/app/views/events/_manage.html.erb
-- events/app/views/events/_new_activity.html.erb
-- events/app/views/events/_new_activity_fields.html.erb
-- events/app/views/events/_sessions_edit.html.erb
-- events/app/views/events/_sidebar_cloud.html.erb
-- events/app/views/events/_sidebar_index.html.erb
-- events/app/views/events/_sidebar_show.html.erb
-- events/app/views/events/agendas.html
-- events/app/views/events/edit.html.erb
-- events/app/views/events/index.html.erb
-- events/app/views/events/manage.html.erb
-- events/app/views/events/manage.js.erb
-- events/app/views/events/new.html.erb
-- events/app/views/events/show.html.erb
-- events/app/views/frontpage/_caracteristics.html.erb
-- events/app/views/frontpage/index.html.erb
-- events/app/views/profiles/_outline.html.erb
-- events/app/views/sessions/_form.html.erb
-- events/app/views/sessions/_new.html.erb
-- events/app/views/sessions/_session.html.erb
-- events/app/views/sessions/_show.html.erb
-- events/app/views/sessions/create.html.erb
-- events/app/views/sessions/create.js.erb
-- events/app/views/sessions/destroy.js.erb
-- events/app/views/sessions/edit.html.erb
-- events/app/views/sessions/index.html.erb
-- events/app/views/sessions/index.js.erb
-- events/app/views/sessions/new.html.erb
-- events/app/views/toolbar/_organizer.html.erb
-- events/app/views/toolbar/_sponsor.html.erb
-- events/app/views/toolbar/_suscribed.html.erb
 - events/config/locales/en.yml
 - events/config/locales/es.yml
 - events/config/routes.rb
@@ -1102,6 +1018,7 @@ files:
 - events/db/migrate/20111102145626_add_more_fields_to_events.rb
 - events/db/migrate/20111104165944_add_more_fields_to_sessions.rb
 - events/db/migrate/20111104182420_add_details_to_events.rb
+- events/db/migrate/20111209120019_reset_events.rb
 - events/lib/generators/social_stream/events/install_generator.rb
 - events/lib/social_stream-events.rb
 - events/lib/social_stream/events/engine.rb
@@ -1147,11 +1064,9 @@ files:
 - linkser/app/models/link.rb
 - linkser/app/views/links/_link.html.erb
 - linkser/app/views/links/_link_preview.html.erb
-- linkser/app/views/links/_link_with_details.html.erb
 - linkser/app/views/links/create.js.erb
 - linkser/app/views/links/destroy.js.erb
 - linkser/app/views/links/show.html.erb
-- linkser/app/views/posts/_new_activity_fields.erb
 - linkser/config/locales/en.yml
 - linkser/config/locales/es.yml
 - linkser/config/routes.rb
@@ -1310,9 +1225,11 @@ files:
 - presence/ejabberd/ejabberd_scripts/reset_connection_script
 - presence/ejabberd/ejabberd_scripts/set_connection_script
 - presence/ejabberd/ejabberd_scripts/set_presence_script
+- presence/ejabberd/ejabberd_scripts/set_script_header.sh
 - presence/ejabberd/ejabberd_scripts/synchronize_presence_script
 - presence/ejabberd/ejabberd_scripts/unset_connection_script
 - presence/ejabberd/ejabberd_scripts/unset_presence_script
+- presence/ejabberd/installer.sh
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.beam
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.erl
 - presence/ejabberd/mod_sspresence/mod_sspresence.beam
@@ -1326,6 +1243,7 @@ files:
 - presence/lib/social_stream/presence/version.rb
 - presence/lib/social_stream/presence/xmpp_server_order.rb
 - presence/lib/social_stream/views/settings/presence.rb
+- presence/lib/tasks/presence/installer.rake
 - presence/lib/tasks/presence/synchronize.rake
 - presence/social_stream-presence.gemspec
 - presence/spec/demo/.gitignore