my-ruby-deployer 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011acb5e8ea3b1f472cdc7762bbe8c28c9af0d71d0e794c400941878d58c2dc0
-  data.tar.gz: 2b804b60e3f7112fa281444b3209b5c4bbcdf42e09d6267ecc15a8e2a325f841
+  metadata.gz: cd0330fe5840899f6a649f4e5e9ce04039ba883b599d76de530fafea9f703a80
+  data.tar.gz: 4ac3a19b11c83ffefe2f266b991eff09b1e46a3a349a2e46e6bf65360cd9bac1
 SHA512:
-  metadata.gz: 46f6485783a33b8907d82b6973075b2b75d0bb53874a28c28f7608e7cff689ab27a1da72263525e20399aa8330b7f4cea434c7ca7758762a3ba80334a6313aaa
-  data.tar.gz: 50643d4b9906e09f1ffd7a8a578ed8482e787464224b4d7d7089309fd5a85980fa9becca7362305a902cb9dc0432f6ed04e7c48abf9806ff6a48822aaa022992
+  metadata.gz: 0a6d27889df5a4b81fefc6ef188f21aba08147e903bee5da21fa50ae746bf59af275a932b8b0a63e6763d9640c3a1545680dc8c3214c014dbb764a703059544f
+  data.tar.gz: 3f553255065000e8cd4aaed5b9cdb1d85698ab5dd634f13dd39eb3283c802516b96488e24c44641b25ecd45dad55b1ac591b429dd0642542edd4c404df914882

data/lib/my-ruby-deployer.rb

@@ -147,14 +147,14 @@ module BlackStack
         h
       end
 
-      def run(node, l=nil)
+      def run(node, l=nil, params={})
         l = BlackStack::DummyLogger.new(nil) if l.nil?
         l.logs "Running routine #{self.name.blue} on node #{node.name.blue}... "
         i = 0
         self.commands.each do |c|
           i += 1
           l.logs "Command #{i.to_s.blue}... "
-          c.run(node, l)
+          c.run(node, l, params)
           l.logf 'done'.green
         end
         l.logf 'done'.green
@@ -210,7 +210,7 @@ module BlackStack
       # running pre-defined commands: :root
       # calling to other routines: :'change-name'
       # calling 
-      def run(n, l=nil)
+      def run(n, l=nil, params={})
         l = BlackStack::DummyLogger.new(nil) if l.nil?
 
         # if self.command is a symbol
@@ -224,7 +224,7 @@ module BlackStack
             # look for a routine with this name
             r = BlackStack::Deployer.routines.select { |r| r.name == self.command.to_s }.first
             if !r.nil?
-              r.run(n)
+              r.run(n, l, params)
             else
               raise "The routine #{self.command.to_s} does not exist"
             end
@@ -234,22 +234,26 @@ module BlackStack
         elsif self.command.is_a?(String)      
           s = self.command.dup
       
-          l.logs "Replacing merge-tags... "
+          #l.logs "Replacing merge-tags... "
           s.scan(/%[a-zA-Z0-9\_]+%/).uniq.each do |p|
-            l.logs "Replacing #{p.blue}... "
+            #l.logs "Replacing #{p.blue}... "
             if p == '%timestamp%' # reserved parameter
               # TODO: move this to a timestamp function on blackstack-core
               s.gsub!(p, Time.now.to_s.gsub(/\D/, '')) 
             else
+              # replace node parameters
               if n.parameters.has_key?(p.gsub(/%/, '').to_sym)
                 s.gsub!(p, n.parameters[p.gsub(/%/, '').to_sym].to_s)
+              # replace routine-call parameters
+              elsif params.has_key?(p.gsub(/%/, '').to_sym)
+                s.gsub!(p, params[p.gsub(/%/, '').to_sym].to_s)
               else
                 raise "The parameter #{p} does not exist in the node descriptor #{n.parameters.to_s}"
               end
             end
-            l.logf 'done'.green
+            #l.logf 'done'.green
           end      
-          l.logf 'done'.green
+          #l.logf 'done'.green
       
           l.logs "Running command... "
           n.ssh.exec!(s)
@@ -318,7 +322,7 @@ module BlackStack
     end # def
          
     # running a routine on a node
-    def self.run_routine(node_name, routine_name, l=nil)
+    def self.run_routine(node_name, routine_name, l=nil, params={})
       l = BlackStack::DummyLogger.new(nil) if l.nil?
       errors = []
 
@@ -344,7 +348,7 @@ module BlackStack
 
       # run the routine
       l.logs "Running routine #{r.name}... "
-      r.run(n, l)
+      r.run(n, l, params)
       l.done
 
       # disconnect the node
@@ -354,7 +358,7 @@ module BlackStack
     end # def self.run_routine
 
     module DB
-      LOCKFILE = './blackstack-deployer.lock'
+      LOCKFILE = './my-ruby-deployer.lock'
       @@checkpoint = nil
       @@superhuser = nil
       @@ndb = nil
@@ -418,7 +422,7 @@ module BlackStack
       # This method should not be called directly by user code.
       def self.execute_sentences(sql, chunk_size=200, l=nil)      
         l = BlackStack::DummyLogger.new(nil) if l.nil?
-
+        
         # 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
         #
@@ -462,6 +466,7 @@ module BlackStack
       def self.deploy(save_checkpoints=false, lockfilename=BlackStack::Deployer::DB::LOCKFILE, l=nil)
         l = BlackStack::DummyLogger.new(nil) if l.nil?
         # get list of `.sql` files in the directory `sql_path`, with a name higher than `last_filename`, sorted by name.
+
         Dir.entries(@@folder).select { 
           |filename| filename =~ /\.sql$/ && filename > @@checkpoint.to_s
         }.uniq.sort.each { |filename|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my-ruby-deployer
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blackstack-nodes
@@ -70,46 +70,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.56.0
-- !ruby/object:Gem::Dependency
-  name: websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement