raykit 0.0.439 → 0.0.441

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d7aa6c3a8cb54d80f50e8d452a1881a2cf20a6a74d80cf0645b9bee0d430d5
-  data.tar.gz: 50ed85cddcc44c580ebbb4b048dd636d46da7f3b6583fb17efecfa04a1fe029c
+  metadata.gz: 94b2cf08f83bf1471755f4243b3ff27fabed667151da409150ba95d089646619
+  data.tar.gz: 3ecc869f957d7dfd88c30bc7b3504875f254d735b300af1e66a4f57c68b8a709
 SHA512:
-  metadata.gz: 8270cd7c18792132f85f6b2093f9e2e5e683e482ce6253dc8b520df3e4f72644494feb3add9d010bdcfa6cb8f5e59e34d936bfa57b9de3f0f147d9b76b2a3dd9
-  data.tar.gz: e5eafbf053099b6e2acdb21339e3edd66f7f6936456dddb7ee0e9c32f70ecfe528d1dd7ebe20eab00c2b6a41ba9ec22c1ba52b2ef18c1a5bd2ed4daab49bb1f8
+  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")
@@ -197,12 +199,11 @@ module Raykit
 
       def self.work_url(url, cmd)
         repo = Raykit::Git::Repository.new(url)
-        puts "  work #{url} #{command}"
+        puts "  work #{url} #{cmd}"
         work_dir = repo.get_dev_dir("work")
         repo.clone(work_dir) if !Dir.exist?(work_dir)
         Dir.chdir(work_dir) do
           run("git pull")
-          #run(cmd)
           cmd = Raykit::Command.new(cmd)
           cmd = cmd.run().summary()
           cmd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.439
+  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