blackstack-deployer 1.2.19 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dfec0f6c8509d10655041122a6e4c80d536edf5835232a9e1606443cfc7635c
-  data.tar.gz: cad9f6289af37135b3a1e3fd2cb31708c1d4f76c90e7598b7b51f3c0798c3430
+  metadata.gz: 596376713a5b5eab0a27f97e8601c59188c5436e26e3312f4d783c3e129e415a
+  data.tar.gz: 83d61e633596e2c4963bd3e7a5d1907630363d5968de96c6544c2916c07e5041
 SHA512:
-  metadata.gz: 41b6b36ab5294ea1b64a954ed5389aab6004422933cf814b4b7adc67dad15f22ac48c63b67931496be104fd2b69447a999158f4325406e22d4dbd504c3a6376a
-  data.tar.gz: f476bfaa60b97e39f08f019c301d9281249e79f31c349813a2a2fe691ae29f0fdda4ba60a09564e2f8a29e2fa99333a41f3c6f6f5c956d289c4517661ea370c1
+  metadata.gz: e3271ce02a03667a0725a3fc2fd3025cdd7c6662176226acf1ad69bb13f162a3b5e5ca81613d07fbccc6271ff2c20c85a4010af88273f9d6183925670b63dc4f
+  data.tar.gz: 753d60764dbef8249eb23d64a6b0b9eebb9029ba7a4b9325377bd3dc35bc44e837dd2d45e199f90491577e2fe07e4d682d05d288d0f2531d39a8000f17557120

data/lib/blackstack-deployer.rb

@@ -211,11 +211,17 @@ module BlackStack
             # :reboot is a reserved word, so it is fine to call :reboot
           else
             # validate: existis a routine with a the value c[:command].to_s on its :name key
-            errors << "The routine with the name #{c[:command].to_s} does not exist" unless BlackStack::Deployer::deployment_routines.select { |r| r.name == c[:command].to_s }.size > 0
+            errors << "The routine with the name #{c[:command].to_s} does not exist" unless BlackStack::Deployer::routines.select { |r| r.name == c[:command].to_s }.size > 0
           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
@@ -278,11 +284,16 @@ module BlackStack
             end
           end
         end
+#puts
+#puts
+#puts "command: #{self.command}"
+#puts "h[:background] = #{h[:background]}"
         if h.has_key?(:background)
           self.background = h[:background]
         else
           self.background = false
-        end                                                                                                            
+        end
+#puts "self.background = #{self.background}"
       end # def initialize(h)
 
       def to_hash
@@ -305,6 +316,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 +328,24 @@ 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.
+#puts
+#puts "self.background: #{self.background.to_s}"
+          if self.background #&& !BlackStack::Deployer.show_output
             lines = ret.strip.lines
             total = lines.size
             i = 0
@@ -339,6 +362,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.22
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-08 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