social_stream 0.12.2 → 0.12.3

data/base/app/models/contact.rb

@@ -126,9 +126,6 @@ class Contact < ActiveRecord::Base
   # We need to update that status here
   def relation_ids=(ids)
     remove_follower(ids)
-    if defined?(SocialStream::Presence) and SocialStream::Presence.enable
-      SocialStream::Presence::XmppServerOrder::removeBuddy(self)
-    end
     association(:relations).ids_writer(ids)
   end
 

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.25".freeze
+    VERSION = "0.9.26".freeze
   end
 end

data/base/vendor/assets/javascripts/jquery.screw.js

@@ -1,4 +1,3 @@
-<!-- 
 /* 
     Screw - A jQuery plugin
     ==================================================================
@@ -185,4 +184,3 @@
 	});
 	
 })(jQuery);
- -->

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.2".freeze
+  VERSION = "0.12.3".freeze
 end

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

@@ -18,6 +18,7 @@ SocialStream::Presence.setup do |config|
   #SSH Login
   #config.ssh_domain = "domain"
   #config.ssh_user = "login"
+  #Comment to allow SSH authentication with key instead of password
   #config.ssh_password= "password"
 
   #Configure to use a Xmpp Client on Rails App

data/presence/lib/social_stream/presence/models/buddy_manager.rb

@@ -42,6 +42,16 @@ module SocialStream
               subscription_type = "to"
               SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,"SocialStream",subscription_type)
             else
+              #Negative Tie
+              
+              if self.contact.positive_replied?
+                #Bidirectional contacts
+                #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
+                SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,"SocialStream")
+              else
+                SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
+              end
+              
               return  
             end
             
@@ -49,38 +59,41 @@ module SocialStream
           
           
           def remove_buddy 
-            
-            unless SocialStream::Presence.enable
-              return
-            end
-            
-            unless self.receiver and self.sender
-              return
-            end
-            
-            unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
-              return
-            end
- 
-            #XMPP DOMAIN
-            domain = SocialStream::Presence.domain
-            user_sid = self.sender.slug + "@" + domain
-            user_name =  self.sender.name  
-            buddy_sid = self.receiver.slug + "@" + domain
-            buddy_name =  self.receiver.name
-            
-            #Check if is a positive and replied tie         
-            if self.bidirectional?
-              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
-              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,"SocialStream")
-            elsif self.positive?
-              #Case: Possitive tie unidirectional
-              #Execute removeBuddyFromRoster(user_sid,buddy_sid)
-              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
-            else
-              return  
-            end
-            
+#            
+#            unless SocialStream::Presence.enable
+#              return
+#            end
+#            
+#            unless self.receiver and self.sender
+#              return
+#            end
+#            
+#            unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
+#              return
+#            end
+#            
+#            if self.contact.established?
+#              return
+#            end
+# 
+#            #XMPP DOMAIN
+#            domain = SocialStream::Presence.domain
+#            user_sid = self.sender.slug + "@" + domain
+#            user_name =  self.sender.name  
+#            buddy_sid = self.receiver.slug + "@" + domain
+#            
+#            #Check if is a positive and replied tie         
+#            if self.bidirectional?
+#              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
+#              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,"SocialStream")
+#            elsif self.positive?
+#              #Case: Possitive tie unidirectional
+#              #Execute removeBuddyFromRoster(user_sid,buddy_sid)
+#              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
+#            else
+#              return  
+#            end
+#            
           end
           
         end

data/presence/lib/social_stream/presence/version.rb

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

data/presence/lib/social_stream/presence/xmpp_server_order.rb

@@ -28,43 +28,7 @@ module SocialStream
           
           def removeBuddyFromRoster(userSid,buddySid)
               executeEmanagementCommand("removeBuddyFromRoster",[userSid,buddySid])
-          end
-          
-          
-          #Before delete contact (destroy ties) callback
-          def removeBuddy(contact)
-            
-            unless SocialStream::Presence.enable
-              return
-            end
-            
-            unless contact.receiver and contact.sender
-              return
-            end
-            
-            unless contact.receiver.subject_type == "User" and contact.sender.subject_type == "User"
-              return
-            end
- 
-            #XMPP DOMAIN
-            domain = SocialStream::Presence.domain
-            user_sid = contact.sender.slug + "@" + domain
-            user_name =  contact.sender.name  
-            buddy_sid = contact.receiver.slug + "@" + domain
-            buddy_name =  contact.receiver.name
-            
-            #Check for bidirecctional
-            
-            if contact.sender.contact_actors(:type=>:user).include?(contact.receiver)
-              #Bidirectional contacts
-              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
-              unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,"SocialStream")
-            elsif contact.sender.contact_actors(:type=>:user, :direction=>:sent).include?(contact.receiver)
-              #Unidirectional contacts
-              removeBuddyFromRoster(user_sid,buddy_sid)
-            end
-            
-          end
+          end   
           
           
           def synchronizePresence
@@ -176,22 +140,24 @@ module SocialStream
           end
           
           def executeCommand(command)
-            puts "Executing " + command
-            if SocialStream::Presence.remote_xmpp_server
-              output = executeRemoteCommand(command)
-            else
-              #SocialStream::Presence.remote_xmpp_server=false
-              output = executeLocalCommand(command)
-            end
+            output = executeCommands([command])
             return output
           end
           
           def executeCommands(commands)
-            puts "Executing the following commands:"
-            commands.each do |command|
-              puts command
-            end  
-            puts "Command list finish"
+            if commands.length > 1
+              puts "Executing the following commands:"
+              commands.each do |command|
+                puts command
+              end  
+              puts "Command list finish"
+            elsif commands.length == 1
+              puts "Executing " + commands[0]
+            else
+              puts "No command to execute"
+              return
+            end
+                       
             if SocialStream::Presence.remote_xmpp_server
               output = executeRemoteCommands(commands)
             else
@@ -200,10 +166,6 @@ module SocialStream
             end
             return output
           end
-               
-          def executeLocalCommand(command)
-            return executeLocalCommands([command])
-          end
         
           def executeLocalCommands(commands)
             output="No command received";
@@ -213,17 +175,33 @@ module SocialStream
             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)
+            
+            begin
+              if SocialStream::Presence.ssh_password
+                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
+              else
+                #SSH with authentication key instead of password
+                Net::SSH.start( SocialStream::Presence.ssh_domain, SocialStream::Presence.ssh_user) do |session|
+                  commands.each do |command|
+                    output = session.exec!(command)
+                  end
+                end
               end
-            end
+            rescue Exception => e
+              case e
+                when Net::SSH::AuthenticationFailed
+                  output = "AuthenticationFailed on remote access"
+                else
+                  output = "Unknown exception in executeRemoteCommands method: #{e.to_s}"
+              end
+            end  
+ 
             return output
           end
         

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.25')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.26')
   s.add_runtime_dependency('social_stream-documents', '~> 0.4.2')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.17')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 12
-  - 2
-  version: 0.12.2
+  - 3
+  version: 0.12.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 0
         - 9
-        - 25
-        version: 0.9.25
+        - 26
+        version: 0.9.26
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency