blackstack-deployer 1.2.5 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a37fa20e8810c1408c85c48e113e46fa37c22d320c989ea94cea166e41f177
-  data.tar.gz: feb180021ee96e498215aa904134ca0b2c540a147e7e9b5cd27397de4da1cce8
+  metadata.gz: 2679af8f481fed33450095920f1df612031cc47f790311e184abe7eed4a9c635
+  data.tar.gz: 53fbd6168caa6fa4b119a54a3533c6472695eb695d11a26f9e2c140656990ebe
 SHA512:
-  metadata.gz: ff9992f727b516ab7ff2c66289aa8a91515a65aaaf29fa73cb48c238f57c654dedd706ac97a95443e412079973c538f55cac515b1e3b16b1f50757882a6f71ac
-  data.tar.gz: b187ca6e096557c602b7bf3050059a270c9f68863adda5bb7bac591b74021b830206a00365ec095c0b805b688dd72e9228eb0dfa0ad7ca4b1ff0b861bcc3ffcd
+  metadata.gz: 73e025d6a248f20851a4d40fb635c5a0cc2cecbc4d7d2b4f82e654034923746760daaae6049ead50d0db5db2b1e467bf82af0721b1b4df66a36a5136c4d0c31d
+  data.tar.gz: 56b9cf40e81503d9de69eee618bb1d7cdf024b6604a0fdf00da9da830f75ba5fe7ad4c14c4547cfec26e5b0bb8667e11fe153cb2eae6eb9944089642f80e5b53

data/lib/blackstack-deployer.rb

@@ -1,6 +1,4 @@
-#require 'blackstack-nodes'
-require_relative '../../blackstack-nodes/lib/blackstack-nodes'
-
+require 'blackstack-nodes'
 require 'sequel'
 
 module BlackStack
@@ -524,6 +522,7 @@ module BlackStack
     end # def
       
     module DB
+      LOCKFILE = './blackstack-deployer.lock'
       @@checkpoint = nil
       @@superhuser = nil
       @@ndb = nil
@@ -532,7 +531,24 @@ module BlackStack
       def self.set_checkpoint(s)
         @@checkpoint = s
       end
-    
+
+      def self.checkpoint
+        @@checkpoint
+      end
+
+      def self.save_checkpoint
+        File.new('./blackstack-deployer.lock', "w").write(@@checkpoint)
+      end
+
+      def self.load_checkpoint
+        if File.exists?(BlackStack::Deployer::DB::LOCKFILE)
+          @@checkpoint = File.new(BlackStack::Deployer::DB::LOCKFILE, "r").read
+        else
+          @@checkpoint = nil
+        end
+        @@checkpoint
+      end
+
       def self.connect(s)
         @@db = Sequel::connect(s)
       end # def
@@ -568,18 +584,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
@@ -593,7 +627,7 @@ module BlackStack
 
       # Run a series of `.sql` files with updates to the database.
       #
-      def self.deploy()
+      def self.deploy(save_checkpoints=false)
         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 { 
@@ -606,8 +640,16 @@ module BlackStack
           tlogger.done
 
           tlogger.logs "Updating checkpoint... "
-          @@checkpoint = filename
+          BlackStack::Deployer::DB::set_checkpoint filename
           tlogger.done
+
+          tlogger.logs 'Saving checkpoint... '
+          if save_checkpoints
+            BlackStack::Deployer::DB::save_checkpoint
+            tlogger.done
+          else
+            tlogger.logf 'disabled'
+          end
         }
       end # def
     end # module DB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.10
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blackstack-nodes