blackstack-deployer 1.2.3 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b5da852c4f5f0f290aa5b4ab31d0e940e164d12b57401b0840dd1fa3fac553b
-  data.tar.gz: e4c316a7efd0f4ba46ec0c8173dc63f6b9fb8d33373fd101feda6a0587e5275f
+  metadata.gz: c2197d07351cc7992754e1a97848f862cece1e90384b539a93d89fb765a200a7
+  data.tar.gz: 849d35bb7fa51c2071a9567fe2a9ab01fd75d7c50d239da9446f09c81a2db3e4
 SHA512:
-  metadata.gz: ad8cbc95d607a1133d8d61fbc4529661563c5c2a3c980fab185ca2a1a0056b47ce2a75ecbde6ed2b1ee8a18bd85b2ff7f25e159bbff8061c8313b531f6406fc9
-  data.tar.gz: b782b149a28d306dfdee8d5ce12b963cf650fa72c117a20255c5a36b8337e307586278ba3cd3d17c4ff57ba85018bd7b2e34cc8bde2c8dd182563166a3727cd8
+  metadata.gz: a67164cd4df13e59d5e3258700d7ebe2451b1b787e315968d7ea5647866138d90ac5acaee8ed2c4f660fcf179af5c6aeacfdb6aafa71ca1c9a1d14c8f0e71a63
+  data.tar.gz: 8893cf809bf4d011ac52e2cb161fe38cfbc700bcf418d6ca630d38696b8508f6ddb01e0749d8b2eaba0767b089d83830278b692167108541ee3da17fbd37cab2

data/lib/blackstack-deployer.rb

@@ -1,4 +1,6 @@
-require 'blackstack-nodes'
+#require 'blackstack-nodes'
+require'blackstack-nodes'
+
 require 'sequel'
 
 module BlackStack
@@ -8,6 +10,11 @@ module BlackStack
     @@nodes = []
     @@routines = []
 
+    # set the logger
+    def self.set_logger(i_logger)
+      @@logger = i_logger
+    end
+
     # get the logger assigned to the module
     def self.logger
       @@logger
@@ -66,6 +73,10 @@ module BlackStack
         h[:deployment_routine] = self.deployment_routine
         h
       end # def to_hash
+
+      def deploy()
+        BlackStack::Deployer::run_routine(self.name, self.deployment_routine);
+      end
     end # module NodeModule
 
     # define attributes and methods of a deployer routine
@@ -134,8 +145,8 @@ module BlackStack
           h = c.run(node)
           ret << h
 
-          BlackStack::Deployer.logger.logs "Result: "
-          BlackStack::Deployer.logger.logf h.to_s
+          #BlackStack::Deployer.logger.logs "Result: "
+          #BlackStack::Deployer.logger.logf h.to_s
 
           if h[:errors].size == 0
             BlackStack::Deployer.logger.done
@@ -291,24 +302,16 @@ module BlackStack
             end
           end
 
-          # running the command
-          if self.sudo
-            # escale the single quotes in the code variable
-            code.gsub!(/'/, "\\\\'")
-
-            if node.ssh_private_key_file.nil?
-              code = "echo '#{node.ssh_password.to_s.gsub("'", "\\\\'")}' | sudo -S su root -c '#{code.to_s}'"
-            else
-              code = "sudo -S su root -c '#{code.to_s}'"
-            end
-          else
-            code = code.to_s
-          end
+#puts
 #puts
 #puts code
 #exit(0)
-          output = node.ssh.exec!(code)
-
+#puts
+#puts "SUDO: #{self.sudo}"
+          # running the command
+          output = node.exec(code, self.sudo)
+#puts
+#puts '1'
           # validation: at least one of the matches should happen
           if self.matches.size > 0
             i = 0
@@ -565,18 +568,36 @@ module BlackStack
       # Reference: https://stackoverflow.com/questions/64066344/import-large-sql-files-with-ruby-sequel-gem
       # This method is called by `BlackStack::Deployer::db_execute_file` if the filename matches with `/\.sentences\./`. 
       # This method should not be called directly by user code.
-      def self.execute_sentences(sql)      
+      def self.execute_sentences(sql, chunk_size=200)      
         tlogger = BlackStack::Deployer::logger
 
         # Fix issue: Ruby `split': invalid byte sequence in UTF-8 (ArgumentError)
         # Reference: https://stackoverflow.com/questions/11065962/ruby-split-invalid-byte-sequence-in-utf-8-argumenterror
-        sql.encode!('UTF-8', :invalid => :replace)
-
-        # Keeping only ASCII characters
-        # Ruby: https://programming-idioms.org/idiom/147/remove-all-non-ascii-characters/1903/ruby
-        sql.split(/;/i).each { |statement|
-          statement = statement.to_s.strip
-          tlogger.logs "#{statement.split("\n").first}... "
+        #
+        # Fix issue: `PG::SyntaxError: ERROR:  at or near "��truncate": syntax error`
+        #
+        sql.encode!('UTF-8', :invalid => :replace, :replace => '')
+
+        # Remove null bytes to avoid error: `String contains null byte`
+        # Reference: https://stackoverflow.com/questions/29320369/coping-with-string-contains-null-byte-sent-from-users
+        sql.gsub!("\u0000", "")
+
+        # Get the array of sentences
+        tlogger.logs "Splitting the sql sentences... "
+        sentences = sql.split(/;/i) 
+        tlogger.logf "done (#{sentences.size})"
+
+        # Chunk the array into parts of chunk_size elements
+        # Reference: https://stackoverflow.com/questions/2699584/how-to-split-chunk-a-ruby-array-into-parts-of-x-elements
+        tlogger.logs "Bunlding the array of sentences into chunks of #{chunk_size} each... "
+        chunks = sentences.each_slice(chunk_size).to_a
+        tlogger.logf "done (#{chunks.size})"
+
+        chunk_number = -1
+        chunks.each { |chunk|
+          chunk_number += 1
+          statement = chunk.join(";\n").to_s.strip
+          tlogger.logs "lines #{chunk_size*chunk_number+1} to #{chunk_size*chunk_number+chunk.size} of #{sentences.size}... "
           begin
             @@db.execute(statement) #if statement.to_s.strip.size > 0
             tlogger.done
@@ -594,21 +615,30 @@ module BlackStack
         tlogger = BlackStack::Deployer::logger
         # get list of `.sql` files in the directory `sql_path`, with a name higher than `last_filename`, sorted by name.
         Dir.entries(@@folder).select { 
-          |f| f =~ /\.sql$/ && f > @@checkpoint.to_s
+          |filename| filename =~ /\.sql$/ && filename > @@checkpoint.to_s
         }.uniq.sort.each { |filename|
           fullfilename = "#{@@folder}/#{filename}"
-#puts fullfilename
-#puts File.open(fullfilename).read
+
           tlogger.logs "#{fullfilename}... "
           BlackStack::Deployer::DB::execute_sentences( File.open(fullfilename).read )
           tlogger.done
+
+          tlogger.logs "Updating checkpoint... "
+          @@checkpoint = filename
+          tlogger.done
         }
       end # def
     end # module DB
 
     # deploying all db-updates and run all routines on all nodes
     def self.deploy()
-      # TODO: Code Me!
+      tlogger = BlackStack::Deployer::logger
+
+      @@nodes.each { |n|
+        tlogger.logs "Node #{n.name}... "
+        n.deploy()
+        tlogger.done
+      }
     end # def
 
   end # module Deployer

metadata

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