aro 0.1.8 → 0.2.0

data/locale/en.cngelog.yml

@@ -2,4 +2,4 @@
 en:
   cngelog:
     1765093549_rename_display_column: "rename(ivar): ARO_CONFIG_DISPLAY_COLUMN -> ARO_CONFIG_WIDTH"
-    1765094034_add_height_env_var: "add(ivar): ARO_CONFIG_HEIGHT"
+    1765094034_add_height_env_var: "add(ivar): ARO_CONFIG_HEIGHT"

data/locale/en.dom.yml

@@ -0,0 +1,42 @@
+en:
+  dom:
+    wings:
+      welcome:
+        description: "sign up process."
+      games:
+        description: "aro game rooms."
+      know:
+        description: "information space."
+      setup:
+        description: "user configuration space."
+    rooms:
+      waite:
+        description: "sign up."
+      winner:
+        description: "win."
+      abpps:
+        description: "artificial beings."
+      hbpps:
+        description: "human beings."
+      shpps:
+        description: "human and artificial beings."
+      vipps:
+        description: "only dev_tarot users. no ruby_facots allowed."
+      library:
+        description: "definition management."
+      temple:
+        description: "mindfulness management."
+      settings:
+        description: "user settings and configuration."
+    errors:
+      directory_exists: "unable to create arodome at %{name}. file or directory already exists."
+      failed_already_in_arodom: "unable to create an arodome because you are already in arodom."
+      failed_in_aro_space: "unable to create an arodome inside of aro space."
+      failed_already_initialized: "arodome is already initialized. doing nothing."
+    messages:
+      arodome_created: "%{name} arodome created. enter the following commands to begin: $ cd %{name}"
+      creating_arodome: "creating arodome named %{name}"
+      generating_wings: "generating wings..."
+      generating_wing: "generating the %{wing} wing..."
+      generating_room: "generating the %{room} room."
+      initialization_complete: "%{name} initialization complete! use aos to begin."

data/locale/en.usage.yml

@@ -22,14 +22,25 @@ en:
             this runs by default after create and has no effect if init is complete.
 
         config
-          config management (ex: update preferences)
-          todo:
+          aro config management.
+
+            $ aro config <commands>
+
+          passing no args opens prints the current config.
+
+          SUBCOMMANDS
+            set
+              sets an ivar to a specified value. the aro var prefix can be omitted.
+
+                $ aro config set <var_name> <var_value>
 
         deck
-          manage decks in the current room
+          manage decks in the current room.
 
             $ aro deck <commands>
 
+          passing no args opens the selection menu.
+
           note:
 
             deck subcommands do not require typing 'deck'. for example,
@@ -90,16 +101,10 @@ en:
               shuffles the current deck and generates a log record.
 
         dom
-          create or manage an arodome (ex: list game rooms)
+          arodom management.
 
           $ aro dom <commands>
 
-            note: passing no arguments displays the main dom.
-
-              example
-
-                $ aro dom
-
           SUBCOMMANDS
             init
               generate the arodome

data/locale/en.yml

@@ -16,7 +16,6 @@ en:
         I2097I_description: "read-only env var for i2097i."
         YES_description: "read-only env var for 'aroyes'."
         ALL_description: "read-only env var for 'all'."
-      def_type: "CLI::Config::DEF_TYPES"
       dimension:
         description: "selected dimension of aro space."
         dev_tarot_description: "reads from /dev/tarot device if available."
@@ -25,43 +24,41 @@ en:
         description: "aro output format."
         text_description: "show aro responses in text format (default)"
         json_description: "show aro responses in json format."
-
       height_description: "display height. valid range: (${min}-${max})"
       width_description: "display width. valid range: (${min}-${max})"
-
       env:
         description: "aro run environment."
         development_description: "basic development logs and features."
         production_description: "game logging only."
         test_description: "logging and features tailored for tests."
-
+      verbose_description: "enable verbose logging in development env."
+      log_aos_db_description: "show aos database transactions."
+      log_aro_db_description: "show aro database transactions"
       generate: "generating default config file at %{name}."
       source: "installing ivars from %{name}..."
-
       maximum: "max"
       minimum: "min"
       possible_values: "possible values"
-
       type:
         bool_description: "true or false."
         int_description: "a primitive decimal-less numeric."
         string_description: "a blank-space-terminated string of characters."
         values_description: "an enumerated type."
-
       z_description: "sleep time between attempts to read /dev/tarot. valid range (%{min}-%{max})"
       z_max_description: "max number of z long sleeps before giving up. valid range (%{min}-%{max})"
     errors:
-      # , cmd: Aro::Mancy::I2097I))
-      header: "$%{cmd}: !error."
-      invalid_usage: "$%{cmd}: !says you're not supposed to be here."
-      missing_args: "$%{cmd}: !says missing required argument(s)."
-      missing_deck: "$%{cmd}: !no deck selected. use 'aro deck' to select one or 'aro deck new <name>' to create one."
-      not_in_aro: "$%{cmd}: !you are not in aro space. that command will not work here."
-      not_initialized: "$%{cmd}: you need to initialize aro. run 'aro init' to do so"
+      header: "%{cmd} says there was a problem."
+      invalid_usage: "%{cmd} says you're not supposed to be here."
+      missing_args: "%{cmd} says missing required argument(s)."
+      missing_deck: "%{cmd} says no deck selected. use 'aro deck' to select one or 'aro deck new <name>' to create one."
+      not_in_aro: "%{cmd} says you are not in aro space. that command will not work here."
+      not_in_aos: "%{cmd} says you are not in aos space. that command will not work here."
+      not_initialized: "%{cmd} says you need to initialize aro. run 'aro init' to do so"
     warnings:
       invalid_order: "the order specified for displaying logs in invalid. using default (desc)."
     messages:
       choose_card: "choose a card."
+      choose_deck: "choose a deck."
       confirmation_prompt: "input 'aroyes' to reset %{name}, or enter to cancel (cancel): "
       creating: "creating %{name}..."
       creation_attempt: "attempting to create aro table named %{name}..."
@@ -92,7 +89,7 @@ en:
         see aro --help for usage.
       showing: "showing %{name} [count:%{count}, order:%{order}]..."
       shuffling: "shuffling %{name}'s cards..."
-      replacing_drawn: "all drawn cards to %{name}..."
+      replacing_drawn: "replacing all drawn cards to %{name}..."
       resetting: "resetting %{name}'s cards..."
       understood: "%{name} says: 'understood.'"
       welcome: "welcome.to.the.%{name}."

data/sys/aos/aos.rb

@@ -13,32 +13,28 @@ require :aro.to_s
 module Aos
 
   def self.run
-    Aos::Os::boot(Aos::you)
-    Aos::Os.instance.run
-  end
-
-  def self.watch
-    Aos::Os::boot(Aos::you)
-    Aos::Os::instance.render
-  end
-
-  def self.you
-    Aos::Db.new
-    you = Aos::You.where(name: :you).first
-    if you.nil?
-      you = Aos::You.new(name: :you, pwd: Dir.pwd)
-      you.save
+    begin
+      Aos::Os.instance.run
+    rescue Interrupt => e
+      Aos.run
     end
+  end
 
-    you
+  def self.process
+    cmd = ARGV.join(" ")
+    Aro::D.say("processing cmd #{cmd}...")
+    Aos::Os::instance.process_cmd(cmd)
   end
 
   class Os
     include Singleton
 
-    attr_accessor :you, :running, :view
+    attr_accessor :you, :running, :view, :db
 
-    PS1 = "@#{Aos::Os}$"
+    A = :"@"
+    STAR = :"*"
+    PS1 = :">[#{Aos::Os}]>: "
+    DATE_FORMAT = "%A %d %b %Y %I:%M:%S %p"
 
     CMDS = {
       CD: {
@@ -53,7 +49,7 @@ module Aos
         cmds: {
           SET: {
             key: :set,
-            description: I18n.t("aos.commands.description.config_set"),
+            description: I18n.t("aos.commands.description.config_set", prefix: CLI::Config::ARO_CONFIG_PREFIX),
             usage: I18n.t("aos.commands.usage.config_set"),
           }
         }
@@ -68,6 +64,11 @@ module Aos
         description: I18n.t("aos.commands.description.ls"),
         usage: I18n.t("aos.commands.usage.ls"),
       },
+      LL: {
+        key: :ll,
+        description: I18n.t("aos.commands.description.ll"),
+        usage: I18n.t("aos.commands.usage.ll"),
+      },
       PWD: {
         key: :pwd,
         description: I18n.t("aos.commands.description.pwd"),
@@ -75,125 +76,259 @@ module Aos
       },
     }
 
-    def self.boot(you)
-      self.instance.you = you
-      self.instance.load_view
+    def initialize
+      if Aro::Dom.in_arodom? && !Aro::Dom.is_initialized?
+        Aro::Dom.new.generate
+      end
+      @db = Aos::Db.new
+      load_you
+    end
+
+    def load_you
+      @you = Aos::You.where(name: :you).first
+      @you = Aos::You.create(name: :you, pwd: Dir.pwd) if @you.nil?
+      Aro::D.say(@you.inspect)
     end
 
     def load_view
-      view_name = Aos::Os.osify(you.pwd).split("/").last || :dom.to_s
-      view_cls = (Aos::Vi.name + "::#{view_name.capitalize}").constantize
+      view_name = Aos::Os.osify(@you.pwd).split("/").last || :dom.to_s
+      view_cls = nil
+      begin
+        view_cls = (Aos::Vi.name + "::#{view_name.capitalize}").constantize
+      rescue
+        view_cls = Aos::Vi::Base
+      end
+
+      Dir.chdir(@you.pwd) do
+        if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
+          view_cls = Aos::Vi::Game
+        end
+      end
+
       Aro::D.say("loading view #{view_cls}")
-      self.view = view_cls
+      @view = view_cls
     end
 
-    def render
-      return if view.nil?
+    def self.osify(path)
+      return path unless Aro::Dom.in_arodom?
+      path_arr = path.split("/")
+      Aro::Dom::dom_root.split("/").each{|rdp| path_arr.delete(rdp)}
+      path_arr.join("/")
+    end
 
-      view.show(you)
+    def self.is_aos_command?(arg)
+      # determine if command is Aos::Os::CMDS
+      # passthrough to system if command is not in Aos::Os::CMDS
+      Aos::Os::CMDS.values.map{|v| v[:key]}.include?(arg.to_sym)
     end
 
-    def run
-      self.running = true
+    def render
+      load_view
+      return if @view.nil?
+      Dir.chdir(@you.reload.pwd) do
+        if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
+          system(:aro.to_s)
+        else
+          @view.show(@you)
+        end
+      end
+    end
 
-      # begin game loop
-      while running do
-        # get input
-        cmd = Aos::S.p.ask(Aos::Os::PS1)
+    def process_cmd(cmd)
+      Dir.chdir(@you.reload.pwd) do
+        passthrough = main(cmd)
+        if CLI::Config.is_format_text?
+          IO.console.goto(Aro::Mancy::O, Aro::Mancy::O)
+        end
+        if passthrough
+          system(cmd)
+          Aos::S.say("\n")
+        else
+          render
+        end
+      end
 
-        # default to passthrough
-        passthrough = true
+      CLI::EXIT_CODES[:SUCCESS]
+    end
 
-        # get args
-        args = cmd.split(" ")
-
-        # search for room path
-        room_path = Aro::Dom.room_path(args[0])
-        if !room_path.empty?
-          you.update(pwd: File.join(
-            File.dirname(Aro::Dom.ethergeist_path),
-            room_path
-          ))
-          Dir.chdir(you.pwd)
-          next
-        end
+    def confgiure_readline
+      # configure Readline
+      # Readline.completion_append_character = "/"
+      Readline.completion_proc = Proc.new{|str|
+        # todo: the reserved_words search is working but the || case is not
+        Aro::Dom::D.reserved_words.grep(/^#{Regexp.escape(str)}/) ||
+        Dir[@you.pwd + str + Aos::Os::STAR.to_s].grep(/^#{Regexp.escape(str)}/)
+      }
+    end
 
-        # determine if command is Aos::Os::CMDS
-        if Aos::Os::CMDS.values.map{|v| v[:key]}.include?(args[0].to_sym)
-          Dir.chdir(you.pwd)
-          passthrough = false
+    def run
+      # run condition
+      @running = true
+
+      original_stdout = $stdout
+      $stdout = StringIO.open do |out|
+        cmd = nil
+        loop do
+          # erase before cursor
+          IO.console.erase_screen(Aro::Mancy::S)
+          process_cmd(cmd)
+          IO.console.goto(CLI::Config.display_config[:HEIGHT], Aro::Mancy::O)
+          break unless @running && cmd = Readline.readline(calc_ps1, true)
         end
 
-        # config commands
-
-        if args[0].to_sym == Aos::Os::CMDS[:CONFIG][:key]
-          if args[1].nil?
-            # show settings
-            you.update(pwd:
-              File.join(
-                File.dirname(Aro::Dom.ethergeist_path),
-                Aro::Dom::SETUP.to_s,
-                Aro::Dom::SETTINGS.to_s
-              )
-            )
-          else
-            Aos::S.say("not implemented.")
-          end
-        elsif args[0] == Aos::Os::CMDS[:LS][:key].to_s
-          Aos::S.say(Dir[File.join(Dir.pwd, "*/")].map{|p| "@/" + Aos::Os::osify(p)}.join("\n"))
-        elsif args[0] == Aos::Os::CMDS[:PWD][:key].to_s
-          osified = "@/" + Aos::Os::osify(you.pwd)
-          Aos::S.say(osified)
-        elsif args[0] == Aos::Os::CMDS[:EXIT][:key].to_s
-          Aos::S.say("exiting...")
-          self.running = false
-        elsif args[0] == Aos::Os::CMDS[:CD][:key].to_s
-
-          if args[1].nil? || args[1] == "~/"
-            # no arg takes you to arodom root
-            you.update(pwd: File.dirname(Aro::Dom.ethergeist_path))
-          else
-            if args[1].include?("..")
-              # going up
-              if File.dirname(Aro::Dom.ethergeist_path) == you.pwd
-                Aos::S.say("within #{Aos::Os}, one cannot leave the #{Aro::Dom}.")
-              else
-                # todo: support dots in paths
-                # this only supports moving one level up
-
-                pwd_arr = you.pwd.split("/")
-                new_pwd = (pwd_arr.first(pwd_arr.length - 1)).join("/")
-
-                you.update(pwd: new_pwd)
-              end
-            elsif !args[1].nil?
-              if args[1][0] != "/" && Dir.exist?(args[1])
-                you.update(pwd: File.join(you.pwd, args[1]))
-              else
-                Aos::S.say("that directory is invalid.")
-              end
-            end
+        out
+      end
+
+      CLI::EXIT_CODES[:SUCCESS]
+    ensure
+      $stdout = original_stdout
+    end
+
+    def main(cmd)
+      # begin game loop
+      return false if cmd.nil?
+
+      # get args
+      args = cmd.split(" ")
+      return false if args[0].nil?
+      return false if args[0] == :aos.to_s
+
+      # reconfigure for updates to pwd
+      # todo: not working for tab completion
+      confgiure_readline
+
+      args = handle_aro_override(args)
+
+      passthrough = !Aos::Os.is_aos_command?(args[Aro::Mancy::O]) ||
+        args.include?(:aos.to_s)
+
+      return false if handle_room_path(args[Aro::Mancy::O])
+
+      # set aos pwd
+      unless passthrough
+        Dir.chdir(@you.pwd) do
+          # process commands
+          case args[Aro::Mancy::O].to_sym
+          when Aos::Os::CMDS[:CONFIG][:key]
+            # config
+            passthrough = handle_config(args)
+          when Aos::Os::CMDS[:LS][:key]
+            # ls
+            handle_ls(args)
+          when Aos::Os::CMDS[:LL][:key]
+            # ll
+            handle_ll(args)
+          when Aos::Os::CMDS[:PWD][:key]
+            # pwd
+            handle_pwd(args)
+          when Aos::Os::CMDS[:EXIT][:key]
+            # exit
+            passthrough = true
+            handle_exit(args)
+          when Aos::Os::CMDS[:CD][:key]
+            # cd
+            handle_cd(args)
           end
         end
+      end
 
-        if passthrough
-          system(cmd)
-        end
+      return passthrough
+    end
+
+    def calc_ps1
+      you_pwd = Aos::Os::osify(@you.pwd)
+      "#{Aos::Os::PS1}" # #{you_pwd.empty? ? "" : "#{you_pwd}:"}$ "
+    end
+
+    def handle_room_path(arg)
+      # search for reserved room path
+      handled = false
+      room_path = Aro::Dom.room_path(arg)
+      if !room_path.empty?
+        handled = true
+        @you.update(pwd: File.join(
+          File.dirname(Aro::Dom.ethergeist_path),
+          room_path
+        ))
       end
+      handled
+    end
 
-      CLI::EXIT_CODES[:SUCCESS]
+    def handle_aro_override(args)
+      if args[0].include?(:aro.to_s)
+        args = "#{args.join(" ")} #{:aos.to_s}".split(" ")
+      end
+      args
     end
 
-    def self.osify(path)
-      # strips off non-arodom part of path
-      # Aos::Os::osify()
+    def handle_config(args)
+      passthrough = false
+      if args[1].nil?
+        # show settings
+        passthrough = true
+        CLI::Config.dump_config.each{|l| Aos::S.say(l)}
+      else
+        CLI::Config.process_config_command(args)
+      end
+      passthrough
+    end
 
-      path_arr = path.split("/")
-      Aro::Dom::dom_root.split("/").each{|rdp|
-        path_arr.delete(rdp)
-      }
+    def handle_ls(args)
+      Aos::S.say(Dir.glob(File.join(@you.pwd, (args[1] || "") + Aos::Os::STAR.to_s), File::FNM_EXTGLOB).map{|p| "/" + Aos::Os::osify(p)}.join("\n"))
+    end
 
-      path_arr.join("/")
+    def handle_ll(args)
+      Aos::S.say(Dir.glob(File.join(@you.pwd, (args[1] || "") + Aos::Os::STAR.to_s), File::FNM_DOTMATCH).map{|p| "/" + Aos::Os::osify(p)}.join("\n"))
+    end
+
+    def handle_pwd(args)
+      osified = "/" + Aos::Os::osify(@you.pwd)
+      Aos::S.say(osified)
+    end
+
+    def handle_exit(args)
+      Aos::S.say("#{Aos::Os} is exiting...")
+      @running = false
+    end
+
+    def handle_cd(args)
+      if args[1].nil? || args[1] == "~/"
+        # no arg takes you to arodom root
+        @you.update(pwd: File.dirname(Aro::Dom.ethergeist_path))
+      else
+        if args[1].include?(Aro::Dom::DOTT.to_s)
+          # going up
+          if File.dirname(Aro::Dom.ethergeist_path) == @you.pwd
+            Aos::S.say("within #{Aos::Os}, one cannot leave the #{Aro::Dom}.")
+          else
+            # todo: support dots in paths
+            # this only supports moving one level up
+
+            pwd_arr = @you.pwd.split("/")
+            new_pwd = (pwd_arr.first(pwd_arr.length - 1)).join("/")
+
+            @you.update(pwd: new_pwd)
+          end
+        else
+          # this particular block needs to be better
+          if args[1][0] == "/"
+            Aro::V.say("handling cd to root (/) arg...")
+            Aro::V.say(Aro::Dom::dom_root)
+            Aro::V.say(args[1][1..])
+            args[1] = args[1][1..]
+            new_pwd = File.join(Aro::Dom.dom_root, args[1])
+            if Dir.exist?(new_pwd)
+              @you.update(pwd: new_pwd)
+            end
+          elsif Dir.exist?(args[1]) && args[1] != Aro::Dom::DOT.to_s
+            new_pwd = File.join(@you.pwd, args[1])
+            Aro::V.say("new_pwd: #{new_pwd}")
+            @you.update(pwd: new_pwd)
+          else
+            Aos::S.say("that directory is invalid.")
+          end
+        end
+      end
     end
   end
 end

data/sys/aos/db.rb

@@ -11,18 +11,25 @@
 module Aos
   class Db < Aro::Db
     DATABASE_YML = :"database.yml"
-    SQL_FILE = :"database.sql"
+    SQL_FILE = :"aos.sql"
     SCHEMA_FILE = :"schema.rb"
     MIGRATIONS_DIR = :"db/migrate"
 
     def initialize
-      # ActiveRecord::Base.logger = Logger.new(STDOUT)
-      unless Aro::Dom.in_arodom?
+      Aos::Db.configure_logger
+      if Aro::Dom.in_arodom?
+        set_up_aos
+      else
         Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Dom.name))
-        return
       end
+    end
 
-      set_up_aos
+    def self.configure_logger
+      if CLI::Config.ivar(:LOG_AOS_DB).to_s == CLI::Config::BOOLS[:TRUE].to_s
+        ActiveRecord::Base.logger = Logger.new(STDOUT)
+      else
+        ActiveRecord::Base.logger = nil
+      end
     end
 
     def self.base_aro_dir
@@ -42,8 +49,8 @@ module Aos
         FileUtils.mkdir(Aos::Db.base_aro_dir)
       end
 
-      Aro::D.say("creating database: #{db_config_filepath}")
       unless File.exist?(db_config_filepath)
+        Aro::D.say("creating database: #{db_config_filepath}")
         # create database config yaml file
         c = {
           adapter: :sqlite3.to_s,