raykit 0.0.292 → 0.0.296

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf809b8d58ba93ff0722006674d2a60cc95f4891e32f516eb666f8e8d4e1f8c
-  data.tar.gz: c0f6c85bad11623688e5329000f3bffb2cce09447edc2a2668b1b1a2f0461f57
+  metadata.gz: 7fd42edf229b6649271f97fd4433975e6bd843f877f37bdd02ea496b1cd2c05e
+  data.tar.gz: 72c395999f191fc67eda334b79630641f026274e734b1947802e3a964a495e88
 SHA512:
-  metadata.gz: b0c6a0f4b7909c4bae0281db12f17b4ae315541687cc269b17e4cd12701629f7c9c50e6ef4b59983c971e304cfb1e97f0aa3aefba09e26811293313ae6ad4da4
-  data.tar.gz: 3d3141e44ac13643d564887daf2feff0f46f1faac90af01b13cc28ceb9847009df593e1068fe39a3d047c47ab5d45ed83a615c661e90a92e848d7694aff4e9f7
+  metadata.gz: c57390ca7fb1f6ec46e76ab075f8b889e7fec39eff9c44a414a6f682f589023028378d7d9d67647858f1755822541dbcdfadd08949e1b18cf1da84861f079de6
+  data.tar.gz: ab071d35efdf8b913f5318bfeedbdad3cb8e4b19f67c8abb4c57a0e20527b0749f63280c8849ef33cc603d5184be745896fb4d8964cb8c812e4f827fb355f672

data/lib/raykit/command.rb

@@ -20,6 +20,8 @@ module Raykit
         attr_accessor :elapsed
         attr_accessor :command,:output,:error,:exitstatus
         attr_accessor :user,:machine
+        attr_accessor :logging_enabled
+        attr_accessor :success_log_level
 
         def init_defaults 
             @timeout=0
@@ -29,11 +31,13 @@ module Raykit
             @exitstatus = 0
             @user = Environment.user
             @machine=Environment.machine
+            @logging_enabled = true
         end
 
-        def initialize(command,timeout=0)
+        def initialize(command,timeout=0,success_log_level=nil,logging_enabled=true)
             @@commands=Array.new
             init_defaults
+            @logging_enabled=logging_enabled
             @command=command
             @timeout=timeout
             if(@command.length > 0)
@@ -73,14 +77,27 @@ module Raykit
                             Process.kill("TERM", pid)
                         end
                         @exitstatus=5
+                        @error="timed out"
                     else
                         @exitstatus=thread.value.exitstatus
                     end
                   }
             end
             @elapsed = timer.elapsed
-            log
-            to_log_event.to_seq if @exisstatus != 0
+            if @logging_enabled
+                log
+                if @exitstatus != 0 
+                    to_log_event.to_seq
+                else
+                    if !@success_log_level.nil?
+                        e = to_log_event
+                        e.level = "Verbose" if @success_log_level = Logging::Verbose
+                        e.level = "Debug" if @success_log_level = Logging::Debug
+                        e.level = "Information" if @success_log_level = Logging::Information
+                        e.to_seq
+                    end
+                end
+            end
         end
 
         def to_log_event
@@ -90,6 +107,7 @@ module Raykit
             level="Warning" if @exitstatus != 0
             Raykit::LogEvent.new(level,msg,{
                 "SourceContext"=>"Raykit::Command",
+                "Category"=>"Command",
                 "Timeout"=>@timeout,
                 "Directory"=>@directory,
                 "Output"=>@output,

data/lib/raykit/git/directory.rb

@@ -89,7 +89,7 @@ module Raykit
             end
 
             def get_tag_commit_id(name)
-                cmd = Raykit::Command.new("git rev-parse \"#{name}\"")
+                cmd = Raykit::Command.new("git rev-parse \"#{name}\"",0,nil,false)
                 if !cmd.output.include?('fatal') && !cmd.error.include?('fatal')
                     cmd.output.strip()
                 else

data/lib/raykit/logevent.rb

@@ -9,27 +9,17 @@ module Raykit
             self["MessageTemplate"] = messageTemplate
             properties["MachineName"] = Raykit::Environment::machine if !properties.has_key?('MachineName')
             properties["UserName"] = Raykit::Environment::user if !properties.has_key?('UserName')
+            properties["RakeDirectory"] = ::Rake.application.original_dir
             self["Properties"] = properties
         end
 
         def to_seq
-            #ENV.each{|ek,ev|
-            #    puts "#{ek} #{ev}"
-            #}
-            if !ENV['SEQ_SERVER'].nil?# != nil# && ENV['SEQ_SERVER'].is_set?
+            if !ENV['SEQ_SERVER'].nil?
                 cmd_str="seqcli log -m \"#{self['Message']}\" -l #{self['Level']} -s #{ENV['SEQ_SERVER']}"
                 self["Properties"].each{|k,v|
                     cmd_str=cmd_str + " -p \"#{k}=#{v}\""
                 }
                 puts `#{cmd_str}`
-                # puts cmd_str
-                #puts `#{cmd_str}`
-                #cmd=Raykit::Command.new(cmd_str)
-                #cmd.run
-                #puts cmd.summary
-                #puts cmd.details
-            #else
-                #puts 'SEQ_SERVER env var not found'
             end
         end
     end

data/lib/raykit/project.rb

@@ -282,12 +282,11 @@ module Raykit
             self
         end
 
-        def run(command,quit_on_failure=true) 
-            #log.update_command_time(command,DateTime.now)
+        def run(command,quit_on_failure=true,success_log_level=nil) 
             if(command.kind_of?(Array))
                 command.each{|subcommand| run(subcommand,quit_on_failure)}
             else
-                cmd = Command.new(command)
+                cmd = Command.new(command,0,success_log_level)
                 cmd.summary
                 cmd.save
                 elapsed_str = Timer.get_elapsed_str(cmd.elapsed,0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.292
+  version: 0.0.296
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-09 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler