aro 0.1.8 → 0.2.0

data/sys/cli/config.rb

@@ -12,7 +12,7 @@ module CLI
 
   # cli entrypoint
   def self.config
-    Aro::D.say("#{__FILE__}:#{__method__} was called (todo)...")
+    CLI::Config.process_config_command(ARGV)
   end
 
   class Config
@@ -83,7 +83,7 @@ module CLI
         name: CLI::Config::TYPES[:BOOL],
         description: I18n.t("cli.config.type.bool_description"),
         converter: Proc.new{|v|
-          if v == CLI::Config::BOOLS[:TRUE].to_s
+          if [CLI::Config::BOOLS[:TRUE].to_s, Aro::Mancy::S].include?(v)
             CLI::Config::BOOLS[:TRUE]
           else
             CLI::Config::BOOLS[:FALSE]
@@ -99,14 +99,14 @@ module CLI
         description: I18n.t("cli.config.type.int_description"),
         converter: Proc.new{|v| v.to_i},
         validator: Proc.new{|unvalid, k, v|
+          Aro::V.say("validating #{k} (#{CLI::Config::DEF_TYPES[:INT][:name]})")
+          Aro::V.say("unvalid = #{unvalid}")
+          Aro::V.say("[min, max] = [#{v[:min]}, #{v[:max]}]")
           int_valid = CLI::Config.def_valid?(k, v) &&
             CLI::Config.int_valid?(unvalid)        &&
             unvalid.to_i >= v[:min]                &&
             unvalid.to_i <= v[:max]
-
-          Aro::V.say("validating #{k} (#{CLI::Config::DEF_TYPES[:INT][:name]})")
-          Aro::V.say("unvalid = #{unvalid}")
-          Aro::V.say("unvalid is#{int_valid ? " " : :" not ".to_s}valid.")
+          Aro::V.say("unvalid(#{unvalid}) is#{int_valid ? " " : :" not ".to_s}valid.")
           int_valid
         }
       },
@@ -131,7 +131,7 @@ module CLI
     }
 
     def self.bool_valid?(unvalid)
-      CLI::Config::BOOLS.include?(unvalid&.to_s&.to_sym)
+      CLI::Config::BOOLS.values.map{|b| b.to_s.to_sym}.include?(unvalid&.to_s&.to_sym)
     end
 
     def self.int_valid?(unvalid)
@@ -154,13 +154,19 @@ module CLI
     def validate_config
       invalid_vars = []
       CLI::Config::DEF.each{|k, v|
-        is_valid = valid_var?(ENV[CLI::Config.ivar_k(k)], k, v)
+        is_valid = v[:access] == CLI::Config::DEF_ACCESS[:READ]
+        unless is_valid
+          is_valid = valid_var?(CLI::Config.ivar(k), k, v)
+        end
         invalid_vars << k unless is_valid
       }
       invalid_vars
     end
 
     def valid_var?(var_value, k, v)
+      Aro::V.say(v)
+      return true if v[:access] == CLI::Config::DEF_ACCESS[:READ]
+
       CLI::Config::DEF_TYPES[
         v[:type].to_s.upcase.to_sym
       ][:validator].call(var_value, k, v)
@@ -192,6 +198,24 @@ module CLI
           test: I18n.t("cli.config.env.test_description"),
         }
       },
+      VERBOSE: {
+        type: CLI::Config::TYPES[:BOOL],
+        access: CLI::Config::DEF_ACCESS[:WRITE],
+        value: CLI::Config::BOOLS[:FALSE],
+        description: I18n.t("cli.config.verbose_description"),
+      },
+      LOG_AOS_DB: {
+        type: CLI::Config::TYPES[:BOOL],
+        access: CLI::Config::DEF_ACCESS[:WRITE],
+        value: CLI::Config::BOOLS[:FALSE],
+        description: I18n.t("cli.config.log_aos_db_description"),
+      },
+      LOG_ARO_DB: {
+        type: CLI::Config::TYPES[:BOOL],
+        access: CLI::Config::DEF_ACCESS[:WRITE],
+        value: CLI::Config::BOOLS[:FALSE],
+        description: I18n.t("cli.config.log_aro_db_description"),
+      },
       FORMAT: { # not implemented yet.
         type: CLI::Config::TYPES[:VALUES],
         implemented: false,
@@ -218,7 +242,7 @@ module CLI
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: Aro::Mancy::NUMERALS[:XLII],
         min: Aro::Mancy::NUMERALS[:I],
-        max: Aro::Mancy::NUMERALS[:VII].pow(Aro::Mancy::OS),
+        max: Aro::Mancy::NUMERALS[:MMXCVII],
         description: I18n.t(
           "cli.config.height_description",
           min: Aro::Mancy::NUMERALS[:I],
@@ -230,7 +254,7 @@ module CLI
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: Aro::Mancy::NUMERALS[:C] + Aro::Mancy::NUMERALS[:XXXVII] - Aro::Mancy::S,
         min: Aro::Mancy::NUMERALS[:I],
-        max: Aro::Mancy::NUMERALS[:XI].pow(Aro::Mancy::OS),
+        max: Aro::Mancy::NUMERALS[:MMXCVII],
         description: I18n.t(
           "cli.config.width_description",
           min: Aro::Mancy::NUMERALS[:I],
@@ -261,12 +285,6 @@ module CLI
           max: Aro::Mancy::NUMERALS[:XXII],
         ),
       },
-      VERBOSE: {
-        type: CLI::Config::TYPES[:BOOL],
-        access: CLI::Config::DEF_ACCESS[:WRITE],
-        value: CLI::Config::BOOLS[:FALSE],
-        description: I18n.t("cli.config.verbose_description"),
-      },
 
       #
       # => ovars
@@ -335,13 +353,14 @@ module CLI
 
     def initialize
       @@context = nil
-      if Aro::Mancy.is_aro_space? && Aro::Mancy.is_initialized?
-        @@context = Aro::Mancy.name
-      elsif Aro::Dom.in_arodom?
-        @@context = Aro::Dom.name
+      if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
+        @@context = Aro::Db
+      elsif Aro::Dom.in_arodom? && Aro::Dom.is_initialized?
+        @@context = Aos::Db
       end
 
       return if @@context.nil?
+      Aro::V.say(@@context)
 
       unless File.exist?(CLI::Config.config_filepath)
         generate_config
@@ -351,26 +370,58 @@ module CLI
       setup_env
     end
 
+    def self.context
+      @@context
+    end
+
     def self.config_filepath
-      db_cls = @@context == Aro::Dom.name ? Aos::Db : Aro::Db
-      File.join(db_cls.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      cfp = nil
+      if @@context == Aro::Db &&
+        Aro::Dom.in_arodom? &&
+        Aro::Dom.is_initialized?
+
+        # override when in arodome game room
+        # this ensures the arodome config is being used
+        cfp = File.join(Aos::Db.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      else
+        cfp = File.join(@@context.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      end
+
+      cfp
+    end
+
+    def self.is_test?
+      ENV[:ARO_ENV.to_s] == CLI::Config::ENVS[:TEST].to_s
     end
 
     def self.display_config
-      Aro::V.say(__method__)
-      width = CLI::Config.ivar(:WIDTH).to_i
-      columns = width.pow(Aro::Mancy::S.to_f / Aro::Mancy::OS.to_f).to_i
+      height, width = IO.console.winsize
       result = {
-        COLUMNS: columns,
-        HEIGHT: CLI::Config.ivar(:HEIGHT).to_i,
-        WIDTH: width,
-        DIVIDER: :"-".to_s
+        HEIGHT: height, #CLI::Config.ivar(:HEIGHT).to_i,
+        WIDTH: width - Aro::Mancy::O,
+        DIVIDER: :"_".to_s
       }
-      Aro::V.say(result)
+      # Aro::V.say(result)
 
       result
     end
 
+    def self.is_format_text?
+      CLI::Config.ivar(:FORMAT)&.to_sym == CLI::Config::FORMATS[:TEXT]
+    end
+
+    def self.process_config_command(args)
+      if args[1].nil? || args[1] == :aos.to_s
+        # print config
+        Aro::P.say((
+          ["config loaded from #{CLI::Config.config_filepath}"] +
+          CLI::Config.dump_config
+        ).join("\n"))
+      elsif [args[2],args[3]].compact.any? && args[1] == Aos::Os::CMDS[:CONFIG][:cmds][:SET][:key].to_s
+        CLI::Config.set_ivar(args[2], args[3])
+      end
+    end
+
     # out vars
     def self.ovar(suffix)
       CLI::Config::DEF[suffix][:value]
@@ -389,6 +440,32 @@ module CLI
       "#{CLI::Config::ARO_CONFIG_PREFIX}#{suffix}"
     end
 
+    def self.set_ivar(k, new_value)
+      k = k.upcase.to_sym
+
+      current_value = CLI::Config.ivar(k)
+      # ensure the var name is valid
+      unless current_value.nil?
+        Aro::Dom::P.say("validating #{k} with value #{new_value}")
+        if CLI::Config.instance.valid_var?(new_value, k, CLI::Config::DEF[k])
+          # set ENV value
+          ENV[CLI::Config.ivar_k(k)] = new_value
+          Aro::Dom::P.say("#{k} set to #{new_value}")
+          Aro::V.say(ENV[CLI::Config.ivar_k(k)])
+
+          # flush existing config and regen
+          CLI::Config.instance.generate_config(true)
+          CLI::Config.instance.source_config
+          CLI::Config.instance.setup_env
+          @@context.configure_logger
+        else
+          Aro::Dom::P.say("the ivar value you entered is invalid. ignoring.")
+        end
+      else
+        Aro::Dom::P.say("the ivar name you entered is invalid. ignoring.")
+      end
+    end
+
     def setup_env
       # do not change - update $ARO_CONFIG_ENV .aro/.config file
       # 
@@ -399,8 +476,17 @@ module CLI
       Aro::D.say("setup_env: #{ENV[:ARO_ENV.to_s]}")
     end
 
-    def self.is_test?
-      ENV[:ARO_ENV.to_s] == CLI::Config::ENVS[:TEST].to_s
+    def self.dump_config
+      dump = []
+      CLI::Config::DEF.each{|k, v|
+        if v[:access] == CLI::Config::DEF_ACCESS[:WRITE]
+          dump << "$#{CLI::Config.ivar_k(k).ljust(Aro::Mancy::NUMERALS[:XIV] * Aro::Mancy::OS)}=#{CLI::Config.ivar(k)}"
+        else
+          dump << "$#{CLI::Config.ovar_k(k).ljust(Aro::Mancy::NUMERALS[:XIV] * Aro::Mancy::OS)}=#{CLI::Config.ovar(k)}"
+        end
+      }
+
+      dump
     end
 
     def source_config
@@ -417,17 +503,18 @@ module CLI
       
       # todo: implement
       invalid_defs = validate_config
-      CLI::Config::DEF.keys.each{|dfk|
-        Aro::V.say("$#{CLI::Config.ivar_k(dfk)}=#{CLI::Config.ivar(dfk)}")
+      CLI::Config.dump_config.each{|l| Aro::V.say(l)}
+      invalid_defs.each{|k|
+        v = CLI::Config::DEF[k.to_sym]
+        if v[:access] == CLI::Config::DEF_ACCESS[:WRITE]
+          ENV[CLI::Config.ivar_k(k)] = v[:value]
+        else
+          ENV[CLI::Config.ovar_k(k)] = v[:value]
+        end
       }
-      Aro::V.say("todo: invalid_defs: #{invalid_defs}")
-      # todo: set all invalid_refs to default in ENV
-      # invalid_defs.each{|id| 
-
-      # }
     end
 
-    def generate_config
+    def generate_config(from_memory = false)
       # todo: localize generated config text
       Aro::D.say(I18n.t("cli.config.generate", name: CLI::Config.config_filepath))
       File.open(CLI::Config.config_filepath, "w+") do |file|
@@ -464,7 +551,7 @@ module CLI
 
         # vars
         CLI::Config::DEF.each{|k, v|
-          print_var file.object_id, k, v
+          print_var file.object_id, k, v, (from_memory ? ENV[CLI::Config.ivar_k(k)] : nil)
         }
 
         print_osr file.object_id
@@ -535,7 +622,7 @@ module CLI
       file.write("#     => which can be used to write programs on top of aro.\n")
     end
 
-    def print_var f_object_id, k, v
+    def print_var f_object_id, k, v, mem_v
       file = ObjectSpace._id2ref f_object_id
 
       is_ovar = CLI::Config::DEF[k][:access] == CLI::Config::DEF_ACCESS[:READ]
@@ -547,7 +634,7 @@ module CLI
       Aro::V.say("access for #{k} is #{CLI::Config::DEF[k][:access]}")
       Aro::V.say("using var_name: #{var_name}")
       file.write("# [#{var_name}] (#{is_ovar ? :ovar : :ivar})\n")
-      file.write("#   => #{I18n.t("cli.config.def_type")}: #{v[:type]}\n")
+      file.write("#   => CLI::Config::DEF_TYPES: #{v[:type]}\n")
       case v[:type]
       when CLI::Config::DEF_TYPES[:INT][:name]
         file.write("#   => #{I18n.t("cli.config.type.int_description")}\n")
@@ -573,7 +660,7 @@ module CLI
       if is_ovar && CLI::Config::DEF_TYPES[:STRING][:name] == v[:type]
         file.write("export #{var_name}=\"#{v[:value]}\"\n")
       else
-        file.write("export #{var_name}=#{v[:value]}\n")
+        file.write("export #{var_name}=#{mem_v || v[:value]}\n")
       end
       print_osr f_object_id
     end

data/sys/cli/constants.rb

@@ -18,9 +18,9 @@ module CLI
   }
 
   EXIT_CODES = {
-    SUCCESS: 0,
-    GENERAL_ERROR: 1,
-    INVALID_ARG: 3
+    SUCCESS: Aro::Mancy::O,
+    GENERAL_ERROR: Aro::Mancy::S,
+    INVALID_ARG: Aro::Mancy::E,
   }
 
   CMDS = {

data/sys/cli/deck.rb

@@ -13,19 +13,28 @@ module CLI
   def self.deck
     action = CLI::ARGV1&.to_sym
 
-    if CLI::FLAGS[:HELP].include?(CLI::ARGV1)
+    if CLI::FLAGS[:HELP].include?(action.to_s)
       # todo: breakout usage into subcommand-specific verbiage
       CLI.usage::usage
       exit(CLI::EXIT_CODES[:SUCCESS])
-    elsif CLI::ARGV1.nil?
+    elsif action.nil? || action == :aos
       # no args, open deck menu
-      Aro::Db.new
-      Aro::Deck.display_selection_menu
+      if Aro::Mancy.in_aro?
+        Aro::Db.new
+        Aro::Deck.display_selection_menu
+      else
+        Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
+      end
     elsif action == CLI::CMDS[:DECK][:NEW]
       CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
-      deck = Aro::Deck.make(CLI::ARGV2.to_s)
-      Aro::P.say(I18n.t("cli.messages.deck_created_sucessfully", name: Aro::Mancy.game.name))
-      Aro::Deck.display_selection_menu
+      if Aro::Mancy.in_aro?
+        Aro::Db.new
+        deck = Aro::Deck.make(CLI::ARGV2.to_s)
+        Aro::P.say(I18n.t("cli.messages.deck_created_sucessfully", name: Aro::Mancy.game.name))
+        Aro::Deck.display_selection_menu
+      else
+        Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
+      end
     elsif CLI::CMDS[:DECK].values.include?(action)    
       if Aro::Mancy.game.nil?
         Aro::P.say(I18n.t("cli.errors.missing_deck", cmd: Aro::Mancy::I2097I))
@@ -51,7 +60,7 @@ module CLI
         Aro::P.say(I18n.t("cli.messages.replacing_drawn", name: Aro::Mancy.game.name))
         Aro::Mancy.game.replace
       when CLI::CMDS[:DECK][:RESET]
-        if Aro::Mancy::YES.to_s != Aro::P.p.ask(I18n.t("cli.messages.confirmation_prompt", name: Aro::Mancy.game.name))
+        if Aro::Mancy::YES.to_s != Aro::P.p.ask("#{Aro::Mancy::PS1}#{I18n.t("cli.messages.confirmation_prompt", name: Aro::Mancy.game.name)}")
           Aro::P.say(I18n.t("cli.messages.understood", name: Aro::Mancy.game.name))
           exit(CLI::EXIT_CODES[:SUCCESS])
         end
@@ -60,6 +69,11 @@ module CLI
         Aro::Mancy.game.reset
       end
 
+      if ARGV.include?(:aos.to_s)
+        # run silent
+        exit(CLI::EXIT_CODES[:SUCCESS])
+      end
+
       Aro::Mancy.game.show(**CLI::shoptions)
     end
   end
@@ -70,23 +84,23 @@ module CLI
     show_options_count = Aro::Mancy::S
     show_options_order = Aro::Log::ORDERING[:DESC]
     
-    # Aro::P.say("ARGV.map{|a| a.to_sym} => #{ARGV.map{|a| a.to_sym}}")
+    # Aro::D.say("ARGV.map{|a| a.to_sym} => #{ARGV.map{|a| a.to_sym}}")
     
     count_option_flags = ARGV.map{|a| a.to_sym} & CLI::FLAGS[:SHOW_COUNT]
-    # Aro::P.say("count_option_flags: #{count_option_flags}")
+    # Aro::D.say("count_option_flags: #{count_option_flags}")
     if count_option_flags.any?
       # get the ARGV index element after flag index
       show_options_count = ARGV[ARGV.index(count_option_flags.first.to_s) + 1]
       show_options_count = show_options_count.to_i unless [0, nil].include?(show_options_count&.to_i)
-      # Aro::P.say("show_options_count: #{show_options_count}")
+      # Aro::D.say("show_options_count: #{show_options_count}")
     end
 
     order_option_flags = ARGV.map{|a| a.to_sym} & CLI::FLAGS[:SHOW_ORDER]
-    # Aro::P.say("count_option_flags: #{order_option_flags}")
+    # Aro::D.say("count_option_flags: #{order_option_flags}")
     if order_option_flags.any?
       # get the ARGV index element after flag index
       show_options_order = ARGV[ARGV.index(order_option_flags.first.to_s) + 1].to_sym
-      Aro::P.say("show_options_order: #{show_options_order}")
+      # Aro::D.say("show_options_order: #{show_options_order}")
     end
 
     {

data/sys/cli/dom.rb

@@ -22,13 +22,20 @@ module CLI
 
     case action
     when CLI::CMDS[:DOM][:INIT]
-      arodome = Aro::Dom.new
-      arodome.generate
+      if Aro::Dom.is_initialized?
+        Aro::P.say(I18n.t("dom.errors.failed_already_initialized"))
+      elsif Aro::Dom.in_arodom? && !Aro::Dom.is_initialized?
+        arodome = Aro::Dom.new
+        arodome.generate
+      else
+        CLI::Nterface.exit_error_invalid_usage!
+      end
     when CLI::CMDS[:DOM][:NEW]
       CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
       if Aro::Dom.in_arodom?
-        # todo: i18n
-        Aro::P.say("unable to create an arodome because you are already in arodom.")
+        Aro::P.say(I18n.t("dom.errors.failed_already_in_arodom"))
+      elsif Aro::Mancy.in_aro?
+        Aro::P.say(I18n.t("dom.errors.failed_in_aro_space"))
       else
         Aro::Dom.create(CLI::ARGV2.to_s)
       end

data/sys/dom/d.rb

@@ -12,50 +12,60 @@ require_relative :dom.to_s
 
 module Aro
   class Dom::D
-    # definition of rooms in each layout section
+    def self.reserved_words
+      reserved = []
+      Aro::Dom::D::LAYOUT.values.each{|wing|
+        reserved << wing[:name].to_s
+        wing[:rooms].each{|room| reserved << room[:name].to_s}
+      }
+
+      reserved.sort
+    end
+
+    # definition of rooms in each layout wing
     WINGS = {
       WELCOME: {
         WAITE: {
           name: Aro::Dom::WAITE,
-          description: "sign up."
+          description: I18n.t("dom.rooms.waite.description"),
         },
         WINNER: {
           name: Aro::Dom::WINNER,
-          description: "win."
+          description: I18n.t("dom.rooms.winner.description"),
         },
       },
       GAMES: {
         ABPPS: {
           name: Aro::Dom::ABPPS,
-          description: "artificial beings."
+          description: I18n.t("dom.rooms.abpps.description"),
         },
         HBPPS: {
           name: Aro::Dom::HBPPS,
-          description: "human beings."
+          description: I18n.t("dom.rooms.hbpps.description"),
         },
         SHPPS: {
           name: Aro::Dom::SHPPS,
-          description: "human and artificial beings."
+          description: I18n.t("dom.rooms.shpps.description"),
         },
         VIPPS: {
           name: Aro::Dom::VIPPS,
-          description: "very important - 100% /dev/tarot users."
+          description: I18n.t("dom.rooms.vipps.description"),
         },
       },
       KNOW: { 
         LIBRARY: {
           name: Aro::Dom::LIBRARY,
-          description: "definition management."
+          description: I18n.t("dom.rooms.library.description"),
         },
         TEMPLE: {
           name: Aro::Dom::TEMPLE,
-          description: "mindfulness management."
+          description: I18n.t("dom.rooms.temple.description"),
         },
       },
       SETUP: {
         SETTINGS: {
           name: Aro::Dom::SETTINGS,
-          description: "user settings and configuration."
+          description: I18n.t("dom.rooms.settings.description"),
         },
       },
     }
@@ -64,7 +74,7 @@ module Aro
     LAYOUT = {
       WELCOME: {
         name: Aro::Dom::WELCOME,
-        description: "sign up process.",
+        description: I18n.t("dom.wings.welcome.description"),
         rooms: [
           Aro::Dom::D::WINGS[:WELCOME][:WAITE],
           Aro::Dom::D::WINGS[:WELCOME][:WINNER],
@@ -72,7 +82,7 @@ module Aro
       },
       GAMES: {
         name: Aro::Dom::GAMES,
-        description: "aroflie game rooms.",
+        description: I18n.t("dom.wings.games.description"),
         rooms: [
           Aro::Dom::D::WINGS[:GAMES][:ABPPS],
           Aro::Dom::D::WINGS[:GAMES][:HBPPS],
@@ -82,7 +92,7 @@ module Aro
       },
       KNOW: {
         name: Aro::Dom::KNOW,
-        description: "information space.",
+        description: I18n.t("dom.wings.know.description"),
         rooms: [
           Aro::Dom::D::WINGS[:KNOW][:LIBRARY],
           Aro::Dom::D::WINGS[:KNOW][:TEMPLE]
@@ -90,7 +100,7 @@ module Aro
       },
       SETUP: {
         name: Aro::Dom::SETUP,
-        description: "user configuration space.",
+        description: I18n.t("dom.wings.setup.description"),
         rooms: [
           Aro::Dom::D::WINGS[:SETUP][:SETTINGS]
         ],