aro 0.2.2 → 0.2.3

data/sys/aro/models/teck.rb

@@ -9,19 +9,20 @@
 =end
 
 require :base64.to_s
+require_relative :"./base_model".to_s
 
 class Aro::Teck < ActiveRecord::Base
   has_many :tlogs
 
-  DECK_FILE = :".teck"
+  TECK_FILE = :".aro_teck"
   CARD_DELIM = :","
 
   before_create :populate_cards
   after_commit :generate_log
 
   def self.make(new_name)
-    return nil unless Aro::Mancy.is_initialized?
     Aro::Db.load
+    return nil unless Aro::Mancy.is_initialized?
     new_teck = Aro::Teck.create(name: new_name)
     Aro::Teck.select_teck(new_teck) if Aro::Teck.current_teck.nil?
     new_teck
@@ -32,6 +33,7 @@ class Aro::Teck < ActiveRecord::Base
   end
 
   def populate_cards
+    Aro::Db.load
     self.cards = Aro::Teck.fresh_cards
   end
 
@@ -59,14 +61,15 @@ class Aro::Teck < ActiveRecord::Base
   def self.select_teck(teck)
     return unless teck.present?
     Aro::P.say(I18n.t("cli.messages.teck_selected", name: teck.name, room: Aro::Mancy::aro_mancy_name))
-    File.open(Aro::Teck::DECK_FILE.to_s, "w") do |file|
+    File.open(File.join(Aro::Db.base_aro_dir, Aro::Teck::TECK_FILE.to_s), "w") do |file|
       file.write(teck.id)
     end
   end
 
   def self.current_teck
-    if File.exist?(DECK_FILE.to_s)
-      current_teck_id = File.read(DECK_FILE.to_s)
+    Aro::Db.load
+    if File.exist?(File.join(Aro::Db.base_aro_dir, TECK_FILE.to_s))
+      current_teck_id = File.read(File.join(Aro::Db.base_aro_dir, TECK_FILE.to_s))
       return Aro::Teck.find_by(id: current_teck_id)
     end
   end
@@ -76,14 +79,15 @@ class Aro::Teck < ActiveRecord::Base
   end
 
   def show(count_n: Aro::Mancy::S, order_o: Aro::Tlog::ORDERING[:DESC])
+    tlogs_count = tlogs.count
     unless count_n.kind_of?(Numeric) && count_n.to_i > Aro::Mancy::O
       if count_n&.to_s&.to_sym == Aro::Mancy::ALL
-        count_n = tlogs.count
+        count_n = tlogs_count
       else
         count_n = Aro::Mancy::S
       end
     end
-    count_n = [[Aro::Mancy::S, count_n.to_i].max, tlogs.count].min
+    count_n = [[Aro::Mancy::S, count_n.to_i].max, tlogs_count].min
     Aro::V.say("count_n: #{count_n}")
     Aro::V.say("order_o: #{order_o}")
 
@@ -98,12 +102,12 @@ class Aro::Teck < ActiveRecord::Base
     # todo: this is doing more work than it needs to. needs debugging.
     # Aro::V.say("tlog_records.count: #{tlog_records.count}")
 
-    # for now tests just expect text output
-    return tlog_records if Aro::Config.is_test?
+    # for now tests just expect count
+    return tlog_records if Aos::Cor.is_test?
 
     Aro::D.say(I18n.t("cli.messages.showing", name: name, count: count_n, order: order_o))
 
-    Aos::Vw::Game.show_game({
+    Aos::Vw::Teck.show_game({
       teck: self,
       tlog_records: tlog_records,
       count_n: count_n,
@@ -113,11 +117,11 @@ class Aro::Teck < ActiveRecord::Base
 
   def explore
     # allows user to browse each card in the current teck.
-    answer = Aro::P.p.select(
+    answer = Aos::S.p.select(
       Aro::Mancy::PS1.to_s + I18n.t("cli.messages.choose_card"),
       # formatted for tty-prompt gem
       cards.split(Aro::Teck::CARD_DELIM.to_s).map{|c| [I18n.t("cards.#{Aro::Teck.card_strip(c)}.name"), c]}.to_h,
-      per_page: Aro::Config.display_configuration[:HEIGHT] - Aro::Mancy::S,
+      per_page: Aos::Cor.display_configuration[:HEIGHT] - Aro::Mancy::S,
       cycle: true,
       default: Aro::Mancy::S
     )

data/sys/aro/models/tlog.rb

@@ -11,10 +11,11 @@
 require_relative :"./teck".to_s
 
 class Aro::Tlog < ActiveRecord::Base
-  belongs_to :teck, :class_name => :"#{Aro::Teck.name}".to_s
+  belongs_to :teck
 
   ORDERING = {
     ASC: :asc,
     DESC: :desc
   }
+
 end

data/sys/aro/p.rb

@@ -17,7 +17,7 @@ module Aro
       if Aro::Mancy.in_aro? && !Aro::T.is_dev_tarot?
         Aro::R.say(message)
       else
-        Aro::P::p.say("#{Aro::Mancy::PS1}#{message}")
+        super(["#{Aro::Mancy::PS1}#{message}"])
       end
     end
   end

data/sys/aro/r.rb

@@ -12,8 +12,9 @@ require_relative :"../shr/prompt".to_s
 
 module Aro
   class R < Aro::Prompt
+    PS1 = :">[#{Aro::T::RUBY_FACOT}]>:"
     def self.say(message)
-      Aro::P::p.say(">[#{Aro::T::RUBY_FACOT}]>: #{message}\n")
+      super(["#{Aro::R::PS1} #{message}"])
     end
   end
 end

data/sys/aro/v.rb

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

data/sys/cli/constants.rb

@@ -24,21 +24,15 @@ module CLI
   }
 
   CMDS = {
-    AOS: {
-      RUN: :run,
-      WATCH: :watch,
-    },
     ARO: {
       CREATE: :create,
-      CONFIG: :config,
-      DECK: :teck,
+      COR: :cor,
+      TECK: :teck,
       DOM: :dom,
       INIT: :init,
     },
-    CONFIG: {
-      # ...
-    },
-    DECK: {
+    COR: {}, # see Aos::Cor
+    TECK: {
       DRAW: :draw,
       EXPLORE: :explore,
       NEW: :new,

data/sys/cli/create.rb

@@ -1,15 +1,14 @@
 =begin
   
-  aro.rb
+  create.rb
 
-  process aro commands.
+  create aro space.
 
   by i2097i
 
 =end
 
 module CLI
-  # cli entrypoint
   def self.create
     CLI::Nterface.exit_error_missing_args! if CLI::ARGV1.nil?
     

data/sys/cli/dom.rb

@@ -25,8 +25,7 @@ module CLI
       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(ARGV[Aro::Mancy::OS], ARGV[Aro::Mancy::E])
+        Aro::Dom.instance.generate(ARGV[Aro::Mancy::OS], ARGV[Aro::Mancy::E])
       else
         CLI::Nterface.exit_error_invalid_usage!
       end

data/sys/cli/teck.rb

@@ -9,8 +9,8 @@
 =end
 
 module CLI
-  # cli entrypoint
   def self.teck
+    Aro::Mancy.init
     action = CLI::ARGV1&.to_sym
 
     if CLI::FLAGS[:HELP].include?(action.to_s)
@@ -20,63 +20,56 @@ module CLI
     elsif action.nil? || action == :aos
       # no args, open teck menu
       if Aro::Mancy.in_aro?
-        Aro::Db.load
         Aro::Teck.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]
+    elsif action == CLI::CMDS[:TECK][:NEW]
       CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
       if Aro::Mancy.in_aro?
-        Aro::Db.load
         teck = Aro::Teck.make(CLI::ARGV2.to_s)
         Aro::P.say(I18n.t("cli.messages.teck_created_sucessfully", name: teck.name))
         Aro::Teck.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?
+    elsif CLI::CMDS[:TECK].values.include?(action)
+      if Aro::Mancy.teck.nil?
         Aro::P.say(I18n.t("cli.errors.missing_teck", cmd: Aro::Mancy::I2097I))
         exit(CLI::EXIT_CODES[:GENERAL_ERROR])
       end
 
       case action
-      when CLI::CMDS[:DECK][:EXPLORE]
-        Aro::Mancy.game.explore
+      when CLI::CMDS[:TECK][:EXPLORE]
+        Aro::Mancy.teck.explore
         exit(CLI::EXIT_CODES[:SUCCESS])
-      when CLI::CMDS[:DECK][:SHUFFLE]
-        Aro::P.say(I18n.t("cli.messages.shuffling", name: Aro::Mancy.game.name))
-        Aro::Mancy.game.shuffle
-      when CLI::CMDS[:DECK][:DRAW]
-        Aro::P.say(I18n.t("cli.messages.drawing", name: Aro::Mancy.game.name))
-        Aro::P.say(I18n.t("cli.messages.drawing_from_dimension", dimension: "#{Aro::Config.ivar(:DIMENSION)}"))
-        Aro::Mancy.game.draw(
+      when CLI::CMDS[:TECK][:SHUFFLE]
+        Aro::P.say(I18n.t("cli.messages.shuffling", name: Aro::Mancy.teck.name))
+        Aro::Mancy.teck.shuffle
+      when CLI::CMDS[:TECK][:DRAW]
+        Aro::P.say(I18n.t("cli.messages.drawing", name: Aro::Mancy.teck.name))
+        Aro::P.say(I18n.t("cli.messages.drawing_from_dimension", dimension: "#{Aos::Cor.ivar(:DIMENSION)}"))
+        Aro::Mancy.teck.draw(
           is_dt_dimension: Aro::T::is_dev_tarot?,
-          z_max: Aro::Config.ivar(:Z_MAX).to_i,
-          z: Aro::Config.ivar(:Z)
+          z_max: Aos::Cor.ivar(:Z_MAX).to_i,
+          z: Aos::Cor.ivar(:Z)
         )
-      when CLI::CMDS[:DECK][:REPLACE]
-        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("#{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))
+      when CLI::CMDS[:TECK][:REPLACE]
+        Aro::P.say(I18n.t("cli.messages.replacing_drawn", name: Aro::Mancy.teck.name))
+        Aro::Mancy.teck.replace
+      when CLI::CMDS[:TECK][:RESET]
+        Aro::P.say("#{I18n.t("cli.messages.confirmation_prompt", name: Aro::Mancy.teck.name)}")
+        Aro::P.say("\n")
+        if Aro::Mancy::YES.to_s != Aos::S.p.ask("\n#{Aro::Mancy::PS1}$")
+          Aro::P.say(I18n.t("cli.messages.understood", name: Aro::Mancy.teck.name))
           exit(CLI::EXIT_CODES[:SUCCESS])
         end
 
-        Aro::P.say(I18n.t("cli.messages.resetting", name: Aro::Mancy.game.name))
-        Aro::Mancy.game.reset
+        Aro::P.say(I18n.t("cli.messages.resetting", name: Aro::Mancy.teck.name))
+        Aro::Mancy.teck.reset
       end
-
-      if ARGV.include?(:aos.to_s)
-        # run silent
-        exit(CLI::EXIT_CODES[:SUCCESS])
-      end
-
-      Aro::Mancy.game.show(**CLI::shoptions)
+      Aro::Mancy.teck.show(**CLI::shoptions)
     else
-      Aro::Db.load
       Aro::Teck.select_teck(
         Aro::Teck.find_by(name: action)
       )

data/sys/cli.rb

@@ -9,18 +9,16 @@
 =end
 
 module CLI
-  # todo: set an Aro::Mancy.instance.you variable here:
-  argv_sanitized = Aos::Os.sanitize_you(ARGV.join(" ")).split(" ")
-
-  if CLI::CMDS[:DECK].values.include?(argv_sanitized[0]&.to_sym)
+  # todo: make this filtering better. dom uses :new as well
+  if CLI::CMDS[:TECK].values.filter{|k| ![:new].include?(k)}.include?(ARGV[0]&.to_sym)
     # enable teck shortcut (skip typing teck while in-game)
     ARGV0 = :teck
-    ARGV1 = argv_sanitized[0]&.to_sym
-    ARGV2 = argv_sanitized[1]&.to_sym
+    ARGV1 = ARGV[0]&.to_sym
+    ARGV2 = ARGV[1]&.to_sym
   else
     # default
-    ARGV0 = argv_sanitized[0]&.to_sym
-    ARGV1 = argv_sanitized[1]&.to_sym
-    ARGV2 = argv_sanitized[2]&.to_sym
+    ARGV0 = ARGV[0]&.to_sym
+    ARGV1 = ARGV[1]&.to_sym
+    ARGV2 = ARGV[2]&.to_sym
   end
 end

data/sys/dom/d.rb

@@ -13,14 +13,27 @@ require_relative :"../shr/prompt".to_s
 
 module Aro
   class Dom::D
-    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}
-      }
+    include Singleton
+
+    attr_accessor :reserved_words_def
+
+    def self.reserved_words(include_root = false)
+      if Aro::Dom::D.instance.reserved_words_def.nil?
+
+        reserved = []
+        Aro::Dom::D::LAYOUT.values.each{|wing|
+          if wing == Aro::Dom::D::LAYOUT[:ROOT]&& !include_root
+            next
+          end
+
+          reserved << wing[:name].to_s
+          wing[:rooms].each{|room| reserved << room[:name].to_s}
+        }
 
-      reserved.sort
+        Aro::Dom::D.instance.reserved_words_def = reserved.sort
+      end
+
+      return Aro::Dom::D.instance.reserved_words_def
     end
 
     # definition of rooms in each layout wing
@@ -38,23 +51,12 @@ module Aro
         },
       },
       GAMES: {
-        ABPPS: {
-          name: Aro::Dom::ABPPS,
-          description: I18n.t("dom.rooms.abpps.description"),
-        },
-        HBPPS: {
-          name: Aro::Dom::HBPPS,
-          description: I18n.t("dom.rooms.hbpps.description"),
-        },
-        SHPPS: {
-          name: Aro::Dom::SHPPS,
-          description: I18n.t("dom.rooms.shpps.description"),
-        },
-        VIPPS: {
-          name: Aro::Dom::VIPPS,
-          description: I18n.t("dom.rooms.vipps.description"),
+        ABOT: {
+          name: Aro::Dom::ABOT,
+          description: I18n.t("dom.rooms.abot.description"),
         },
       },
+      HOME: {},
       KNOW: {
         BODY: {
           name: Aro::Dom::BODY,
@@ -74,14 +76,18 @@ module Aro
           name: Aro::Dom::AMG,
           description: I18n.t("dom.rooms.amg.description"),
         },
-        CONFIG: {
-          name: Aro::Dom::CONFIG,
+        COR: {
+          name: Aro::Dom::COR,
           description: I18n.t("dom.rooms.config.description"),
         },
         DATA: {
           name: Aro::Dom::DATA,
           description: I18n.t("dom.rooms.data.description"),
         },
+        FLIE: {
+          name: Aro::Dom::FLIE,
+          description: I18n.t("dom.rooms.flie.description"),
+        }
       },
     }
 
@@ -99,12 +105,14 @@ module Aro
         name: Aro::Dom::GAMES,
         description: I18n.t("dom.wings.games.description"),
         rooms: [
-          Aro::Dom::D::WINGS[:GAMES][:ABPPS],
-          Aro::Dom::D::WINGS[:GAMES][:HBPPS],
-          Aro::Dom::D::WINGS[:GAMES][:SHPPS],
-          Aro::Dom::D::WINGS[:GAMES][:VIPPS],
+          Aro::Dom::D::WINGS[:GAMES][:ABOT],
         ],
       },
+      HOME: {
+        name: Aro::Dom::HOME,
+        description: I18n.t("dom.wings.home.description"),
+        rooms: [],
+      },
       KNOW: {
         name: Aro::Dom::KNOW,
         description: I18n.t("dom.wings.know.description"),
@@ -119,8 +127,9 @@ module Aro
         description: I18n.t("dom.wings.root.description"),
         rooms: [
           Aro::Dom::D::WINGS[:ROOT][:AMG],
-          Aro::Dom::D::WINGS[:ROOT][:CONFIG],
+          Aro::Dom::D::WINGS[:ROOT][:COR],
           Aro::Dom::D::WINGS[:ROOT][:DATA],
+          Aro::Dom::D::WINGS[:ROOT][:FLIE],
         ],
       }
     }

data/sys/dom/dom.rb

@@ -10,7 +10,11 @@
 
 module Aro
   class Dom
-    PS1 = :">[#{Aro::Dom.name}]>: "
+    include Singleton
+
+    attr_accessor :eg_path, :is_initializing
+
+    PS1 = :">[#{Aro::Dom.name}]>:"
     DOT = :"."
     DOTT = :"#{DOT}#{DOT}"
     ETHERGEIST = :eg
@@ -22,6 +26,7 @@ module Aro
     # < user spaces
     WELCOME = :welcome
     GAMES = :games
+    HOME = :home
     KNOW = :know
     ROOT = :root
 
@@ -30,10 +35,7 @@ module Aro
     WINNER = :winner
     
     # > game spaces
-    ABPPS = :abpps
-    HBPPS = :hbpps
-    SHPPS = :shpps
-    VIPPS = :vipps
+    ABOT = :abot
 
     # > know spaces
     BODY = :body
@@ -43,10 +45,15 @@ module Aro
 
     # > root spaces
     AMG = :amg
-    CONFIG = :config
+    COR = :cor
     DATA = :data
+    FLIE = :flie
     # ...
 
+    def initialize
+      self.is_initializing = false
+    end
+
     def self.create(name)
       if Dir.exist?(name) || File.exist?(name)
         Aro::Dom::P.say(I18n.t("dom.errors.failed_directory_exists", name: name))
@@ -69,9 +76,15 @@ module Aro
     end
 
     def self.is_initialized?
-      return false if !Aro::Dom.in_arodom?
+      return false if !Aro::Dom.in_arodom? || self.instance.is_initializing
 
-      File.exist?(File.join(Aro::Dom.room_path(:data), Aos::Db::SQL_FILE.to_s))
+      File.exist?(
+        File.join(
+          Aro::Dom.dom_root,
+          Aro::Dom.room_path(:data),
+          Aos::Db::SQL_FILE.to_s
+        )
+      )
     end
 
     def self.domain
@@ -107,19 +120,22 @@ module Aro
     end
 
     def self.ethergeist_path
-      path = nil
-      search_path = Dir.pwd.split("/").reject{|p| p.empty?}
-      search_pwd = "/"
-
-      search_path.any?{|step|
-        search_pwd = File.join(search_pwd, step)
-        ls = Dir.glob("#{search_pwd}/#{ETHER_FILE}", File::FNM_DOTMATCH)
-
-        path = ls.first if ls.any?
-        !path.nil?
-      }
+      if self.instance.eg_path.nil?
+        path = nil
+        search_path = Dir.pwd.split("/").reject{|p| p.empty?}
+        search_pwd = "/"
+        search_path.any?{|step|
+          search_pwd = File.join(search_pwd, step)
+          ls = Dir.glob("#{search_pwd}/#{ETHER_FILE}", File::FNM_DOTMATCH)
+
+          path = ls.first if ls.any?
+          !path.nil?
+        }
+
+        self.instance.eg_path = path unless path.nil?
+      end
 
-      return path
+      return self.instance.eg_path
     end
 
     def self.ethergeist_name
@@ -133,22 +149,39 @@ module Aro
     end
 
     def generate(r_you, r_password)
-      unless r_password.present?
-        Aro::Dom::P.say("missing password argument.")
+      if r_you.nil? || r_you.empty?
+        Aro::Dom::P.say(I18n.t("dom.messages.missing_root_username"))
+        return
+      end
+
+      if r_password.nil? || r_password.empty?
+        Aro::Dom::P.say(I18n.t("dom.messages.missing_root_password"))
         return
       end
 
       unless Aro::Dom.in_arodom?
-        Aro::Dom::P.say("unable to init arodom here.")
+        Aro::Dom::P.say(I18n.t("dom.errors.failed_already_initialized"))
         return
       end
 
-      # todo: add file permissions to Aro::Dom::ARODOME and all WINGS
+      self.is_initializing = true
       Aro::Dom::P.say(I18n.t("dom.messages.generating_wings"))
       Aro::Dom::D::LAYOUT.values.each{|w| generate_wing w}
+      # generate a dom aro instance and teck named same as dom
+      Dir.chdir(Aro::Dom.ethergeist_path) do
+        Aro::Dom::P.say(I18n.t("dom.messages.generating_dom_aro"))
+        Aro::Mancy.init
+        Aro::Teck.select_teck(
+          Aro::Teck.make(Aro::Dom.ethergeist_name)
+        )
+      end
       Aos::Db.load(r_password)
       Aos::You.create(name: r_you, access: :root)
       Aro::Dom::P.say(I18n.t("dom.messages.initialization_complete", name: Aro::Dom.name))
+      # todo: make this better and make an initial commit
+      system(:"git init".to_s) if `which git`&.strip&.split("/")&.include?(:git.to_s)
+
+      self.is_initializing = false
     end
 
     def generate_wing(wing)
@@ -160,26 +193,19 @@ module Aro
     end
 
     def generate_room(wing, room)
-      return unless Aro::Dom::D::WINGS[wing[:name].upcase].values.include?(room)
+      return unless Aro::Dom::D::WINGS[wing[:name].upcase].values.include?(room) ||
+        wing[:name] == Aro::Dom::HOME
 
       Aro::Dom::P.say(I18n.t("dom.messages.generating_room", room: room[:name].to_s))
 
-      room_path = File.join(wing[:name].to_s, room[:name].to_s)
-      FileUtils.mkdir(room_path)
+      r_path = File.join(wing[:name].to_s, room[:name].to_s)
+      FileUtils.mkdir(r_path)
 
       if wing[:name] == Aro::Dom::GAMES
-        File.open(File.join(room_path, Aro::Mancy::NAME_FILE.to_s), "w") do |f|
+        File.open(File.join(r_path, Aro::Mancy::NAME_FILE.to_s), "w") do |f|
           f.write(room[:name])
         end
       end
     end
-
-    def self.ethergeist_name
-      File.read(
-        File.join(
-          Aro::Dom.ethergeist_path, Aro::Mancy::NAME_FILE.to_s
-        )
-      )
-    end
   end
 end # aroadhome

data/sys/dom/p.rb

@@ -11,7 +11,7 @@
 module Aro
   class Dom::P < Aro::Prompt
     def self.say(message)
-      Aro::Dom::P.p.say("#{Aro::Dom::PS1}#{message}")
+      super(["#{Aro::Dom::PS1}#{message}"])
     end
   end
 end