canzea 0.1.154 → 0.1.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71b01b5c047288fe116dc85fa49b141963907aae
-  data.tar.gz: 0e0b2486a7cf2ad2b506c73b9193b50d70fe6a42
+  metadata.gz: a749973ddbc778253e8def9cb73cd155f78b2267
+  data.tar.gz: 80e169252d67de0ec091da799ffa09c484521b25
 SHA512:
-  metadata.gz: 12a29b7de618b0dbf7f02606a8bf89f55b0ffcf492ba419db1b0f06cd13e4c4a6963e5fa18af73e4d6f0924cd246aa1da3901414978d114676d79f11a7a770f8
-  data.tar.gz: cc72e1afd22f20b63e5da602dda3b09389cf690c601dd97862f3a36cbd9c255165de749812518e3f1392800da0f41b03e67bcd30f402a99676d31f41afe1f7ad
+  metadata.gz: 6e4b534c43c5d872888b92b3fcdfa860d3c3e0bd20ed8886d5d9f6fa97d42736caaadec9d8b3d6b96c6da2602efe8bca1e59f9cf3d72530810e40b7beb911c24
+  data.tar.gz: 43d8771a9366464c9622a7971941e3f0da8fceaeb4c3cd9a84d7fce8db17c9e604b765fd8d004baea377a5a1bc6a3cc68a22ece160a7aa06c433a4a8fc8a1a6a

data/lib/canzea/version.rb

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

data/lib/canzea.rb

@@ -149,13 +149,24 @@ module Canzea
                 publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{opts[:serverBase]}-#{opts[:serverNumber]}.json")
                 publicIp.strip!
 
-                phases.each { | phase |
-                    basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
-                    cmd = "#{basePath}/roles/#{opts[:role]}/#{opts[:solution]}/#{phase}.sh"
-                    if File.exists? cmd
-                        list += Worker.new.find (cmd)
-                    end
-                }
+                root = "#{basePath}/blocks/#{opts[:solution]}"
+                if File.exists? root
+                    phases.each { | phase |
+                        basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
+                        cmd = "#{basePath}/blocks/#{opts[:solution]}/#{phase}.sh"
+                        if File.exists? cmd
+                            list += Worker.new.find (cmd)
+                        end
+                    }
+                else
+                    phases.each { | phase |
+                        basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
+                        cmd = "#{basePath}/roles/#{opts[:role]}/#{opts[:solution]}/#{phase}.sh"
+                        if File.exists? cmd
+                            list += Worker.new.find (cmd)
+                        end
+                    }
+                end
 
                 list.each_with_index { | cmd, index |
                     if index >= step

data/lib/plan-step-class.rb

@@ -34,11 +34,14 @@ class PlanStep
 
                 root = "#{@basePath}/roles/#{item['role']}/#{item['solution']}"
                 if File.exist?(root) == false
-                    puts "-- ERROR #{root} does not exist!"
-                    raise "#{root} does not exist!"
+                    root = "#{@basePath}/blocks/#{item['solution']}"
+                    if File.exist?(root) == false
+                        puts "-- ERROR #{root} does not exist!"
+                        raise "#{root} does not exist!"
+                    end
                 end
 
-                cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/install.sh"
+                cmd = "#{root}/install.sh"
                 if File.exist?(cmd)
                     lines = n.run cmd, start, lines - 1
 
@@ -75,14 +78,17 @@ class PlanStep
 
                 root = "#{@basePath}/roles/#{item['role']}/#{item['solution']}"
                 if File.exist?(root) == false
-                    log "-- ERROR #{root} does not exist!"
-                    raise "#{root} does not exist!"
+                    root = "#{@basePath}/blocks/#{item['solution']}"
+                    if File.exist?(root) == false
+                        log "-- ERROR #{root} does not exist!"
+                        raise "#{root} does not exist!"
+                    end
                 end
 
                 if (test == false)
                     # Register the service with Consul, if consul is ready
                     # If metadata.json exists, then use the information to register
-                    cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/metadata.json"
+                    cmd = "#{root}/metadata.json"
                     if File.exist?(cmd)
                         md = File.read(cmd)
                         md = JSON.parse(md)
@@ -102,7 +108,7 @@ class PlanStep
                         end
                     end
 
-                    envScript = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/environment.json"
+                    envScript = "#{root}/environment.json"
                     if File.exist?(envScript)
                         envPush = PrepareEnvironment.new false
                         envPush.addToEnv "#{envScript}"
@@ -110,17 +116,17 @@ class PlanStep
 
                 end
 
-                cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/configure.sh"
+                cmd = "#{root}/configure.sh"
                 if File.exist?(cmd)
                   lines = n.run cmd, start, lines - 1, false, ref
                 end
 
-                cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/enable.sh"
+                cmd = "#{root}/enable.sh"
                 if File.exist?(cmd)
                   lines = n.run cmd, start, lines - 1, false, ref
                 end
 
-                cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/status.sh"
+                cmd = "#{root}/status.sh"
                 if File.exist?(cmd)
                   lines = n.run cmd, start, lines - 1, true, ref
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.154
+  version: 0.1.155
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Canzea command line interface for orchestrating builds.