summaryrefslogtreecommitdiff
path: root/controllers/instance.rb
diff options
context:
space:
mode:
Diffstat (limited to 'controllers/instance.rb')
-rw-r--r--controllers/instance.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/controllers/instance.rb b/controllers/instance.rb
index 259a548..85b97ec 100644
--- a/controllers/instance.rb
+++ b/controllers/instance.rb
@@ -1,11 +1,10 @@
# frozen_string_literal: true
-require 'yaml'
-
require_relative '../logic/helpers/hash'
require_relative '../components/provider'
require_relative '../components/storage'
require_relative '../components/stream'
+require_relative 'cartridges'
require_relative 'interfaces/repl'
require_relative 'interfaces/eval'
require_relative 'session'
@@ -83,13 +82,11 @@ module NanoBot
raise StandardError, "Cartridge file not found: \"#{path}\""
end
- @cartridge = YAML.safe_load_file(elected_path, permitted_classes: [Symbol])
+ @cartridge = Cartridges.load(elected_path)
end
@safe_cartridge = Marshal.load(Marshal.dump(@cartridge))
- @cartridge = Logic::Helpers::Hash.symbolize_keys(@cartridge)
-
inject_environment_variables!(@cartridge)
end