canzea 0.1.155 → 0.1.156

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a749973ddbc778253e8def9cb73cd155f78b2267
4
- data.tar.gz: 80e169252d67de0ec091da799ffa09c484521b25
3
+ metadata.gz: c169d1616a109996c39ad8ec2c10b93a132a8e78
4
+ data.tar.gz: 237dec1aa027803c1a669bafb28eeda824c03acb
5
5
  SHA512:
6
- metadata.gz: 6e4b534c43c5d872888b92b3fcdfa860d3c3e0bd20ed8886d5d9f6fa97d42736caaadec9d8b3d6b96c6da2602efe8bca1e59f9cf3d72530810e40b7beb911c24
7
- data.tar.gz: 43d8771a9366464c9622a7971941e3f0da8fceaeb4c3cd9a84d7fce8db17c9e604b765fd8d004baea377a5a1bc6a3cc68a22ece160a7aa06c433a4a8fc8a1a6a
6
+ metadata.gz: 7d0e0dcbf88d670c555eb6b547aef1e6e3ff0ff31709655fc871ecfa80c25a37a9c68ba0d7452be57392ed6c8569290f0d275db5ccc02dd9f6a7dc9338a8e776
7
+ data.tar.gz: cb159fd86ac0254146b4b3430c838a5ec49f399ee1144e469b3cde2c7c17d405811c53c98900af2d0152e20d200ea89a7ae8a2ea979647a8cd26f153126cccbf
@@ -1,3 +1,3 @@
1
1
  module Canzea
2
- VERSION = "0.1.155"
2
+ VERSION = "0.1.156"
3
3
  end
@@ -38,15 +38,19 @@ class HelperRun
38
38
  envPush = PrepareEnvironment.new @raw
39
39
 
40
40
  begin
41
- envScript = "#{@basePath}/helpers/#{solution}/environment.json"
41
+ root = "#{@basePath}/helpers/#{solution}"
42
+ if File.exist?("#{@basePath}/blocks/#{solution}/#{action}")
43
+ root = "#{@basePath}/blocks/#{solution}/#{action}"
44
+ end
45
+ envScript = "#{root}/environment.json"
42
46
  if File.exist?(envScript)
43
47
  @log.info("Adding environment variables...")
44
48
  envPush.addToEnv "#{envScript}"
45
49
  end
46
50
 
47
- if File.exist?("#{@basePath}/helpers/#{solution}/#{action}.sh")
51
+ if File.exist?("#{root}/#{action}.sh")
48
52
  type = "shell"
49
- elsif File.exist?("#{@basePath}/helpers/#{solution}/#{action}.py")
53
+ elsif File.exist?("#{root}/#{action}.py")
50
54
  type = "python"
51
55
  end
52
56
 
@@ -60,9 +64,9 @@ class HelperRun
60
64
  parameters = Template.new.processString(parameters, {})
61
65
 
62
66
  if (type == "ruby")
63
- cmd = "ruby #{@basePath}/helpers/#{solution}/#{action}.rb '#{parameters}'"
67
+ cmd = "ruby #{root}/#{action}.rb '#{parameters}'"
64
68
  elsif (type == "python")
65
- cmd = "python #{@basePath}/helpers/#{solution}/#{action}.py '#{parameters}'"
69
+ cmd = "python #{root}/#{action}.py '#{parameters}'"
66
70
  else
67
71
  argList = []
68
72
  args = JSON.parse(parameters)
@@ -71,7 +75,7 @@ class HelperRun
71
75
  argList.push('"' + k[1] + '"')
72
76
  end
73
77
 
74
- cmd = "#{@basePath}/helpers/#{solution}/#{action}.sh #{argList.join(' ')}"
78
+ cmd = "#{root}/#{action}.sh #{argList.join(' ')}"
75
79
  end
76
80
  r.run cmd, 1, 1, status
77
81
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: canzea
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.155
4
+ version: 0.1.156
5
5
  platform: ruby
6
6
  authors:
7
7
  - Canzea Technologies