canzea 0.1.155 → 0.1.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a749973ddbc778253e8def9cb73cd155f78b2267
-  data.tar.gz: 80e169252d67de0ec091da799ffa09c484521b25
+  metadata.gz: c169d1616a109996c39ad8ec2c10b93a132a8e78
+  data.tar.gz: 237dec1aa027803c1a669bafb28eeda824c03acb
 SHA512:
-  metadata.gz: 6e4b534c43c5d872888b92b3fcdfa860d3c3e0bd20ed8886d5d9f6fa97d42736caaadec9d8b3d6b96c6da2602efe8bca1e59f9cf3d72530810e40b7beb911c24
-  data.tar.gz: 43d8771a9366464c9622a7971941e3f0da8fceaeb4c3cd9a84d7fce8db17c9e604b765fd8d004baea377a5a1bc6a3cc68a22ece160a7aa06c433a4a8fc8a1a6a
+  metadata.gz: 7d0e0dcbf88d670c555eb6b547aef1e6e3ff0ff31709655fc871ecfa80c25a37a9c68ba0d7452be57392ed6c8569290f0d275db5ccc02dd9f6a7dc9338a8e776
+  data.tar.gz: cb159fd86ac0254146b4b3430c838a5ec49f399ee1144e469b3cde2c7c17d405811c53c98900af2d0152e20d200ea89a7ae8a2ea979647a8cd26f153126cccbf

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.155"
+  VERSION = "0.1.156"
 end

data/lib/helper-run-class.rb

@@ -38,15 +38,19 @@ class HelperRun
         envPush = PrepareEnvironment.new @raw
 
         begin
-            envScript = "#{@basePath}/helpers/#{solution}/environment.json"
+            root = "#{@basePath}/helpers/#{solution}"
+            if File.exist?("#{@basePath}/blocks/#{solution}/#{action}")
+                root = "#{@basePath}/blocks/#{solution}/#{action}"
+            end
+            envScript = "#{root}/environment.json"
             if File.exist?(envScript)
                 @log.info("Adding environment variables...")
                 envPush.addToEnv "#{envScript}"
             end
 
-            if File.exist?("#{@basePath}/helpers/#{solution}/#{action}.sh")
+            if File.exist?("#{root}/#{action}.sh")
                 type = "shell"
-            elsif File.exist?("#{@basePath}/helpers/#{solution}/#{action}.py")
+            elsif File.exist?("#{root}/#{action}.py")
                 type = "python"
             end
 
@@ -60,9 +64,9 @@ class HelperRun
             parameters = Template.new.processString(parameters, {})
 
             if (type == "ruby")
-                cmd = "ruby #{@basePath}/helpers/#{solution}/#{action}.rb '#{parameters}'"
+                cmd = "ruby #{root}/#{action}.rb '#{parameters}'"
             elsif (type == "python")
-                cmd = "python #{@basePath}/helpers/#{solution}/#{action}.py '#{parameters}'"
+                cmd = "python #{root}/#{action}.py '#{parameters}'"
             else
                 argList = []
                 args = JSON.parse(parameters)
@@ -71,7 +75,7 @@ class HelperRun
                     argList.push('"' + k[1] + '"')
                 end
 
-                cmd = "#{@basePath}/helpers/#{solution}/#{action}.sh #{argList.join(' ')}"
+                cmd = "#{root}/#{action}.sh #{argList.join(' ')}"
             end
             r.run cmd, 1, 1, status
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.155
+  version: 0.1.156
 platform: ruby
 authors:
 - Canzea Technologies