raykit 0.0.285 → 0.0.286

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93593eb2d9871a26d0e9c59f674aca9facb4cb0cc56f433d1458df9d899efd16
-  data.tar.gz: f81113ebbe2f3639dbda7dfc37c60a7e0858dfdefade8746047bb7fa067167a5
+  metadata.gz: 738325d3fc54e5ab0ac4eb8601ad904c5d46d25fabdeb586d347476b626a2cda
+  data.tar.gz: 8e471c7a4df1fc056e309ce5dc45a1acec782952b4c19991d29fc4e273a730cf
 SHA512:
-  metadata.gz: 7cf027e2b70ffdd02af889c85be32f3af9cdd7b389cc376829f480c13a2a38ad74d97b229d86c9876f5741e3f2c7b5810ce210555617ac74f85674e7179571a5
-  data.tar.gz: ab6f0cd2895ef3a5f3049c1b2b45bee830ac10bb3c597246be2301ffd150840c420b7ae900f5e6e0790e36196a53c21821c9ca9c3866e72eb7907244664be867
+  metadata.gz: a2c665a23eee6f2fb379f643b218370abdf00e34e3e31a4e5d96efe1eeddf04257d62e10d9fb78820e3327da209d83b0a5aa7d31452ce3f2aa9efbd37788f86b
+  data.tar.gz: 16d87464c793877a71b2b5e6c910f55ed82024e86bd4a6f203f1a9ca090be43b522b787f7445053cfabc53ae6a065116672690a2e1860f839538db5e0c9f5078

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

metadata

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