aro 0.1.9 → 0.2.1

data/sys/aos/vws/base.rb

@@ -0,0 +1,169 @@
+=begin
+  
+  vws/base.rb
+
+  the base view (abstract).
+
+  by i2097i
+
+=end
+
+require :aro.to_s
+
+module Aos
+  module Vw
+    class Base
+      BAR = :"".to_s
+      COL_POW = Proc.new{|n| n.pow(Aro::Mancy::S.to_f / Aro::Mancy::OS.to_f).to_i}
+      MARGIN_V = Aro::Mancy::S
+      MARGIN_H = Aro::Mancy::S
+
+      def self.show
+        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("")
+        end
+
+        # yield => print lines
+        body_lines.each{|line|
+          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
+        # )
+
+        # print everything
+        Aos::S.say(lines.join("\n"))
+
+        # explicitly return true
+        true
+      end
+
+      def self.get_aos_display_lines
+        # current Aos::Os output
+        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
+          }
+          lines << "".center(width)
+          lines << "v#{Aro::VERSION.to_s}".ljust(width - display_dim.length) + display_dim
+          # lines << "".center(width, "=")
+        end
+        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..]
+      end
+
+      def self.get_dimension
+        (Aro::T.is_dev_tarot? ? Aro::T::DEV_TAROT : Aro::T::RUBY_FACOT)
+      end
+
+      def self.get_domain
+        Aro::Dom.in_arodom? ? Aro::Dom::domain : Aro::Mancy.domain
+      end
+
+      def self.get_clock
+        Time.now.strftime(Aos::Os::DATE_FORMAT)
+      end
+
+      def self.viewport_width
+        dc = Aro::Config.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)
+
+        (width - (bar_width + h_margin_width))
+      end
+
+      def self.get_body_line(line)
+        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)
+        (bar + hm_space + (line || "")).ljust(just) + hm_space + bar
+      end
+
+      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
+      end
+
+      def self.debug_log(lines)
+        Aro::V.say(lines)
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 =begin
   
-  views/dom.rb
+  vws/dom.rb
 
   the dom view.
 
@@ -11,25 +11,22 @@
 require_relative :"./base".to_s
 
 module Aos
-  module Vi
-    class Dom < Aos::Vi::Base
+  module Vw
+    class Dom < Aos::Vw::Base
 
-      def self.show(model)
+      def self.show
         lines = []
         lines << I18n.t("aos.views.dom.title")
         lines << I18n.t("aos.views.dom.description")
         lines << ""
         lines << I18n.t("aos.constants.commands")
-        Aos::Os::CMDS.keys.sort.each{|cmd|
-          lines += lines_for_cmd(Aos::Os::CMDS[cmd])
-        }
-
+        lines += lines_for_cmd(Aos::Os::CMDS[:HELP])
         lines << ""
         lines << I18n.t("aos.views.dom.quick_navigation")
         lines << ""
         lines << "  =>  #{Aro::Dom::D.reserved_words.join("  ")}"
         lines << ""
-        draw(lines, model)
+        draw(lines)
       end
     end
   end

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

@@ -0,0 +1,19 @@
+=begin
+
+  vws/games/abpps.rb
+
+  the apbbs view.
+
+  by i2097i
+
+=end
+
+require_relative :"./game".to_s
+
+module Aos
+  module Vw
+    class Abpps < Aos::Vw::Game
+
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 =begin
 
-  views/games/game.rb
+  vws/games/game.rb
 
   the game view.
 
@@ -12,8 +12,8 @@ require_relative :"../../../models/deck".to_s
 require_relative :"../base".to_s
 
 module Aos
-  module Vi
-    class Game < Aos::Vi::Base
+  module Vw
+    class Game < Aos::Vw::Base
 
       DECK_PARAMS = [
         :deck,
@@ -22,7 +22,7 @@ module Aos
         :order_o,
       ]
 
-      def self.show(model)
+      def self.show
         unless Aro::Mancy.game.nil?
           Aro::Mancy.game.show
           return
@@ -33,19 +33,19 @@ module Aos
         lines << I18n.t("aos.views.game.description").center(viewport_width)
 
         room_def = Aro::Dom::D::WINGS[:GAMES].values.filter{|gr|
-          "#{Aos::Vi.name}::#{gr[:name].to_s.downcase.capitalize}" == self.name
+          "#{Aos::Vw.name}::#{gr[:name].to_s.downcase.capitalize}" == self.name
         }.first
         unless room_def.nil?
           lines << I18n.t("aos.views.game.is_the", name: room_def[:name].to_s)
           lines << I18n.t("aos.views.game.designed_for", description: room_def[:description])
         end
 
-        draw(lines, model)
+        draw(lines)
       end
 
       def self.show_game(model)
         mk = model.keys
-        dp = Aos::Vi::Game::DECK_PARAMS
+        dp = Aos::Vw::Game::DECK_PARAMS
         return nil unless (mk & dp).count == dp.count
         return nil unless model.values.all?{|v| v != nil}
 
@@ -54,23 +54,24 @@ module Aos
         count_n = model[:count_n]
         order_o = model[:order_o]
 
-        dc = CLI::Config.display_config
-        width = dc[:WIDTH] = viewport_width
-        divider = dc[:DIVIDER] * viewport_width
+        dc = Aro::Config.display_configuration
+        width = count_n == Aro::Mancy::S ? viewport_width : dc[:WIDTH]
+        divider = dc[:DIVIDER] * width
         lines = []
+        lines << divider
         lines << "#{deck.name.upcase.center(width)}"
         h_logs.each_with_index{|l, i|
           lines << divider
           lines << ""
-          timestamp = l.created_at.strftime(CLI::Config::DATE_FORMAT)
+          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}"
           lines << of_text.ljust(width - timestamp.length) + timestamp
           lines << divider
           cards = Base64::decode64(l.card_data).split(Aro::Deck::CARD_DELIM.to_s)
           if !cards.nil? && cards.any?
-            lines << ""
+            # lines << ""
             lines += self.get_display_for_cards(cards)
-            lines << divider
+            # lines << divider
           end
 
           drawn_cards = Base64::decode64(l.drawn_data).split(Aro::Deck::CARD_DELIM.to_s)
@@ -82,8 +83,8 @@ module Aos
             lines += self.get_display_for_cards(
               drawn_cards
             )
-            lines << ""
-            lines << divider
+            # lines << ""
+            # lines << divider
           end
         }
         if count_n == Aro::Mancy::S
@@ -94,7 +95,9 @@ module Aos
       end
 
       def self.get_display_for_cards(input = [])
-        columns = CLI::Config.display_config[:COLUMNS].to_i
+        columns = Aos::Vw::Base::COL_POW.call(
+          Aro::Config.display_configuration[:WIDTH].to_i
+        )
         lines = []
         return lines unless input.any?
         card_line = ""

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

@@ -0,0 +1,19 @@
+=begin
+
+  vws/games/hbpps.rb
+
+  the hpbbs view.
+
+  by i2097i
+
+=end
+
+require_relative :"./game".to_s
+
+module Aos
+  module Vw
+    class Hbpps < Aos::Vw::Game
+
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+=begin
+
+  vws/games/shpps.rb
+
+  the shbbs view.
+
+  by i2097i
+
+=end
+
+require_relative :"./game".to_s
+
+module Aos
+  module Vw
+    class Shpps < Aos::Vw::Game
+
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+=begin
+
+  vws/games/vipps.rb
+
+  the vipps view.
+
+  by i2097i
+
+=end
+
+require_relative :"./game".to_s
+
+module Aos
+  module Vw
+    class Vipps < Aos::Vw::Game
+
+    end
+  end
+end

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

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

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

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

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

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

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/setup/amg.rb

@@ -0,0 +1,22 @@
+=begin
+
+  vws/setup/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 output
+        draw(Aos::Amg.instance.display_lines)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+=begin
+  
+  vws/setup/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/{views → vws}/setup.rb

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

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

@@ -0,0 +1,30 @@
+=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")
+        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/{views → vws}/welcome.rb

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

data/sys/aos/you.rb

@@ -10,10 +10,12 @@
 
 module Aos
   class You < ActiveRecord::Base
-    after_commit :update_aos_pwd
+    after_update :clear_aos_display
 
-    def update_aos_pwd
-      Dir.chdir(pwd)
+    private
+
+    def clear_aos_display
+      Aos::Os.instance.display_lines = [Aos::Os.osify(pwd, true)]
     end
   end
 end

data/sys/aro/db.rb

@@ -11,16 +11,23 @@
 module Aro
   class Db
     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 = :"database.sql"
 
     def initialize
-      # ActiveRecord::Base.logger = Logger.new(STDOUT)
+      Aro::Db.configure_logger
       if Aro::Mancy.in_aro?
         setup_local_aro
+      end
+    end
+
+    def self.configure_logger
+      if Aro::Config.ivar(:LOG_ARO_DB).to_s == Aro::Config::BOOLS[:TRUE].to_s
+        ActiveRecord::Base.logger = Logger.new(STDOUT)
       else
-        Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
+        ActiveRecord::Base.logger = nil
       end
     end
 
@@ -34,7 +41,7 @@ module Aro
 
     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
@@ -71,7 +78,7 @@ module Aro
       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

@@ -60,6 +60,7 @@ module Aro
     }
 
     def initialize
+      Aro::Config.instance.load
       if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
         Aro::Mancy.init
         self.game = Aro::Deck.current_deck

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