aro 0.1.7 → 0.1.8

data/sys/aro/mancy.rb

@@ -17,6 +17,7 @@ module Aro
     O  = 0
     S  = 1
     OS = 2
+    E  = 3
     N  = 4
     PS1 = Aro::Mancy.name
     NAME_FILE = :".name"
@@ -26,7 +27,6 @@ module Aro
     ALL = :all
 
     ARO_ENV_DEBUG_MODES = [:development, :test]
-    DEBUG_VERBOSE = false
 
     NUMERALS = {
       O:       0,
@@ -52,22 +52,15 @@ module Aro
       XX:      20,
       XXI:     21,
       XXII:    22,
+      XXXVII:  37,
+      XLII:    42,
+      C:       100,
       MMXCVII: Aro::Mancy::I2097I[Aro::Mancy::S..Aro::Mancy::N].to_i,
     }
 
     def initialize
-      # ENV bindings
-      ENV[:ARO_ENV_O.to_s] = "#{Aro::Mancy::O}"
-      ENV[:ARO_ENV_S.to_s] = "#{Aro::Mancy::S}"
-      ENV[:ARO_ENV_OS.to_s] = "#{Aro::Mancy::OS}"
-      ENV[:ARO_ENV_N.to_s] = "#{Aro::Mancy::N}"
-      ENV[:ARO_ENV_PS1.to_s] = "#{Aro::Mancy::PS1}"
-      ENV[:ARO_ENV_NAME_FILE.to_s] = "#{Aro::Mancy::NAME_FILE}"
-      ENV[:ARO_ENV_I2097I.to_s] = "#{Aro::Mancy::I2097I}"
-      ENV[:ARO_ENV_YES.to_s] = "#{Aro::Mancy::YES}"
-
-      if Aro::Mancy.is_aro_space?
-        Aro::Db.new
+      if Aro::Mancy.is_aro_space? && Aro::Mancy.is_initialized?
+        Aro::Mancy.init
         self.game = Aro::Deck.current_deck
       end
     end
@@ -97,13 +90,17 @@ module Aro
       end
 
       Dir.chdir(name) do
-        Aro::Db.new.setup_local_aro
+        Aro::Mancy.init
       end
       return true
     end
 
     def self.init
-      Aro::Db.new.setup_local_aro
+      Aro::Db.new
+    end
+
+    def self.start
+      Aos.start(:aro)
     end
 
     def self.is_initialized?

data/sys/aro/p.rb

@@ -14,7 +14,7 @@ require_relative :"./r".to_s
 module Aro
   class P < Aro::Prompt
     def self.say(message)
-      unless Aro::T.is_dev_tarot?
+      if !Aro::Dom.in_arodom? && !Aro::T.is_dev_tarot?
         Aro::R.say(message)
       else
         Aro::P::p.say(">[#{Aro::Mancy::PS1}]>: #{message}")

data/sys/aro/v.rb

@@ -14,12 +14,11 @@ module Aro
   class V < Aro::D
     def self.say(message)
       return unless Aro::V.should_print?
-      Aro::P::p.say(">[Aro::Mancy::DEBUG_VERBOSE]>: #{message}\n")
+      Aro::P::p.say(">[VERBOSE]>: #{message}\n")
     end
 
     def self.should_print?
-      Aro::Mancy::DEBUG_VERBOSE && super 
+      CLI::Config.ivar(:VERBOSE).to_s == CLI::Config::BOOLS[:TRUE].to_s && super
     end
   end
 end
-

data/sys/aro.rb

@@ -12,4 +12,5 @@ require_relative :reiquire.to_s
 Reiquire::aro
 
 module Aro
+
 end

data/sys/cli/config.rb

@@ -53,19 +53,51 @@ module CLI
       RUBY_FACOT: :ruby_facot,
     }
 
+    # ovar and ivar access
+    #
+    # example usage:
+    # CLI::Config::DEF_ACCESS[:READ]
     DEF_ACCESS = {
       READ: :read,
       WRITE: :write
     }
 
+    BOOLS = {
+      FALSE: false,
+      TRUE: true,
+    }
+
+    TYPES = {
+      BOOL: :bool,
+      INT: :int,
+      STRING: :string,
+      VALUES: :values
+    }
+
     # types used in definition
     # 
     # example usage:
     # CLI::Config::DEF_TYPES[:INT][:validator].call(unvalid, CLI::Config::DEF[:DIMENSION])
     DEF_TYPES = {
+      BOOL: {
+        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
+            CLI::Config::BOOLS[:TRUE]
+          else
+            CLI::Config::BOOLS[:FALSE]
+          end
+        },
+        validator: Proc.new{|unvalid, k, v|
+          CLI::Config.def_valid?(k, v) &&
+          CLI::Config.bool_valid?(unvalid)
+        }
+      },
       INT: {
         name: :int,
-        description: I18n.t("cli.config.type_int_description"),
+        description: I18n.t("cli.config.type.int_description"),
+        converter: Proc.new{|v| v.to_i},
         validator: Proc.new{|unvalid, k, v|
           int_valid = CLI::Config.def_valid?(k, v) &&
             CLI::Config.int_valid?(unvalid)        &&
@@ -80,14 +112,17 @@ module CLI
       },
       STRING: {
         name: :string,
-        description: I18n.t("cli.config.type_string_description"),
+        description: I18n.t("cli.config.type.string_description"),
+        converter: Proc.new{|v| v.to_s},
         validator: Proc.new{|unvalid, k, v|
-          unvalid.is_a?(String)
+          CLI::Config.def_valid?(k, v) &&
+          CLI::Config.string_valid?(unvalid)
         }
       },
       VALUES: {
         name: :values,
-        description: I18n.t("cli.config.type_values_description"),
+        description: I18n.t("cli.config.type.values_description"),
+        converter: Proc.new{|v| v.to_s},
         validator: Proc.new{|unvalid, k, v|
           CLI::Config.def_valid?(k, v) &&
           v[:possible_values].keys.include?(unvalid&.to_sym)
@@ -95,10 +130,18 @@ module CLI
       },
     }
 
+    def self.bool_valid?(unvalid)
+      CLI::Config::BOOLS.include?(unvalid&.to_s&.to_sym)
+    end
+
     def self.int_valid?(unvalid)
       !unvalid&.to_i.nil?
     end
 
+    def self.string_valid?(unvalid)
+      unvalid.is_a?(String)
+    end
+
     def self.def_valid?(key, deff)
       def_valid = deff == CLI::Config::DEF[key]
       unless def_valid
@@ -109,80 +152,93 @@ module CLI
     end
 
     def validate_config
-      invalid_defs = []
-      CLI::Config::DEF.each{|k, v|        
-        invalid_defs << k unless validate_value(CLI::Config.ivar(k), k, v)
+      invalid_vars = []
+      CLI::Config::DEF.each{|k, v|
+        is_valid = valid_var?(ENV[CLI::Config.ivar_k(k)], k, v)
+        invalid_vars << k unless is_valid
       }
-      invalid_defs
+      invalid_vars
     end
 
-    def validate_value(var_value, k, v)
+    def valid_var?(var_value, k, v)
       CLI::Config::DEF_TYPES[
         v[:type].to_s.upcase.to_sym
       ][:validator].call(var_value, k, v)
-    end   
+    end
+
+    def convert_var_for_def(k)
+      CLI::Config::DEF_TYPES[
+        CLI::Config::DEF[k][:type].upcase
+      ][:converter].call(ENV[CLI::Config.ivar_k(k)])
+    end
 
     # adapts I18n translations to generate bash environment vars.
     # 
     # example usage:
     # CLI::Config::DEF[:Z_MAX]
     DEF = {
-      # writable variables
+
+      #
+      # => ivars
+      #
       ENV: {
-        type: :values,
+        type: CLI::Config::TYPES[:VALUES],
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: CLI::Config::ENVS[:PRODUCTION],
-        description: I18n.t(
-          "cli.config.env_description",
-          possible_values: CLI::Config::ENVS.values.join(", ")
-         ),
+        description: I18n.t("cli.config.env.description"),
         possible_values: {
-          development: I18n.t("cli.config.env_development_description"),
-          production: I18n.t("cli.config.env_production_description"),
-          test: I18n.t("cli.config.env_test_description"),
+          development: I18n.t("cli.config.env.development_description"),
+          production: I18n.t("cli.config.env.production_description"),
+          test: I18n.t("cli.config.env.test_description"),
         }
       },
       FORMAT: { # not implemented yet.
-        type: :values,
+        type: CLI::Config::TYPES[:VALUES],
         implemented: false,
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: CLI::Config::FORMATS[:TEXT],
-        description: I18n.t(
-          "cli.config.format_description",
-          possible_values: CLI::Config::FORMATS.values.join(", ")
-        ),
+        description: I18n.t("cli.config.format.description"),
         possible_values: {
-          text: I18n.t("cli.config.text_format_description"),
-          json: I18n.t("cli.config.json_format_description")
+          text: I18n.t("cli.config.format.text_description"),
+          json: I18n.t("cli.config.format.json_description")
         }
       },
       DIMENSION: {
-        type: :values,
+        type: CLI::Config::TYPES[:VALUES],
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: CLI::Config::DMS[:DEV_TAROT],
-        description: I18n.t(
-          "cli.config.dimension_description",
-          possible_values: CLI::Config::DMS.values.join(", ")
-         ),
+        description: I18n.t("cli.config.dimension.description"),
         possible_values: {
-          dev_tarot: I18n.t("cli.config.dimension_dev_tarot_description"),
-          ruby_facot: I18n.t("cli.config.dimension_ruby_facot_description"),
+          dev_tarot: I18n.t("cli.config.dimension.dev_tarot_description"),
+          ruby_facot: I18n.t("cli.config.dimension.ruby_facot_description"),
         }
       },
-      DISPLAY_COLUMNS: {
-        type: :int,
+      HEIGHT: {
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:WRITE],
-        value: Aro::Mancy::NUMERALS[:VII],
+        value: Aro::Mancy::NUMERALS[:XLII],
         min: Aro::Mancy::NUMERALS[:I],
-        max: Aro::Mancy::NUMERALS[:XXII] / Aro::Mancy::OS,
+        max: Aro::Mancy::NUMERALS[:VII].pow(Aro::Mancy::OS),
         description: I18n.t(
-          "cli.config.display_columns_description",
+          "cli.config.height_description",
           min: Aro::Mancy::NUMERALS[:I],
-          max: Aro::Mancy::NUMERALS[:XXII] / Aro::Mancy::OS,
+          max: Aro::Mancy::NUMERALS[:VII].pow(Aro::Mancy::OS),
+        ),
+      },
+      WIDTH: {
+        type: CLI::Config::TYPES[:INT],
+        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),
+        description: I18n.t(
+          "cli.config.width_description",
+          min: Aro::Mancy::NUMERALS[:I],
+          max: Aro::Mancy::NUMERALS[:XI].pow(Aro::Mancy::OS),
         ),
       },
       Z: {
-        type: :int,
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: Aro::Mancy::NUMERALS[:I],
         min: Aro::Mancy::NUMERALS[:I],
@@ -194,7 +250,7 @@ module CLI
         ),
       },
       Z_MAX: {
-        type: :int,
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:WRITE],
         value: Aro::Mancy::NUMERALS[:VII],
         min: Aro::Mancy::NUMERALS[:I],
@@ -205,79 +261,88 @@ 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"),
+      },
 
-      # read only variables
+      #
+      # => ovars
+      #
       ARO_ENV_O: {
-        type: :string,
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::O,
-        description: I18n.t(
-          "cli.config.aro_env_O_description"
-        ),
+        description: I18n.t("cli.config.aro_env.O_description"),
       },
       ARO_ENV_S: {
-        type: :string,
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::S,
-        description: I18n.t(
-          "cli.config.aro_env_S_description"
-        ),
+        description: I18n.t("cli.config.aro_env.S_description"),
       },
       ARO_ENV_OS: {
-        type: :string,
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::OS,
-        description: I18n.t(
-          "cli.config.aro_env_OS_description"
-        ),
+        description: I18n.t("cli.config.aro_env.OS_description"),
+      },
+      ARO_ENV_E: {
+        type: CLI::Config::TYPES[:INT],
+        access: CLI::Config::DEF_ACCESS[:READ],
+        value: Aro::Mancy::E,
+        description: I18n.t("cli.config.aro_env.E_description"),
       },
       ARO_ENV_N: {
-        type: :string,
+        type: CLI::Config::TYPES[:INT],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::N,
-        description: I18n.t(
-          "cli.config.aro_env_N_description"
-        ),
+        description: I18n.t("cli.config.aro_env.N_description"),
       },
       ARO_ENV_PS1: {
-        type: :string,
+        type: CLI::Config::TYPES[:STRING],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::PS1,
-        description: I18n.t(
-          "cli.config.aro_env_PS1_description"
-        ),
+        description: I18n.t("cli.config.aro_env.PS1_description"),
       },
       ARO_ENV_NAME_FILE: {
-        type: :string,
+        type: CLI::Config::TYPES[:STRING],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::NAME_FILE,
-        description: I18n.t(
-          "cli.config.aro_env_NAME_FILE_description"
-        ),
+        description: I18n.t("cli.config.aro_env.NAME_FILE_description"),
       },
       ARO_ENV_I2097I: {
-        type: :string,
+        type: CLI::Config::TYPES[:STRING],
         access: CLI::Config::DEF_ACCESS[:READ],
-        description: I18n.t(
-          "cli.config.aro_env_I2097I_description"
-        ),
-        value: Aro::Mancy::I2097I
+        value: Aro::Mancy::I2097I,
+        description: I18n.t("cli.config.aro_env.I2097I_description"),
       },
       ARO_ENV_YES: {
-        type: :string,
+        type: CLI::Config::TYPES[:STRING],
         access: CLI::Config::DEF_ACCESS[:READ],
         value: Aro::Mancy::YES,
-        description: I18n.t(
-          "cli.config.aro_env_YES_description"
-        ),
+        description: I18n.t("cli.config.aro_env.YES_description"),
+      },
+      ARO_ENV_ALL: {
+        type: CLI::Config::TYPES[:STRING],
+        access: CLI::Config::DEF_ACCESS[:READ],
+        value: Aro::Mancy::ALL,
+        description: I18n.t("cli.config.aro_env.ALL_description"),
       },
-
-      # ...
     }
 
     def initialize
-      Aro::P.say("config init")
-      return unless Aro::Mancy.is_aro_space? && Aro::Mancy.is_initialized?
+      @@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
+      end
+
+      return if @@context.nil?
+
       unless File.exist?(CLI::Config.config_filepath)
         generate_config
       end
@@ -287,33 +352,28 @@ module CLI
     end
 
     def self.config_filepath
-      File.join(Aro::Db.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      db_cls = @@context == Aro::Dom.name ? Aos::Db : Aro::Db
+      File.join(db_cls.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
     end
 
     def self.display_config
-      Aro::V.say("getting display config...")
-      columns = CLI::Config.ivar(:DISPLAY_COLUMNS)
-      Aro::V.say("DISPLAY_COLUMNS: #{columns}")
-
-      # default
-      width = CLI::Config::DEF[:DISPLAY_COLUMNS][:value]
-      if columns.respond_to?(:to_i)
-        # user setting
-        columns = columns.to_i
-        width = columns.to_i.pow(Aro::Mancy::OS)
-      end
-      Aro::V.say("WIDTH: #{width}")
-
-      {
+      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
+      result = {
         COLUMNS: columns,
+        HEIGHT: CLI::Config.ivar(:HEIGHT).to_i,
         WIDTH: width,
         DIVIDER: :"-".to_s
       }
+      Aro::V.say(result)
+
+      result
     end
 
     # out vars
     def self.ovar(suffix)
-      ENV[CLI::Config.ovar_k(suffix)]
+      CLI::Config::DEF[suffix][:value]
     end
     # out vars
     def self.ovar_k(suffix)
@@ -334,8 +394,8 @@ module CLI
       # 
       # default is production
       varenv = CLI::Config.ivar(:ENV)
-      var_valid = validate_value(varenv, :ENV, CLI::Config::DEF[:ENV])
-      ENV[:ARO_ENV.to_s] = var_valid ? varenv : CLI::Config::ENVS[:PRODUCTION].to_s
+      is_valid = valid_var?(varenv, :ENV, CLI::Config::DEF[:ENV])
+      ENV[:ARO_ENV.to_s] = is_valid ? varenv : CLI::Config::ENVS[:PRODUCTION].to_s
       Aro::D.say("setup_env: #{ENV[:ARO_ENV.to_s]}")
     end
 
@@ -344,9 +404,9 @@ module CLI
     end
 
     def source_config
-      Aro::D.say(I18n.t("cli.config.sourcing_config", name: CLI::Config.config_filepath))
+      Aro::D.say(I18n.t("cli.config.source", name: CLI::Config.config_filepath))
       File.read(CLI::Config.config_filepath).split("\n").select{|line|
-        line.match?(/export #{:ARO_}/)
+        line.match?(/export #{CLI::Config::ARO_CONFIG_PREFIX}/)
       }.map{|line| 
         line.gsub("export ", "").split("=")
       }.each{|kv|
@@ -369,7 +429,7 @@ module CLI
 
     def generate_config
       # todo: localize generated config text
-      Aro::D.say(I18n.t("cli.config.generating_default_config", name: CLI::Config.config_filepath))
+      Aro::D.say(I18n.t("cli.config.generate", name: CLI::Config.config_filepath))
       File.open(CLI::Config.config_filepath, "w+") do |file|
         # intro
         Aro::Mancy::OS.times do
@@ -490,14 +550,14 @@ module CLI
       file.write("#   => #{I18n.t("cli.config.def_type")}: #{v[:type]}\n")
       case v[:type]
       when CLI::Config::DEF_TYPES[:INT][:name]
-        file.write("#   => #{I18n.t("cli.config.type_int_description")}\n")
+        file.write("#   => #{I18n.t("cli.config.type.int_description")}\n")
         file.write("#   => #{I18n.t("cli.config.minimum")}: #{v[:min]}\n")
         file.write("#   => #{I18n.t("cli.config.maximum")}: #{v[:max]}\n")
       when CLI::Config::DEF_TYPES[:STRING][:name]
-        file.write("#   => #{I18n.t("cli.config.type_string_description")}\n")
+        file.write("#   => #{I18n.t("cli.config.type.string_description")}\n")
         file.write("#   => use \"double quotes\" if there are any spaces.\n")
       when CLI::Config::DEF_TYPES[:VALUES][:name]
-        file.write("#   => #{I18n.t("cli.config.type_values_description")}\n")
+        file.write("#   => #{I18n.t("cli.config.type.values_description")}\n")
         file.write("#   => #{I18n.t("cli.config.possible_values")}:\n")
         print_sr f_object_id
         v[:possible_values].each{|name, description|
@@ -510,7 +570,11 @@ module CLI
       print_osr f_object_id
       file.write("#   => description:\n")
       file.write("#   => #{v[:description]}\n")
-      file.write("export #{var_name}=#{v[:value]}\n")
+      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")
+      end
       print_osr f_object_id
     end
 

data/sys/cli/constants.rb

@@ -24,6 +24,10 @@ module CLI
   }
 
   CMDS = {
+    AOS: {
+      RUN: :run,
+      WATCH: :watch,
+    },
     ARO: {
       CREATE: :create,
       CONFIG: :config,
@@ -45,9 +49,8 @@ module CLI
     },
     DOM: {
       INIT: :init,
-      MAP: :map,
       NEW: :new,
-    }
+    },
   }
   
 end

data/sys/cli/dom.rb

@@ -10,21 +10,17 @@
 
 module CLI
   def self.dom
-    action = CLI::ARGV1&.to_sym
-
-    CLI::Nterface.exit_error_invalid_usage! unless CLI::CMDS[:DOM].values.include?(action)
-
     if CLI::FLAGS[:HELP].include?(CLI::ARGV1)
       CLI.usage::usage
       exit(CLI::EXIT_CODES[:SUCCESS])
-    elsif CLI::ARGV1.nil?
-      # no args, default dom action
-      Aro::Dom.map
     end
 
+    action = CLI::ARGV1&.to_sym
+
+    CLI::Nterface.exit_error_invalid_usage! unless !action.nil? &&
+      CLI::CMDS[:DOM].values.include?(action)
+
     case action
-    when CLI::CMDS[:DOM][:MAP]
-      Aro::Dom.map
     when CLI::CMDS[:DOM][:INIT]
       arodome = Aro::Dom.new
       arodome.generate
@@ -36,10 +32,6 @@ module CLI
       else
         Aro::Dom.create(CLI::ARGV2.to_s)
       end
-    else
-      if CLI::CMDS[:DOM].values.include?(action) 
-        # todo: 
-      end
     end
   end
 end

data/sys/cli/nterface.rb

@@ -21,5 +21,11 @@ module CLI
       Aro::P.say(I18n.t("cli.errors.invalid_usage", cmd: Aro::Mancy::I2097I))
       exit(CLI::EXIT_CODES[:INVALID_ARG])
     end
+
+    def self.exit_error_not_initialized!
+      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy::I2097I))
+      Aro::P.say(I18n.t("cli.errors.not_initialized", cmd: Aro::Mancy::I2097I))
+      exit(CLI::EXIT_CODES[:INVALID_ARG])
+    end
   end
 end

data/sys/dom/d.rb

@@ -19,10 +19,6 @@ module Aro
           name: Aro::Dom::WAITE,
           description: "sign up."
         },
-        WELCOME: { 
-          name: Aro::Dom::WELCOME,
-          description: "sign in."
-        },
         WINNER: {
           name: Aro::Dom::WINNER,
           description: "win."
@@ -71,7 +67,6 @@ module Aro
         description: "sign up process.",
         rooms: [
           Aro::Dom::D::WINGS[:WELCOME][:WAITE],
-          Aro::Dom::D::WINGS[:WELCOME][:WELCOME],
           Aro::Dom::D::WINGS[:WELCOME][:WINNER],
         ]
       },