aro 0.2.2 → 0.2.3

data/sys/aos/vws/base.rb

@@ -17,16 +17,26 @@ module Aos
       MARGIN_H = Aro::Mancy::S
 
       def self.show
-        draw([self.name])
+        draw([
+          "the #{self.name} room.",
+          "",
+          "getting directory listing...",
+          "",
+          Aos::Os.instance.get_ls([])
+        ])
       end
 
       def self.draw(body_lines)
         return false unless body_lines.kind_of?(Array)
         lines = []
-        dc = Aro::Config.display_configuration
-        height = dc[:HEIGHT]
+
+        dc = Aos::Cor.display_configuration
         width = dc[:WIDTH]
 
+        if Aro::Dom.in_arodom?
+          lines += get_main_divider(width, true)
+        end
+
         # top vertical margin
         Aos::Vw::Base::MARGIN_V.times do
           lines << get_body_line("")
@@ -37,39 +47,73 @@ module Aos
           lines << get_body_line(line)
         }
 
-        lines += get_aos_display_lines if Aro::Dom.in_arodom?
+        if Aro::Dom.in_arodom?
+          lines += get_aos_display_lines
+        end
 
         # print everything
-        Aos::S.say(lines.join("\n"))
+
+        Aro::Prompt.say(lines)
 
         # explicitly return true
         true
       end
 
+      def self.get_main_divider(width, clock = false)
+        left = "#{Aos::Os::PS1}"
+        if clock
+          left = "#{left}#{get_domain} >"
+        else
+          left = "#{left}v#{Aro::VERSION} >"
+        end
+        right = "< " + (clock ? get_clock : get_display_dimension.strip)
+        lines = []
+        lines << ""
+        lines << left.ljust(width - right.length, "-".to_s) + right
+        lines << ""
+        lines
+      end
+
       def self.get_aos_display_lines
         # current Aos::Os output
+
+        width = Aos::Cor.display_configuration[:WIDTH]
         lines = []
+        Aos::Os.instance.display_lines ||= []
         unless Aos::Os.instance.display_lines.empty?
-          dc = Aro::Config.display_configuration
-          width = dc[:WIDTH]
-          lines << "".center(width)
-          display_dim = get_display_dimension
           Aos::Os.instance.display_lines.each{|line|
             lines << line
           }
+          Aos::Os.instance.display_lines = []
           lines << "".center(width)
-          lines << "v#{Aro::VERSION.to_s}".ljust(width - display_dim.length) + display_dim
         end
 
+        Aos::Db.load
+
+        the_you = Aos::Os.instance.you_flag || Aos::Os.instance.you
+        Aro::V.say(Aos::Os.you_name_from_flag_arg)
+        Aro::V.say(the_you.inspect)
+        present_users = Aos::You.order(
+          name: :asc
+        ).where(
+          pwd: the_you.pwd,
+          access: [:agodo, :user]
+        ).map{|y|
+          (the_you == y ? Aos::Os::STAR.to_s : "") +
+          y.name
+        }
+
+        if present_users.any?
+          lines << "[ yous in the room ]".center(width)
+          lines << ("[  " + present_users.join("    ") + "  ]").center(width)
+        end
+        lines << ":you_are_root".center(width) if the_you.root?
+        lines += get_main_divider(width)
         lines
       end
 
       def self.get_display_dimension
-        "#{self.get_dt.rjust(Aro::Mancy::V)} :<[#{self.get_dimension}]<"
-      end
-
-      def self.get_dt
-        Aro::T.read_dev_tarot.strip[Aro::Mancy::S..]
+        "#{Aro::T.read_dev_tarot(true).rjust(Aro::Mancy::V)} :<[#{self.get_dimension}]<"
       end
 
       def self.get_dimension
@@ -77,7 +121,7 @@ module Aos
       end
 
       def self.get_domain
-        Aro::Dom.in_arodom? ? Aro::Dom::domain : Aro::Mancy.domain
+        Aro::Mancy.in_aro? ? Aro::Mancy.domain : Aro::Dom.domain
       end
 
       def self.get_clock
@@ -85,7 +129,7 @@ module Aos
       end
 
       def self.viewport_width
-        dc = Aro::Config.display_configuration
+        dc = Aos::Cor.display_configuration
         width = dc[:WIDTH]
         bar_width = (Aos::Vw::Base::BAR.length * Aro::Mancy::OS)
         h_margin_width = (Aos::Vw::Base::MARGIN_H * Aro::Mancy::OS)
@@ -97,7 +141,7 @@ module Aos
         hm = Aos::Vw::Base::MARGIN_H
         bar = Aos::Vw::Base::BAR
         hm_space = " " * Aos::Vw::Base::MARGIN_H
-        just = Aro::Config.display_configuration[:WIDTH] - (hm_space.length + bar.length)
+        just = Aos::Cor.display_configuration[:WIDTH] - (hm_space.length + bar.length)
         (bar + hm_space + (line || "")).ljust(just) + hm_space + bar
       end
 
@@ -111,10 +155,6 @@ module Aos
         lines << ""
         lines
       end
-
-      def self.debug_log(lines)
-        Aro::V.say(lines)
-      end
     end
   end
 end

data/sys/aos/vws/dom.rb

@@ -23,7 +23,7 @@ module Aos
         lines << ""
         lines << I18n.t("aos.views.dom.quick_navigation")
         lines << ""
-        lines << "  =>  #{Aro::Dom::D.reserved_words.join("  ")}"
+        lines << "  =>  #{Aro::Dom::D.reserved_words(Aos::Os.instance.you.root?).join("  ")}"
         lines << ""
         draw(lines)
       end

data/sys/aos/vws/games/abot.rb

@@ -0,0 +1,21 @@
+=begin
+
+  vws/games/abot.rb
+
+  the abot view.
+
+  by i2097i
+
+=end
+
+require_relative :"../base".to_s
+
+module Aos
+  module Vw
+    class Abot < Aos::Vw::Base
+      def self.show
+        draw(Aos::Abot.instance.display_lines)
+      end
+    end
+  end
+end

data/sys/aos/vws/games/{game.rb → teck.rb}

@@ -13,24 +13,26 @@ require_relative :"../base".to_s
 
 module Aos
   module Vw
-    class Game < Aos::Vw::Base
+    class Teck < Aos::Vw::Base
 
-      DECK_PARAMS = [
+      TECK_PARAMS = [
         :teck,
         :tlog_records,
         :count_n,
         :order_o,
       ]
 
+      DIV_CHAR = :"."
+
       def self.show
-        unless Aro::Mancy.game.nil?
-          Aro::Mancy.game.show
+        unless Aro::Mancy.teck.nil?
+          Aro::Mancy.teck.show
           return
         end
 
         lines = []
-        lines << I18n.t("aos.views.game.title").center(viewport_width)
-        lines << I18n.t("aos.views.game.description").center(viewport_width)
+        lines << I18n.t("aos.views.game.title").center(Aos::Vw::Base.viewport_width)
+        lines << I18n.t("aos.views.game.description").center(Aos::Vw::Base.viewport_width)
 
         room_def = Aro::Dom::D::WINGS[:GAMES].values.filter{|gr|
           "#{Aos::Vw.name}::#{gr[:name].to_s.downcase.capitalize}" == self.name
@@ -45,27 +47,28 @@ module Aos
 
       def self.show_game(model)
         mk = model.keys
-        dp = Aos::Vw::Game::DECK_PARAMS
+        dp = Aos::Vw::Teck::TECK_PARAMS
         return nil unless (mk & dp).count == dp.count
         return nil unless model.values.all?{|v| v != nil}
 
         teck = model[:teck]
         tlog_records = model[:tlog_records]
+        teck_tlog_count = teck.tlogs.count
         count_n = model[:count_n]
         order_o = model[:order_o]
 
-        dc = Aro::Config.display_configuration
-        width = count_n == Aro::Mancy::S ? viewport_width : dc[:WIDTH]
-        divider = dc[:DIVIDER] * width
+        divider = Aos::Vw::Teck::DIV_CHAR.to_s * Aos::Vw::Base.viewport_width
         lines = []
         lines << divider
-        lines << "#{teck.name.upcase.center(width)}"
+        lines << "#{teck.name.upcase.center(Aos::Vw::Base.viewport_width)}"
         tlog_records.each_with_index{|l, i|
           lines << divider
           lines << ""
-          timestamp = l.created_at.strftime(Aro::Config::DATE_FORMAT)
-          of_text = "#{order_o.to_sym == Aro::Tlog::ORDERING[:DESC] ? teck.tlogs.count - i : 1 + i} of #{teck.tlogs.count}"
-          lines << of_text.ljust(width - timestamp.length) + timestamp
+          timestamp = l.created_at.strftime(Aos::Cor::DATE_FORMAT)
+          of_text = "#{order_o.to_sym == Aro::Tlog::ORDERING[:DESC] ? teck_tlog_count - i : 1 + i} of #{teck_tlog_count}"
+          lines << Aos::Vw::Base.get_body_line(
+            of_text.ljust(Aos::Vw::Base.viewport_width - timestamp.length - Aro::Mancy::OS) + timestamp
+          )
           lines << divider
           cards = Base64::decode64(l.card_data).split(Aro::Teck::CARD_DELIM.to_s)
           if !cards.nil? && cards.any?
@@ -77,7 +80,7 @@ module Aos
           drawn_cards = Base64::decode64(l.drawn_data).split(Aro::Teck::CARD_DELIM.to_s)
           if !drawn_cards.nil? && drawn_cards.any?
             lines << ""
-            lines << I18n.t("cli.messages.history_drawn").center(width)
+            lines << I18n.t("cli.messages.history_drawn").center(Aos::Vw::Base.viewport_width)
             lines << divider
             lines << ""
             lines += self.get_display_for_cards(
@@ -96,7 +99,7 @@ module Aos
 
       def self.get_display_for_cards(input = [])
         columns = Aos::Vw::Base::COL_POW.call(
-          Aro::Config.display_configuration[:WIDTH].to_i
+          Aos::Cor.display_configuration[:WIDTH].to_i
         )
         lines = []
         return lines unless input.any?

data/sys/aos/vws/home.rb

@@ -0,0 +1,23 @@
+=begin
+
+  vws/root/home.rb
+
+  the home view.
+
+  by i2097i
+
+=end
+
+require_relative :"./base".to_s
+
+module Aos
+  module Vw
+    class Home < Aos::Vw::Base
+      def self.show
+        if Aos::Os.instance.you.home?
+          draw(Aos::Cor.instance.display_lines)
+        end
+      end
+    end
+  end
+end

data/sys/aos/vws/root/config.rb

@@ -1,8 +1,8 @@
 =begin
   
-  vws/root/config.rb
+  vws/root/cor.rb
 
-  the config view.
+  the cor view.
 
   by i2097i
 
@@ -12,9 +12,9 @@ require_relative :"../base".to_s
 
 module Aos
   module Vw
-    class Config < Aos::Vw::Base
+    class Cor < Aos::Vw::Base
       def self.show
-        draw(Aro::Config.instance.display_lines)
+        draw(Aos::Cor.instance.display_lines)
       end
     end
   end

data/sys/aos/vws/root/flie.rb

@@ -0,0 +1,21 @@
+=begin
+
+  vws/root/flie.rb
+
+  the flie view.
+
+  by i2097i
+
+=end
+
+require_relative :"../base".to_s
+
+module Aos
+  module Vw
+    class Flie < Aos::Vw::Base
+      def self.show
+        draw(Aos::Flie.instance.display_lines)
+      end
+    end
+  end
+end

data/sys/aos/vws/welcome.rb

@@ -16,13 +16,49 @@ module Aos
       def self.show
         lines = []
 
-        dc = Aro::Config.display_configuration
-        height = dc[:HEIGHT]
+        dc = Aos::Cor.display_configuration
         width = dc[:WIDTH]
 
-
         lines << "welcome to #{Aro::Dom.ethergeist_name}".center(width)
-        lines <<
+        lines << ""
+        hwidth = width - (Aos::Vw::Base::MARGIN_H * Aro::Mancy::OS)
+        lines << "".ljust(hwidth, dc[:DIVIDER])
+        lines << "map".center(hwidth)
+        lines << "".ljust(hwidth, dc[:DIVIDER])
+        lines << ""
+        yous = Aos::You.where(pwd: Aro::Dom.dom_root)
+        dom_line = "#{Aro::Dom.ethergeist_name}"
+        dom_line += (yous.any? ? " [#{yous.map{|y| y.name}.join(" ")}]" : "")
+        lines << dom_line
+        Aro::Dom::D::LAYOUT.values.each{|wing|
+          yous = Aos::You.where(pwd: File.join(Aro::Dom.dom_root, wing[:name].to_s))
+          wing_line = "".ljust(Aro::Mancy::NUMERALS[:IV])
+          wing_line += wing[:name].to_s
+          wing_line += (yous.any? ? " [#{yous.map{|y| y.name}.join(" ")}]" : "")
+          lines << wing_line
+          wing[:rooms].each{|room|
+            yous = Aos::You.where(pwd: File.join(Aro::Dom.dom_root, Aro::Dom.room_path(room[:name])))
+            room_line = "".ljust(Aro::Mancy::NUMERALS[:VIII])
+            room_line += room[:name].to_s
+            room_line += (yous.any? ? " [#{yous.map{|y| y.name}.join(" ")}]" : "")
+            lines << room_line
+          }
+        }
+        lines << ""
+
+        yous = Aos::You.order(access: :desc).all
+        if yous.empty?
+          lines << "no yous."
+        else
+          lines << "".ljust(hwidth, dc[:DIVIDER])
+          lines << "roster".center(hwidth)
+          lines << "".ljust(hwidth, dc[:DIVIDER])
+          lines << ""
+          yous.each{|y|
+            next if y.root? && !Aos::Os.instance.you.root?
+            lines += y.get_lines.map{|l| l.center(hwidth)}
+          }
+        end
         draw(lines)
       end
     end

data/sys/aro/d.rb

@@ -9,16 +9,18 @@
 =end
 
 require_relative :"../shr/prompt".to_s
+require :aro.to_s
 
 module Aro
   class D < Aro::Prompt
     def self.say(message)
       return unless Aro::D.should_print?
-      Aro::P::p.say(">[#{Aro::Mancy::I2097I}]>: #{message}\n")
+      super([">[#{Aro::Mancy::I2097I}]>: #{message}"])
     end
 
     def self.should_print?
-      Aro::Mancy::ARO_ENV_DEBUG_MODES[Aro::Mancy::O].to_s == ENV[:ARO_ENV.to_s]
+      return false unless Aos::Cor.ivar(:ENV).present?
+      Aos::Cor::DBG_MODES.include?(Aos::Cor.ivar(:ENV)&.to_sym)
     end
   end
 end

data/sys/aro/db.rb

@@ -8,6 +8,9 @@
 
 =end
 
+require_relative :"./mancy".to_s
+require_relative :"../aos/cor".to_s
+
 module Aro
   class Db
     include Singleton
@@ -20,13 +23,15 @@ module Aro
 
     def self.load
       Aro::Db.configure_logger
-      if Aro::Mancy.in_aro?
-        self.instance.setup_local_aro
+      Mutex.new.synchronize do
+        if Aro::Mancy.in_aro?
+          self.instance.setup_local_aro
+        end
       end
     end
 
     def self.configure_logger
-      if Aro::Config.ivar(:LOG_ARO_DB).to_s == Aro::Config::BOOLS[:TRUE].to_s
+      if Aos::Cor.ivar(:LOG_ARO_DB).to_s == Aos::Cor::BOOLS[:TRUE].to_s
         ActiveRecord::Base.logger = Logger.new(STDOUT)
       else
         ActiveRecord::Base.logger = nil
@@ -35,11 +40,13 @@ module Aro
 
     def self.base_aro_dir
       base_aro_file = Aro::Mancy::ARO_FILE.to_s
-      Aro::Config.is_test? ? "#{base_aro_file}_test" : base_aro_file
+      return "#{base_aro_file}_#{Aos::Cor::ENVS[:TEST]}" if Aos::Cor.is_test?
+
+      base_aro_file
     end
 
     def db_config_filepath
-      File.join(Aro::Db.base_aro_dir, Aro::Db::DATABASE_YML.to_s)
+      @db_config_filepath ||= File.join(Aro::Db.base_aro_dir, Aro::Db::DATABASE_YML.to_s)
     end
 
     def setup_local_aro
@@ -48,6 +55,7 @@ module Aro
 
       # create local .aro/ directory
       unless File.exist?(Aro::Db.base_aro_dir)
+        Aro::P.say("creating #{Aro::Mancy::ARO_FILE.to_s} directory...")
         FileUtils.mkdir(Aro::Db.base_aro_dir)
       end
 
@@ -57,18 +65,19 @@ module Aro
           adapter: :sqlite3.to_s,
           database: File.join(Aro::Db.base_aro_dir, Aro::Db::SQL_FILE.to_s),
           username: name,
-          password: name
+          password: name,
+          pool: Aos::Os::DB_POOL
         }.to_yaml
         File.open(db_config_filepath, "w") do |file|
           file.write(c)
         end
       end
 
-      connect(name)
+      connect
       migrate(name)
     end
 
-    def connect(name)
+    def connect
       ActiveRecord::Base.establish_connection(
         YAML.load_file(db_config_filepath)
       )
@@ -77,8 +86,8 @@ module Aro
     def migrate(name)
       local_migrate_dir = File.join(Aro::Db.base_aro_dir, Aro::Db::MIGRATIONS_DIR.to_s)
       unless Dir.exist?(local_migrate_dir)
-        gem_dir = Dir[Gem.loaded_specs[:aro.to_s]&.full_gem_path || '.'].first
-        FileUtils.cp_r(File.join(gem_dir, Aro::Db::GEM_DB_PATH.to_s), Aro::Db::base_aro_dir)
+        gem_dir = Dir[Reiquire::GEM_PATH || '.'].first
+        FileUtils.cp_r(File.join(gem_dir, Aro::Db::GEM_DB_PATH.to_s), Aro::Db.base_aro_dir)
       end
 
       migration_version = Dir["#{local_migrate_dir}/*.rb"].map{|n|

data/sys/aro/mancy.rb

@@ -12,7 +12,7 @@ module Aro
   class Mancy
     include Singleton
 
-    attr_accessor :game
+    attr_accessor :current
 
     O  = 0
     S  = 1
@@ -21,14 +21,12 @@ module Aro
     N  = 4
     V  = 5
     PS1 = :">[#{Aro::Mancy.name}]>: "
-    NAME_FILE = :".name"
+    NAME_FILE = :".aro_space"
     ARO_FILE = :".aro"
     I2097I = :i2097i
     YES = :aroyes
     ALL = :all
 
-    ARO_ENV_DEBUG_MODES = [:development, :test]
-
     NUMERALS = {
       O:       0,
       I:       1,
@@ -55,20 +53,16 @@ module Aro
       XXII:    22,
       XXXVII:  37,
       XLII:    42,
+      LX:      60,
       C:       100,
       MMXCVII: Aro::Mancy::I2097I[Aro::Mancy::S..Aro::Mancy::N].to_i,
     }
 
-    def initialize
+    def self.teck
       if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
-        Aro::Config.instance.load
-        Aro::Mancy.init
-        self.game = Aro::Teck.current_teck
+        self.instance.current = Aro::Teck.current_teck
       end
-    end
-
-    def self.game
-      Aro::Mancy.instance.game
+      self.instance.current
     end
 
     def self.create(name)
@@ -77,7 +71,6 @@ module Aro
       # explicitly only allow String/Symbol types for name
       return false unless name.kind_of?(String) || name.kind_of?(Symbol)
       name = name.to_s.strip
-      
       # create the new aro directory and database
       if !Dir.exist?(name)
         Aro::P.say(I18n.t("cli.messages.no_tecks"))
@@ -86,18 +79,23 @@ module Aro
         return false
       end
 
-      # create name file
-      File.open(File.join(name, Aro::Mancy::NAME_FILE.to_s), "w+") do |file|
-        file.write(name)
-      end
-
       Dir.chdir(name) do
+        Aos::Cor.instance.load
         Aro::Mancy.init
       end
       return true
     end
 
     def self.init
+      unless Aro::Mancy.in_aro? || Aos::Cor.is_test?
+        Aro::P.say("init aro running in present directory...")
+        new_name = File.basename(Dir.pwd)
+        Aro::P.say("echo #{new_name} > #{Aro::Mancy::NAME_FILE.to_s}")
+        File.open(Aro::Mancy::NAME_FILE.to_s, "w") do |file|
+          file.write(new_name)
+        end
+      end
+
       Aro::Db.load
     end
 
@@ -114,8 +112,6 @@ module Aro
     end
 
     def self.aro_mancy_name
-      return nil unless Aro::Mancy.in_aro?
-
       File.read(Aro::Mancy::NAME_FILE.to_s).strip
     end
   end

data/sys/aro/models/base_model.rb

@@ -0,0 +1,13 @@
+=begin
+
+  aro/base_model.rb
+
+  aro base_model object.
+
+  by i2097i
+
+=end
+
+class Aro::BaseModel < ActiveRecord::Base
+
+end