aro 0.2.3 → 0.2.4

data/sys/aos/vws/base.rb

@@ -12,7 +12,6 @@ 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
 
@@ -30,7 +29,7 @@ module Aos
         return false unless body_lines.kind_of?(Array)
         lines = []
 
-        dc = Aos::Cor.display_configuration
+        dc = Aos::Cor.discon
         width = dc[:WIDTH]
 
         if Aro::Dom.in_arodom?
@@ -77,17 +76,8 @@ module Aos
       def self.get_aos_display_lines
         # current Aos::Os output
 
-        width = Aos::Cor.display_configuration[:WIDTH]
+        width = Aos::Cor.discon[:WIDTH]
         lines = []
-        Aos::Os.instance.display_lines ||= []
-        unless Aos::Os.instance.display_lines.empty?
-          Aos::Os.instance.display_lines.each{|line|
-            lines << line
-          }
-          Aos::Os.instance.display_lines = []
-          lines << "".center(width)
-        end
-
         Aos::Db.load
 
         the_you = Aos::Os.instance.you_flag || Aos::Os.instance.you
@@ -108,6 +98,15 @@ module Aos
           lines << ("[  " + present_users.join("    ") + "  ]").center(width)
         end
         lines << ":you_are_root".center(width) if the_you.root?
+        Aos::Os.instance.display_lines ||= []
+        unless Aos::Os.instance.display_lines.empty?
+          lines << ""
+          Aos::Os.instance.display_lines.each{|line|
+            lines << line
+          }
+          Aos::Os.instance.display_lines = []
+          lines << ""
+        end
         lines += get_main_divider(width)
         lines
       end
@@ -129,7 +128,7 @@ module Aos
       end
 
       def self.viewport_width
-        dc = Aos::Cor.display_configuration
+        dc = Aos::Cor.discon
         width = dc[:WIDTH]
         bar_width = (Aos::Vw::Base::BAR.length * Aro::Mancy::OS)
         h_margin_width = (Aos::Vw::Base::MARGIN_H * Aro::Mancy::OS)
@@ -141,7 +140,7 @@ module Aos
         hm = Aos::Vw::Base::MARGIN_H
         bar = Aos::Vw::Base::BAR
         hm_space = " " * Aos::Vw::Base::MARGIN_H
-        just = Aos::Cor.display_configuration[:WIDTH] - (hm_space.length + bar.length)
+        just = Aos::Cor.discon[:WIDTH] - (hm_space.length + bar.length)
         (bar + hm_space + (line || "")).ljust(just) + hm_space + bar
       end
 

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

@@ -46,6 +46,7 @@ module Aos
       end
 
       def self.show_game(model)
+        Aro::Db.load
         mk = model.keys
         dp = Aos::Vw::Teck::TECK_PARAMS
         return nil unless (mk & dp).count == dp.count
@@ -57,9 +58,13 @@ module Aos
         count_n = model[:count_n]
         order_o = model[:order_o]
 
-        divider = Aos::Vw::Teck::DIV_CHAR.to_s * Aos::Vw::Base.viewport_width
+        divider = "".ljust(
+          Aos::Vw::Base.viewport_width,
+          Aos::Vw::Teck::DIV_CHAR.to_s
+        )
         lines = []
         lines << divider
+        lines << ""
         lines << "#{teck.name.upcase.center(Aos::Vw::Base.viewport_width)}"
         tlog_records.each_with_index{|l, i|
           lines << divider
@@ -72,7 +77,7 @@ module Aos
           lines << divider
           cards = Base64::decode64(l.card_data).split(Aro::Teck::CARD_DELIM.to_s)
           if !cards.nil? && cards.any?
-            # lines << ""
+            lines << ""
             lines += self.get_display_for_cards(cards)
             # lines << divider
           end
@@ -98,20 +103,19 @@ module Aos
       end
 
       def self.get_display_for_cards(input = [])
-        columns = Aos::Vw::Base::COL_POW.call(
-          Aos::Cor.display_configuration[:WIDTH].to_i
-        )
+        return input unless input.any?
+        width = Aos::Cor.discon[:WIDTH]
+        c_width = Aro::Mancy::NUMERALS[:XI]
+        columns = (width / c_width).to_i
         lines = []
-        return lines unless input.any?
-        card_line = ""
-        input.each_with_index{|c, i|
-          s = (i + Aro::Mancy::S) % [Aro::Mancy::S, columns].max
-          card_line += c.ljust(columns)
-          if Aro::Mancy::O == s || i == input.count - Aro::Mancy::S
-            lines << card_line
-            card_line = ""
+        while input.any?
+          line = []
+          columns.times do
+            next if input[Aro::Mancy::O].nil?
+            line << input.delete_at(Aro::Mancy::O).center(c_width)
           end
-        }
+          lines << line.join("")
+        end
         lines << ""
         lines
       end

data/sys/aos/vws/welcome.rb

@@ -16,7 +16,7 @@ module Aos
       def self.show
         lines = []
 
-        dc = Aos::Cor.display_configuration
+        dc = Aos::Cor.discon
         width = dc[:WIDTH]
 
         lines << "welcome to #{Aro::Dom.ethergeist_name}".center(width)

data/sys/aro/db.rb

@@ -23,10 +23,8 @@ module Aro
 
     def self.load
       Aro::Db.configure_logger
-      Mutex.new.synchronize do
-        if Aro::Mancy.in_aro?
-          self.instance.setup_local_aro
-        end
+      if Aro::Mancy.in_aro?
+        self.instance.setup_local_aro
       end
     end
 
@@ -51,7 +49,7 @@ module Aro
 
     def setup_local_aro
       name = Aro::Mancy.in_aro? ? Aro::Mancy.aro_mancy_name : nil
-      return if name.nil?
+      return if name.nil? || name.to_sym == Aos::Os::CMDS[:ABOT][:key]
 
       # create local .aro/ directory
       unless File.exist?(Aro::Db.base_aro_dir)

data/sys/aro/models/teck.rb

@@ -48,6 +48,7 @@ class Aro::Teck < ActiveRecord::Base
   end
 
   def self.display_selection_menu
+    Aro::Db.load
     unless Aro::Teck.any?
       Aro::P.say(I18n.t("cli.messages.no_tecks"))
       exit(CLI::EXIT_CODES[:SUCCESS])
@@ -97,6 +98,7 @@ class Aro::Teck < ActiveRecord::Base
     end
 
     # perform query
+    Aro::Db.load
     tlog_records = tlogs.order(created_at: order_o).first(count_n)
 
     # todo: this is doing more work than it needs to. needs debugging.
@@ -121,20 +123,29 @@ class Aro::Teck < ActiveRecord::Base
       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: Aos::Cor.display_configuration[:HEIGHT] - Aro::Mancy::S,
+      per_page: Aos::Cor.discon[: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::Teck.card_strip(answer)}")
-    indent = Aro::Mancy::N
-    Aro::P.say(definition[:name])
-    Aro::P.say(definition[:summary])
-    Aro::P.say("tags:")
-    definition[:tag_list].sort.each{|tl| Aro::P.say("".rjust(indent) + tl)}
-    Aro::P.say(definition[:reversed_summary])
-    Aro::P.say("reverse tags:")
-    definition[:reversed_tag_list].sort.each{|tl| Aro::P.say("".rjust(indent) + tl)}
+
+    Aro::Teck.print_card(answer)
+  end
+
+  def self.print_card(card_code)
+    card_code = card_code.to_s.upcase
+    orientation = "+"
+    if card_code.include?("-")
+      orientation = "-"
+    end
+
+    definition = I18n.t("cards.#{Aro::Teck.card_strip(card_code)}")
+    output = []
+    output << orientation + definition[:name]
+    output += definition["#{orientation}tags".to_sym].sort
+    # 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")}")
   end
 
   def shuffle
@@ -185,7 +196,7 @@ class Aro::Teck < ActiveRecord::Base
     # find a card that is not already drawn
     while sleeps <= sleeps_max && dev_tarot.nil? do
       # use fallback randomness if /dev/tarot unavailable
-      if !is_dt_dimension || !File.exist?(Aro::T::DEV_TAROT_FILE.to_s)
+      unless Aro::T.is_dev_tarot? && Aro::T.is_dev_tarot_avail?
         dev_tarot = Aro::T.summon_ruby_facot.split("")
       else
         # preferred randomness
@@ -219,6 +230,8 @@ class Aro::Teck < ActiveRecord::Base
 
     # insert dev_tarot to drawn
     drawn_arr << dev_tarot
+    Aro::Teck.print_card(dev_tarot)
+    Aro::Db.load
 
     # update database 
     update(

data/sys/cli/constants.rb

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

data/sys/cli/create.rb

@@ -10,7 +10,7 @@
 
 module CLI
   def self.create
-    CLI::Nterface.exit_error_missing_args! if CLI::ARGV1.nil?
+    CLI::Nterface.exit_error_missing_args!(:var_aro_name) if CLI::ARGV1.nil?
     
     name = CLI::ARGV1&.to_s
     Aro::P.say(I18n.t("cli.messages.creation_attempt", name: name))

data/sys/cli/dom.rb

@@ -11,7 +11,7 @@
 module CLI
   def self.dom
     if CLI::FLAGS[:HELP].include?(CLI::ARGV1)
-      CLI.usage::usage
+      CLI.usage_dom
       exit(CLI::EXIT_CODES[:SUCCESS])
     end
 
@@ -30,7 +30,7 @@ module CLI
         CLI::Nterface.exit_error_invalid_usage!
       end
     when CLI::CMDS[:DOM][:NEW]
-      CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
+      CLI::Nterface.exit_error_missing_args!(:var_dom_name) if CLI::ARGV2.nil?
       if Aro::Dom.in_arodom?
         Aro::P.say(I18n.t("dom.errors.failed_already_in_arodom"))
       elsif Aro::Mancy.in_aro?

data/sys/cli/nterface.rb

@@ -10,22 +10,28 @@
 
 module CLI
   class Nterface
-    def self.exit_error_missing_args!
-      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy::I2097I))
-      Aro::P.say(I18n.t("cli.errors.missing_args", cmd: Aro::Mancy::I2097I))
+    def self.exit_error_not_found!(arg)
+      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy))
+      Aro::P.say(I18n.t("cli.errors.not_found", cmd: arg))
       exit(CLI::EXIT_CODES[:INVALID_ARG])
     end
 
-    def self.exit_error_invalid_usage!
-      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy::I2097I))
-      Aro::P.say(I18n.t("cli.errors.invalid_usage", cmd: Aro::Mancy::I2097I))
+    def self.exit_error_missing_args!(arg)
+      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy))
+      Aro::P.say(I18n.t("cli.errors.missing_args", cmd: arg))
       exit(CLI::EXIT_CODES[:INVALID_ARG])
     end
 
+    def self.exit_error_invalid_usage!
+      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy))
+      Aro::P.say(I18n.t("cli.errors.invalid_usage", cmd: Aro::Mancy))
+      exit(CLI::EXIT_CODES[:GENERAL_ERROR])
+    end
+
     def self.exit_error_not_initialized!
-      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy::I2097I))
-      Aro::P.say(I18n.t("cli.errors.not_initialized", cmd: Aro::Mancy::I2097I))
-      exit(CLI::EXIT_CODES[:INVALID_ARG])
+      Aro::P.say(I18n.t("cli.errors.header", cmd: Aro::Mancy))
+      Aro::P.say(I18n.t("cli.errors.not_initialized", cmd: Aro::Mancy))
+      exit(CLI::EXIT_CODES[:GENERAL_ERROR])
     end
   end
 end

data/sys/cli/teck.rb

@@ -12,10 +12,8 @@ module CLI
   def self.teck
     Aro::Mancy.init
     action = CLI::ARGV1&.to_sym
-
-    if CLI::FLAGS[:HELP].include?(action.to_s)
-      # todo: breakout usage into subcommand-specific verbiage
-      CLI.usage::usage
+    if CLI::FLAGS[:HELP].include?(action)
+      CLI.usage_teck
       exit(CLI::EXIT_CODES[:SUCCESS])
     elsif action.nil? || action == :aos
       # no args, open teck menu
@@ -25,7 +23,7 @@ module CLI
         Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
       end
     elsif action == CLI::CMDS[:TECK][:NEW]
-      CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
+      CLI::Nterface.exit_error_missing_args!(:var_teck_name) if CLI::ARGV2.nil?
       if Aro::Mancy.in_aro?
         teck = Aro::Teck.make(CLI::ARGV2.to_s)
         Aro::P.say(I18n.t("cli.messages.teck_created_sucessfully", name: teck.name))
@@ -47,6 +45,7 @@ module CLI
         Aro::P.say(I18n.t("cli.messages.shuffling", name: Aro::Mancy.teck.name))
         Aro::Mancy.teck.shuffle
       when CLI::CMDS[:TECK][:DRAW]
+        Aos::Cor.instance.load
         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(
@@ -59,7 +58,6 @@ module CLI
         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])

data/sys/cli/usage.rb

@@ -9,7 +9,17 @@
 =end
 
 module CLI
-  def self.usage
+
+  def self.usage_dom
+    Aro::P.less(I18n.t("usage.dom"))
+  end
+
+  def self.usage_main
     Aro::P.less(I18n.t("usage.main"))
   end
+
+  def self.usage_teck
+    Aro::P.less(I18n.t("usage.teck"))
+  end
+
 end

data/sys/dom/dom.rb

@@ -115,7 +115,6 @@ module Aro
         end
       }
       found_space = nil if found_room.nil?
-
       [found_space, found_room].compact.join("/")
     end
 

data/sys/fpx.rb

@@ -13,15 +13,6 @@ require :sinatra.to_s
 
 module Aos
   module Fpx
-    def self.read_you(you_name)
-      url = URI.parse(File.join(Aos::Fpx::Server::URL, :"you/#{you_name}".to_s))
-      req = Net::HTTP::Get.new(url.to_s)
-      res = Net::HTTP.start(url.host, url.port) {|http|
-        http.request(req)
-      }
-      res.body
-    end
-
     class Server < Sinatra::Base
       PORT = 7474
       HOST = :localhost
@@ -29,54 +20,51 @@ module Aos
       URL = :"http://#{Aos::Fpx::Server::HOST}:#{Aos::Fpx::Server::PORT}/".to_s
       TIMEOUT = Aro::Mancy::NUMERALS[:VI] * Aro::Mancy::NUMERALS[:X]
 
-      def self.serve_pid_file
-        return "" if Aro::Dom.dom_root.nil? || Aro::Dom.room_path(:abot).nil?
+      def self.log_filepath
+        File.join(
+          Aro::Dom.dom_root,
+          Aro::Dom.room_path(:flie),
+          "fpx.log"
+        )
+      end
+
+      def self.server_pid_file
+        return "" if Aro::Dom.dom_root.nil? || Aro::Dom.room_path(:flie).nil?
         File.join(Aro::Dom.dom_root, Aro::Dom.room_path(:flie), "fpx.pid")
       end
 
-      # def self.log_file
-      #   File.new(
-      #     File.join(
-      #       Aro::Dom.dom_root,
-      #       Aro::Dom.room_path(:flie),
-      #       "fpx.log"
-      #     ),
-      #     "a+"
-      #   )
-      # end
 
       def self.start
-        return if File.exist?(Aos::Fpx::Server.serve_pid_file)
+        return if File.exist?(Aos::Fpx::Server.server_pid_file)
 
         serve_pid = fork {Aos::Fpx::Server.run!}
         Process.detach(serve_pid)
-        File.open(Aos::Fpx::Server.serve_pid_file, "w") do |f|
+        File.open(Aos::Fpx::Server.server_pid_file, "w") do |f|
           f.write(serve_pid)
         end
       end
 
       def self.stop
-        if File.exist?(Aos::Fpx::Server.serve_pid_file)
-          system("kill -9 #{File.read(Aos::Fpx::Server.serve_pid_file)}")
-          FileUtils.rm(Aos::Fpx::Server.serve_pid_file)
+        if File.exist?(Aos::Fpx::Server.server_pid_file)
+          system("kill -9 #{File.read(Aos::Fpx::Server.server_pid_file)}")
+          FileUtils.rm(Aos::Fpx::Server.server_pid_file)
         end
       end
 
+      # todo: make this work
+      # aos fpx -h localhost -p 7474 -t 60 -l root/flie/fpx.log --flie localhost:3000
+
       set :port, Aos::Fpx::Server::PORT
       # set :bind, "0.0.0.0"
       set :server_settings, timeout: Aos::Fpx::Server::TIMEOUT
 
-      # configure do
-      #   enable :logging
-      #   file = Aos::Fpx::Server.log_file
-      #   file.sync = true
-      #   use Rack::CommonLogger, file
-      #   set :logging, Logger::DEBUG
-      # end
-
-      # after do
-      #   ActiveRecord::Base.clear_active_connections!
-      # end
+      configure do
+        enable :logging
+        file = File.new(Aos::Fpx::Server.log_filepath, "w+")
+        file.sync = true
+        use Rack::CommonLogger, file
+        set :logging, Logger::DEBUG
+      end
 
       use Rack::Cors do |config|
         config.allow do |allow|

data/sys/shr/t.rb

@@ -52,7 +52,7 @@ module Aro
       # get orientation
       rf = ["+","-"].sample
 
-      # get suite
+      # get suit
       rf += ruby_facot[1]
 
       # calculate the sym
@@ -60,7 +60,7 @@ module Aro
         # loops through the characters in ruby_facot
         # return all characters not matching:
         # => character[0]: orientation
-        # => character[1]: suite 
+        # => character[1]: suit
 
         # the first two characters in the dev_tarot format designate the
         !ruby_facot.first(Aro::Mancy::OS).include?(c)

data/sys/shr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aro
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - i2097i
@@ -242,7 +242,6 @@ files:
 - sys/aos/db/migrate/1766203888_create_fpxies.rb
 - sys/aos/flie.rb
 - sys/aos/models/agodo.rb
-- sys/aos/models/base_model.rb
 - sys/aos/models/fpxy.rb
 - sys/aos/models/ilib.rb
 - sys/aos/models/ilog.rb

data/sys/aos/models/base_model.rb

@@ -1,13 +0,0 @@
-=begin
-
-  aos/base_model.rb
-
-  aos base_model object.
-
-  by i2097i
-
-=end
-
-class Aos::BaseModel < ActiveRecord::Base
-
-end