blackstack-deployer 1.2.18 → 1.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b14b1870b2b15b1f26f5b6087e4ceb672e375fce44d02ea7ae36d658d690c3
-  data.tar.gz: ff442f3dc4231513d28147431c859bc0791114a57d7085e90903e6aa7a09b7b2
+  metadata.gz: 352e8143167fb520bb742fecbedf3c43daaa6f517a5cd4c3351ce70eb04c7239
+  data.tar.gz: fc4ff4649a5fd482812e8acc624f44c04ef9a13eb3573f6ba91cca24c78371fb
 SHA512:
-  metadata.gz: 1080f3ec0c42bd3d0d47405f988a7ce6d3173340026c570b1442e2cbcb83ad68169eecb8987f61317a3adfce36f23f5cbabd56d1341ac2c027a06841dff89824
-  data.tar.gz: d11e282d1b7653cdb69c567f865f23a82d1a6b147f2e0258bd5e1371b92cf5864f17173a81c505010384e95b923c7bcf208e69a06cb25905151170e39e05cbce
+  metadata.gz: 9b981b975934c4786fcfbfbfa8ae135b7753f670b30937cc1517b93f2878fbc9fb69f42962a230ec699f451519730b2cd05a5480c28deede4db569f3aa9cac9c
+  data.tar.gz: 80d6b0bc534572be9c7d92a5faf51bf5c1e222bd65a9cab4fffac646b19febb5c8da56e59b6df27de3e814a76459c8316c17bd0296d7fcfb88f8001d862fea5a

data/lib/blackstack-deployer.rb

@@ -215,7 +215,13 @@ module BlackStack
           end
         else
           # validate: each line of the :command value must finish with ;
-          errors << "Each line in the :command value must finish with `;`.\nCommand: #{c[:command]}.\nRefer https://github.com/leandrosardi/blackstack-deployer#67-running-commands-in-background for more details." unless c[:command].strip.split("\n").select { |l| l.strip[-1,1] != ';' }.size == 0
+          #errors << "Each line in the :command value must finish with `;`.\nCommand: #{c[:command]}.\nRefer https://github.com/leandrosardi/blackstack-deployer#67-running-commands-in-background for more details." unless c[:command].strip.split("\n").select { |l| l.strip.strip[-1,1] != ';' }.size == 0
+          c[:command].strip.split("\n").each { |l| 
+            l.strip!
+            if l.strip[-1,1] != ';'
+              errors << "Each line in the :command value must finish with `;`.\nCommand: #{l}.\nRefer https://github.com/leandrosardi/blackstack-deployer#67-running-commands-in-background for more details."
+            end
+          }
         end
 
         # if c[:matches] exists
@@ -305,6 +311,9 @@ module BlackStack
       # some parameters like `:show_outut` or `:background`.
       def code(node)
           ret = self.command
+#puts
+#puts
+#puts "self.command: #{self.command}"
           # replacing parameters
           ret.scan(/%[a-zA-Z0-9\_]+%/).each do |p|
             if p == '%eth0_ip%' # reserved parameter
@@ -314,15 +323,22 @@ module BlackStack
               # TODO: move this to a timestamp function on blackstack-core
               ret.gsub!(p, Time.now.to_s.gsub(/\D/, '')) 
             else
+#puts
+#puts
+#puts "p: #{p}"
               if node.parameters.has_key?(p.gsub(/%/, '').to_sym)
                 ret.gsub!(p, node.parameters[p.gsub(/%/, '').to_sym].to_s)
               else
                 raise "The parameter #{p} does not exist in the node descriptor #{node.parameters.to_s}"
               end
+#puts
+#puts
+#puts "ret: #{ret}"
             end
           end
-          # if the command is configured to run in background, and the flag show_ouput is off, then modify the ret to run in background
-          if self.background && !BlackStack::Deployer.show_output
+          # if the command is configured to run in background, then modify the ret to run in background.
+          # note: even if you the flag show_ouput is on, you won't see any error message.
+          if self.background #&& !BlackStack::Deployer.show_output
             lines = ret.strip.lines
             total = lines.size
             i = 0
@@ -339,6 +355,19 @@ module BlackStack
           # apply modifications due the sudo flag
           # return the code
           ret = node.code(ret, self.sudo)
+#puts
+#puts
+#puts 'lalala'
+#puts ret
+=begin
+          if self.sudo
+            if node.using_password?
+              ret = "echo '#{node.ssh_password.gsub(/'/, "\\\\'")}' | sudo -S su root -c '#{ret}'"
+            elsif node.using_private_key_file?
+              ret = "sudo -S su root -c '#{ret}'"
+            end
+          end  
+=end
           # return
           ret
         end
@@ -372,7 +401,7 @@ module BlackStack
           # running the command
           l.logs "Show command output... " if BlackStack::Deployer.show_output
           l.log "\n\nCommand:\n--------\n\n#{s} " if BlackStack::Deployer.show_output
-          output = node.exec(s, false) # false: I already evaluated the :sudo parameter in the code method above.
+          output = node.ssh.exec!(s) 
           l.log "\n\nOutput:\n-------\n\n#{output}" if BlackStack::Deployer.show_output
           l.logf('done tracing.') if BlackStack::Deployer.show_output
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.18
+  version: 1.2.21
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blackstack-nodes
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.2.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.2.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.2.10
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement