diff options
Diffstat (limited to 'controllers')
| -rw-r--r-- | controllers/instance.rb | 3 | ||||
| -rw-r--r-- | controllers/interfaces/cli.rb | 16 | ||||
| -rw-r--r-- | controllers/interfaces/eval.rb | 37 | ||||
| -rw-r--r-- | controllers/interfaces/repl.rb | 63 | ||||
| -rw-r--r-- | controllers/session.rb | 16 |
5 files changed, 92 insertions, 43 deletions
diff --git a/controllers/instance.rb b/controllers/instance.rb index e8037e2..f3cbd74 100644 --- a/controllers/instance.rb +++ b/controllers/instance.rb @@ -6,6 +6,7 @@ require_relative '../logic/helpers/hash' require_relative '../components/provider' require_relative '../components/storage' require_relative './interfaces/repl' +require_relative './interfaces/eval' require_relative './session' module NanoBot @@ -24,7 +25,7 @@ module NanoBot end def eval(input) - @session.evaluate_and_print(input, mode: 'eval') + Interfaces::Eval.evaluate(input, @cartridge, @session) end def repl diff --git a/controllers/interfaces/cli.rb b/controllers/interfaces/cli.rb index 550361f..3574a80 100644 --- a/controllers/interfaces/cli.rb +++ b/controllers/interfaces/cli.rb @@ -13,14 +13,14 @@ module NanoBot puts NanoBot::GEM[:version] exit when 'help', '', nil - puts "Ruby Nano Bots #{NanoBot::GEM[:version]}" - puts ' rnb cartridge.yml - eval "Hello"' - puts ' rnb cartridge.yml - repl' - puts ' rnb cartridge.yml - debug' - puts ' rnb cartridge.yml STATE-KEY eval "Hello"' - puts ' rnb cartridge.yml STATE-KEY repl' - puts ' rnb cartridge.yml STATE-KEY debug' - puts ' rnb version' + puts "Nano Bots #{NanoBot::GEM[:version]}" + puts ' nb cartridge.yml - eval "Hello"' + puts ' nb cartridge.yml - repl' + puts ' nb cartridge.yml - debug' + puts ' nb cartridge.yml STATE-KEY eval "Hello"' + puts ' nb cartridge.yml STATE-KEY repl' + puts ' nb cartridge.yml STATE-KEY debug' + puts ' nb version' exit end diff --git a/controllers/interfaces/eval.rb b/controllers/interfaces/eval.rb new file mode 100644 index 0000000..6cb12b4 --- /dev/null +++ b/controllers/interfaces/eval.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'pry' +require 'rainbow' + +require_relative '../../logic/helpers/hash' + +module NanoBot + module Controllers + module Interfaces + module Eval + def self.evaluate(input, cartridge, session) + prefix = build_prefix(cartridge) + postfix = build_postfix(cartridge) + + session.print(prefix) unless prefix.nil? + + session.evaluate_and_print(input, mode: 'eval') + + session.print(postfix) unless postfix.nil? + end + + def self.build_prefix(cartridge) + eval_interface = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces eval]) + return nil if eval_interface.nil? + eval_interface[:prefix] + end + + def self.build_postfix(cartridge) + eval_interface = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces eval]) + return "\n" if eval_interface.nil? || !eval_interface.key?(:postfix) # default + eval_interface[:postfix] + end + end + end + end +end diff --git a/controllers/interfaces/repl.rb b/controllers/interfaces/repl.rb index 7b53eb2..5477c33 100644 --- a/controllers/interfaces/repl.rb +++ b/controllers/interfaces/repl.rb @@ -10,20 +10,17 @@ module NanoBot module Interfaces module REPL def self.start(cartridge, session) - if Logic::Helpers::Hash.fetch( - cartridge, %i[interfaces repl prefix] - ) - session.print(Logic::Helpers::Hash.fetch(cartridge, - %i[interfaces repl prefix])) - end - - session.boot(mode: 'repl') + prefix = build_prefix(cartridge) + postfix = build_postfix(cartridge) - session.print(Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl postfix]) || "\n") - - session.flush + if Logic::Helpers::Hash.fetch(cartridge, %i[behaviors boot instruction]) + session.print(prefix) unless prefix.nil? + session.boot(mode: 'repl') + session.print(postfix) unless postfix.nil? + session.print("\n") + end - prompt = build_prompt(cartridge[:interfaces][:repl][:prompt]) + prompt = build_prompt(Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl prompt])) Pry.config.prompt = Pry::Prompt.new( 'REPL', @@ -32,31 +29,43 @@ module NanoBot ) Pry.commands.block_command(/(.*)/, 'handler') do |line| - if Logic::Helpers::Hash.fetch( - cartridge, %i[interfaces repl prefix] - ) - session.print(Logic::Helpers::Hash.fetch( - cartridge, %i[interfaces repl prefix] - )) - end - + session.print(postfix) unless postfix.nil? session.evaluate_and_print(line, mode: 'repl') - session.print(Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl postfix]) || "\n") + session.print(postfix) unless postfix.nil? + session.print("\n") session.flush end Pry.start end + def self.build_prefix(cartridge) + repl = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl]) + return "\n" if repl.nil? || !repl.key?(:prefix) # default + repl[:prefix] + end + + def self.build_postfix(cartridge) + repl = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl]) + return "\n" if repl.nil? || !repl.key?(:postfix) # default + repl[:postfix] + end + def self.build_prompt(prompt) result = '' - prompt.each do |partial| - result += if partial[:color] - Rainbow(partial[:text]).send(partial[:color]) - else - partial[:text] - end + if prompt.is_a?(Array) + prompt.each do |partial| + result += if partial[:color] + Rainbow(partial[:text]).send(partial[:color]) + else + partial[:text] + end + end + elsif prompt.is_a?(String) + result = prompt + else + result = '🤖' + Rainbow('> ').blue end result diff --git a/controllers/session.rb b/controllers/session.rb index 9277a84..ff3b8ad 100644 --- a/controllers/session.rb +++ b/controllers/session.rb @@ -67,13 +67,18 @@ module NanoBot process(input, mode:) end - def process(input, mode:) - streaming = @provider.settings[:stream] && Logic::Helpers::Hash.fetch( - @cartridge, [:interfaces, mode.to_sym, :stream] - ) + def stream(interface) + provider = @provider.settings.key?(:stream) ? @provider.settings[:stream] : true + interface = interface.key?(:stream) ? interface[:stream] : true + + provider && interface + end + def process(input, mode:) interface = Logic::Helpers::Hash.fetch(@cartridge, [:interfaces, mode.to_sym]) || {} + streaming = stream(interface) + input[:interface] = interface updated_at = Time.now @@ -84,9 +89,6 @@ module NanoBot if finished @state[:history] << output self.print(output[:message]) unless streaming - unless Logic::Helpers::Hash.fetch(@cartridge, [:interfaces, mode.to_sym, :postfix]).nil? - self.print(Logic::Helpers::Hash.fetch(@cartridge, [:interfaces, mode.to_sym, :postfix])) - end ready = true flush elsif streaming |