aro 0.1.9 → 0.2.0

data/sys/cli/config.rb

@@ -154,7 +154,6 @@ module CLI
     def validate_config
       invalid_vars = []
       CLI::Config::DEF.each{|k, v|
-        Aro::V.say(v[:access])
         is_valid = v[:access] == CLI::Config::DEF_ACCESS[:READ]
         unless is_valid
           is_valid = valid_var?(CLI::Config.ivar(k), k, v)
@@ -205,6 +204,18 @@ module CLI
         value: CLI::Config::BOOLS[:FALSE],
         description: I18n.t("cli.config.verbose_description"),
       },
+      LOG_AOS_DB: {
+        type: CLI::Config::TYPES[:BOOL],
+        access: CLI::Config::DEF_ACCESS[:WRITE],
+        value: CLI::Config::BOOLS[:FALSE],
+        description: I18n.t("cli.config.log_aos_db_description"),
+      },
+      LOG_ARO_DB: {
+        type: CLI::Config::TYPES[:BOOL],
+        access: CLI::Config::DEF_ACCESS[:WRITE],
+        value: CLI::Config::BOOLS[:FALSE],
+        description: I18n.t("cli.config.log_aro_db_description"),
+      },
       FORMAT: { # not implemented yet.
         type: CLI::Config::TYPES[:VALUES],
         implemented: false,
@@ -343,12 +354,13 @@ module CLI
     def initialize
       @@context = nil
       if Aro::Mancy.in_aro? && Aro::Mancy.is_initialized?
-        @@context = Aro::Mancy.name
+        @@context = Aro::Db
       elsif Aro::Dom.in_arodom? && Aro::Dom.is_initialized?
-        @@context = Aro::Dom.name
+        @@context = Aos::Db
       end
 
       return if @@context.nil?
+      Aro::V.say(@@context)
 
       unless File.exist?(CLI::Config.config_filepath)
         generate_config
@@ -358,9 +370,24 @@ module CLI
       setup_env
     end
 
+    def self.context
+      @@context
+    end
+
     def self.config_filepath
-      db_cls = @@context == Aro::Dom.name ? Aos::Db : Aro::Db
-      File.join(db_cls.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      cfp = nil
+      if @@context == Aro::Db &&
+        Aro::Dom.in_arodom? &&
+        Aro::Dom.is_initialized?
+
+        # override when in arodome game room
+        # this ensures the arodome config is being used
+        cfp = File.join(Aos::Db.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      else
+        cfp = File.join(@@context.base_aro_dir, CLI::Config::CONFIG_FILE.to_s)
+      end
+
+      cfp
     end
 
     def self.is_test?
@@ -368,13 +395,10 @@ module CLI
     end
 
     def self.display_config
-      # Aro::V.say(__method__)
-      width = CLI::Config.ivar(:WIDTH).to_i
-      columns = width.pow(Aro::Mancy::S.to_f / Aro::Mancy::OS.to_f).to_i
+      height, width = IO.console.winsize
       result = {
-        COLUMNS: columns,
-        HEIGHT: CLI::Config.ivar(:HEIGHT).to_i,
-        WIDTH: width,
+        HEIGHT: height, #CLI::Config.ivar(:HEIGHT).to_i,
+        WIDTH: width - Aro::Mancy::O,
         DIVIDER: :"_".to_s
       }
       # Aro::V.say(result)
@@ -382,6 +406,10 @@ module CLI
       result
     end
 
+    def self.is_format_text?
+      CLI::Config.ivar(:FORMAT)&.to_sym == CLI::Config::FORMATS[:TEXT]
+    end
+
     def self.process_config_command(args)
       if args[1].nil? || args[1] == :aos.to_s
         # print config
@@ -418,16 +446,18 @@ module CLI
       current_value = CLI::Config.ivar(k)
       # ensure the var name is valid
       unless current_value.nil?
-        Aro::V.say("validating #{k} with value #{new_value}")
+        Aro::Dom::P.say("validating #{k} with value #{new_value}")
         if CLI::Config.instance.valid_var?(new_value, k, CLI::Config::DEF[k])
           # set ENV value
           ENV[CLI::Config.ivar_k(k)] = new_value
+          Aro::Dom::P.say("#{k} set to #{new_value}")
           Aro::V.say(ENV[CLI::Config.ivar_k(k)])
 
           # flush existing config and regen
           CLI::Config.instance.generate_config(true)
           CLI::Config.instance.source_config
           CLI::Config.instance.setup_env
+          @@context.configure_logger
         else
           Aro::Dom::P.say("the ivar value you entered is invalid. ignoring.")
         end

data/sys/cli/deck.rb

@@ -19,13 +19,22 @@ module CLI
       exit(CLI::EXIT_CODES[:SUCCESS])
     elsif action.nil? || action == :aos
       # no args, open deck menu
-      Aro::Db.new
-      Aro::Deck.display_selection_menu
+      if Aro::Mancy.in_aro?
+        Aro::Db.new
+        Aro::Deck.display_selection_menu
+      else
+        Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
+      end
     elsif action == CLI::CMDS[:DECK][:NEW]
       CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
-      deck = Aro::Deck.make(CLI::ARGV2.to_s)
-      Aro::P.say(I18n.t("cli.messages.deck_created_sucessfully", name: Aro::Mancy.game.name))
-      Aro::Deck.display_selection_menu
+      if Aro::Mancy.in_aro?
+        Aro::Db.new
+        deck = Aro::Deck.make(CLI::ARGV2.to_s)
+        Aro::P.say(I18n.t("cli.messages.deck_created_sucessfully", name: Aro::Mancy.game.name))
+        Aro::Deck.display_selection_menu
+      else
+        Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
+      end
     elsif CLI::CMDS[:DECK].values.include?(action)    
       if Aro::Mancy.game.nil?
         Aro::P.say(I18n.t("cli.errors.missing_deck", cmd: Aro::Mancy::I2097I))

data/sys/dom/dom.rb

@@ -68,6 +68,8 @@ module Aro
     end
 
     def self.is_initialized?
+      return false if !Aro::Dom.in_arodom?
+
       File.exist?(File.join(Aro::Dom::ethergeist_path, Aos::Db::SQL_FILE.to_s))
     end
 
@@ -111,6 +113,7 @@ module Aro
       search_path.any?{|step|
         search_pwd = File.join(search_pwd, step)
         ls = Dir.glob("#{search_pwd}/#{ETHER_FILE}", File::FNM_DOTMATCH)
+
         path = ls.first if ls.any?
         !path.nil?
       }
@@ -155,7 +158,7 @@ module Aro
       FileUtils.mkdir(room_path)
 
       if wing[:name] == Aro::Dom::GAMES
-        File.open(File.join(room_path, Aro::Mancy::NAME_FILE.to_s), "w+") do |f|
+        File.open(File.join(room_path, Aro::Mancy::NAME_FILE.to_s), "w") do |f|
           f.write(room[:name])
         end
       end

data/sys/models/deck.rb

@@ -56,7 +56,8 @@ class Aro::Deck < ActiveRecord::Base
       exit(CLI::EXIT_CODES[:SUCCESS])
     end
 
-    selection = Aro::P.p.select("choose a deck:") do |menu|
+    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
@@ -119,15 +120,23 @@ class Aro::Deck < ActiveRecord::Base
   def explore
     # allows user to browse each card in the current deck.
     answer = Aro::P.p.select(
-      I18n.t("cli.messages.choose_card"),
+      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: Aro::Mancy::NUMERALS[:VII],
+      per_page: CLI::Config.display_config[:HEIGHT] - Aro::Mancy::S,
       cycle: true,
       default: Aro::Mancy::S
     )
-
-    Aro::P.say(I18n.t("cards.#{Aro::Deck.card_strip(answer)}"))
+    # {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)}")
+    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)}
   end
 
   def shuffle

data/sys/reiquire.rb

@@ -13,6 +13,7 @@ require :active_record.to_s
 require :"active_record/schema_dumper".to_s
 require :base64.to_s
 require :fileutils.to_s
+require :"io/console".to_s
 require :i18n.to_s
 require :readline.to_s
 require :"tty-prompt".to_s

data/sys/shr/t.rb

@@ -21,14 +21,22 @@ module Aro
     # read dev_tarot
     def self.read_dev_tarot
       dt = nil
-      if Aro::T.is_dev_tarot? && File.exist?(Aro::T::DEV_TAROT_FILE.to_s)
-        File.open(Aro::T::DEV_TAROT_FILE.to_s, "r"){|dtf| dt = dtf.read(Aro::Mancy::N)}
-        # VERY IMPORTANT!
-        Aro::V.say(I18n.t("cli.very_important", dev_tarot: dt))
-      else
+      if Aro::T.is_dev_tarot?
+        if File.exist?(Aro::T::DEV_TAROT_FILE.to_s)
+          File.open(Aro::T::DEV_TAROT_FILE.to_s, "r"){|dtf| dt = dtf.read(Aro::Mancy::N)}
+          # VERY IMPORTANT!
+          Aro::V.say(I18n.t("cli.very_important", dev_tarot: dt))
+        else
+          Aro::D.say("error: /dev/tarot not installed.")
+        end
+      end
+
+      if dt.nil?
+        # fallback on ruby_facot
         Aro::V.say("warning: summoning ruby_facot in #{__method__}")
-        dt = Aro::T.summon_ruby_facot unless Aro::T.is_dev_tarot?
+        dt = Aro::T.summon_ruby_facot
       end
+
       return dt
     end
 

data/sys/shr/version.rb

@@ -9,10 +9,6 @@
 =end
 
 module Aro
-  VERSION = :"0.1.9"
-  RELEASE_NOTES = :"this version".to_s + [
-    "adds improved views.",
-    "adds aro gameplay within an arodome game room.",
-    "adds ability to set config ivars from aos."
-  ].join(",")
+  VERSION = :"0.2.0"
+  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.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - i2097i
@@ -194,6 +194,7 @@ files:
 - checksums/aro-0.1.7.gem.sha512
 - checksums/aro-0.1.8.gem.sha512
 - checksums/aro-0.1.9.gem.sha512
+- checksums/aro-0.2.0.gem.sha512
 - db/migrate/1763374647_create_decks.rb
 - db/migrate/1763432541_create_logs.rb
 - db/migrate/1765148774_create_yous.rb
@@ -270,6 +271,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: this versionadds improved views.,adds aro gameplay within an arodome game
-  room.,adds ability to set config ivars from aos.
+summary: this version
 test_files: []