raykit 0.0.287 → 0.0.291

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40bac36f5f9c35c2f31b144155a0f98eddb193178fb46ea2b3076a97663615d7
-  data.tar.gz: 052fc176d1d7a1d6c7231e4bf2b8442b6b08e07c9df06997c3e661d7c4950a0d
+  metadata.gz: 475d2c341577676c9a039c02a38fdfde4c18eb638c864165ac3b9d9112887266
+  data.tar.gz: f1b911ee4a511444bfdb18b712707f35574395e328f5146d7e7948b9a8d021ee
 SHA512:
-  metadata.gz: bef23584ac4d9f56a51aafb7a1dd54dda36874e5c23e823532d969da3fbd999222602ad4eb7d19bfa41f532b052bf5f17bd0b0e056d508372274bae282cc425a
-  data.tar.gz: 795aa871242776dec0eff3ac7a5cb0326f1a870f5ec18ed86be0519ba06bb88e63a83f6238a5db31c5e44cc881cbcee420f00343f42e09496e901db2e4c8aabb
+  metadata.gz: 80e4920fe00c9ce59d11e7150c462afcb071f912052bdb7e820eccfd5d158cbb7457a5788273d0de8390b0cc85c13cf3b121d118fbd2a0a48dd76573e757057a
+  data.tar.gz: bdc321368e6522528a8767f1fca78cb827502acec1741b7953f91dba93eb9ad148dff8bdd5efbdf9287614beb32fa999b27210014e3e0d8f654eb12f6083618d

data/lib/raykit/command.rb

@@ -80,9 +80,49 @@ module Raykit
             end
             @elapsed = timer.elapsed
             log
+            to_log_event.to_seq
         end
 
+        def to_log_event
+            secrets=Secrets.new()
+            msg =secrets.hide(@command)
+            level="Verbose"
+            level="Warning" if @exitstatus != 0
+            Raykit::LogEvent.new(level,msg,{
+                "SourceContext"=>"Raykit::Command",
+                "Timeout"=>@timeout,
+                "Directory"=>@directory,
+                "Output"=>@output,
+                "Error"=>@error,
+                "ExitStatus"=>@exitstatus,
+                "Elapsed"=>elapsed_str
+            })
+        end
+        #@timeout=0
+        #@directory = Dir.pwd
+        #@output = ''
+        #@error = ''
+        #@exitstatus = 0
+
         def log
+            # --- Rolling File JSON -----
+            log = Logger.new("#{Raykit::Environment::log_dir}/Raykit.Commands.txt",'daily')
+            log.formatter = proc do |severity,datetime,progname,msg|
+                "#{msg}\n"
+            end
+            secrets=Secrets.new()
+            msg =secrets.hide(@command)#"?"# self.summary(false)
+            level="Verbose"
+            level="Warning" if @exitstatus != 0
+            event = Raykit::LogEvent.new(level,msg,{ 
+                "Timeout"=>@timeout,
+                "Directory"=>@directory,
+                "Output"=>@output,
+                "Error"=>@error,
+                "ExitStatus"=>@exitstatus,
+                "Elapsed"=>elapsed_str})
+            log.info event.to_json
+            # ---------------------------
             begin
                 json=JSON.generate(to_hash)
                 log_filename = Environment.get_dev_dir('log') + '/Raykit.Command/' + SecureRandom.uuid + '.json'

data/lib/raykit/environment.rb

@@ -25,6 +25,9 @@ module Raykit
             normalize_path(ENV['HOME'])
         end
 
+        def self.log_dir
+            return get_dev_dir('log')
+        end
         # Get, and create if it does not exist, a specific development directory
         def self.get_dev_dir(name)
             dir = Pathname.new("#{Environment::root_dir}/#{name}")

data/lib/raykit/logevent.rb

@@ -0,0 +1,54 @@
+require 'json'
+module Raykit
+    # :verbose, :debug, :information, :error, :fatal
+    class LogEvent < Hash
+        def initialize(level,messageTemplate,properties)
+            self["Timestamp"] = DateTime.now.iso8601
+            self["Level"] = level
+            self["Message"] = messageTemplate
+            self["MessageTemplate"] = messageTemplate
+            #properties["SourceContext"] = "Raykit" if !properties.has_key?('SourceContext')
+            properties["MachineName"] = Raykit::Environment::machine if !properties.has_key?('MachineName')
+            properties["UserName"] = Raykit::Environment::user if !properties.has_key?('UserName')
+            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?
+                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
+end
+
+
+#{
+#	"Timestamp": "2021-10-06T06:09:25.5275817-06:00",
+#	"Level": "Information",
+#	"MessageTemplate": "MachineName     {machine}",
+#	"Properties": {
+#		"machine": "BLUEFIN",
+#		"SourceContext": "cslogging.Program",
+#		"ThreadId": 1,
+#		"ProcessId": 16764,
+#		"ProcessName": "cs-logging",
+#		"MachineName": "\"BLUEFIN\"",
+#		"UserName": "\"loupa\"",
+#		"OS": "Windows_NT"
+#	}
+#}

data/lib/raykit/vstest.rb

@@ -2,8 +2,9 @@ module Raykit
     class VsTest
         def self.vstest_path
             ['2019/Community/Common7/IDE/CommonExtensions/Microsoft',
+             '2019/Professional/Common7/IDE/Extensions/TestPlatform',
              '2019/Community/Common7/IDE/Extensions',
-             '2019\Community\Common7\IDE\Extensions\TestPlatform',
+             '2019/Community/Common7/IDE/Extensions/TestPlatform',
              '2022/Preview/Common7/IDE/Extensions/TestPlatform'].each{|relative_path|
                 ['C:/Program Files (x86)/Microsoft Visual Studio/',
                 'C:/Program Files/Microsoft Visual Studio/'].each{|root_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.287
+  version: 0.0.291
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - lib/raykit/git/repositories.rb
 - lib/raykit/git/repository.rb
 - lib/raykit/log.rb
+- lib/raykit/logevent.rb
 - lib/raykit/logging.rb
 - lib/raykit/msbuild.rb
 - lib/raykit/nugetpackage.rb