canzea 0.1.56 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4552872d9584dc1d8455e4907a0b02145a5c207
-  data.tar.gz: 6f0790140e14aaeeebf7cb3b0da898ab861b7493
+  metadata.gz: d94c94866a7ce75578cb6e85238425f9a19e9160
+  data.tar.gz: b5f9af7cb3ff37f433de5a35384f8d5aa6cffa43
 SHA512:
-  metadata.gz: f50fd3d5e353eb8b5f60fe7261560e584839e95f9ebfa72228efd63ec21f0f7aa7a8d9c2d9915775d3084cdecdc9bc4c7d7c7f8bd9644b2abeb6f53e0036613e
-  data.tar.gz: 60ddae33921b4d0dc3bd56ee1709b3fbe3cae6a1c085e5bf47dce0c881345fe6fe2d2de96c81a5bab0ad0ce742a99df39f8d8175126f2d21fc8cd5e203294971
+  metadata.gz: 96e272ba25adbf415d83552c3df597bece0d2caaaed923c9e2982c9799e733be9de960184a1efebe975e2524a02b31654eb9342c919ea8ef6a27cc69beb7c23a
+  data.tar.gz: 66934fe7d892a651c967009c256dad42726ef49b225a17f04fba751da0b39b407be61df52edbb940883da50923ae29c2184a7e1ae47ff01644ef01727b4083d1

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.56"
+  VERSION = "0.1.57"
 end

data/lib/canzea.rb

@@ -115,7 +115,7 @@ module Canzea
             end
             if (util == "prepare-plan")
                 ac = PreparePlan.new
-                ac.do opts[:blueprint], opts[:segment]
+                ac.do opts[:blueprint], opts[:segment], opts[:step], test, opts[:privateKey]
             end
             if (util == "apply-config")
                 gitRoot = opts.fetch(:gitRoot, Canzea::config[:git_repo])

data/lib/commands/apply-config.rb

@@ -3,12 +3,16 @@ require 'commands/add-env'
 require 'plan-step-class'
 
 class ApplyConfig
+    def initialize ()
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+    end
 
     def do (gitRoot, test = false, stepNum = nil, task = nil)
         ps = PlanStep.new
 
         # Read the configuration file and make calls out to run
 
+        @log.info("Processing #{gitRoot}/configure.json")
         puts "Processing #{gitRoot}/configure.json"
         steps = JSON.parse(File.read("#{gitRoot}/configure.json"))
 
@@ -21,9 +25,11 @@ class ApplyConfig
             solution = step['solution']
             puts "#{stepNum} and #{index}"
             if (stepNum == nil or index >= Integer(stepNum))
-                puts "[#{index}] Configure for #{role} and #{solution}"
+                @log.info "[#{index}] Configure for #{role} and #{solution}"
                 ps.runPhaseConfigure role, solution, test, (task == nil ? 1:task)
                 task = 1
+            else
+                @log.info "[#{index}] Configure for #{role} and #{solution} SKIP"
             end
             index = index + 1
         }

data/lib/commands/prepare-plan.rb

@@ -10,22 +10,32 @@ class PreparePlan
     end
 
     # Read the blueprint instructions and prepare plan for a particular segment
-    def do (blueprint, segment)
+    def do (blueprint, segment, step, test, privateKey)
         planStep = PlanStep.new
 
-        puts "Processing configure.json for #{segment} in #{blueprint}"
+        puts "Processing configure.json for #{segment} in #{blueprint} from #{@basePath}"
 
         instructions = YAML.load_file("#{@basePath}/blueprints/#{blueprint}/instruction.yml")
         segment = instructions['instructions']['segments'][segment]
 
         puts segment['abbreviation']
 
+        index = 1
         segment['image'].each { |item|
             if item.start_with?("step:")
-                puts item
                 parts = item.split(':')
 
-                planStep.runPhaseInstall parts[1], parts[2], true, 1
+                if (index < Integer(step))
+                    puts "[#{index}] #{item} SKIPPING"
+                else
+                    puts "[#{index}] #{item}"
+                    if (test == false)
+                        publicIp = File.read("#{Canzea::config[:pwd]}/vps-DevOps-1.json")
+                        RemoteRun.new.do publicIp, privateKey, parts[1], parts[2]
+                        # Keep track of what we have done; parsing the response and looking at the JSON
+                    end
+                end
+                index = index + 1
             end
         }
     end

metadata

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