raykit 0.0.440 → 0.0.441

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c2403f2969862b6794ccee4702f40f3b62b450d057a58a5c7f3acfb20f2d7a
-  data.tar.gz: bc98bdd06e4d2743b3a6f3dc9ca1216aa852d440db77147c2513042d793ccae6
+  metadata.gz: 94b2cf08f83bf1471755f4243b3ff27fabed667151da409150ba95d089646619
+  data.tar.gz: 3ecc869f957d7dfd88c30bc7b3504875f254d735b300af1e66a4f57c68b8a709
 SHA512:
-  metadata.gz: 3108eb214771280ff819e06f024ff547f25f3e92e92439b60c56c9473ff8f69914651d6e5619eab9b5588d9f7803fe658d06723f90250794d671361e27c65ff3
-  data.tar.gz: a027e05958a96158ef2125d5ca76358f36eda1c3adf28ecbfec9a7f7ed17b39bd77a9537f59a5c7e2b8bb3b42fa40f527a567f72335f7b72635266db7f694e46
+  metadata.gz: c460af89b0c02547f76439e1d531f9ce29cab17750b346d71989f23913244203e460415d91236c434c5b10d56f26ce99f7bc7cdcbaa0852ffec6528afdba3551
+  data.tar.gz: 1b9f0a3c4099667057e66854bebf7891e3f0203ec0a1065b5942fd559df1f7db99aa8232d10fd5d8fa352074bba64b5c940e90d3b8e026242488941c18190ca6

data/lib/raykit/filesystem.rb

@@ -25,5 +25,10 @@ module Raykit
         return "#{dest} now exists"
       end
     end
+
+    def self.replace_invalid_chars(str)
+      #[\\/:"*?<>|]
+      str.gsub('\\', "_").gsub("/", "_").gsub(":", "_").gsub("*", "_").gsub("?", "_")
+    end
   end
 end

data/lib/raykit/git/repository.rb

@@ -144,10 +144,11 @@ module Raykit
         update_local_clone_directory
       end
 
-      def work(command)
+      def work(command, force = false)
         pull if (!Dir.exist?(get_dev_dir("work")))
-        filename = "#{Raykit::Environment::log_dir}/work_#{relative_path.gsub("/", "-")}.json"
-        if (Raykit::Git::Directory.new(get_dev_dir("work")).outstanding_commit?)
+        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
+        filename = "#{Raykit::Environment::log_dir}/work_#{fcommand}_#{relative_path.gsub("/", "-")}.json"
+        if (Raykit::Git::Directory.new(get_dev_dir("work")).outstanding_commit? || force)
           puts "  outstanding commit in #{get_dev_dir("work")}"
           work_cmd = Raykit::Git::Repository::work_url(url, command)
           work_cmd.save_as(filename)
@@ -163,11 +164,12 @@ module Raykit
         end
       end
 
-      def make(command)
+      def make(command, force = false)
         commit_id = "#{latest_commit(default_branch)}"
         make_id = "make_#{relative_path.gsub("/", "-")}_#{commit_id}"
-        filename = "#{Raykit::Environment::log_dir}/#{make_id}.json"
-        if (File.exist?(filename))
+        fcommand = Raykit::FileSystem::replace_invalid_chars(command)
+        filename = "#{Raykit::Environment::log_dir}/#{make_id}_#{fcommand}.json"
+        if (!force && File.exist?(filename))
           return Raykit::Command::parse(IO.read(filename))
         else
           make_cmd = Raykit::Git::Repository::make_url(url, commit_id, "rake default")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.440
+  version: 0.0.441
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler