raykit 0.0.293 → 0.0.297

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0fae022320e540c31f64fb00fdbf87b3c483831eeea0ff0dc3efb7aabc258d
-  data.tar.gz: a90f7ff036216fa7058b8a4c49823884743858b1c228607252395a985079e15a
+  metadata.gz: f07f5d3a1dea20fc2c6b7b63d4c438e13bd8ba95ffd3868648bd7a2a3b47c41d
+  data.tar.gz: b9fe5d3efe492c2a82b3fd726dc78374538a2d9dd26064e2c5c71c8fdae79d4d
 SHA512:
-  metadata.gz: 661e59bb0e80cdb32f64a8b68cfe436b02f1b77b0af2b9fead9ada7602fd9734e8345bfd3a7a0792e1c8f5b8d65681ae5eec5b74f40ffd8f04b1e65468cdb0a7
-  data.tar.gz: a8dec9175f8c1c383409383ac1d3738269434d67fdc1754713f32b56fd1f268c5b6e693a47bc5b2b578aea6c1112f189515c6c739d2b75d62461593214948290
+  metadata.gz: c6ba118fd9809e4478082f5efbd7ca3fef4e02d6d4524938048c70c817c34f77781ced8d973843b7c0524f1f29e77b841d44e6a68d7b78168ea40ce24d890dca
+  data.tar.gz: 49e39fda62d15d6ef73ded9b86358052f7522bc2bbfc7ee40416655a21737f84e4a59e5adf5632d3d72b9bf002cce7a76d4683132cb38edbe4cd0dc49e3ea889

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 = Logger::VERBOSE
+                        e.level = "Debug" if @success_log_level = Logger::DEBUG
+                        e.level = "Information" if @success_log_level = Logger::INFO
+                        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.293
+  version: 0.0.297
 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