raykit 0.0.284 → 0.0.288

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03ba575789af654596866dda0634888cd15be1eff85cf4f0d30a2b81a4a109b2
-  data.tar.gz: b553814de248ed81573bfce93a1fcf0d6a86185379f2b0f8d71315ebd8873df1
+  metadata.gz: ca39389db5e0297bed811fe9d54bf3425dbf75efaa90035a4b2d8b96960b4c58
+  data.tar.gz: a7baabecf86d29b0cced7f7e6a06a0460640d9a58445788e637750eb755b7c38
 SHA512:
-  metadata.gz: 89f6a452087f7418f8687816e5b66c9a25e921029757e6723e12eb0c203ad0a01918458e927c307be6adc3cadcb03560c3f0065a28d50cb3fc2950730eb32ba9
-  data.tar.gz: a19ba2a2d5b67764c0770e95ce54f36a096decca956432f43a2b2cccdd7c218cc05e91ce0ffc1dfeb1503fe51faa82214987c29c991e8552e6310cf42118aad0
+  metadata.gz: 3662fe9339f3398f23e5889d8ec8921cba8ebd3c437cc87805b0130c99cc78ee0dd61fff45e16d6bf2f47f88602b00d3c48f8eb1f597eb332438c9fb356d98c0
+  data.tar.gz: 5856978c20d77863834991ed75e7a4648d85c77b90000856d867707ef353c55baa4d60cbbe604b87ac6429ba25b0ae404bdafb2766883c563ca86a1b538ccf71

data/lib/raykit/command.rb

@@ -82,7 +82,31 @@ module Raykit
             log
         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,15 +25,18 @@ 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}")
             dir.mkpath
-            dir.to_s
+            dir.to_s().gsub('//','/')
         end
 
         def self.get_work_dir(url)
-            Raykit::Environment::get_dev_dir('work') + url.gsub('://','/').gsub('.git','')
+            Raykit::Environment::get_dev_dir('work') +'/' + url.gsub('://','/').gsub('.git','')
         end
         # Get the size of a directory and its contents
         def self.get_dir_size(dir)

data/lib/raykit/logevent.rb

@@ -0,0 +1,33 @@
+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
+    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/secrets.rb

@@ -3,6 +3,21 @@ require 'time'
 module Raykit
     # Provides functionality to record the time execution times
     class Secrets < Hash
+        def initialize()
+            if ENV.has_key?('RAYKIT_SECRETS_PATH')
+                secrets_file = ENV['RAYKIT_SECRETS_PATH']
+                if File.exists?(secrets_file)
+                    text = IO.read(secrets_file)
+                    if (text.length > 7 )
+                        data = JSON.parse(text)
+                        data.each{|key,value|
+                            self[key] = value
+                        }
+                    end
+                end
+            end
+        end
+
         def hide(text)
             hidden=text
             self.each{|k,v|
@@ -12,5 +27,12 @@ module Raykit
             }
             hidden
         end
+
+        def save() 
+            if ENV.has_key?('RAYKIT_SECRETS_PATH')
+                secrets_file = ENV['RAYKIT_SECRETS_PATH']
+                File.open(secrets_file,"w") { |f| f.puts self.to_json }
+            end
+        end
     end
 end

data/lib/raykit/tasks.rb

@@ -9,7 +9,9 @@ task :integrate do
     puts Rainbow(':integrate').blue.bright
 
     git_dir=Raykit::Git::Directory.new(Rake.application.original_dir)
-    if(!git_dir.detached?)
+    if(git_dir.detached?)
+        puts "detached head state, skipping integrate operations"
+    else
         if(PROJECT.outstanding_commit?)
             if(Rake::Task.task_defined?("test"))
                 Rake::Task["test"].invoke
@@ -23,17 +25,29 @@ task :integrate do
             puts "warning: .gitignore does not exist."
         else
             PROJECT.run('git add --all')
-            if(PROJECT.outstanding_commit?)
+            if(!`git status`.include?('nothing to commit'))
+            #if(PROJECT.outstanding_commit?)
                 commit_message='integrate'
                 PROJECT.run("git commit -m\"#{commit_message}\"") if(PROJECT.outstanding_commit?)
                 PROJECT.run("git pull")
-                PROJECT.run("git push")
-                PROJECT.run("git push --tags")
+                #PROJECT.run("git push")
+                #PROJECT.run("git push --tags")
             end
         end
     end
 end
 
+desc "push changes including tags"
+task :push do
+    git_dir=Raykit::Git::Directory.new(Rake.application.original_dir)
+    if(git_dir.detached?)
+        puts "detached head state, skipping push operations"
+    else
+        PROJECT.run("git push")
+        PROJECT.run("git push --tags")
+    end
+end
+
 desc "clean files not tracked by git"
 task :clean do
     puts Rainbow(':clean').blue.bright

data/lib/raykit/vstest.rb

@@ -2,14 +2,18 @@ module Raykit
     class VsTest
         def self.vstest_path
             ['2019/Community/Common7/IDE/CommonExtensions/Microsoft',
+             '2019/Professional/Common7/IDE/CommonExtensions/Microsoft/TestPlatform',
              '2019/Community/Common7/IDE/Extensions',
+             '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|
-                path = root_path + relative_path
-                    return path if(Dir.exists?(path))
+                    path = root_path + relative_path
+                    exe_path = path + '/vstest.console.exe'
+                    return path if(Dir.exists?(path)) && File.exist?(exe_path)
                 }  
             }
+            return "vstest_path not found"
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.284
+  version: 0.0.288
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-10-08 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
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: ruby gem to support rake ci/cd tasks