canzea 0.1.91 → 0.1.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652bd25f6974c93cfdf45f2f916bb482fcd6e931
-  data.tar.gz: 79c893a4f3920ae26309e23f969891fdc98ff649
+  metadata.gz: 86d48a2e1e860761c041034ec274886a8a1ceced
+  data.tar.gz: 33b402d0f21c40d3036c79b09883e2582fbc3e1a
 SHA512:
-  metadata.gz: 638c40097c2ff01b9bc403e0775e6affb87ead512049a04046aaa8caddcf7a4c46003ce62a72ed6dfa8e7263db77fe327506de98ad0950002e5616b657e79c01
-  data.tar.gz: 28a749b7288cf9747f68e75676c025a17163715e3eedf43de0826ebbc861b52ca91e83b8c17ae67374cb7e93c0ea06736b9f0e06ed343bf9e0de838011ab3b42
+  metadata.gz: 5a628c054b3280dc50e6efa794355da08a8c867416c3ac08abbf47412117a7a8212bf8d956a8397493d0df0581cc28687863199e36615ad77e7caa04d0389878
+  data.tar.gz: c104f110c889f4e018f0fd21297b68f9c160a7cc783e44139abfb94766b8505ec6075669af4a73ea996461817548171b074ada412e83a1779ad0a76734225c8d

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.91"
+  VERSION = "0.1.93"
 end

data/lib/canzea.rb

@@ -18,6 +18,7 @@ require "commands/update-config"
 require "commands/apply-config"
 require "commands/add-env"
 require "commands/prepare-plan"
+require "commands/register-metadata"
 
 module Canzea
   command = Cri::Command.define do
@@ -107,6 +108,8 @@ module Canzea
             GetCatalog.new.do(opts.fetch(:catalogTag, nil));
         end
 
+        GetCatalog.new.state
+
         if (opts[:util])
             AddEnv.new.injectEnvironmentVariables()
 
@@ -117,6 +120,9 @@ module Canzea
             if (util == "add-env-secret")
                 AddEnv.new.addSecret(args[0], args[1])
             end
+            if (util == "register-metadata")
+                RegisterMetadata.new.do(opts[:role], opts[:solution], test)
+            end
 
             if (util == "gen-user")
                 GenUser.new.do(args[0])
@@ -192,7 +198,7 @@ module Canzea
             if lifecycle == 'wire'
               puts "-- Running helper #{opts[:solution]} #{opts[:action]}"
               ps = HelperRun.new
-              ps.run opts[:solution], opts[:action], opts.fetch(:args, {}), opts.fetch(:status,nil)
+              ps.run opts[:solution], opts[:action], opts.fetch(:args, '{}'), opts.fetch(:status,nil)
             end
         end
 

data/lib/commands/get-catalog.rb

@@ -14,13 +14,33 @@ class GetCatalog
         FileUtils.mkdir_p "#{catalogLocation}"
         catalogLocation = Pathname.new(catalogLocation).parent().realpath
         g = Git.clone(Canzea::config[:catalog_git], "catalog", :path => catalogLocation)
-        g.branch Canzea::config[:catalog_branch]
         if (tag != nil)
-            puts "-- For tag #{tag}"
-            g.tag tag
+            puts "-- (RESET) For tag #{tag}"
+            g.checkout(tag)
+        else
+            g.checkout(g.branch(Canzea::config[:catalog_branch]))
         end
-        puts "-- Branch '#{g.branch}' Commit #{g.log[0]}"
-        puts "-- Source #{catalogLocation}/catalog"
+        branch = g.current_branch
+        puts "-- (RESET) Branch '#{branch}' Commit #{g.log[0]}"
+        puts "-- (RESET) Source #{catalogLocation}/catalog"
+    end
+
+    def state()
+        g = Git.open(Canzea::config[:catalog_location])
+
+        branch = g.current_branch
+        commit = g.log[0]
+        g.tags.each do | c |
+            # Doesn't seem to link tag to the branch so excluding for now
+            # ENV.store('CATALOG_TAG', c.name)
+            # puts "-- Tag #{c.name}"
+        end
+
+        ENV.store('CATALOG_BRANCH', branch)
+        ENV.store('CATALOG_COMMIT', "#{g.log[0]}")
+
+        puts "-- Branch '#{ENV['CATALOG_BRANCH']}' Commit #{ENV['CATALOG_COMMIT']}"
+
     end
 
 end

data/lib/commands/register-metadata.rb

@@ -0,0 +1,68 @@
+require 'json'
+require 'logger'
+require 'pathname'
+require 'trace-component'
+require 'helper-run-class'
+require 'prepare-environment'
+
+class RegisterMetadata
+    def initialize ()
+        @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}/"
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+    end
+
+    def do (role, solution, test)
+
+        plan = JSON.parse("{ \"plan\": [ { \"role\": \"#{role}\", \"solution\": \"#{solution}\" } ] }")
+
+        n = Worker.new
+        n.test ( test )
+
+        lines = 1
+
+        cmd = "undefined"
+
+        begin
+
+            plan['plan'].each do |item|
+
+                root = "#{@basePath}/roles/#{item['role']}/#{item['solution']}"
+                if File.exist?(root) == false
+                    log "-- ERROR #{root} does not exist!"
+                    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'], "service"=>svc['name'], "tags"=>[ item['role'] ], "port"=>svc['port']}
+                        log "-- Registering Service: #{svc['name']}"
+                        h = HelperRun.new
+                        if test
+                            log "--  TEST ONLY"
+                        else
+                            h.run "consul", "register_service", JSON.generate(adef)
+                        end
+                    end
+                end
+            end
+        rescue => exception
+            @log.error(cmd)
+            @log.error(exception.to_s)
+            @log.error(exception.backtrace)
+            abort()
+        end
+    end
+
+    def log (msg)
+        puts msg
+        @log.info(msg)
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.91
+  version: 0.1.93
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,7 @@ files:
 - lib/commands/gen-user.rb
 - lib/commands/get-catalog.rb
 - lib/commands/prepare-plan.rb
+- lib/commands/register-metadata.rb
 - lib/commands/remote-bootstrap.rb
 - lib/commands/remote-run.rb
 - lib/commands/update-config.rb