aro 0.2.4 → 0.2.5

data/sys/aos/aos.rb

@@ -196,6 +196,17 @@ module Aos
         Aro::V.say("you loaded:\n#{caller[Aro::Mancy::O..Aro::Mancy::N].join("\n")}")
         Aro::V.say(self.you.name)
         Aro::V.say(Aos::Os.osify(self.you.pwd))
+        self.you.history.each{|h| Readline::HISTORY.push(h)}
+      end
+    end
+
+    def self.configure_aro_cli
+      Aro::V.say(ARGV)
+      if ARGV.include?(Aos::Os::YOU_FLAG)
+        Aos::Db.load
+        yfi = ARGV.index(Aos::Os::YOU_FLAG)
+        Aos::Os.instance.you = Aos::You.find_by(name: ARGV[yfi + Aro::Mancy::S]&.strip)
+        Aos::Os.instance.you_flag = Aos::You.find_by(name: ARGV[yfi + Aro::Mancy::S]&.strip)
       end
     end
 
@@ -268,7 +279,7 @@ module Aos
         if current_you.nil?
           Aos::S.say(lines.join("\n"))
         else
-          # Mutex.new.synchronize do
+          Mutex.new.synchronize do
             Aos::Os.instance.q ||= {}
             Aos::Os.q[current_you.name] ||= []
             Aos::Os.q[current_you.name] += lines
@@ -284,7 +295,7 @@ module Aos
                 Aos::Os.q.delete(you_name)
               )
             }
-          # end
+          end
         end
       end
     end
@@ -359,7 +370,8 @@ module Aos
     # end
 
     def handle_aro_override(args)
-      return nil unless args[0].include?(:aro.to_s)
+      return nil unless !args[Aro::Mancy::O].nil? &&
+        [:aro, :ino].include?(args[Aro::Mancy::O].to_sym)
       # !self.you_flag.nil?
       yfi = args.index(Aos::Os::YOU_FLAG)
       if yfi.nil?
@@ -376,6 +388,7 @@ module Aos
         Aos::Cor.instance.cor_path = nil
         Aos::Cor.instance.load
         Dir.chdir(self.you.reload.pwd) do
+          self.you.add_history(cmd) unless cmd.nil?
           send_to_system_call = main(cmd)
           nothing = nil
           unless cmd.nil? || cmd.empty?
@@ -383,38 +396,32 @@ module Aos
             self.you.generate_ilog(cmd)
           end
           if send_to_system_call && nothing.nil?
-            nothing = `#{cmd}`
-          end
-
-          unless nothing.nil?
+            begin
+              Aos::Os.say(`#{cmd}`)
+            rescue => e
+              Aos::Os.say(e)
+            end
+          elsif !nothing.nil?
             Aos::Os.say(nothing)
-          else
-            render
           end
+
+          render unless send_to_system_call
         end
 
         CLI::EXIT_CODES[:SUCCESS]
       end
     end
 
-    def configure_readline(env)
-      # case env
-      # when :home
-        Readline.completion_append_character = "/"
-        Readline.completion_proc = Proc.new{|str|
-          pwd = self.you_flag&.reload&.pwd || self.you&.reload&.pwd || ""
-          dir_matcher = File.join(pwd, str + Aos::Os::STAR.to_s)
-          # Aro::V.say(dir_matcher)
-          dir_listing = Dir.glob(dir_matcher, File::FNM_DOTMATCH).map{|d| Aos::Os.osify(d).split("/").reject{|p| pwd.include?(p)}.join("/")}
-          # Aro::V.say(dir_listing)
-          dir_listing.grep(/^#{Regexp.escape(str)}/)
-        }
-      # when :aos
-      #   Readline.completion_append_character = "/"
-      #   Readline.completion_proc = Proc.new{|str|
-      #     Aro::Dom::D.reserved_words.grep(/^#{Regexp.escape(str)}/)
-      #   }
-      # end
+    def configure_readline
+      Readline.completion_append_character = "/"
+      Readline.completion_proc = Proc.new{|str|
+        pwd = self.you_flag&.reload&.pwd || self.you&.reload&.pwd || ""
+        dir_matcher = File.join(pwd, str + Aos::Os::STAR.to_s)
+        # Aro::V.say(dir_matcher)
+        dir_listing = Dir.glob(dir_matcher, File::FNM_DOTMATCH).map{|d| Aos::Os.osify(d).split("/").reject{|p| pwd.include?(p)}.join("/")}
+        # Aro::V.say(dir_listing)
+        dir_listing.grep(/^#{Regexp.escape(str)}/)
+      }
     end
 
     Mutex.new.synchronize do
@@ -433,9 +440,9 @@ module Aos
             height, width = IO.console.winsize
             IO.console.goto(height, Aro::Mancy::O)
             process_cmd(cmd)
-            break unless self.running && cmd = Readline.readline(calc_ps1)
+            break unless self.running && cmd = Readline.readline(calc_ps1, true)
             IO.console.erase_screen(Aro::Mancy::S)
-            configure_readline :aos
+            configure_readline
           end
 
 

data/sys/aos/models/agodo.rb

@@ -43,6 +43,14 @@ class Aos::Agodo < ActiveRecord::Base
     ]
   end
 
+  def create_home_directory
+    Aro::Dom.instance.generate_agodo_home(self)
+  end
+
+  def home
+    File.join(Aro::Dom.room_path(Aro::Dom::ABOT), Aos::Abot::AGODOS_DIR.to_s, self.you.name)
+  end
+
   private
 
   def create_you

data/sys/aos/models/you.rb

@@ -15,7 +15,7 @@ module Aos
     has_many :fpxies
 
     before_validation :set_pwd
-    before_create :create_home_directory
+    before_create :create_home_directory, :create_history_file
     after_update :clear_aos_display
 
     enum :access, [
@@ -24,8 +24,10 @@ module Aos
       :root,
     ]
 
+    AOS_HISTORY_FILE = :".aos_history"
     ARO_SRT_FILE = :".aro_srt"
 
+
     def generate_ilog(cmd)
       ilogs.create(
         pwd: Aos::Os.osify(pwd),
@@ -53,6 +55,10 @@ module Aos
     end
 
     def home
+      if agodo?
+        return agodo.home
+      end
+
       File.join(
         Aro::Dom::dom_root,
         Aro::Dom.room_path(root? ? Aro::Dom::COR : Aro::Dom::HOME),
@@ -78,6 +84,20 @@ module Aos
       end
     end
 
+    def history
+      return "" unless root? || user?
+      File.read(history_file).split("\n").compact
+    end
+
+    def add_history(entry)
+      return unless root? || user?
+      return if entry.nil? || entry.to_s.empty?
+      File.open(history_file, "a+") do |aos_history|
+        aos_history.write(entry)
+        aos_history.write("\n")
+      end
+    end
+
     private
 
     def set_pwd
@@ -88,9 +108,25 @@ module Aos
       File.join(self.home, Aos::You::ARO_SRT_FILE.to_s)
     end
 
+    def history_file
+      File.join(self.home, Aos::You::AOS_HISTORY_FILE.to_s)
+    end
+
     def create_home_directory
-      return if root? || agodo? || Dir.exist?(File.join(Aro::Dom.room_path(Aro::Dom::HOME), self.name))
-      Aro::Dom.instance.generate_room(Aro::Dom::D::LAYOUT[:HOME], {name: self.name.to_sym})
+      return if root?
+
+      if agodo?
+        agodo&.create_home_directory
+        return
+      else
+        return if Dir.exist?(File.join(Aro::Dom.room_path(Aro::Dom::HOME), self.name))
+        Aro::Dom.instance.generate_room(Aro::Dom::D::LAYOUT[:HOME], {name: self.name.to_sym})
+      end
+    end
+
+    def create_history_file
+      return unless root? || user?
+      File.open(history_file, "w+")
     end
 
     def clear_aos_display

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

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

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

@@ -88,9 +88,7 @@ module Aos
             lines << I18n.t("cli.messages.history_drawn").center(Aos::Vw::Base.viewport_width)
             lines << divider
             lines << ""
-            lines += self.get_display_for_cards(
-              drawn_cards
-            )
+            lines += self.get_display_for_cards(drawn_cards)
             # lines << ""
             # lines << divider
           end

data/sys/aro/db/migrate/1768856981_create_scrolls.rb

@@ -0,0 +1,20 @@
+class CreateScrolls < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :scrolls do |t|
+      t.belongs_to :legend, null: false, foreign_key: true
+      t.belongs_to :player, null: false, foreign_key: true
+      t.string :name, null: false
+      t.string :cards, null: false, default: ""
+
+      t.timestamps
+    end
+
+    add_index :scrolls, :name
+  end
+
+  def self.down
+    drop_table :scrolls
+  end
+
+end

data/sys/aro/db/migrate/1768858841_create_legends.rb

@@ -0,0 +1,16 @@
+class CreateLegends < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :legends do |t|
+      t.belongs_to :story, null: false, foreign_key: true
+      t.integer :play_to, null: false, default: Aro::Mancy::NUMERALS[:XI]
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :legends
+  end
+
+end

data/sys/aro/db/migrate/1768858967_create_stories.rb

@@ -0,0 +1,17 @@
+class CreateStories < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :stories do |t|
+      t.belongs_to :legend, null: false, foreign_key: true
+      t.belongs_to :chapter, null: false, foreign_key: true
+      t.belongs_to :dealer, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :stories
+  end
+
+end

data/sys/aro/db/migrate/1768859060_create_chapters.rb

@@ -0,0 +1,15 @@
+class CreateChapters < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :chapters do |t|
+      t.belongs_to :story, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :chapters
+  end
+
+end

data/sys/aro/db/migrate/1768859126_create_statements.rb

@@ -0,0 +1,22 @@
+class CreateStatements < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :statements do |t|
+      t.belongs_to :player, null: false, foreign_key: true
+      t.belongs_to :chapter, null: false, foreign_key: true
+
+      # all cards in the statement except the word
+      t.string :thought, null: false, default: ""
+
+      # the final card that must be played to close the statement
+      t.string :word, null: false, default: ""
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :statements
+  end
+
+end

data/sys/aro/db/migrate/1768859144_create_players.rb

@@ -0,0 +1,18 @@
+class CreatePlayers < ActiveRecord::Migration[8.1]
+
+  def self.up
+    create_table :players do |t|
+      t.belongs_to :scroll, null: false, foreign_key: true
+      t.integer :you_id, null: false
+
+      t.timestamps
+    end
+
+    add_index :players, :you_id
+  end
+
+  def self.down
+    drop_table :players
+  end
+
+end

data/sys/aro/ino.rb

@@ -0,0 +1,64 @@
+=begin
+
+  ino.rb
+
+  aro and ino.
+
+  by i2097i
+
+=end
+
+module Aro
+  def self.ino
+    Aro::Ino.process_command(ARGV)
+  end
+
+  class Ino
+    include Singleton
+
+    attr_accessor :scroll, :display_lines
+
+    CMDS = {
+      CREATE: {
+        key: :create,
+        description: I18n.t("ino.commands.description.create"),
+        usage: I18n.t("ino.commands.usage.create"),
+      }
+    }
+
+    def self.run
+
+    end
+
+    def self.process_command(args)
+      self.instance.display_lines = args
+      args = Aos::Os.sanitize_you(args)
+
+      if args[Aro::Mancy::O].nil? ||
+        CLI::FLAGS[:HELP].include?(args[Aro::Mancy::O].to_sym)
+        self.instance.display_lines = [I18n.t("usage.ino")]
+        Aos::Vw::Ino.show
+        return
+      end
+
+      case args[Aro::Mancy::O].to_sym
+      when Aro::Ino::CMDS[:CREATE][:key]
+        CLI::Nterface.exit_error_missing_args!(:var_aro_name) if args[Aro::Mancy::S].nil?
+        Aro::Db.load
+        self.instance.scroll = Aro::Scroll.find_by(name: args[Aro::Mancy::S].strip)
+        if self.instance.scroll.nil?
+          self.instance.scroll = Aro::Scroll.create(name: args[Aro::Mancy::S].strip)
+          self.instance.scroll.players << Aro::Player.create(you_id: Aos::Os.instance.you.id)
+          self.instance.display_lines = self.instance.scroll.display_lines
+        else
+          self.instance.display_lines = [I18n.t("ino.error.scroll_exists")]
+        end
+      else
+        self.instance.display_lines = [I18n.t("ino.messages.invalid_cmd")]
+      end
+
+      Aos::Vw::Ino.show
+    end
+
+  end
+end

data/sys/aro/models/chapter.rb

@@ -0,0 +1,18 @@
+=begin
+
+  chapter.rb
+
+  chapter object.
+
+  by i2097i
+
+=end
+
+# require_relative :story.to_s
+# require_relative :statement.to_s
+
+class Aro::Chapter < ActiveRecord::Base
+  has_many :statements
+  belongs_to :story
+
+end

data/sys/aro/models/legend.rb

@@ -0,0 +1,28 @@
+=begin
+
+  legend.rb
+
+  legend object.
+
+  by i2097i
+
+=end
+
+# require_relative :scroll.to_s
+require_relative :"./story".to_s
+
+class Aro::Legend < ActiveRecord::Base
+  has_one :scroll
+  has_many :stories
+  belongs_to :story
+
+  # play_to:integer default 11
+
+  after_create :create_story
+
+  private
+
+  def create_story
+    self.story = Aro::Story.create()
+  end
+end

data/sys/aro/models/player.rb

@@ -0,0 +1,17 @@
+=begin
+
+  player.rb
+
+  player object.
+
+  by i2097i
+
+=end
+
+# require_relative :scroll.to_s
+# require_relative :statement.to_s
+
+class Aro::Player < ActiveRecord::Base
+  has_many :statements
+  belongs_to :scroll
+end

data/sys/aro/models/scroll.rb

@@ -0,0 +1,46 @@
+=begin
+
+  scroll.rb
+
+  scroll object.
+
+  by i2097i
+
+=end
+
+class Aro::Scroll < ActiveRecord::Base
+
+  HISTORY_FILE = :".ino_history"
+
+  has_many :players
+  belongs_to :legend
+  belongs_to :player
+
+  before_create :create_history_file, :create_legend
+
+  def history_file
+    File.join(Aro::Db.base_aro_dir, Aro::Scroll::HISTORY_FILE.to_s)
+  end
+
+  def history
+    File.read(history_file).split("\n").compact
+  end
+
+  def add_history(entry)
+    return if entry.nil? || entry.to_s.empty?
+    File.open(history_file, "a+") do |ino_history|
+      ino_history.write(entry)
+      ino_history.write("\n")
+    end
+  end
+
+  private
+
+  def create_legend
+    self.legend = Aro::Legend.create()
+  end
+
+  def create_history_file
+    File.open(history_file, "w+")
+  end
+end

data/sys/aro/models/statement.rb

@@ -0,0 +1,14 @@
+=begin
+
+  statement.rb
+
+  statement object.
+
+  by i2097i
+
+=end
+
+class Aro::Statement < ActiveRecord::Base
+  belongs_to :player
+  belongs_to :chapter
+end

data/sys/aro/models/story.rb

@@ -0,0 +1,28 @@
+=begin
+
+  story.rb
+
+  story object.
+
+  by i2097i
+
+=end
+
+require_relative :"./legend".to_s
+require_relative :"./chapter".to_s
+require_relative :"./player".to_s
+
+class Aro::Story < ActiveRecord::Base
+  has_many :chapters
+  belongs_to :legend
+  belongs_to :chapter, class_name: Aro::Chapter.name
+  # belongs_to :dealer, class_name: Aro::Player.name
+
+  after_create :create_chapter
+
+  private
+
+  def create_chapter
+    self.chapter = Aro::Chapter.create()
+  end
+end

data/sys/aro/models/teck.rb

@@ -9,7 +9,6 @@
 =end
 
 require :base64.to_s
-require_relative :"./base_model".to_s
 
 class Aro::Teck < ActiveRecord::Base
   has_many :tlogs
@@ -138,14 +137,33 @@ class Aro::Teck < ActiveRecord::Base
       orientation = "-"
     end
 
-    definition = I18n.t("cards.#{Aro::Teck.card_strip(card_code)}")
+    Aro::P.say(I18n.t("cli.messages.printing_card", card: card_code))
+    width = Aos::Cor.discon[:WIDTH]
+    divider = Aos::Cor.discon[:DIVIDER]
+    card_lookup = Aro::Teck.card_strip(card_code)
+    suit_lookup = card_lookup[Aro::Mancy::O]
+    definition = I18n.t("cards.#{card_lookup}")
+    suit_definition = I18n.t("suits.#{suit_lookup}")
     output = []
-    output << orientation + definition[:name]
-    output += definition["#{orientation}tags".to_sym].sort
+    output << "".ljust(width, divider)
+    output << ""
+    output << "(#{orientation}) #{definition[:name].upcase}"
+    output << ""
+    unless suit_definition.nil?
+      suit_definition[:summary].split(".").each{|sentence| output << sentence + ".\n"}
+      output << suit_definition[:tags].sort.join(" | ")
+    end
+    output << "".ljust(width, divider)
+    output << ""
+    card_tags = definition["#{orientation}tags".to_sym].sort
+    max_word = card_tags.max_by{|t| t.length}.length
+    card_tags.each{|t|
+      output << t.center(max_word)
+    }
     # todo: add an actual summary
     # Aro::P.say(definition["#{orientation}summary".to_sym])
-    width = Aos::Cor.discon[:WIDTH]
-    Aro::P.say("#{card_code}\n#{output.map{|l| l.center(width, Aos::Cor.discon[:DIVIDER])}.join("\n")}")
+    output << "".ljust(width, divider)
+    Aro::P.say("#{card_code}\n#{output.map{|l| l.center(width)}.join("\n")}")
   end
 
   def shuffle

data/sys/cli/constants.rb

@@ -14,7 +14,6 @@ module CLI
     HELP:         [:"-h", :"--help"],
     SHOW_COUNT:   [:"-n", :"--count"],
     SHOW_ORDER:   [:"-o", :"--order"],
-    TAROT:        [:"+t", :"-t"],
     VERSION:      [:"-v", :"--version"],
   }
 

data/sys/cli/usage.rb

@@ -14,6 +14,10 @@ module CLI
     Aro::P.less(I18n.t("usage.dom"))
   end
 
+  def self.usage_ino
+    Aro::P.less(I18n.t("usage.ino"))
+  end
+
   def self.usage_main
     Aro::P.less(I18n.t("usage.main"))
   end

data/sys/dom/dom.rb

@@ -206,5 +206,10 @@ module Aro
         end
       end
     end
+
+    def generate_agodo_home(agodo)
+      Aro::Dom::P.say(I18n.t("dom.messages.generating_agodo_home", name: agodo.you.name))
+      FileUtils.mkdir_r(agodo.home)
+    end
   end
-end # aroadhome
+end

data/sys/shr/version.rb

@@ -9,6 +9,6 @@
 =end
 
 module Aro
-  VERSION = :"0.2.4"
+  VERSION = :"0.2.5"
   RELEASE_NOTES = :"this version".to_s + [].join(",")
 end