blackstack-deployer 1.2.17 → 1.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e60ac86398b508a3c0262ee2a8d19d41e59994dbe293de5d155c68b0681d75a
-  data.tar.gz: 6054c1d54a2c3da6bea3b8e30ad1168c09450039918eeed55f1e1380deb7f01f
+  metadata.gz: d18d657b11702c6216df79fea79448ddc9551be15b494f43fbbce5afe734a997
+  data.tar.gz: f532b2676c8f21bd4ffcc23f37f732bc7630dba88e2ba986baba7c585e2fbc63
 SHA512:
-  metadata.gz: 441321acb984529b0d4fceb4b6b25cd6d7264731019d6076df6c8b5c65026345e9f7cab72c2b12df6843bedae5520b4b8dd6745d87e388057938a861a7ccd055
-  data.tar.gz: 5f487e1c15d30092ca92583eb98e0438334350cda2d719e77b18a03a416f7cfcb34fadd452de992c83b482f1c2b20c9c33cc1f9f0ea572825bf5f35348a1d1fd
+  metadata.gz: 39f74640d3ff4ae8de2e1a5c827524d74fe0a87cd82b775bde836fe02f45dce59423e6372f422010bc5dd8326815a7b255c8f9cf69deb53ceada0f48b5cfe9fb
+  data.tar.gz: f3e77987d1dd68ff263bca563e9931e812e01fc823ab707632eccedd791705288c81f6cbe84259de79bd08e8aef5db1f15b55e6e470e29f334f1af421c0869bb

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,11 +323,17 @@ 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
@@ -336,9 +351,25 @@ module BlackStack
             }
             ret = lines.join("\n")
           end
+          # 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
+        end
 
       def run(node)
         l = BlackStack::Deployer.logger
@@ -369,12 +400,12 @@ 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, self.sudo)
+          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
 
           # validation: at least one of the matches should happen
-          if self.matches.size > 0
+          if self.matches.size > 0 && !self.background
             i = 0
             self.matches.each do |m|
               if m.validate(output).size == 0 # no errors 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.20
 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.8
+        version: 1.2.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.10
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement