blackstack-deployer 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7466aeed2f2ea365d7db6a32c0ce631f003250d0be94c57a7622ed25ae7089b
-  data.tar.gz: 95ec5407f0e0a90b48fa586c51d9c4e22b35cd54343d6d937ce5377f12f6c657
+  metadata.gz: 9e60ac86398b508a3c0262ee2a8d19d41e59994dbe293de5d155c68b0681d75a
+  data.tar.gz: 6054c1d54a2c3da6bea3b8e30ad1168c09450039918eeed55f1e1380deb7f01f
 SHA512:
-  metadata.gz: 7b803e9242d6b063f3a77b4185e027bb6e242bf7ec1ea711b7c6ed838a3420688f53a8074ea6e8ac8d11dc1c645c566ec434c2c4b748b471014e68783a86e3f6
-  data.tar.gz: c1435b21e31e84d11b1bb9d193672423706a0342bfb6434fa1f64689eb89a8d33f5d40ce6f42313c19cff736082c4a03f49d76414116a8b14ad7ff06f647ee51
+  metadata.gz: 441321acb984529b0d4fceb4b6b25cd6d7264731019d6076df6c8b5c65026345e9f7cab72c2b12df6843bedae5520b4b8dd6745d87e388057938a861a7ccd055
+  data.tar.gz: 5f487e1c15d30092ca92583eb98e0438334350cda2d719e77b18a03a416f7cfcb34fadd452de992c83b482f1c2b20c9c33cc1f9f0ea572825bf5f35348a1d1fd

data/lib/blackstack-deployer.rb

@@ -213,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
@@ -297,68 +300,76 @@ module BlackStack
         h
       end # def to_hash
 
-      def run(node)
-        l = BlackStack::Deployer.logger
-        errors = []
-        code = self.command
-        output = nil
-
-        # if code is a symbol
-        if code.is_a?(Symbol)
-
-          # if code is equel than :reboot
-          if code == :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
-            if !r.nil?
-              r.run(node)
-            else
-              raise "The routine #{code.to_s} does not exist"
-            end
-          end
-
-        # if code is a string
-        elsif code.is_a?(String)
+      # 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
-          code.scan(/%[a-zA-Z0-9\_]+%/).each do |p|
+          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
-              code.gsub!(p, node.eth0_ip) 
+              ret.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/, '')) 
+              ret.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)
+                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 code to run in background
+          # 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 = code.strip.lines
+            lines = ret.strip.lines
             total = lines.size
             i = 0
             lines.each { |l| 
               i += 1
               if i == total
-                l.gsub!(/;$/, '> /dev/null 2>&1 &')
+                l.gsub!(/;$/, ' > /dev/null 2>&1 &')
               else
-                l.gsub!(/;$/, '> /dev/null 2>&1;')
+                l.gsub!(/;$/, ' > /dev/null 2>&1;')
               end
             }
-            code = lines.join("\n")
+            ret = lines.join("\n")
           end
+          # return the code
+          ret
+      end
+
+      def run(node)
+        l = BlackStack::Deployer.logger
+        errors = []
+        output = nil
+        s = self.code(node)
+
+        # if self.command is a symbol
+        if self.command.is_a?(Symbol)
+
+          # 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 == self.command.to_s }.first
+            if !r.nil?
+              r.run(node)
+            else
+              raise "The routine #{self.command.to_s} does not exist"
+            end
+          end
+
+        # if self.command is a string
+        elsif self.command.is_a?(String)
 
           # 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\nCommand:\n--------\n\n#{s} " if BlackStack::Deployer.show_output
+          output = node.exec(s, self.sudo)
           l.log "\n\nOutput:\n-------\n\n#{output}" if BlackStack::Deployer.show_output
           l.logf('done tracing.') if BlackStack::Deployer.show_output
 
@@ -382,7 +393,7 @@ module BlackStack
         # return a hash descriptor of the command result 
         {
           :command => self.command,
-          :code => code,
+          :code => s,
           :output => output,
           :errors => errors,
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Leandro Daniel Sardi