social_stream-presence 0.0.17 → 0.0.18

data/app/controllers/xmpp_controller.rb

@@ -100,7 +100,7 @@ class XmppController < ApplicationController
       return
     end
     
-    SocialStream::Presence::XmppServerOrder::reset_presence
+    SocialStream::Presence::XmppServerOrder::resetPresence
     
     render :text => "Ok" 
   end
@@ -115,7 +115,7 @@ class XmppController < ApplicationController
     #Actual connected users
     user_slugs = params[:name]  
     
-    SocialStream::Presence::XmppServerOrder::synchronize_presence_for_slugs(user_slugs)
+    SocialStream::Presence::XmppServerOrder::synchronizePresenceForSlugs(user_slugs)
     
     render :text => "ok"
   end
@@ -125,10 +125,6 @@ class XmppController < ApplicationController
     return params[:password] == SocialStream::Presence.xmpp_server_password
   end
   
-  def chatAuthWithCookie
-    cookie = params[:cookie]
-    render :text => "Ok"
-  end
   
   def chatWindow
     if (current_user) and (current_user.status != 'disable') and (params[:userConnected]=="true")

data/lib/generators/social_stream/presence/templates/initializer.rb

@@ -9,16 +9,21 @@ SocialStream::Presence.setup do |config|
   config.xmpp_server_password = "password"
   #Remote or local mode
   config.remote_xmpp_server = false
+  #Scripts path to execute ejabberd scripts: local or remote
+  config.scripts_path = "/scripts_path"
   #False to disable Social Stream Presence
   #config.enable = false
   
   #Parameters for remote mode
+  #SSH Login
+  #config.ssh_domain = "domain"
+  #config.ssh_user = "login"
+  #config.ssh_password= "password"
+
+  #Configure to use a Xmpp Client on Rails App
   #Username of the the Social Stream Admin sid
   config.social_stream_presence_username = "social_stream-presence"
   #Configures Social Stream Rails App Password
-  config.password = "password"
-  
-  #Parameters for local mode  
-  #Scripts path to execute local ejabberd commands
-  config.scripts_path = "/scripts_path"
-end
+  config.password = "password"  
+
+end

data/lib/social_stream-presence.rb

@@ -14,13 +14,16 @@ module SocialStream
     mattr_accessor :auth_method
     mattr_accessor :xmpp_server_password
     mattr_accessor :remote_xmpp_server
+    mattr_accessor :scripts_path
     mattr_accessor :enable
     
+    mattr_accessor :ssh_domain
+    mattr_accessor :ssh_user
+    mattr_accessor :ssh_password
+    
     mattr_accessor :social_stream_presence_username
     mattr_accessor :password
 
-    mattr_accessor :scripts_path
-
     @@auth_method = "cookie"
     @@remote_xmpp_server = false
     @@enable = true

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

data/lib/social_stream/presence/xmpp_server_order.rb

@@ -3,55 +3,31 @@ require 'xmpp4r/muc'
 require 'xmpp4r/roster'
 require 'xmpp4r/client'
 require 'xmpp4r/message'
+require 'net/ssh'
 
 module SocialStream
   module Presence
     class XmppServerOrder
       
       class << self
-        
-        
+               
           def setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
-            if SocialStream::Presence.remote_xmpp_server
-              puts "Not implemented setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB) for remote_xmpp_server"
-              return
-            else
-              #SocialStream::Presence.remote_xmpp_server=false
-              executeEmanagementLocalCommand("setBidireccionalBuddys",[userASid,userBSid,userANick,userBNick,groupForA,groupForB])
-            end
+              executeEmanagementCommand("setBidireccionalBuddys",[userASid,userBSid,userANick,userBNick,groupForA,groupForB])
           end 
           
           
           def unsetRosterForBidirectionalTie(userSid,oldfriendSid,oldfriendNick,oldfriendGroup)
-            if SocialStream::Presence.remote_xmpp_server
-              puts "Not implemented unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup) for remote_xmpp_server"
-              return
-            else
-              #SocialStream::Presence.remote_xmpp_server=false
-              executeEmanagementLocalCommand("unsetBidireccionalBuddys",[userSid,oldfriendSid,oldfriendNick,oldfriendGroup])
-            end
+              executeEmanagementCommand("unsetBidireccionalBuddys",[userSid,oldfriendSid,oldfriendNick,oldfriendGroup])
           end
           
           
           def addBuddyToRoster(userSid,buddySid,buddyNick,buddyGroup,subscription_type)
-            if SocialStream::Presence.remote_xmpp_server
-              puts "Not implemented addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type) for remote_xmpp_server"
-              return
-            else
-              #SocialStream::Presence.remote_xmpp_server=false
-              executeEmanagementLocalCommand("addBuddyToRoster",[userSid,buddySid,buddyNick,buddyGroup,subscription_type])
-            end
+              executeEmanagementCommand("addBuddyToRoster",[userSid,buddySid,buddyNick,buddyGroup,subscription_type])
           end
           
           
           def removeBuddyFromRoster(userSid,buddySid)
-            if SocialStream::Presence.remote_xmpp_server
-              puts "Not implemented removeBuddyFromRoster(userSid,buddySid) for remote_xmpp_server"
-              return
-            else
-              #SocialStream::Presence.remote_xmpp_server=false
-              executeEmanagementLocalCommand("removeBuddyFromRoster",[userSid,buddySid])
-            end
+              executeEmanagementCommand("removeBuddyFromRoster",[userSid,buddySid])
           end
           
           
@@ -62,6 +38,10 @@ module SocialStream
               return
             end
             
+            unless contact.receiver and contact.sender
+              return
+            end
+            
             unless contact.receiver.subject_type == "User" and contact.sender.subject_type == "User"
               return
             end
@@ -78,77 +58,56 @@ module SocialStream
             if contact.sender.contact_actors(:type=>:user).include?(contact.receiver)
               #Bidirectional contacts
               #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
-              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,"SocialStream")
+              unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,"SocialStream")
             elsif contact.sender.contact_actors(:type=>:user, :direction=>:sent).include?(contact.receiver)
               #Unidirectional contacts
-              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
+              removeBuddyFromRoster(user_sid,buddy_sid)
             end
             
           end
           
           
-          def synchronize_presence
-            if SocialStream::Presence.remote_xmpp_server  
-              
-              begin
-                client = openXmppClientForSocialStreamUser
-                if client
-                  sendXmppChatMessage(client,getSocialStreamUserSid,"Synchronize")
-                  client.close()
-                  return "Ok"
-                else
-                  reset_presence
-                  return "Reset Connected Users"
-                end
-              rescue
-                puts "Error in SocialStream::Presence::XmppServerOrder::synchronize_presence"
-              end
-              
+          def synchronizePresence
+            
+            if !isEjabberdNodeUp
+              resetPresence
+              return "Xmpp Server Down: Reset Connected Users"
+            end 
+            
+            if SocialStream::Presence.remote_xmpp_server      
+              command = buildCommand("synchronize_presence_script","",[])
+              executeCommand(command)    
             else
               #SocialStream::Presence.remote_xmpp_server=false
               
-              #Get connected users locally 
-              output = executeEmanagementLocalCommand("isEjabberdNodeStarted",[])
-              nodeUp = output.split("\n")[3]
-              
-              if nodeUp and nodeUp.strip() == "true"
-                users = []
-                output = %x[ejabberdctl connected-users]
-                sessions = output.split("\n")
-  
-                sessions.each do |session|
-                  users << session.split("@")[0]
-                  puts session.split("@")[0]
-                end
-                
-                synchronize_presence_for_slugs(users)  
-                
-              else
-                reset_presence
-                return "Xmpp Server Down: Reset Connected Users"
+              #Get connected users locally  
+              users = []
+              output = %x[ejabberdctl connected-users]
+              sessions = output.split("\n")
+
+              sessions.each do |session|
+                users << session.split("@")[0]
+                puts session.split("@")[0]
               end
               
+              synchronizePresenceForSlugs(users)  
+              
             end
           end
           
           
-          def remove_all_rosters
-            if SocialStream::Presence.remote_xmpp_server
-              puts "Not implemented SocialStream::Presence::XmppServerOrder::remove_all_rosters for remote_xmpp_server"
-              return
-            else
-            #SocialStream::Presence.remote_xmpp_server=false
-              executeEmanagementLocalCommand("removeAllRosters",[])
-            end
+          def removeAllRosters
+              executeEmanagementCommand("removeAllRosters",[])
           end
           
           
-          def synchronize_rosters
-            puts "Removing all rosters"
-            remove_all_rosters
-            puts "Rosters removed"
-       
-            puts "Populate rosters"
+          def synchronizeRosters
+            commands = []
+            
+            #"Remove all rosters"
+            commands << buildCommand("emanagement","removeAllRosters",[])
+
+            #"Populate rosters"
             users = User.all
             checkedUsers = []
           
@@ -159,54 +118,17 @@ module SocialStream
                 unless checkedUsers.include?(contact.slug)
                   domain = SocialStream::Presence.domain
                   user_sid = user.slug + "@" + domain
-                  contact_sid = contact.slug + "@" + domain  
-                  setRosterForBidirectionalTie(user_sid,contact_sid,user.name,contact.name,"SocialStream","SocialStream")
+                  contact_sid = contact.slug + "@" + domain
+                  commands << buildCommand("emanagement","setBidireccionalBuddys",[user_sid,contact_sid,user.name,contact.name,"SocialStream","SocialStream"])
                 end
               end
             end
+            
+            executeCommands(commands)
           end
           
-          
-          
-          #Help methods
-          
-          def getSocialStreamUserSid
-            #XMPP DOMAIN
-            domain = SocialStream::Presence.domain
-            #SS Username
-            ss_name = SocialStream::Presence.social_stream_presence_username
-            return ss_name + "@" + domain
-          end
-          
-          
-          def openXmppClientForSocialStreamUser
-            begin            
-              password= SocialStream::Presence.password
-              client = Jabber::Client.new(Jabber::JID.new(getSocialStreamUserSid))
-              client.connect
-              client.auth(password)
-              return client
-            rescue Exception => e
-              case e
-                when Errno::ECONNREFUSED
-                  puts "Connection to XMPP Server refused"
-                  return nil
-                else
-                  puts "Unknown exception: #{e.to_s}"
-                  return nil
-              end  
-            end
-          end
-          
-          
-          def sendXmppChatMessage(client,dest_sid,body)
-                msg = Jabber::Message::new(dest_sid, body)
-                msg.type=:chat
-                client.send(msg)
-          end
-          
-          
-          def synchronize_presence_for_slugs(user_slugs)
+     
+          def synchronizePresenceForSlugs(user_slugs)
             #Check connected users
             users = User.find_all_by_connected(true)
             
@@ -227,7 +149,7 @@ module SocialStream
           end
           
           
-          def reset_presence
+          def resetPresence
             users = User.find_all_by_connected(true)
     
             users.each do |user|
@@ -237,17 +159,123 @@ module SocialStream
           end
           
           
-          def executeEmanagementLocalCommand(order,params)
-            command = SocialStream::Presence.scripts_path + "/emanagement " + order
+          
+          #Execution commands manage  
+        
+          def buildCommand(script,order,params)
+            command = SocialStream::Presence.scripts_path + "/" + script + " " + order
             params.each do |param|
               command = command + " " + param.split(" ")[0]
             end
+            return command
+          end
+          
+          def executeEmanagementCommand(order,params)
+            command = buildCommand("emanagement",order,params)
+            executeCommand(command)
+          end
+          
+          def executeCommand(command)
             puts "Executing " + command
-            output = %x[#{command}];
+            if SocialStream::Presence.remote_xmpp_server
+              output = executeRemoteCommand(command)
+            else
+              #SocialStream::Presence.remote_xmpp_server=false
+              output = executeLocalCommand(command)
+            end
+            return output
+          end
+          
+          def executeCommands(commands)
+            puts "Executing the following commands:"
+            commands.each do |command|
+              puts command
+            end  
+            puts "Command list finish"
+            if SocialStream::Presence.remote_xmpp_server
+              output = executeRemoteCommands(commands)
+            else
+              #SocialStream::Presence.remote_xmpp_server=false
+              output = executeLocalCommands(commands)
+            end
+            return output
+          end
+               
+          def executeLocalCommand(command)
+            return executeLocalCommands([command])
+          end
+        
+          def executeLocalCommands(commands)
+            output="No command received";
+            commands.each do |command|
+                output = %x[#{command}];
+            end
             return output
           end
         
+          def executeRemoteCommand(command)
+            return executeRemoteCommands([command])
+          end
+        
+          def executeRemoteCommands(commands)
+            output="No command received";
+            Net::SSH.start( SocialStream::Presence.ssh_domain, SocialStream::Presence.ssh_user, :password => SocialStream::Presence.ssh_password, :auth_methods => ["password"]) do |session|
+              commands.each do |command|
+                output = session.exec!(command)
+              end
+            end
+            return output
+          end
+        
+        
+        
+         #Help methods
+         
+          def isEjabberdNodeUp
+              output = executeEmanagementCommand("isEjabberdNodeStarted",[])
+              nodeUp = output.split("\n")[3]
+              return (nodeUp and nodeUp.strip()=="true")
+          end
+        
+        
         
+         #Xmpp client manage methods
+          
+          def getSocialStreamUserSid
+            #XMPP DOMAIN
+            domain = SocialStream::Presence.domain
+            #SS Username
+            ss_name = SocialStream::Presence.social_stream_presence_username
+            return ss_name + "@" + domain
+          end
+          
+          
+          def openXmppClientForSocialStreamUser
+            begin            
+              password= SocialStream::Presence.password
+              client = Jabber::Client.new(Jabber::JID.new(getSocialStreamUserSid))
+              client.connect
+              client.auth(password)
+              return client
+            rescue Exception => e
+              case e
+                when Errno::ECONNREFUSED
+                  puts "Connection to XMPP Server refused"
+                  return nil
+                else
+                  puts "Unknown exception: #{e.to_s}"
+                  return nil
+              end  
+            end
+          end
+          
+          
+          def sendXmppChatMessage(client,dest_sid,body)
+                msg = Jabber::Message::new(dest_sid, body)
+                msg.type=:chat
+                client.send(msg)
+          end
+               
       end
     end
   end

data/lib/tasks/presence/synchronize.rake

@@ -7,7 +7,7 @@ namespace :presence do
     desc "Synchronize user presence"
     task :connections => :environment do
       puts "Starting presence:synchronize:connections"
-      SocialStream::Presence::XmppServerOrder::synchronize_presence
+      SocialStream::Presence::XmppServerOrder::synchronizePresence
       puts "Synchronization complete"
     end
 
@@ -15,7 +15,7 @@ namespace :presence do
     desc "Remove all rosters and populate rosters from Social Stream data."
     task :rosters => :environment do
         puts "Starting presence:synchronize:rosters"
-        SocialStream::Presence::XmppServerOrder::synchronize_rosters
+        SocialStream::Presence::XmppServerOrder::synchronizeRosters
         puts "Rosters Synchronization complete"
     end
   end

data/social_stream-presence.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('social_stream-base','~> 0.9.18')
   
   s.add_runtime_dependency "xmpp4r"
+
+  s.add_runtime_dependency "net-ssh"
   
   s.add_development_dependency "ruby-debug19"
   

metadata

@@ -2,7 +2,7 @@
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 +01:00
+date: 2011-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: net-ssh
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -44,8 +44,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
 email: 
 - iamchrono@gmail.com