raykit 0.0.283 → 0.0.287

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4a71887ea689823ee432f2e5c5ef92553ce4d18c6d81620d3d44dc415e6f58
-  data.tar.gz: 650003232518b6d375383b86c372f70847d10a92b758fb0af06d2639e8d623e5
+  metadata.gz: 40bac36f5f9c35c2f31b144155a0f98eddb193178fb46ea2b3076a97663615d7
+  data.tar.gz: 052fc176d1d7a1d6c7231e4bf2b8442b6b08e07c9df06997c3e661d7c4950a0d
 SHA512:
-  metadata.gz: b2ee8e9898866df79b29b928cbb8ed67e5a34d0343b1085bb8799fd19664663ac0aae9b91305a87fda8bc6372bc6086b5be01e90103d6a733bbd37ad61e9265d
-  data.tar.gz: a07da2666596fe47111de77c67c90ddaaaf24f82eb7d70867d108f2d82a310af5ee66ac2de828a29da59e66c2527f93209b13a936cd1fcbcf9274a583ee43eaa
+  metadata.gz: bef23584ac4d9f56a51aafb7a1dd54dda36874e5c23e823532d969da3fbd999222602ad4eb7d19bfa41f532b052bf5f17bd0b0e056d508372274bae282cc425a
+  data.tar.gz: 795aa871242776dec0eff3ac7a5cb0326f1a870f5ec18ed86be0519ba06bb88e63a83f6238a5db31c5e44cc881cbcee420f00343f42e09496e901db2e4c8aabb

data/lib/raykit/environment.rb

@@ -29,11 +29,11 @@ module Raykit
         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/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

@@ -3,10 +3,16 @@ module Raykit
         def self.vstest_path
             ['2019/Community/Common7/IDE/CommonExtensions/Microsoft',
              '2019/Community/Common7/IDE/Extensions',
+             '2019\Community\Common7\IDE\Extensions\TestPlatform',
              '2022/Preview/Common7/IDE/Extensions/TestPlatform'].each{|relative_path|
-                path = 'C:/Program Files/Microsoft Visual Studio/' + relative_path
-                return path if(Dir.exists?(path))
+                ['C:/Program Files (x86)/Microsoft Visual Studio/',
+                'C:/Program Files/Microsoft Visual Studio/'].each{|root_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.283
+  version: 0.0.287
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,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