canzea 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4173c7e6e1d59a0fd6d4d3b0646af9cbba2def41
-  data.tar.gz: a1c2ab05ece4771b31e0e5cb6f7c7ae81567cc3f
+  metadata.gz: 07c1fd750790a2c8a5f46d9ef71b2b945bd00345
+  data.tar.gz: 89eecb6433b3372b3120611c57a8e955f581df77
 SHA512:
-  metadata.gz: 4ce919180e9abe97ddef2f6392967862a88b3e2e1dbe1ddf121dab086daba97403ebd4c7234045c0bbf64e490bcfd247f3070c40680e6762b7443021cd4b4b17
-  data.tar.gz: aed9a155472adaded217be2d7d5ede2f4d715c74bd17352407fc938b5a1c2d5062b0bde5bbadd16d6ef8d8150599c05cbeae031e723940e6aec6ba48c65939e1
+  metadata.gz: 4fe6176806dbcf3a8e138f3f2adabc8c24cb12ef4f1ad052998a74bb48e07d5a2c4b026db17bd867c01c2ed2e0166170060db15e36d7cee0532f85e379e23732
+  data.tar.gz: 983f4f95775fc60076b55ea030035a9911fc5365582818390390b5497c6ef5faa90082c83936aede997473b98bf1ad16bccffa18e8406d98c3c084fa51d3af83

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.30"
+  VERSION = "0.1.31"
 end

data/lib/canzea.rb

@@ -18,7 +18,6 @@ require "commands/update-config"
 require "commands/apply-config"
 
 module Canzea
-
   command = Cri::Command.define do
       name        'canzea'
       usage       'canzea [options]'
@@ -57,6 +56,7 @@ module Canzea
       option nil, :solution, 'Solution', argument: :required
       option nil, :task, 'Task', argument: :required
       option nil, :step, 'Step', argument: :required
+      option nil, :status, 'Result will be put into the status message', argument: :required
       option nil, :serverBase, 'Server Base', argument: :required
       option nil, :serverNumber, 'Server Number', argument: :required
       option nil, :privateKey, 'Task', argument: :required
@@ -76,6 +76,9 @@ module Canzea
 
         if opts[:pwd]
             puts Dir.pwd
+        end
+
+        if (opts[:reset])
             GetCatalog.new.do(opts.fetch(:catalogTag, nil));
         end
 
@@ -96,10 +99,6 @@ module Canzea
             end
         end
 
-        if (opts[:reset])
-            GetCatalog.new.do(opts.fetch(:catalogTag, nil));
-        end
-
         if (opts[:lifecycle])
 
             lifecycle = opts[:lifecycle]
@@ -128,7 +127,7 @@ module Canzea
             if lifecycle == 'wire'
               puts "Running helper #{opts[:solution]} #{opts[:action]}"
               ps = HelperRun.new
-              ps.run opts[:solution], opts[:action], opts[:args]
+              ps.run opts[:solution], opts[:action], opts[:args], opts.fetch(:status,nil)
             end
         end
 

data/lib/commands/get-catalog.rb

@@ -1,9 +1,13 @@
 require "git"
 require "fileutils"
+require "logger"
 require "pathname"
 
 
 class GetCatalog
+    def initialize ()
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+    end
     def do(tag = nil)
         catalogLocation = Canzea::config[:catalog_location]
         FileUtils.rm_rf catalogLocation
@@ -12,11 +16,11 @@ class GetCatalog
         g = Git.clone(Canzea::config[:catalog_git], "", :path => catalogLocation)
         g.branch Canzea::config[:catalog_branch]
         if (tag != nil)
-            puts "For tag #{tag}"
+            @log.info "For tag #{tag}"
             g.tag tag
         end
-        puts "Branch '#{g.branch}' Commit #{g.log[0]}"
-        puts "Source #{catalogLocation}"
+        @log.info "Branch '#{g.branch}' Commit #{g.log[0]}"
+        @log.info "Source #{catalogLocation}"
     end
 
 end

data/lib/helper-run-class.rb

@@ -18,7 +18,7 @@ class HelperRun
         }
     end
 
-    def run (solution, action, parameters)
+    def run (solution, action, parameters, status = false)
 
         type = "ruby"
 
@@ -42,7 +42,7 @@ class HelperRun
             else
                 cmd = "#{@basePath}/helpers/#{solution}/#{action}.sh \"#{parameters}\""
             end
-            r.run cmd, 1, 1, false
+            r.run cmd, 1, 1, status
 
         rescue => exception
             @log.error(cmd)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler