aro 0.2.0 → 0.2.2

data/sys/aos/{views → vws}/know.rb

@@ -1,6 +1,6 @@
 =begin
 
-  views/know.rb
+  vws/know.rb
 
   the know view.
 
@@ -11,8 +11,8 @@
 require_relative :"./base".to_s
 
 module Aos
-  module Vi
-    class Know < Aos::Vi::Base
+  module Vw
+    class Know < Aos::Vw::Base
 
     end
   end

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

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

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

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

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

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

data/sys/aos/{views/setup.rb → vws/root.rb}

@@ -1,8 +1,8 @@
 =begin
 
-  views/setup.rb
+  vws/root.rb
 
-  the setup view.
+  the root view.
 
   by i2097i
 
@@ -11,8 +11,8 @@
 require_relative :"./base".to_s
 
 module Aos
-  module Vi
-    class Setup < Aos::Vi::Base
+  module Vw
+    class Root < Aos::Vw::Base
 
     end
   end

data/sys/aos/vws/welcome/waite.rb

@@ -0,0 +1,31 @@
+=begin
+
+  vws/welcome/waite.rb
+
+  the welcome waite view.
+
+  by i2097i
+
+=end
+
+require_relative :"../base".to_s
+
+module Aos
+  module Vw
+    class Waite < Aos::Vw::Base
+      def self.show
+        # print all commands
+        lines = []
+        lines << ""
+        lines << I18n.t("aos.constants.commands")
+        lines << ""
+        Aos::Os::CMDS.values.each{|v|
+          lines += lines_for_cmd(v)
+        }
+
+        # draw output
+        draw(lines)
+      end
+    end
+  end
+end

data/sys/aos/{views → vws}/welcome/winner.rb

@@ -1,6 +1,6 @@
 =begin
 
-  views/welcome/winner.rb
+  vws/welcome/winner.rb
 
   the welcome winner view.
 
@@ -11,8 +11,8 @@
 require_relative :"../base".to_s
 
 module Aos
-  module Vi
-    class Winner < Aos::Vi::Base
+  module Vw
+    class Winner < Aos::Vw::Base
 
     end
   end

data/sys/aos/vws/welcome.rb

@@ -0,0 +1,30 @@
+=begin
+
+  vws/welcome.rb
+
+  the welcome view.
+
+  by i2097i
+
+=end
+
+require_relative :"./base".to_s
+
+module Aos
+  module Vw
+    class Welcome < Aos::Vw::Base
+      def self.show
+        lines = []
+
+        dc = Aro::Config.display_configuration
+        height = dc[:HEIGHT]
+        width = dc[:WIDTH]
+
+
+        lines << "welcome to #{Aro::Dom.ethergeist_name}".center(width)
+        lines <<
+        draw(lines)
+      end
+    end
+  end
+end

data/{db/migrate/1763374647_create_decks.rb → sys/aro/db/migrate/1763374647_create_tecks.rb}

@@ -1,7 +1,7 @@
-class CreateDecks < ActiveRecord::Migration[8.1]
+class CreateTecks < ActiveRecord::Migration[8.1]
 
   def self.up
-    create_table :decks do |t|
+    create_table :tecks do |t|
       t.string :name
       t.string :cards, null: false, default: ""
       t.string :drawn, null: false, default: ""
@@ -9,12 +9,12 @@ class CreateDecks < ActiveRecord::Migration[8.1]
       t.timestamps
     end
 
-    add_index :decks, :name, unique: true
+    add_index :tecks, :name, unique: true
   end
 
   def self.down
-    remove_index :decks, :name
-    drop_table :decks
+    remove_index :tecks, :name
+    drop_table :tecks
   end
 
 end

data/sys/aro/db/migrate/1763432541_create_tlogs.rb

@@ -0,0 +1,20 @@
+class CreateTlogs < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :tlogs do |t|
+      t.string :card_data
+      t.string :drawn_data
+
+      t.timestamps
+    end
+
+    add_column :tlogs, :teck_id, :integer
+    add_index :tlogs, :teck_id
+  end
+
+  def self.down
+    remove_index :tlogs, :teck_id
+    drop_table :tlogs
+  end
+
+end

data/sys/aro/db.rb

@@ -10,37 +10,32 @@
 
 module Aro
   class Db
+    include Singleton
+
     DATABASE_YML = :"database.yml"
-    SQL_FILE = :"database.sql"
-    SCHEMA_FILE = :"schema.rb"
+    GEM_DB_PATH = :"sys/aro/db"
     MIGRATIONS_DIR = :"db/migrate"
+    SCHEMA_FILE = :"schema.rb"
+    SQL_FILE = :"aro.sql"
 
-    def initialize
+    def self.load
       Aro::Db.configure_logger
       if Aro::Mancy.in_aro?
-        setup_local_aro
+        self.instance.setup_local_aro
       end
     end
 
     def self.configure_logger
-      if CLI::Config.ivar(:LOG_ARO_DB).to_s == CLI::Config::BOOLS[:TRUE].to_s
+      if Aro::Config.ivar(:LOG_ARO_DB).to_s == Aro::Config::BOOLS[:TRUE].to_s
         ActiveRecord::Base.logger = Logger.new(STDOUT)
       else
         ActiveRecord::Base.logger = nil
       end
     end
 
-    def connect(name)
-      ActiveRecord::Base.establish_connection(config)
-    end
-
-    def config
-      @config ||= YAML.load_file(db_config_filepath)
-    end
-
     def self.base_aro_dir
       base_aro_file = Aro::Mancy::ARO_FILE.to_s
-      CLI::Config.is_test? ? "#{base_aro_file}_test" : base_aro_file
+      Aro::Config.is_test? ? "#{base_aro_file}_test" : base_aro_file
     end
 
     def db_config_filepath
@@ -73,11 +68,17 @@ module Aro
       migrate(name)
     end
 
+    def connect(name)
+      ActiveRecord::Base.establish_connection(
+        YAML.load_file(db_config_filepath)
+      )
+    end
+
     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, "db"), Aro::Db::base_aro_dir)
+        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

@@ -61,8 +61,9 @@ module Aro
 
     def initialize
       if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
+        Aro::Config.instance.load
         Aro::Mancy.init
-        self.game = Aro::Deck.current_deck
+        self.game = Aro::Teck.current_teck
       end
     end
 
@@ -79,7 +80,7 @@ module Aro
       
       # create the new aro directory and database
       if !Dir.exist?(name)
-        Aro::P.say(I18n.t("cli.messages.no_decks"))
+        Aro::P.say(I18n.t("cli.messages.no_tecks"))
         FileUtils.mkdir(name)
       else
         return false
@@ -97,7 +98,7 @@ module Aro
     end
 
     def self.init
-      Aro::Db.new
+      Aro::Db.load
     end
 
     def self.is_initialized?

data/sys/{models/deck.rb → aro/models/teck.rb}

@@ -1,20 +1,19 @@
 =begin
 
-  deck.rb
+  teck.rb
 
-  deck object.
+  teck object.
 
   by i2097i
 
 =end
 
 require :base64.to_s
-require_relative :"../shr/t".to_s
 
-class Aro::Deck < ActiveRecord::Base
-  has_many :logs
+class Aro::Teck < ActiveRecord::Base
+  has_many :tlogs
 
-  DECK_FILE = :".deck"
+  DECK_FILE = :".teck"
   CARD_DELIM = :","
 
   before_create :populate_cards
@@ -22,28 +21,24 @@ class Aro::Deck < ActiveRecord::Base
 
   def self.make(new_name)
     return nil unless Aro::Mancy.is_initialized?
-    Aro::Db.new
-    new_deck = Aro::Deck.create(name: new_name)
-    if Aro::Deck.current_deck.nil?
-      File.open(Aro::Deck::DECK_FILE.to_s, "w") do |file|
-        file.write(new_deck.id)
-      end
-    end
-    new_deck
+    Aro::Db.load
+    new_teck = Aro::Teck.create(name: new_name)
+    Aro::Teck.select_teck(new_teck) if Aro::Teck.current_teck.nil?
+    new_teck
   end
 
   def self.fresh_cards
-    I18n.t("cards.index").map{|c| "+#{c}"}.join(Aro::Deck::CARD_DELIM.to_s)
+    I18n.t("cards.index").map{|c| "+#{c}"}.join(Aro::Teck::CARD_DELIM.to_s)
   end
 
   def populate_cards
-    self.cards = Aro::Deck.fresh_cards
+    self.cards = Aro::Teck.fresh_cards
   end
 
   def generate_log
-    prev_cards = Base64::decode64(logs.last.card_data) if logs.any?
+    prev_cards = Base64::decode64(tlogs.last.card_data) if tlogs.any?
     if (prev_cards.present? && prev_cards != cards) || (prev_cards.nil? || prev_cards.empty?)
-      logs.create(
+      tlogs.create(
         card_data: Base64::encode64(cards || ""),
         drawn_data: Base64::encode64(drawn || "")
       )
@@ -51,29 +46,28 @@ class Aro::Deck < ActiveRecord::Base
   end
 
   def self.display_selection_menu
-    unless Aro::Deck.any?
-      Aro::P.say(I18n.t("cli.messages.no_decks"))
+    unless Aro::Teck.any?
+      Aro::P.say(I18n.t("cli.messages.no_tecks"))
       exit(CLI::EXIT_CODES[:SUCCESS])
     end
-
-    choose_deck_text = Aro::Mancy::PS1.to_s + I18n.t("cli.messages.choose_deck")
-    selection = Aro::P.p.select(choose_deck_text) do |menu|
-      Aro::Deck.all.each{|d|
-        if d.id == Aro::Deck.current_deck&.id
-          menu.default d.id
-        end
-        menu.choice(d.name, d.id)
-      }
+    c_d = Aro::Teck.current_teck
+    Aro::Teck.all.each do |d|
+      Aro::P.say("#{d.id == c_d.id ? :*.to_s : " "}#{d.id}): #{d.name}")
     end
-    File.open(Aro::Deck::DECK_FILE.to_s, "w") do |file|
-      file.write(selection)
+  end
+
+  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.write(teck.id)
     end
   end
 
-  def self.current_deck
+  def self.current_teck
     if File.exist?(DECK_FILE.to_s)
-      current_deck_id = File.read(DECK_FILE.to_s)
-      return Aro::Deck.find_by(id: current_deck_id)
+      current_teck_id = File.read(DECK_FILE.to_s)
+      return Aro::Teck.find_by(id: current_teck_id)
     end
   end
 
@@ -81,54 +75,54 @@ class Aro::Deck < ActiveRecord::Base
     card.gsub(/[+-]/, "").strip
   end
 
-  def show(count_n: Aro::Mancy::S, order_o: Aro::Log::ORDERING[:DESC])
+  def show(count_n: Aro::Mancy::S, order_o: Aro::Tlog::ORDERING[:DESC])
     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 = logs.count
+        count_n = tlogs.count
       else
         count_n = Aro::Mancy::S
       end
     end
-    count_n = [[Aro::Mancy::S, count_n.to_i].max, logs.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}")
 
-    unless Aro::Log::ORDERING.values.include?(order_o)
+    unless Aro::Tlog::ORDERING.values.include?(order_o)
       Aro::P.say(I18n.t("cli.warnings.invalid_order"))
-      order_o = Aro::Log::ORDERING[:DESC]
+      order_o = Aro::Tlog::ORDERING[:DESC]
     end
 
     # perform query
-    h_logs = logs.order(created_at: order_o).first(count_n)
+    tlog_records = tlogs.order(created_at: order_o).first(count_n)
 
     # todo: this is doing more work than it needs to. needs debugging.
-    # Aro::V.say("h_logs.count: #{h_logs.count}")
+    # Aro::V.say("tlog_records.count: #{tlog_records.count}")
 
     # for now tests just expect text output
-    return h_logs if CLI::Config.is_test?
+    return tlog_records if Aro::Config.is_test?
 
     Aro::D.say(I18n.t("cli.messages.showing", name: name, count: count_n, order: order_o))
 
-    Aos::Vi::Game.show_game({
-      deck: self,
-      h_logs: h_logs,
+    Aos::Vw::Game.show_game({
+      teck: self,
+      tlog_records: tlog_records,
       count_n: count_n,
       order_o: order_o
     })
   end
 
   def explore
-    # allows user to browse each card in the current deck.
+    # allows user to browse each card in the current teck.
     answer = Aro::P.p.select(
       Aro::Mancy::PS1.to_s + I18n.t("cli.messages.choose_card"),
       # formatted for tty-prompt gem
-      cards.split(Aro::Deck::CARD_DELIM.to_s).map{|c| [I18n.t("cards.#{Aro::Deck.card_strip(c)}.name"), c]}.to_h,
-      per_page: CLI::Config.display_config[:HEIGHT] - Aro::Mancy::S,
+      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,
       cycle: true,
       default: Aro::Mancy::S
     )
     # {name: "four of swords", tag_list: ["lord of rest from strife", "libra", "jupiter", "introspection", "recuperation", "regain strength", "rest", "solitude", "stability"], reversed_tag_list: ["lord of rest from strife", "libra", "jupiter", "burnt out", "inundated", "need a break", "overwhelmed"], summary: "", reversed_summary: ""}
-    definition = I18n.t("cards.#{Aro::Deck.card_strip(answer)}")
+    definition = I18n.t("cards.#{Aro::Teck.card_strip(answer)}")
     indent = Aro::Mancy::N
     Aro::P.say(definition[:name])
     Aro::P.say(definition[:summary])
@@ -140,27 +134,27 @@ class Aro::Deck < ActiveRecord::Base
   end
 
   def shuffle
-    # shuffles the current deck and generates a log record.
-    update(cards: cards.split(Aro::Deck::CARD_DELIM.to_s).shuffle.join(Aro::Deck::CARD_DELIM.to_s))
+    # shuffles the current teck and generates a log record.
+    update(cards: cards.split(Aro::Teck::CARD_DELIM.to_s).shuffle.join(Aro::Teck::CARD_DELIM.to_s))
   end
 
   def reset
-    # completely reset the deck. replace all drawn and reset order.
+    # completely reset the teck. replace all drawn and reset order.
     # all orientations will be set to upright.
-    update(cards: Aro::Deck.fresh_cards, drawn: "")
+    update(cards: Aro::Teck.fresh_cards, drawn: "")
   end
 
   def replace
     # replaces all drawn cards FIFO and puts them on the bottom of
-    # the deck. this will preserve all card orientations.
-    cards_arr = cards.split(Aro::Deck::CARD_DELIM.to_s) || []
-    drawn_arr = drawn&.split(Aro::Deck::CARD_DELIM.to_s) || []
+    # the teck. this will preserve all card orientations.
+    cards_arr = cards.split(Aro::Teck::CARD_DELIM.to_s) || []
+    drawn_arr = drawn&.split(Aro::Teck::CARD_DELIM.to_s) || []
 
     # append each drawn card to cards
     drawn_arr.each{|dc| cards_arr << dc }
 
     # clear drawn
-    update(drawn: "", cards: cards_arr.join(Aro::Deck::CARD_DELIM.to_s))
+    update(drawn: "", cards: cards_arr.join(Aro::Teck::CARD_DELIM.to_s))
   end
 
   def draw(is_dt_dimension: true, z_max: 7, z: 1)
@@ -171,11 +165,11 @@ class Aro::Deck < ActiveRecord::Base
     dev_tarot = nil
 
     # get cards
-    cards_arr = cards.split(Aro::Deck::CARD_DELIM.to_s) || []
+    cards_arr = cards.split(Aro::Teck::CARD_DELIM.to_s) || []
     # get abs_cards
-    abs_cards_arr = cards_arr.map{|c| Aro::Deck.card_strip(c)}
+    abs_cards_arr = cards_arr.map{|c| Aro::Teck.card_strip(c)}
     # get drawn
-    drawn_arr = drawn&.split(Aro::Deck::CARD_DELIM.to_s) || []
+    drawn_arr = drawn&.split(Aro::Teck::CARD_DELIM.to_s) || []
 
     if cards_arr.empty?
       Aro::P.say("there are no cards left to draw.")
@@ -224,8 +218,8 @@ class Aro::Deck < ActiveRecord::Base
 
     # update database 
     update(
-      cards: cards_arr.join(Aro::Deck::CARD_DELIM.to_s),
-      drawn: drawn_arr.join(Aro::Deck::CARD_DELIM.to_s)
+      cards: cards_arr.join(Aro::Teck::CARD_DELIM.to_s),
+      drawn: drawn_arr.join(Aro::Teck::CARD_DELIM.to_s)
     )
   end
 end

data/sys/aro/models/tlog.rb

@@ -0,0 +1,20 @@
+=begin
+
+  tlog.rb
+
+  teck tlog object.
+
+  by i2097i
+
+=end
+
+require_relative :"./teck".to_s
+
+class Aro::Tlog < ActiveRecord::Base
+  belongs_to :teck, :class_name => :"#{Aro::Teck.name}".to_s
+
+  ORDERING = {
+    ASC: :asc,
+    DESC: :desc
+  }
+end

data/sys/aro/v.rb

@@ -18,7 +18,7 @@ module Aro
     end
 
     def self.should_print?
-      CLI::Config.ivar(:VERBOSE).to_s == CLI::Config::BOOLS[:TRUE].to_s && super
+      Aro::Config.ivar(:VERBOSE).to_s == Aro::Config::BOOLS[:TRUE].to_s && super
     end
   end
 end

data/sys/cli/constants.rb

@@ -31,7 +31,7 @@ module CLI
     ARO: {
       CREATE: :create,
       CONFIG: :config,
-      DECK: :deck,
+      DECK: :teck,
       DOM: :dom,
       INIT: :init,
     },

data/sys/cli/dom.rb

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