canzea 0.1.107 → 0.1.108

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba71b0ca102396c8325d24d2761e61038e9f2075
-  data.tar.gz: d75380a8618c2bf7ea0d521eedadb981d081d9b6
+  metadata.gz: f1c154149608246d765d96d0023c8fb0635cca27
+  data.tar.gz: fd3b9d1b4e737d5c2eacceb781d63c6b267c6869
 SHA512:
-  metadata.gz: dc87e8f4345afe339347b90814c75f9b77ea10366ed058cb713359086f1a721fb01f4837b34babbcf804a78d279e32ba70145c486b94cb9af97cbd3998e3f0a4
-  data.tar.gz: 986d5509a51135ffb4fbb527f7aadea5afd4e49c182e2adba26a1095209c44bc199611a6250ad24c396d2b8b134a1b88cb26e258ba562c23ccef58dc8275bc0a
+  metadata.gz: 548a7d2ecd143697731eb0a4e49ab5da4fa7a8d0800edc18bc214e865c8ac54314d881300352e49f2ba37c417c920b65f2d27f5a077d11f63ae058c0447eda39
+  data.tar.gz: 2cde88c9525282d5337856fe16cd62d26fb9451d95c792b61aecc166e25d07fe2ea6219651e2b81a67305d86c04cecfd3ee94b1bf63936a58e6c377cc3e5bf73

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.107"
+  VERSION = "0.1.108"
 end

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

@@ -4,43 +4,50 @@ require "pathname"
 
 class ConfigGitCommit
     def do(gitRoot, sourcePath, template, parameters)
-        # if file exists on file system and does not exist in gitRoot, then commit the "oem" file
+        begin
+            # 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}"
-        else
-            dest = "#{gitRoot}/config#{sourcePath}"
-        end
-        puts "Writing to #{dest}"
+            if (File.exists?(sourcePath))
+                dest = "#{gitRoot}/config#{Pathname.new(sourcePath).realpath}"
+            else
+                dest = "#{gitRoot}/config#{sourcePath}"
+            end
+            puts "Writing to #{dest}"
+
+            if (File.exist?(dest) == false and File.exist?(sourcePath))
+                FileUtils.mkdir_p Pathname.new(dest).dirname
+                FileUtils.cp sourcePath, dest
 
-        if (File.exist?(dest) == false and File.exist?(sourcePath))
+                puts "Recording in repo the default file first: #{sourcePath}"
+                if (Canzea::config[:track_changes_in_git])
+                    g = Git.init(gitRoot)
+                    g.add(:all=>true)
+                    g.commit("Original default #{sourcePath}")
+                end
+            end
+
+            if template
+                puts "Processing template #{template}"
+                FileUtils.mkdir_p Pathname.new(sourcePath).dirname
+                t = Template.new
+                t.processAndWriteToFile template, sourcePath, parameters
+            end
             FileUtils.mkdir_p Pathname.new(dest).dirname
             FileUtils.cp sourcePath, dest
 
-            puts "Recording in repo the default file first: #{sourcePath}"
             if (Canzea::config[:track_changes_in_git])
                 g = Git.init(gitRoot)
                 g.add(:all=>true)
-                g.commit("Original default #{sourcePath}")
-            end
-        end
-
-        if template
-            puts "Processing template #{template}"
-            FileUtils.mkdir_p Pathname.new(sourcePath).dirname
-            t = Template.new
-            t.processAndWriteToFile template, sourcePath, parameters
-        end
-        FileUtils.mkdir_p Pathname.new(dest).dirname
-        FileUtils.cp sourcePath, dest
-
-        if (Canzea::config[:track_changes_in_git])
-            g = Git.init(gitRoot)
-            g.add(:all=>true)
-            puts g.status.changed.size() + g.status.added.size()
-            if (g.status.changed.size() > 0 or g.status.added.size() > 0)
-                g.commit("Config update #{sourcePath}")
+                puts g.status.changed.size() + g.status.added.size()
+                if (g.status.changed.size() > 0 or g.status.added.size() > 0)
+                    g.commit("Config update #{sourcePath}")
+                end
             end
+        rescue => exception
+            @log.error("ConfigGitCommit Failed")
+            @log.error(exception.to_s)
+            @log.error(exception.backtrace)
+            abort()
         end
     end
 end

metadata

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