blackstack-deployer 1.2.15 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91adc0de4b1c7772630279b38655a021e3a96fd3e9717fbab2e454e93caafd10
-  data.tar.gz: 85cdc1d5270cea1cfde7ac2287d23b4c623eebd221c7bc34b7d00e16c5773c49
+  metadata.gz: e1b14b1870b2b15b1f26f5b6087e4ceb672e375fce44d02ea7ae36d658d690c3
+  data.tar.gz: ff442f3dc4231513d28147431c859bc0791114a57d7085e90903e6aa7a09b7b2
 SHA512:
-  metadata.gz: 42a56dee4a31ce5ad5daf30ffff2ba3fef9fed7e29cda55e535a465c6a43badf893963da1887542e0cacf18cd33e5e982fae3074e5036dbf7cb82d0856718700
-  data.tar.gz: ba329544c91d5fb55c3f76cd12e49b1fad76a163bdd1fed9fd1cd419b47aa52d580b56add739f28419bc3155099dd1193d00f404b7379f0577845fdde77a22bc
+  metadata.gz: 1080f3ec0c42bd3d0d47405f988a7ce6d3173340026c570b1442e2cbcb83ad68169eecb8987f61317a3adfce36f23f5cbabd56d1341ac2c027a06841dff89824
+  data.tar.gz: d11e282d1b7653cdb69c567f865f23a82d1a6b147f2e0258bd5e1371b92cf5864f17173a81c505010384e95b923c7bcf208e69a06cb25905151170e39e05cbce

data/lib/blackstack-deployer.rb

@@ -5,14 +5,25 @@ module BlackStack
   # Deployer is a library that can be used to deploy a cluster of nodes.
   module Deployer
     @@logger = BlackStack::BaseLogger.new(nil)
+    @@show_output = false
     @@nodes = []
     @@routines = []
 
+    # set show_output
+    def self.set_show_output(value)
+      @@show_output = value
+    end
+
     # set the logger
     def self.set_logger(i_logger)
       @@logger = i_logger
     end
 
+    # get show_output
+    def self.show_output
+      @@show_output
+    end
+
     # get the logger assigned to the module
     def self.logger
       @@logger
@@ -165,8 +176,8 @@ module BlackStack
           if h[:errors].size == 0
             #BlackStack::Deployer.logger.done
           else
-            BlackStack::Deployer.logger.logf('error: ' + h.to_s)
-            raise "Error running command: #{h.to_s}"
+            #BlackStack::Deployer.logger.logf('error: ' + h.to_s)
+            raise "Error running command:\n#{h[:errors].uniq.join("\n")}"
           end
         end
         ret
@@ -175,7 +186,7 @@ module BlackStack
 
     # define attributes and methods of a routine's command
     module CommandModule
-      attr_accessor :command, :matches, :nomatches, :sudo
+      attr_accessor :command, :matches, :nomatches, :sudo, :background
 
       def self.descriptor_errors(c)
         errors = []
@@ -202,6 +213,9 @@ module BlackStack
             # 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
           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
         end
 
         # if c[:matches] exists
@@ -229,6 +243,12 @@ module BlackStack
             end # each
           end # if c[:matches].is_a?(Array)
         end # if :matches exists
+
+        # if c[:background] exists, it must be a boolean
+        if c.has_key?(:background)
+          errors << "The value of the key :background is not a boolean" unless c[:background].is_a?(TrueClass) || c[:background].is_a?(FalseClass)
+        end
+
         # 
         errors.uniq
       end # def self.descriptor_error(h)
@@ -257,7 +277,12 @@ module BlackStack
               self.nomatches << BlackStack::Deployer::NoMatch.new(m)
             end
           end
-        end                                                                                                                       
+        end
+        if h.has_key?(:background)
+          self.background = h[:background]
+        else
+          self.background = false
+        end                                                                                                            
       end # def initialize(h)
 
       def to_hash
@@ -275,52 +300,84 @@ module BlackStack
         h
       end # def to_hash
 
+      # return the code to exectute the command, 
+      # after applying modifications requested by 
+      # some parameters like `:show_outut` or `:background`.
+      def code(node)
+          ret = self.command
+          # replacing parameters
+          ret.scan(/%[a-zA-Z0-9\_]+%/).each do |p|
+            if p == '%eth0_ip%' # reserved parameter
+              # TODO: move the method eth0_ip to the blackstack-nodes library
+              ret.gsub!(p, node.eth0_ip) 
+            elsif p == '%timestamp%' # reserved parameter
+              # TODO: move this to a timestamp function on blackstack-core
+              ret.gsub!(p, Time.now.to_s.gsub(/\D/, '')) 
+            else
+              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
+            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
+            lines = ret.strip.lines
+            total = lines.size
+            i = 0
+            lines.each { |l| 
+              i += 1
+              if i == total
+                l.gsub!(/;$/, ' > /dev/null 2>&1 &')
+              else
+                l.gsub!(/;$/, ' > /dev/null 2>&1;')
+              end
+            }
+            ret = lines.join("\n")
+          end
+          # apply modifications due the sudo flag
+          # return the code
+          ret = node.code(ret, self.sudo)
+          # return
+          ret
+        end
+
       def run(node)
+        l = BlackStack::Deployer.logger
         errors = []
-        code = self.command
         output = nil
+        s = self.code(node)
 
-        # if code is a symbol
-        if code.is_a?(Symbol)
+        # if self.command is a symbol
+        if self.command.is_a?(Symbol)
 
-          # if code is equel than :reboot
-          if code == :reboot
+          # if self.command is equel than :reboot
+          if self.command == :reboot
             # call the node reboot method
             node.reboot
           else
             # look for a routine with this name
-            r = BlackStack::Deployer.routines.select { |r| r.name == code.to_s }.first
+            r = BlackStack::Deployer.routines.select { |r| r.name == self.command.to_s }.first
             if !r.nil?
               r.run(node)
             else
-              raise "The routine #{code.to_s} does not exist"
+              raise "The routine #{self.command.to_s} does not exist"
             end
           end
 
-        # if code is a string
-        elsif code.is_a?(String)
-          # replacing parameters
-          code.scan(/%[a-zA-Z0-9\_]+%/).each do |p|
-            if p == '%eth0_ip%' # reserved parameter
-              # TODO: move the method eth0_ip to the blackstack-nodes library
-              code.gsub!(p, node.eth0_ip) 
-            elsif p == '%timestamp%' # reserved parameter
-              # TODO: move this to a timestamp function on blackstack-core
-              code.gsub!(p, Time.now.to_s.gsub(/\D/, '')) 
-            else
-              if node.parameters.has_key?(p.gsub(/%/, '').to_sym)
-                code.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
-            end
-          end
+        # if self.command is a string
+        elsif self.command.is_a?(String)
 
           # running the command
-          output = node.exec(code, self.sudo)
+          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.
+          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 
@@ -339,7 +396,7 @@ module BlackStack
         # return a hash descriptor of the command result 
         {
           :command => self.command,
-          :code => code,
+          :code => s,
           :output => output,
           :errors => errors,
         }
@@ -514,19 +571,19 @@ module BlackStack
       raise "The routine #{routine_name} cannot be run on the node #{node_name}: #{errors.uniq.join(".\n")}" if errors.length > 0
         
       # connect the node
-      self.logger.logs "Connecting to node #{n.name}... "
+      #self.logger.logs "Connecting to node #{n.name}... "
       n.connect
-      self.logger.done
+      #self.logger.done
 
       # run the routine
-      self.logger.logs "Running routine #{r.name}... "
+      #self.logger.logs "Running routine #{r.name}... "
       r.run(n)
-      self.logger.done
+      #self.logger.done
         
       # disconnect the node
-      self.logger.logs "Disconnecting from node #{n.name}... "
+      #self.logger.logs "Disconnecting from node #{n.name}... "
       n.disconnect
-      self.logger.done
+      #self.logger.done
         
     end # def
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 1.2.18
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-09-06 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.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement