canzea 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1679fa92754d35e14fac4f8191f373a800b2568a
-  data.tar.gz: c9fe74d01589e284d5504a553f418a2c3e575137
+  metadata.gz: da9504124bf52bfa8795481791fc25d36b5c4f66
+  data.tar.gz: c666e1c41850f1b425dc0228ee210174ee9348c8
 SHA512:
-  metadata.gz: ab6bba84066ffb4b9130e735c1ce0370dcf14a05ab00ef3421a684d14e170e403fc15e2da8e665dc9a47e1b5c85c9494b9694bca740e92351083ade2c6132cf9
-  data.tar.gz: 17f393254f94b4bd7b931185f1d27f9545ac76564cbbe998dda1d36a3a857f4b45efe9db070b3852d114671d260cfdcd262ad6242a5d80f62c3ee1ae9ebcc654
+  metadata.gz: 0600a59bd95f444939beb3a20361f7675bfba60fc2c4c4770436df80271194ccd2fd71e471860448f39f843218fdeef9d66734abbcdc01fc40e87f1e949019ca
+  data.tar.gz: 18d65b123e274eb84f5570b476b41c5ef2fcadf9010f507cb19757cc67f95fd0871839edc0657cf2c0ade9c45aa3b39af5d3a201daefa8a9e06ccb67c2af0cac

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.28"
+  VERSION = "0.1.29"
 end

data/lib/canzea.rb

@@ -56,6 +56,7 @@ module Canzea
       option nil, :role, 'Role', argument: :required
       option nil, :solution, 'Solution', argument: :required
       option nil, :task, 'Task', argument: :required
+      option nil, :step, 'Step', argument: :required
       option nil, :serverBase, 'Server Base', argument: :required
       option nil, :serverNumber, 'Server Number', argument: :required
       option nil, :privateKey, 'Task', argument: :required
@@ -91,7 +92,7 @@ module Canzea
             if (util == "apply-config")
                 gitRoot = opts.fetch(:gitRoot, Canzea::config[:git_repo])
                 ac = ApplyConfig.new
-                ac.do gitRoot
+                ac.do gitRoot, test, opts[:step], opts[:task]
             end
         end
 

data/lib/commands/apply-config.rb

@@ -3,7 +3,7 @@ require 'plan-step-class'
 
 class ApplyConfig
 
-    def do (gitRoot)
+    def do (gitRoot, test = false, stepNum = nil, task = nil)
         ps = PlanStep.new
 
         # Read the configuration file and make calls out to run
@@ -11,13 +11,18 @@ class ApplyConfig
         puts "Processing #{gitRoot}/configure.json"
         steps = JSON.parse(File.read("#{gitRoot}/configure.json"))
 
+        index = 1
         steps["steps"].each { | step |
 
             role = step['role']
             solution = step['solution']
-
-            puts "Configure for #{role} and #{solution}"
-            ps.runPhaseConfigure role, solution, false, 1
+            puts "#{stepNum} and #{index}"
+            if (stepNum == nil or Integer(stepNum) == index)
+                puts "[#{index}] Configure for #{role} and #{solution}"
+                ps.runPhaseConfigure role, solution, test, (task == nil ? 1:task)
+                task = 1
+            end
+            index = index + 1
         }
     end
 end

data/lib/plan-step-class.rb

@@ -72,27 +72,29 @@ class PlanStep
                     raise "#{root} does not exist!"
                 end
 
-                # 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"
-                if File.exist?(cmd)
-                    md = File.read(cmd)
-                    md = JSON.parse(md)
-                    if (md['services'].size() > 0)
-                        svc = md['services'][0]
-                        adef = {"listener"=>svc['listener'], "serviceName"=>svc['name'], "tags"=>{}, "port"=>svc['port']}
-                        puts "-- Registering #{svc['name']}"
-                        if (test == false)
-                            h = HelperRun.new
-                            h.run "consul", "add_service", JSON.generate(adef)
+                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"
+                    if File.exist?(cmd)
+                        md = File.read(cmd)
+                        md = JSON.parse(md)
+                        if (md['services'].size() > 0)
+                            svc = md['services'][0]
+                            adef = {"listener"=>svc['listener'], "serviceName"=>svc['name'], "tags"=>{}, "port"=>svc['port']}
+                            puts "-- Registering #{svc['name']}"
+                            if (test == false)
+                                h = HelperRun.new
+                                h.run "consul", "add_service", JSON.generate(adef)
+                            end
                         end
                     end
-                end
 
-                envScript = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/environment.json"
-                if File.exist?(envScript)
-                    envPush = PrepareEnvironment.new
-                    envPush.addToEnv "#{envScript}"
+                    envScript = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/environment.json"
+                    if File.exist?(envScript)
+                        envPush = PrepareEnvironment.new
+                        envPush.addToEnv "#{envScript}"
+                    end
                 end
 
                 cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/configure.sh"

metadata

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