canzea 0.1.149 → 0.1.151

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ea91c2d819d2853665868ab8fe3d9b53474657
-  data.tar.gz: e9e24e68a9127f3a874f00a2db0c0f7ab1cee9a9
+  metadata.gz: 254a64dc073ab378b19653debbe60b4183d92c89
+  data.tar.gz: e520f2ac45c7569aa865f861b16a0514f5107967
 SHA512:
-  metadata.gz: 8e8a6fabc22a777c58e7cd047bb834ff59a923a13101d192401f477ee2bd9a3872f6debd88522f40f1ec5bf0ed73f59562a99d4e87b38a2067a736ca219727d8
-  data.tar.gz: f90ffb0576175d6e58d303209c7239f176c86dc77c03831e38f26c840b2f634c57d2dbdd1752a61ccb38c8d420fd2b4556328cbd5e901c9bb3c9c5937e95cb82
+  metadata.gz: 95b298648522f79b86f3bc28c167db8333d4eaf4b054138c760c1545e877f09dcf7ef0afd83d86b98c3c7e5aab9325c55a83eb8d24c64e97eb942d706f0e6625
+  data.tar.gz: 9f232b09ddb3fa11d060e01d2ec9ccf5adf78c1d8f06df6e8d9c78d352f77e5c1c46f40e63a053d1858af8e296521beb20637dcb1010e48cfce463457bb7e309

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.149"
+  VERSION = "0.1.151"
 end

data/lib/canzea.rb

@@ -6,6 +6,7 @@ require "canzea/config"
 require "canzea/version"
 require "canzea/environment"
 require "helper-run-class"
+require "trace-component"
 require "plan-step-class"
 require "ssh-base-cmd-class"
 require "template-runner"
@@ -45,6 +46,7 @@ module Canzea
 #      flag nil, :run, 'Run a step'
 #      flag nil, :helper, 'Execute a helper'
       flag nil, :remote, 'Remote execution'
+      flag nil, :remote_configure, 'Remote configuration'
       flag nil, :remote_wire, 'Remote execution of a helper'
       flag nil, :get, 'Get a file from the remote server'
       flag nil, :put, 'Put a file onto the remote server'
@@ -137,6 +139,35 @@ module Canzea
                 RegisterMetadata.new.do(opts[:role], opts[:solution], test)
             end
 
+            if (util == "analyze-command")
+                step = Integer(opts.fetch(:step, '0'))
+
+                list = []
+                args = JSON.parse(opts.fetch(:args, "{'phases'=>['install']}"))
+                phases = args['phases']
+
+                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
+                }
+
+                list.each_with_index { | cmd, index |
+                    if index >= step
+                        puts "[#{index}] #{cmd}"
+
+                        RemoteRun.new.doCommand publicIp, opts[:privateKey], cmd
+                    else
+                        puts "[#{index}] SKIP #{cmd}"
+                    end
+                }
+            end
+
             if (util == "gen-user")
                 GenUser.new.do(args[0])
             end
@@ -241,6 +272,12 @@ module Canzea
             RemoteRun.new.do publicIp, opts[:privateKey], opts[:role], opts[:solution]
         end
 
+        if opts[:remote_configure]
+            publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{opts[:serverBase]}-#{opts[:serverNumber]}.json")
+            publicIp.strip!
+            RemoteRun.new.doConfigure publicIp, opts[:privateKey], opts[:role], opts[:solution]
+        end
+
         if opts[:remote_wire]
             publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{opts[:serverBase]}-#{opts[:serverNumber]}.json")
             publicIp.strip!

data/lib/commands/push-config.rb

@@ -26,7 +26,7 @@ class PushConfig
     def cp(filePath, destPath)
         if File.directory?(filePath)
             Dir.foreach(filePath) { |x|
-                if x == '.' or x == '..' or x.starts_with('.')
+                if x == '.' or x == '..' or x.start_with?('.')
                 else
                     if File.directory?("#{filePath}/#{x}")
                         cp "#{filePath}/#{x}", "#{destPath}/#{x}"
@@ -40,20 +40,69 @@ class PushConfig
         end
     end
 
+    def backupAndRemove(filePath)
+        backup(filePath)
+        rm(filePath)
+    end
+
+    def backup(filePath)
+        path = "ecosystems/#{ENV['ECOSYSTEM']}/#{@relPath}#{filePath}"
+
+        folder = "sc"
+        if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+          folder = "_working"
+        end
+
+        if File.exists? folder
+            g = Git.init(folder)
+        else
+            if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+                g = Git.clone(ENV['ECOSYSTEM_CONFIG_GIT'], folder, :path => '.')
+            else
+                g = Git.init(folder)
+            end
+        end
+
+        puts "Exists? #{folder}/#{path}"
+        if File.exists? "#{folder}/#{path}"
+            numb = 1
+            bkup = "#{folder}/#{path}.archived"
+            while File.exists? "#{bkup}#{numb}"
+                numb = numb + 1
+            end
+            puts "Backed up to #{bkup}#{numb}"
+            File.write "#{bkup}#{numb}", File.read("#{folder}/#{path}");
+
+            g.add("#{path}.archived#{numb}")
+        end
+    end
+
     def write(filePath, contents)
 
         path = "ecosystems/#{ENV['ECOSYSTEM']}/#{@relPath}#{filePath}"
 
         begin
-            folder = "_working"
+            folder = "sc"
+            if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+              folder = "_working"
+            end
+
 
             if File.exists? folder
                 g = Git.init(folder)
             else
-                g = Git.clone(ENV['ECOSYSTEM_CONFIG_GIT'], folder, :path => '.')
+                if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+                    g = Git.clone(ENV['ECOSYSTEM_CONFIG_GIT'], folder, :path => '.')
+                else
+                    g = Git.init(folder)
+                end
             end
             FileUtils.mkdir_p File.dirname("#{folder}/#{path}")
 
+            pth = File.expand_path "#{folder}/#{path}"
+
+            @log.info "Writing to: #{pth}"
+
             open("#{folder}/#{path}", 'w') { |f|
               f.puts contents
             }
@@ -73,17 +122,30 @@ class PushConfig
         path = "ecosystems/#{ENV['ECOSYSTEM']}/#{@relPath}#{filePath}"
 
         begin
-            folder = "_working"
+            folder = "sc"
+            if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+              folder = "_working"
+            end
 
             if File.exists? folder
                 g = Git.init(folder)
             else
                 g = Git.clone(ENV['ECOSYSTEM_CONFIG_GIT'], folder, :path => '.')
             end
-            FileUtils.rmdir_p File.dirname("#{folder}/#{path}")
 
-            g.add("#{path}")
+            if File.directory? "#{folder}/#{path}"
+                puts "DELETE DIRECTORY: #{folder}/#{path}"
+                FileUtils.rmdir_p File.dirname("#{folder}/#{path}")
 
+                g.add("#{path}")
+
+            else
+                if File.exists? "#{folder}/#{path}"
+                    puts "DELETE FILE: #{folder}/#{path}"
+                    FileUtils.rm_f "#{folder}/#{path}"
+                    g.remove("#{path}")
+                end
+            end
         rescue => exception
             @log.error("PushConfig Failed")
             @log.error(exception.to_s)
@@ -94,7 +156,12 @@ class PushConfig
     end
 
     def commit(comment)
-        folder = "_working"
+        folder = "sc"
+        if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+          folder = "_working"
+        else
+          return
+        end
 
         begin
             count = 0
@@ -120,15 +187,21 @@ class PushConfig
               log "#{count} changes committed."
               g.commit(comment)
 
-              g.push
+              if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+                  g.push
+              end
             end
 
-            FileUtils.rm_rf(folder)
+            if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+              FileUtils.rm_rf(folder)
+            end
         rescue => exception
-            FileUtils.rm_rf(folder)
+            if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+              FileUtils.rm_rf(folder)
+            end
             @log.error("PushConfig Failed")
-            @log.error(exception.to_s)
             @log.error(exception.backtrace)
+            @log.error(exception.to_s)
             abort()
         end
     end
@@ -138,7 +211,10 @@ class PushConfig
 
             # "git@#{ENV["GOGS_ADDRESS"]}:root/ecosystem.git"
 
-            folder = "_working"
+            folder = "sc"
+            if ENV.has_key? 'ECOSYSTEM_CONFIG_GIT'
+              folder = "_working"
+            end
 
             FileUtils.rm_rf(folder)
 

data/lib/commands/remote-run.rb

@@ -20,6 +20,11 @@ class RemoteRun
       remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --solution=#{solution}", ref
     end
 
+    def doConfigure(publicIp, privateKey, role, solution, ref="")
+      remote = RemoteCall.new
+      remote.exec publicIp, privateKey, "canzea --lifecycle=configure --role=#{role} --solution=#{solution}", ref
+    end
+
     def doCommand(publicIp, privateKey, command, ref="")
       remote = RemoteCall.new
       remote.exec publicIp, privateKey, command, ref

data/lib/commands/update-config.rb

@@ -6,19 +6,21 @@ class UpdateConfig
 
         steps = {}
 
-        # write to configure the registration of the service
-        if (File.exists?("#{gitRoot}/configure.json"))
-            steps = JSON.parse(File.read("#{gitRoot}/configure.json"))
-        else
-            steps["steps"] = []
-        end
+        if File.directory? "#{gitRoot}"
+            # write to configure the registration of the service
+            if (File.exists?("#{gitRoot}/configure.json"))
+                steps = JSON.parse(File.read("#{gitRoot}/configure.json"))
+            else
+                steps["steps"] = []
+            end
 
-        conf = {
-            :role => role,
-            :solution => solution
-        }
-        steps["steps"].push(conf)
+            conf = {
+                :role => role,
+                :solution => solution
+            }
+            steps["steps"].push(conf)
 
-        File.open("#{gitRoot}/configure.json", 'w') { |file| file.puts(JSON.generate(steps)) }
+            File.open("#{gitRoot}/configure.json", 'w') { |file| file.puts(JSON.generate(steps)) }
+        end
     end
 end

data/lib/trace-component.rb

@@ -33,6 +33,34 @@ class Worker
         @test = t
     end
 
+    def find(command, list = [])
+        audit = Audit.new false
+
+        @log.info("     FIND: " + command)
+
+        File.foreach(command) { |l|
+            if ( l.start_with?('## ') )
+                @log.info "#{lines + 1} Label: " + l
+            elsif ( l.start_with?('#') )
+            elsif ( /\S/ !~ l )
+            elsif ( l.chomp.end_with?(".sh") && !l.chomp.end_with?(".atomic.sh") && !l.include?("cp ") && !l.include?("chmod") )
+                @log.info("     [#{ref}] RECURSE: " + l)
+
+                workingDir = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
+
+                Dir.chdir(workingDir) {
+
+                    newCommand = "#{Pathname.new(l.chomp).realpath}"
+
+                    lines = find newCommand, list
+                }
+            else
+                list.push l
+            end
+        }
+        return list
+    end
+
     def run(command, start, lines, statusIndicator = false, ref = "" )
         audit = Audit.new false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.149
+  version: 0.1.151
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler