xp5k 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17334721e7c45832785d2e615c822b081cb14d2b
-  data.tar.gz: 2ab5ac52522dd716279c65cb27448e539d697e3f
+  metadata.gz: e63243781dcd538f44d467d8bd3c2b852392c6dd
+  data.tar.gz: c6533692344df8de75efaa9f8463f22c7df642b7
 SHA512:
-  metadata.gz: a62ab77e00dd13ad9d733142ac930462281dadd7bf49f42132553e6f3079204fe90db14d3255a71e0ea0f826c0ff447942d5675013ae999b5af8c9053ee14673
-  data.tar.gz: 6ebbffd6a1b21d621ae59f7219747fa46face90368b15189e7a03433bda024e0b2976aa77ecba5ab9a73c1acb1553bba8a1688567fcc37cf9607bec9975326bd
+  metadata.gz: 98a175bdcf30bfbd561b9457d10b74beb6be3cf427272f09e08436d4fd57b7fc67dc909a414c5b120add6d5bd2799e47a6fba512203d611f40d73a4696bf06c4
+  data.tar.gz: e5f4f5a6f520321f19c1bfcd7956a1bb94cea850a952aa74c5146ab3c3949a9bab6868c43181601552b57a6fadf87ead08c561d0cc246d1020558d13a5dffd2c

data/lib/xp5k/rake/dsl.rb

@@ -48,8 +48,8 @@ module XP5K
       #
       def on(hosts, *args, &block)
 
-        logs = Hash.new { |h,k| h[k] = '' }
-        errors = Hash.new { |h,k| h[k] = '' }
+        logs = Hash.new { |h,k| h[k] = [] }
+        errors = Hash.new { |h,k| h[k] = [] }
         ssh_session = {}
         current_server = ""
         all_connected = false
@@ -66,6 +66,9 @@ module XP5K
         cmd_env = options[:environment].map do |key, value|
           "#{key}=#{value}"
         end
+        
+        # net/ssh specific options
+        options[:ssh] ||= {}
 
         if block_given?
           case result = yield
@@ -81,9 +84,9 @@ module XP5K
         until all_connected
           failed = false
           gateway_options = {}
-          gateway_options[:config] == XP5K::Config[:ssh_config] ? true : XP5K::Config[:ssh_config]
+          gateway_options[:config] = XP5K::Config[:ssh_config] || true
           gateway_user, gateway_host = XP5K::Config[:gateway].match(/^(?:([^;,:=]+)@|)(.*?)$/)[1,2]
-          gateway = Net::SSH::Gateway.new(gateway_host, gateway_user)
+          gateway = Net::SSH::Gateway.new(gateway_host, gateway_user, gateway_options)
           workq = Queue.new
           hosts.each{ |host| workq << host }
           workers = (0...10).map do
@@ -92,7 +95,7 @@ module XP5K
                 while host = workq.pop(true)
                   begin
                     timeout(5) do
-                      ssh_session[host] = gateway.ssh(host, options[:user])
+                      ssh_session[host] = gateway.ssh(host, options[:user], options[:ssh])
                       puts "Connected to #{host}..."
                     end
                   rescue Timeout::Error, Net::SSH::Disconnect, Exception => e
@@ -121,13 +124,15 @@ module XP5K
               while host = workq.pop(true)
                 begin
                   commands.each do |command|
+                    stdout = ""
                     command.prepend(cmd_env.join(' ') + ' ') unless cmd_env.empty?
                     puts "[command][#{host}] #{command}"
                     ssh_session[host].exec!(command) do |channel, stream, data|
-                      logs[host] << data
-                      errors[host] << data if stream == :err
+                      stdout << data
+                      errors[host] << data.chomp if stream == :err
                       puts "[#{stream}][#{host}] #{data}" if data.chomp != ""
                     end
+                    logs[host] = stdout
                   end
                 rescue Exception => e
                   puts "[#{host}] " + e.message
@@ -158,6 +163,9 @@ module XP5K
         end
         gateway.shutdown!
 
+        # returns the output
+        # as a map : node => [out1, ..., outn]
+        return logs
       end
 
       def run(command)

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.12'
+  VERSION='0.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client