blackstack-nodes 1.2.4 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b715095e772fb75530a3e4340f703a8581b6784f3596cfa412a7528fbd2a865
-  data.tar.gz: ce11f94afead91279cd7e5e1a793c8030c42bfc17f35dee3a5806d4e56460b29
+  metadata.gz: 7dfff9ef5d2e94244befce50fd7dff63ff570be36b54da12e550ef100841c2de
+  data.tar.gz: fa9f19672395322af75efafc19d09add8ddc86e510125f4f37433ef7c9c1bd29
 SHA512:
-  metadata.gz: 277fd5c174de605aca61735767fcdfbd3643b48663cef5132a4d08c94d5a654374fac6c86c003f98632e55f2eefeab19a23c801e7b7cf3df9b67f0b7b17701da
-  data.tar.gz: 9f068a0b5852259d7e5c79a1f1e1c3647b53bcbdea66d8f1b0c05361629cbe88872cdace540bf14dec94685c268823bccea6f2561895fe04ee5c6060ea82222c
+  metadata.gz: 18abefb039af30eddfca6d081b563b053205e35ee209adb26b1c5e85c3bad8b9ba44198f62552bcc15a76aa5e53d571096881571451d04c4861df60bfbaf1f92
+  data.tar.gz: '08df674fc7bcc63bbf792a53d57473bffdd12cc5b72a716ca9b2782e58317e940070b05df16400588d5ab2199827038a0aaa63aa3b3902a15be86abbbfae7257'

data/lib/blackstack-nodes.rb

@@ -1,4 +1,5 @@
 require 'net/ssh'
+require 'shellwords'
 require 'simple_cloud_logging'
 # 
 module BlackStack
@@ -33,7 +34,7 @@ module BlackStack
         errors << "The parameter h[:ssh_username] is not a string" unless h[:ssh_username].is_a?(String)
 
         # if the parameter h has a key :ssh_private_key_file
-        if h.has_key?(:ssh_private_key_file)
+        if h.has_key?(:ssh_private_key_file) && !h[:ssh_private_key_file].nil?
           # validate: the parameter h[:ssh_private_key_file] is a string
           errors << "The parameter h[:ssh_private_key_file] is not a string" unless h[:ssh_private_key_file].is_a?(String)
 
@@ -104,13 +105,28 @@ module BlackStack
         self.ssh.close
       end
 
-      def exec(command)
-        s = nil
-        if self.using_password?
-          s = self.ssh.exec!("echo '#{self.ssh_password.gsub("'", "\\'")}' | sudo -S su root -c '#{command.gsub("'", "\\'")}'")
-        elsif self.using_private_key_file?
-          s = self.ssh.exec!("sudo -S su root -c '#{command.gsub("'", "\\'")}'")
+      def exec(command, sudo=true)
+        code = nil
+        if sudo
+          if self.using_password?
+            code = "echo '#{self.ssh_password}' | sudo -S su root -c '#{command}'"
+          elsif self.using_private_key_file?
+            code = "sudo -S su root -c '#{command}'"
+          end
+        else
+          code = command
         end
+#puts
+#puts
+#puts code
+#puts
+#puts
+        s = self.ssh.exec!(code)
+#puts
+#puts
+#puts s
+#puts
+#puts
         s
       end # def exec
 
@@ -124,7 +140,7 @@ module BlackStack
         logger.logs 'reboot... '
         #stdout = host.reboot
         begin
-        stdout = host.ssh.exec!("echo '#{host.ssh_password.gsub("'", "\\'")}' | sudo -S su root -c 'reboot'")
+          stdout = self.exec("reboot")
         rescue
         end
         logger.done #logf("done (#{stdout})")
@@ -150,6 +166,7 @@ module BlackStack
         raise 'reboot failed' if !success
       end # def reboot
 
+
     end # module NodeModule
 
     # TODO: declare these classes (stub and skeleton) using blackstack-rpc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-nodes
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.8
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh