From 262fd30d28c030cb42b4583c0a6bb394dea12067 Mon Sep 17 00:00:00 2001
From: icebaker <icebaker@proton.me>
Date: Tue, 9 Jan 2024 22:00:00 -0300
Subject: migrating to PATH

---
 components/storage.rb | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

(limited to 'components')

diff --git a/components/storage.rb b/components/storage.rb
index 839cd02..270cd81 100644
--- a/components/storage.rb
+++ b/components/storage.rb
@@ -38,6 +38,7 @@ module NanoBot
       def self.build_path_and_ensure_state_file!(key, cartridge, environment: {})
         path = [
           Logic::Helpers::Hash.fetch(cartridge, %i[state directory]),
+          ENV.fetch('NANO_BOTS_STATE_PATH', nil),
           ENV.fetch('NANO_BOTS_STATE_DIRECTORY', nil)
         ].find do |candidate|
           !candidate.nil? && !candidate.empty?
@@ -66,11 +67,31 @@ module NanoBot
         path
       end
 
-      def self.cartridges_path
-        [
-          ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil),
-          "#{user_home!.sub(%r{/$}, '')}/.local/share/nano-bots/cartridges"
-        ].compact.uniq.filter { |path| File.directory?(path) }.compact.first
+      def self.cartridges_path(components: {})
+        components[:directory?] = ->(path) { File.directory?(path) } unless components.key?(:directory?)
+        components[:ENV] = ENV unless components.key?(:ENV)
+
+        default = "#{user_home!(components:).sub(%r{/$}, '')}/.local/share/nano-bots/cartridges"
+
+        from_environment = [
+          components[:ENV].fetch('NANO_BOTS_CARTRIDGES_PATH', nil),
+          components[:ENV].fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil)
+        ].compact
+
+        elected = [
+          from_environment.empty? ? nil : from_environment.join(':'),
+          default
+        ].compact.uniq.filter do |path|
+          path.split(':').any? { |candidate| components[:directory?].call(candidate) }
+        end.compact.first
+
+        return default unless elected
+
+        elected = elected.split(':').filter do |path|
+          components[:directory?].call(path)
+        end.compact
+
+        elected.size.positive? ? elected.join(':') : default
       end
 
       def self.cartridge_path(path)
@@ -82,9 +103,14 @@ module NanoBot
           candidates << "#{partial}.#{extension}"
         end
 
-        unless ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil).nil?
-          directory = ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY').sub(%r{/$}, '')
+        directories = [
+          ENV.fetch('NANO_BOTS_CARTRIDGES_PATH', nil),
+          ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil)
+        ].compact.map do |directory|
+          directory.split(':')
+        end.flatten.map { |directory| directory.sub(%r{/$}, '') }
 
+        directories.each do |directory|
           partial = File.join(File.dirname(partial), File.basename(partial, File.extname(partial)))
 
           partial = partial.sub(%r{^\.?/}, '')
@@ -115,7 +141,9 @@ module NanoBot
         end
       end
 
-      def self.user_home!
+      def self.user_home!(components: {})
+        return components[:home] if components[:home]
+
         [Dir.home, `echo ~`.strip, '~'].find do |candidate|
           !candidate.nil? && !candidate.empty?
         end
-- 
cgit v1.2.3