blackstack-deployer 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91adc0de4b1c7772630279b38655a021e3a96fd3e9717fbab2e454e93caafd10
-  data.tar.gz: 85cdc1d5270cea1cfde7ac2287d23b4c623eebd221c7bc34b7d00e16c5773c49
+  metadata.gz: f7466aeed2f2ea365d7db6a32c0ce631f003250d0be94c57a7622ed25ae7089b
+  data.tar.gz: 95ec5407f0e0a90b48fa586c51d9c4e22b35cd54343d6d937ce5377f12f6c657
 SHA512:
-  metadata.gz: 42a56dee4a31ce5ad5daf30ffff2ba3fef9fed7e29cda55e535a465c6a43badf893963da1887542e0cacf18cd33e5e982fae3074e5036dbf7cb82d0856718700
-  data.tar.gz: ba329544c91d5fb55c3f76cd12e49b1fad76a163bdd1fed9fd1cd419b47aa52d580b56add739f28419bc3155099dd1193d00f404b7379f0577845fdde77a22bc
+  metadata.gz: 7b803e9242d6b063f3a77b4185e027bb6e242bf7ec1ea711b7c6ed838a3420688f53a8074ea6e8ac8d11dc1c645c566ec434c2c4b748b471014e68783a86e3f6
+  data.tar.gz: c1435b21e31e84d11b1bb9d193672423706a0342bfb6434fa1f64689eb89a8d33f5d40ce6f42313c19cff736082c4a03f49d76414116a8b14ad7ff06f647ee51

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 = []
@@ -229,6 +240,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 +274,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
@@ -276,6 +298,7 @@ module BlackStack
       end # def to_hash
 
       def run(node)
+        l = BlackStack::Deployer.logger
         errors = []
         code = self.command
         output = nil
@@ -316,8 +339,28 @@ module BlackStack
             end
           end
 
+          # if the command is configured to run in background, and the flag show_ouput is off, then modify the code to run in background
+          if self.background && !BlackStack::Deployer.show_output
+            lines = code.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
+            }
+            code = lines.join("\n")
+          end
+
           # running the command
+          l.logs "Show command output... " if BlackStack::Deployer.show_output
+          l.log "\n\nCommand:\n--------\n\n#{code} " if BlackStack::Deployer.show_output
           output = node.exec(code, self.sudo)
+          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
@@ -514,19 +557,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.16
 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