social_stream-presence 0.0.19 → 0.0.20

data/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/lib/social_stream/presence/version.rb

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

data/lib/social_stream/presence/xmpp_server_order.rb

@@ -140,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
@@ -164,10 +166,6 @@ module SocialStream
             end
             return output
           end
-               
-          def executeLocalCommand(command)
-            return executeLocalCommands([command])
-          end
         
           def executeLocalCommands(commands)
             output="No command received";
@@ -177,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
         

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.19
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -21,6 +25,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 18
         version: 0.9.18
   type: :runtime
   version_requirements: *id001
@@ -32,6 +40,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +53,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -54,6 +66,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -196,17 +210,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: social_stream-presence
-rubygems_version: 1.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Presence capabilities for Social Stream, the core for building social network websites