aro 0.2.1 → 0.2.2

data/sys/aos/vws/base.rb

@@ -8,8 +8,6 @@
 
 =end
 
-require :aro.to_s
-
 module Aos
   module Vw
     class Base
@@ -22,44 +20,13 @@ module Aos
         draw([self.name])
       end
 
-      def self.get_json(lines)
-        {
-          body: lines,
-          you: Aos::Os.instance.you.to_json,
-          domain: self.get_domain,
-          clock: self.get_clock,
-          dimension: self.get_dimension,
-          dev_tarot: self.get_dt,
-        }
-      end
-
       def self.draw(body_lines)
-        unless Aro::Config.is_format_text?
-          Aos::S.say(self.get_json(lines))
-          return true
-        end
-
         return false unless body_lines.kind_of?(Array)
         lines = []
         dc = Aro::Config.display_configuration
         height = dc[:HEIGHT]
         width = dc[:WIDTH]
 
-        # header
-        # lines << "".center(width, "=")
-        # lines << "".center(width)
-
-        # half = ((width - self.name.length) / Aro::Mancy::OS.to_f).ceil
-        # domain = self.get_domain
-        # clock = self.get_clock
-        # lines << (
-        #   (
-        #     domain.ljust(half) + self.name.to_s.upcase
-        #   ).ljust(width - clock.length) + clock
-        # )
-
-        # lines << "".center(width, dc[:DIVIDER])
-
         # top vertical margin
         Aos::Vw::Base::MARGIN_V.times do
           lines << get_body_line("")
@@ -70,15 +37,7 @@ module Aos
           lines << get_body_line(line)
         }
 
-        lines += get_aos_display_lines
-
-        # footer
-        # display_dim = self.get_display_dimension
-        # lines << (
-        #   (
-        #     ">[#{domain}]>#{Aos::Os::osify(Aos::Os.instance.you&.pwd || Dir.pwd)}"
-        #   ).ljust(width - display_dim.length) + display_dim
-        # )
+        lines += get_aos_display_lines if Aro::Dom.in_arodom?
 
         # print everything
         Aos::S.say(lines.join("\n"))
@@ -100,8 +59,8 @@ module Aos
           }
           lines << "".center(width)
           lines << "v#{Aro::VERSION.to_s}".ljust(width - display_dim.length) + display_dim
-          # lines << "".center(width, "=")
         end
+
         lines
       end
 
@@ -144,21 +103,13 @@ module Aos
 
       def self.lines_for_cmd(cmd)
         just_cmds = Aro::Mancy::NUMERALS[:IX]
-        cmd_lines = []
-        key_proc = Proc.new{|k| "$ #{k}"}
-        desc_proc = Proc.new{|desc| "#{"desc:".rjust(just_cmds)} #{desc}"}
-        usage_proc = Proc.new{|usage| "#{"usage:".rjust(just_cmds)} #{usage}"}
-
-        cmd_lines << key_proc.call(cmd[:key])
-        cmd_lines << desc_proc.call(cmd[:description])
-        cmd_lines << usage_proc.call(cmd[:usage])
-        (cmd[:cmds] || []).each{|k, v|
-          cmd_lines << key_proc.call("#{cmd[:key]} #{v[:key]}")
-          cmd_lines << desc_proc.call(v[:description])
-          cmd_lines << usage_proc.call(v[:usage])
-        }
-
-        cmd_lines
+        lines = []
+        lines << "\"#{cmd[:key]}\""
+        lines << "  => #{cmd[:description]}"
+        lines << ""
+        lines << "#{"  ".rjust(just_cmds)} #{cmd[:usage]}"
+        lines << ""
+        lines
       end
 
       def self.debug_log(lines)

data/sys/aos/vws/dom.rb

@@ -13,7 +13,6 @@ require_relative :"./base".to_s
 module Aos
   module Vw
     class Dom < Aos::Vw::Base
-
       def self.show
         lines = []
         lines << I18n.t("aos.views.dom.title")

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

@@ -8,7 +8,7 @@
 
 =end
 
-require_relative :"../../../models/deck".to_s
+require_relative :"../../../aro/models/teck".to_s
 require_relative :"../base".to_s
 
 module Aos
@@ -16,8 +16,8 @@ module Aos
     class Game < Aos::Vw::Base
 
       DECK_PARAMS = [
-        :deck,
-        :h_logs,
+        :teck,
+        :tlog_records,
         :count_n,
         :order_o,
       ]
@@ -49,8 +49,8 @@ module Aos
         return nil unless (mk & dp).count == dp.count
         return nil unless model.values.all?{|v| v != nil}
 
-        deck = model[:deck]
-        h_logs = model[:h_logs]
+        teck = model[:teck]
+        tlog_records = model[:tlog_records]
         count_n = model[:count_n]
         order_o = model[:order_o]
 
@@ -59,22 +59,22 @@ module Aos
         divider = dc[:DIVIDER] * width
         lines = []
         lines << divider
-        lines << "#{deck.name.upcase.center(width)}"
-        h_logs.each_with_index{|l, i|
+        lines << "#{teck.name.upcase.center(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::Log::ORDERING[:DESC] ? deck.logs.count - i : 1 + i} of #{deck.logs.count}"
+          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
           lines << divider
-          cards = Base64::decode64(l.card_data).split(Aro::Deck::CARD_DELIM.to_s)
+          cards = Base64::decode64(l.card_data).split(Aro::Teck::CARD_DELIM.to_s)
           if !cards.nil? && cards.any?
             # lines << ""
             lines += self.get_display_for_cards(cards)
             # lines << divider
           end
 
-          drawn_cards = Base64::decode64(l.drawn_data).split(Aro::Deck::CARD_DELIM.to_s)
+          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)

data/sys/aos/vws/know/{temple.rb → body.rb}

@@ -1,8 +1,8 @@
 =begin
 
-  vws/know/temple.rb
+  vws/know/body.rb
 
-  the temple view.
+  the body view.
 
   by i2097i
 
@@ -12,7 +12,7 @@ require_relative :"../base".to_s
 
 module Aos
   module Vw
-    class Temple < Aos::Vw::Base
+    class Body < Aos::Vw::Base
 
     end
   end

data/sys/aos/vws/know/{library.rb → mind.rb}

@@ -1,8 +1,8 @@
 =begin
 
-  vws/know/library.rb
+  vws/know/mind.rb
 
-  the library view.
+  the mind view.
 
   by i2097i
 
@@ -12,7 +12,7 @@ require_relative :"../base".to_s
 
 module Aos
   module Vw
-    class Library < Aos::Vw::Base
+    class Mind < Aos::Vw::Base
 
     end
   end

data/sys/aos/vws/know/spirit.rb

@@ -0,0 +1,19 @@
+=begin
+
+  vws/know/spirit.rb
+
+  the spirit view.
+
+  by i2097i
+
+=end
+
+require_relative :"../base".to_s
+
+module Aos
+  module Vw
+    class Spirit < Aos::Vw::Base
+
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 =begin
 
-  vws/setup/amg.rb
+  vws/root/amg.rb
 
   the amg view.
 
@@ -14,7 +14,6 @@ module Aos
   module Vw
     class Amg < Aos::Vw::Base
       def self.show
-        # draw output
         draw(Aos::Amg.instance.display_lines)
       end
     end

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

@@ -1,6 +1,6 @@
 =begin
   
-  vws/setup/config.rb
+  vws/root/config.rb
 
   the config view.
 

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/vws/{setup.rb → root.rb}

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

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

@@ -18,6 +18,7 @@ module Aos
         lines = []
         lines << ""
         lines << I18n.t("aos.constants.commands")
+        lines << ""
         Aos::Os::CMDS.values.each{|v|
           lines += lines_for_cmd(v)
         }

data/sys/aos/vws/welcome.rb

@@ -13,7 +13,18 @@ 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/sys/aro/db/migrate/{1763374647_create_decks.rb → 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,16 +10,18 @@
 
 module Aro
   class Db
+    include Singleton
+
     DATABASE_YML = :"database.yml"
     GEM_DB_PATH = :"sys/aro/db"
     MIGRATIONS_DIR = :"db/migrate"
     SCHEMA_FILE = :"schema.rb"
-    SQL_FILE = :"database.sql"
+    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
 
@@ -31,14 +33,6 @@ module Aro
       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
       Aro::Config.is_test? ? "#{base_aro_file}_test" : base_aro_file
@@ -74,6 +68,12 @@ 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)

data/sys/aro/mancy.rb

@@ -60,10 +60,10 @@ module Aro
     }
 
     def initialize
-      Aro::Config.instance.load
       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
 
@@ -80,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
@@ -98,7 +98,7 @@ module Aro
     end
 
     def self.init
-      Aro::Db.new
+      Aro::Db.load
     end
 
     def self.is_initialized?