canzea 0.1.131 → 0.1.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a965e71ff131905ac4d64d348e4d317096772985
-  data.tar.gz: a1ec3c6b626c3ce5d891bafa4891e89155cb72d1
+  metadata.gz: 3a22dc3a0156ff7036ca85003dc3948838a64dae
+  data.tar.gz: 0f2e1d504adfdb428adfef91b54032543f7e1fa5
 SHA512:
-  metadata.gz: 73c83cf4d14eb47284aef03ee2dc43af128be0371c82b1090cca94523e63e9e19c36b8a66fce23ef6ba7f74aa9c2b8b05a0abbf459e9b364669a65db8b4a4936
-  data.tar.gz: 4b7b5b0315c7b9e09598c3b479fd3f32015c6803dfc446299e07d113a6c3322c067daf2bd63d03fa4c984a9e0f9bc320295df7c5e3e745743566b7dd01c6fd4f
+  metadata.gz: 4d991a2022df498c02d3c3233d44560fceb6dc6244b62a5c1c7d423fe83123cf6bbd91cc939b12594a691113bddc8f625e6e1f485557b1bc269d23d5683fd016
+  data.tar.gz: 80aa98e5ec8bbcb199dce40d7c02dbf55b50b9a1704755f2311b5b64032c570e40f31e106827153dbb8aea63bcef0ff9870a5af9189a3ceab31690edd9cc00ab

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.131"
+  VERSION = "0.1.132"
 end

data/lib/canzea.rb

@@ -64,6 +64,7 @@ module Canzea
       option nil, :util, "Utility action [gen-user, gen-cert, add-env, add-env-secret, prepare-plan, apply-config]", argument: :required
       option nil, :catalogTag, 'Specific tag of the catalog', argument: :required
       option nil, :gitRoot, 'Git root', argument: :required
+      option nil, :gitUri, 'Git URI', argument: :required
 
       option nil, :commit, 'Commit', argument: :required
       option nil, :role, 'Role', argument: :required
@@ -243,9 +244,17 @@ module Canzea
         end
 
         if opts[:config_git_commit]
+            if (ENV.has_key?('ECOSYSTEM') == false)
+                raise "ECOSYSTEM environment variable must be set for this command"
+            end
+
             gitRoot = opts.fetch(:gitRoot, Canzea::config[:git_repo])
+            gitUri = opts.fetch(:gitUri);
+
+            basePath = "ecosystems/#{ENV['ECOSYSTEM']}/config/#{opts[:serverBase]}-#{opts[:serverNumber]}"
+
             cg = ConfigGitCommit.new
-            cg.do gitRoot, args[0], opts[:template], (args.length == 1 ? {}:JSON.parse(args[1]))
+            cg.do gitRoot, gitUri, args[0], opts[:template], basePath, (args.length == 1 ? {}:JSON.parse(args[1]))
         end
       end
     end

data/lib/commands/config-git-commit.rb

@@ -7,14 +7,21 @@ class ConfigGitCommit
         @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
     end
 
-    def do(gitRoot, sourcePath, template, parameters)
+    def do(gitRoot, gitUri, sourcePath, template, basePath, parameters)
         begin
+            log "Using basePath #{basePath}"
+
+            if (File.exists?(gitRoot) == false)
+                log "Cloning git repository #{gitUri}"
+                g = Git.clone(gitUri, "", :path => gitRoot)
+            end
+
             # if file exists on file system and does not exist in gitRoot, then commit the "oem" file
 
             if (File.exists?(sourcePath))
-                dest = "#{gitRoot}/config#{Pathname.new(sourcePath).realpath}"
+                dest = "#{gitRoot}/#{basePath}#{Pathname.new(sourcePath).realpath}"
             else
-                dest = "#{gitRoot}/config#{sourcePath}"
+                dest = "#{gitRoot}/#{basePath}#{sourcePath}"
             end
             log "Writing to #{dest}"
 
@@ -47,6 +54,11 @@ class ConfigGitCommit
                     g.commit("Config update #{sourcePath}")
                 end
             end
+
+            if (Canzea::config[:track_changes_in_git])
+                g = Git.init(gitRoot)
+                g.push
+            end
         rescue => exception
             @log.error("ConfigGitCommit Failed")
             @log.error(exception.to_s)

metadata

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