ruby-cute 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e75eb4ece743b61f9f6b99471737e8254a99ff24
-  data.tar.gz: 11cb6aa7d6f013d72b8b31724b608723b934f7b8
+  metadata.gz: 6202a18499e60b25ccb685d69285251288e565a8
+  data.tar.gz: 3878e7c9fb9822fc911889ca8fb48b6b28df7f7c
 SHA512:
-  metadata.gz: 6ded1372ed4b88ae5937becf2d1c20a84bc70ce9ba3039328fe873804253b71e1a7cb2ea415de768dc6cfa27b751abfaa81c5d67d70ed834bb6222f2e46bb3f5
-  data.tar.gz: 37d332de8dda6d1df60125e282f4ea34e34dea46b8e8a94135168f5f37df577374ec863641ca3f20ff1f28b045d0e3e01c016aa540d19e88ebc011f3f31a4445
+  metadata.gz: 2c929691eb5b0c87268c6626d70f45544cd144df051f02941cda40297e6b151ed0a18ab8bc83664c456f22f8c6ab5c44d1793dd0edace7e17c8a8cb6e69b8c43
+  data.tar.gz: 5eec3f8391dc7c2462abdbec4c1ef5a5c2d994b1fc53faaa377007ff3b9504e1935824fd3d85b559de20f5a6a0233247570240257f69920c547cefd9b39ca19a

data/examples/g5k-tutorial.md

@@ -468,12 +468,10 @@ Let's execute the script using `play` command:
     Nodes assigned ["edel-10.grenoble.grid5000.fr", "edel-11.grenoble.grid5000.fr", "edel-12.grenoble.grid5000.fr", "edel-13.grenoble.grid5000.fr"]
     => nil
 
-The variable `job` is updated in Pry context. When no keys are specified, the option *-allow_classic_ssh* is activated
-which enables the access via default SSH to the reserved machines. You can verify it by doing:
+The variable `job` is updated in Pry context.
 
-    [11] pry(main)> .ssh edel-11.grenoble.grid5000.fr "hostname"
-    Warning: Permanently added 'edel-11.grenoble.grid5000.fr,172.16.17.11' (RSA) to the list of known hosts.
-    edel-11.grenoble.grid5000.fr
+Up to version 0.10 of ruby-cute, when no job types were specified, the type *allow_classic_ssh* was activated
+which enabled the access via default SSH to the reserved machines. You now have to specify it manually.
 
 Let's explore the available modules for the parallel execution of commands in several remote machines.
 The following example shows how to use the {Cute::TakTuk TakTuk} module.

data/lib/cute.rb

@@ -4,3 +4,4 @@ require 'cute/taktuk'
 require 'cute/g5k_api'
 require 'cute/extensions'
 require 'cute/net-ssh'
+require 'cute/net-ssh-exec3'

data/lib/cute/g5k_api.rb

@@ -914,9 +914,7 @@ module Cute
       #     job = g5k.reserve(:site => "nancy", :nodes => 1, :walltime => "2:00:00", :type => [:deploy,:destructive])
       #
       # == Before using OAR hierarchy
-      # All non-deploy reservations are submitted by default with the OAR option "-allow_classic_ssh"
-      # which does not take advantage of the CPU/core management level.
-      # Therefore, in order to take advantage of this capability, SSH keys have to be specified at the moment of reserving resources.
+      # In order to take advantage of this capability, SSH keys have to be specified at the moment of reserving resources.
       # This has to be used whenever we perform a reservation with cpu and core hierarchy.
       # Given that OAR needs access to both keys private and public users are encouraged
       # to create a pair of SSH keys for managing jobs, for instance the following command can be used:
@@ -1062,8 +1060,6 @@ module Cute
         unless type.include?(:deploy)
           if opts[:keys]
             payload['import-job-key-from-file'] = [ File.expand_path(keys) ]
-          else
-            payload['types'] += [ 'allow_classic_ssh' ]
           end
         end
 

data/lib/cute/net-ssh-exec3.rb

@@ -0,0 +1,56 @@
+require 'net/ssh'
+
+class Net::SSH::Connection::Session
+  # Monkey patch that adds the exec3! method.
+  # It executes a command, waits for the result, and returns the output as a hash indexed with :stdout, :stderr, :exit_code, :exit_signal.
+  # Several options are available: :no_log (don't display anything), :no_output (don't show command output), :merge_outputs (merge stdout and stderr),
+  # :ignore_error (don't raise an exception if the command execution fails).
+  #
+  # @return [Hash] result Hash stdout, stderr, exit_code, exit_signal of executed command
+  def exec3!(command, o = {})
+    puts "SSH exec3 on #{host}: #{command}" unless o[:no_log]
+    res = {}
+    res[:stdout] = ""
+    res[:stderr] = ""
+    res[:exit_code] = nil
+    res[:exit_signal] = nil
+    open_channel do |channel|
+      channel.exec(command) do |ch, success|
+        unless success
+          abort "FAILED: couldn't execute command (ssh.channel.exec)"
+        end
+        channel.on_data do |ch,data|
+          print data unless o[:no_output]
+          res[:stdout]+=data
+        end
+
+        channel.on_extended_data do |ch,type,data|
+          print data unless o[:no_output]
+          if o[:merge_outputs]
+            res[:stdout]+=data
+          else
+            res[:stderr]+=data
+          end
+        end
+
+        channel.on_request("exit-status") do |ch,data|
+          res[:exit_code] = data.read_long
+          puts "EXITCODE: #{res[:exit_code]}" unless o[:no_log]
+        end
+
+        channel.on_request("exit-signal") do |ch, data|
+          res[:exit_signal] = data.read_long
+          puts "EXITSIGNAL: #{res[:exit_signal]}" unless o[:no_log]
+        end
+      end
+    end
+    self.loop
+    if res[:exit_code] != 0 and not o[:ignore_error]
+      puts "SSH exec3 failed: #{command}"
+      pp res
+      raise "SSH exec3 failed: #{command}"
+    end
+    res
+  end
+end
+

data/lib/cute/version.rb

@@ -1,3 +1,3 @@
 module Cute
-  VERSION = "0.10"
+  VERSION = "0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cute
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Algorille team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,7 @@ files:
 - lib/cute/execute.rb
 - lib/cute/extensions.rb
 - lib/cute/g5k_api.rb
+- lib/cute/net-ssh-exec3.rb
 - lib/cute/net-ssh.rb
 - lib/cute/net.rb
 - lib/cute/synchronization.rb