aro 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682703a5e353fa13a2f91f36a0c6fbd40d374a353f299fcf8a8c3798e7c9db52
-  data.tar.gz: bcda82c4f2258058b4b068c7870db95877860462e6bf847eb82531141671f117
+  metadata.gz: 112a9db053a27471ff5444243b12bd55426a81491695134c269c5bb4f3513cac
+  data.tar.gz: c6d23c2cb1f9ab42d45711e9f42d91f32aa1f01d0d56896fe73751814eaa8d35
 SHA512:
-  metadata.gz: 0027f44c6addc94631040f867814e184ce4ac8ad60c6cb1c8db67ae0722bd2170f77694f3613381c86071525c6b0cc7b4dc780481a8e19818d05af0e622dc1b3
-  data.tar.gz: 0c1385bea70f6e4b0d4ea715d09ba1eca90e90d30a45d948faf5a00c097c8ad352aed0abb2ebeff42e45d5fecd4768c31dfd224d8f42106936689840639520df
+  metadata.gz: 7b6c85313304ddb52defa7c17b32bbab9bd90fbb79a77235bd065ca67fb88b94a9a5005092599f85d31363cf7a922f5e625c15ced470ac49a1d9aa8b9ea04543
+  data.tar.gz: '06156495bdd7718b9655b1dc56337ba42231d3cd15a6f971a025b3941f2eaa819a2fe65d0e33890669f8b0b302a4b30eead4a50687632230b0ce220df3f49e57'

data/bin/aro

@@ -10,22 +10,7 @@
 
 =end
 
-require :aro.to_s
-[
-  :cli,
-].each do |dir|
-  Dir[
-    File.join(
-      __dir__,
-      dir.to_s,
-      :"**/*.rb".to_s
-    )
-  ].each { |file| require file}
-end
-
-# set environment variable
-ENV[:ARO_ENV.to_s] = :production.to_s
-# ENV[:ARO_ENV.to_s] = :development.to_s
+require_relative :cli.to_s
 
 # todo: add tab completion using abbrev gem
 # https://stackoverflow.com/a/11627931
@@ -36,24 +21,14 @@ ENV[:ARO_ENV.to_s] = :production.to_s
 # 
 
 module CLI
-  
-  if CLI::LOAD_DECK_ACTIONS.keys.map{|k| k.downcase.to_sym}.include?(ARGV[0]&.to_sym)
-    # enable deck shortcut (skip typing deck while in-game)
-    ARGV0 = :deck
-    ARGV1 = ARGV[0]&.to_sym
-    ARGV2 = ARGV[1]&.to_sym
-  else
-    # default
-    ARGV0 = ARGV[0]&.to_sym
-    ARGV1 = ARGV[1]&.to_sym
-    ARGV2 = ARGV[2]&.to_sym
-  end
-
   if CLI::FLAGS[:VERSION].include?(CLI::ARGV0)
-    Aro::P.p.say(Aro::VERSION)
+    Aro::P.say(Aro::VERSION)
     exit(CLI::EXIT_CODES[:SUCCESS])
   end
 
+  # initialize config
+  CLI::Config.instance
+
   # cli parser
   case CLI::ARGV0
   when :create
@@ -62,7 +37,7 @@ module CLI
     CLI::deck
   else
     unless Aro::Mancy.game.nil? || CLI::FLAGS[:HELP].include?(CLI::ARGV0)
-      Aro::P.p.say(I18n.t("cli.messages.welcome", name: "#{Aro::Mancy.name}.game.show"))
+      Aro::P.say(I18n.t("cli.messages.welcome", name: "#{Aro::Mancy.name}.game.show"))
       Aro::Mancy.game.show
       exit(CLI::EXIT_CODES[:SUCCESS])
     end
@@ -70,5 +45,5 @@ module CLI
     CLI::usage
     exit(CLI::EXIT_CODES[:SUCCESS])
   end
-  
+
 end

data/bin/cli/config.rb

@@ -0,0 +1,71 @@
+module CLI
+  class Config
+    include Singleton
+
+    VAR_PREFIX = :ARO_CONFIG_
+
+    CONFIG_FILE = :".config".to_s
+    CONFIG_FILE_PATH = "#{Aro::Db.base_aro_dir(Aro::Db.get_name_from_namefile)}/#{CLI::Config::CONFIG_FILE}"
+
+    DEFAULT_CONFIG = {
+      FORMAT: {
+        value: :text,
+        possible_values: [
+          {name: :text, description: I18n.t("cli.config.text_format_description")},
+          {name: :json, description: I18n.t("cli.config.json_format_description")},
+        ]
+      }
+      # ...
+    }
+
+    def initialize
+      return unless Aro::Mancy.is_aro_dir?
+      unless File.exist?(CLI::Config::CONFIG_FILE_PATH)
+        generate_config
+      end
+
+      source_config
+    end
+
+    def self.format
+      CLI::Config.var_value_with_suffix(:FORMAT)
+    end
+
+    def self.var_value_with_suffix(suffix)
+      ENV[CLI::Config.var_key_with_suffix(suffix)]
+    end
+
+    def self.var_key_with_suffix(suffix)
+      "#{CLI::Config::VAR_PREFIX}#{suffix}"
+    end
+
+    def generate_config
+      Aro::P.say(I18n.t("cli.config.generating_default_config", name: CLI::Config::CONFIG_FILE_PATH))
+      File.open(CLI::Config::CONFIG_FILE_PATH, "w+") do |file|
+        file.write("# #{Aro::Mancy::PS1} configuration file.\n")
+        file.write("# this file is auto generated by the aro cli.\n")
+        2.times do
+          file.write("#\n")
+        end
+        DEFAULT_CONFIG.each{|k, v|
+          var_name = CLI::Config.var_key_with_suffix(k)
+          file.write("# [#{var_name}]\n")
+          file.write("#   => #{I18n.t("cli.config.possible_values")}:\n")
+          v[:possible_values].each{|pv|
+            file.write("#   => #{pv[:name]} - #{pv[:description]}\n")
+          }
+          file.write("export #{var_name}=#{v[:value]}")
+        }
+        file.write("\n")
+      end
+    end
+
+    def source_config
+      Aro::P.say(I18n.t("cli.config.sourcing_config", name: CLI::Config::CONFIG_FILE_PATH))
+      system("source #{CLI::Config::CONFIG_FILE_PATH}")
+      DEFAULT_CONFIG.keys.each{|dfk|
+        Aro::P.say("$#{CLI::Config.var_key_with_suffix(dfk)}=#{CLI::Config.var_value_with_suffix(dfk)}")
+      }
+    end
+  end
+end

data/bin/cli/constants.rb

@@ -11,8 +11,10 @@
 module CLI
 
   FLAGS = {
-    HELP:     [:"-h", :"--help"],
-    VERSION:  [:"-v", :"--version"],
+    HELP:         [:"-h", :"--help"],
+    SHOW_COUNT:   [:"-n", :"--count"],
+    SHOW_ORDER:   [:"-o", :"--order"],
+    VERSION:      [:"-v", :"--version"],
   }
 
   EXIT_CODES = {

data/bin/cli/create.rb

@@ -10,8 +10,13 @@
 
 module CLI
   def self.create
-    name = CLI::ARGV1.to_s || I18n.t("cli.messages.invalid_name")
-    Aro::P.p.say(I18n.t("cli.messages.creation_attempt", name: name))
-    Aro::Create.new(name)
+    CLI.exit_error_missing_args! if CLI::ARGV1.nil?
+    name = CLI::ARGV1&.to_s
+    Aro::P.say(I18n.t("cli.messages.creation_attempt", name: name))
+    if Aro::Create.new(name).initialized
+      Aro::P.say(I18n.t("cli.messages.creation_success", name: name))
+    else
+      Aro::P.say(I18n.t("cli.messages.creation_failure", name: name))
+    end
   end
 end

data/bin/cli/deck.rb

@@ -17,63 +17,79 @@ module CLI
       exit(CLI::EXIT_CODES[:SUCCESS])
     elsif CLI::ARGV1.nil?
       # no args, open deck menu
-      Aro::Create.new(Aro::Database.get_name_from_namefile)
+      Aro::Create.new(Aro::Db.get_name_from_namefile)
       Aro::Deck.display_selection_menu
     elsif action == CLI::CREATE_DECK_ACTIONS[:CREATE]
-      Aro::Mancy.exit_error_missing_args! if CLI::ARGV2.nil?
+      CLI.exit_error_missing_args! if CLI::ARGV2.nil?
       deck = Aro::Deck.make(CLI::ARGV2.to_s)
-      Aro::P.p.say(I18n.t("cli.messages.deck_created_sucessfully", name: deck.name))
+      Aro::P.say(I18n.t("cli.messages.deck_created_sucessfully", name: Aro::Mancy.game.name))
       Aro::Deck.display_selection_menu
-    elsif CLI::LOAD_DECK_ACTIONS.include?(action)
-      deck = CLI::get_deck
-
-      if action == CLI::LOAD_DECK_ACTIONS[:EXPLORE]
-        deck.explore
-      else
-        # assume shuffle or show, in which case show is always called
-        if action == CLI::LOAD_DECK_ACTIONS[:SHUFFLE]
-          Aro::P.p.say(I18n.t("cli.messages.shuffling", name: deck.name))
-          deck.shuffle
-        elsif action == CLI::LOAD_DECK_ACTIONS[:DRAW]
-          Aro::P.p.say(I18n.t("cli.messages.drawing", name: deck.name))
-          deck.draw
-        elsif action == CLI::LOAD_DECK_ACTIONS[:REPLACE]
-          Aro::P.p.say(I18n.t("cli.messages.replacing_drawn", name: deck.name))
-          deck.replace
-        elsif action == CLI::LOAD_DECK_ACTIONS[:RESET]
-          if Aro::AROYES != Aro::P.p.ask(I18n.t("cli.messages.confirmation_prompt", name: deck.name))
-            Aro::P.p.say(I18n.t("cli.messages.understood", name: deck.name))
-            exit(CLI::EXIT_CODES[:SUCCESS])
-          end
+    elsif CLI::LOAD_DECK_ACTIONS.include?(action)    
+      if Aro::Mancy.game.nil?
+        Aro::P.say(I18n.t("cli.errors.missing_deck"))
+        exit(CLI::EXIT_CODES[:GENERAL_ERROR])
+      end
 
-          Aro::P.p.say(I18n.t("cli.messages.resetting", name: deck.name))
-          deck.reset
+      case action
+      when CLI::LOAD_DECK_ACTIONS[:EXPLORE]
+        Aro::Mancy.game.explore
+        exit(CLI::EXIT_CODES[:SUCCESS])
+      when CLI::LOAD_DECK_ACTIONS[:SHUFFLE]
+        Aro::P.say(I18n.t("cli.messages.shuffling", name: Aro::Mancy.game.name))
+        Aro::Mancy.game.shuffle
+      when CLI::LOAD_DECK_ACTIONS[:DRAW]
+        Aro::P.say(I18n.t("cli.messages.drawing", name: Aro::Mancy.game.name))
+        Aro::Mancy.game.draw
+      when CLI::LOAD_DECK_ACTIONS[:REPLACE]
+        Aro::P.say(I18n.t("cli.messages.replacing_drawn", name: Aro::Mancy.game.name))
+        Aro::Mancy.game.replace
+      when CLI::LOAD_DECK_ACTIONS[:RESET]
+        if Aro::AROYES != Aro::P.p.ask(I18n.t("cli.messages.confirmation_prompt", name: Aro::Mancy.game.name))
+          Aro::P.say(I18n.t("cli.messages.understood", name: Aro::Mancy.game.name))
+          exit(CLI::EXIT_CODES[:SUCCESS])
         end
 
-        Aro::P.p.say(I18n.t("cli.messages.showing", name: deck.name))
-        deck.show
+        Aro::P.say(I18n.t("cli.messages.resetting", name: Aro::Mancy.game.name))
+        Aro::Mancy.game.reset
       end
+
+      Aro::Mancy.game.show(**CLI::Deck.shoptions)
     else
       CLI::usage
     end
   end
 
-  def self.get_deck
-    Aro::Create.new(Aro::Database.get_name_from_namefile)
-    deck = nil
-    if CLI::ARGV2.nil?
-      # assume current deck
-      deck = Aro::Deck.current_deck
-    else
-      deck = Aro::Deck.find_by(name: CLI::ARGV2)
-      deck = Aro::Deck.find_by(id: CLI::ARGV2) if deck.nil?
-    end
+  module Deck
+
+    # parse show options
+    def self.shoptions
+      show_options_count = Aro::Log::DEFAULT_COUNT
+      show_options_order = Aro::Log::ORDERING[:DESC]
+      
+      # Aro::P.say("ARGV.map{|a| a.to_sym} => #{ARGV.map{|a| a.to_sym}}")
+      
+      count_option_flags = ARGV.map{|a| a.to_sym} & CLI::FLAGS[:SHOW_COUNT]
+      # Aro::P.say("count_option_flags: #{count_option_flags}")
+      if count_option_flags.any?
+        # get the ARGV index element after flag index
+        show_options_count = ARGV[ARGV.index(count_option_flags.first.to_s) + 1]
+        show_options_count = show_options_count.to_i unless [0, nil].include?(show_options_count&.to_i)
+        # Aro::P.say("show_options_count: #{show_options_count}")
+      end
+
+      order_option_flags = ARGV.map{|a| a.to_sym} & CLI::FLAGS[:SHOW_ORDER]
+      # Aro::P.say("count_option_flags: #{order_option_flags}")
+      if order_option_flags.any?
+        # get the ARGV index element after flag index
+        show_options_order = ARGV[ARGV.index(order_option_flags.first.to_s) + 1].upcase.to_sym
+        Aro::P.say("show_options_order: #{show_options_order}")
+      end
 
-    if deck.nil?
-      Aro::P.p.say(I18n.t("cli.errors.missing_deck", cmd: "#{CLI::ARGV0} #{CLI::ARGV1} #{CLI::ARGV2}"))
-      exit(CLI::EXIT_CODES[:GENERAL_ERROR])
+      {
+        count_n: show_options_count,
+        order_o: show_options_order
+      }
     end
 
-    deck
   end
 end

data/bin/cli.rb

@@ -0,0 +1,36 @@
+require :aro.to_s
+[:cli].each do |dir|
+  Dir[
+    File.join(
+      __dir__,
+      dir.to_s,
+      :"**/*.rb".to_s
+    )
+  ].each { |file| require file}
+end
+
+# set environment variable
+ENV[:ARO_ENV.to_s] = :production.to_s
+# ENV[:ARO_ENV.to_s] = :development.to_s
+
+module CLI
+  
+  if CLI::LOAD_DECK_ACTIONS.keys.map{|k| k.downcase.to_sym}.include?(ARGV[0]&.to_sym)
+    # enable deck shortcut (skip typing deck while in-game)
+    ARGV0 = :deck
+    ARGV1 = ARGV[0]&.to_sym
+    ARGV2 = ARGV[1]&.to_sym
+  else
+    # default
+    ARGV0 = ARGV[0]&.to_sym
+    ARGV1 = ARGV[1]&.to_sym
+    ARGV2 = ARGV[2]&.to_sym
+  end
+
+  def self.exit_error_missing_args!
+    Aro::P.say(I18n.t("cli.errors.header"))
+    Aro::P.say(I18n.t("cli.errors.missing_args", cmd: "#{CLI::ARGV0} #{CLI::ARGV1} #{CLI::ARGV2}".strip))
+    exit(CLI::EXIT_CODES[:INVALID_ARG])
+  end
+
+end

data/lib/aro/create.rb

@@ -1,29 +1,28 @@
 module Aro
   class Create
-    def initialize(name = nil)
-      name = name&.strip
+    attr_accessor :initialized
 
-      error_msg = nil
+    def initialize(name)
+      self.initialized = false
 
-      # is a non-empty string
-      error_msg = I18n.t("cli.errors.missing_args", cmd: "aro create") if name.nil? || !name.kind_of?(String) || name.empty?
+      if !name.nil? && (
+        name.kind_of?(String) ||
+        name.kind_of?(Symbol)
+      )
+        # explicitly only allow String/Symbol types for name
+        name = name.to_s.strip
 
-      # display error and abort
-      unless error_msg.nil?
-        Aro::P.p.say(error_msg)
-        Aro::Mancy.exit_error_missing_args!
-      end
+        # create the new aro directory and database
+        if Aro::Db.get_name_from_namefile.nil? && !Dir.exist?(name)
+          Aro::P.say(I18n.t("cli.messages.no_decks"))
+          create_cmd = "mkdir #{name}"
+          Aro::P.say("#{create_cmd} (result: #{system(create_cmd)})")
+        end
 
-      # create the new aro directory and database
-      if Aro::Database.get_name_from_namefile.nil? && !Dir.exist?(name)
-        Aro::P.p.say(I18n.t("cli.messages.no_decks"))
-        create_cmd = "mkdir #{name}"
-        Aro::P.p.say(create_cmd)
-        system(create_cmd)
+        # create database
+        Aro::Db.new(name) 
+        self.initialized = true       
       end
-
-      # create database
-      Aro::Database.new(name)
     end
 
   end

data/lib/aro/{database.rb → db.rb}

@@ -1,28 +1,27 @@
 require :active_record.to_s
 require :base64.to_s
 require :yaml.to_s
+require :fileutils.to_s
 
 module Aro
-  class Database
+  class Db
     CONFIG_FILE = "database.yml"
     SQL_FILE = "database.sql"
     SCHEMA_FILE = "schema.rb"
     MIGRATIONS_DIR = "db/migrate"
-    NAME_FILE = ".name"
 
     def initialize(name = nil)
       # show queries in stout
       ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV[:ARO_ENV.to_s] == :development.to_s
 
       # generate .name file
-      if name.nil? && Aro::Database.is_aro_dir?
+      if name.nil? && Aro::Mancy.is_aro_dir?
         # pwd is in aro directory, use name file
         name = get_name_from_namefile
-      elsif !name.nil? && !Aro::Database.is_aro_dir?
+      elsif !name.nil? && !Aro::Mancy.is_aro_dir?
         # first use, pwd is not in aro directory yet
-        echo_cmd = "echo #{name} >> #{name}/#{NAME_FILE}"
-        Aro::P.p.say(echo_cmd)
-        system(echo_cmd)
+        echo_cmd = "echo #{name} >> #{name}/#{Aro::Mancy::NAME_FILE}"
+        Aro::P.say("#{echo_cmd} (result: #{system(echo_cmd)})")
       end
 
       if name.nil?
@@ -41,44 +40,39 @@ module Aro
       @config ||= YAML.load_file(db_config_filepath(name))
     end
 
-    def base_aro_dir(name)
-      "#{Aro::Database.is_aro_dir? ? "." : name}/#{Aro::DIRS[:ARO].call}"
+    def self.base_aro_dir(name)
+      "#{Aro::Mancy.is_aro_dir? ? "." : name}/#{Aro::DIRS[:ARO].call}"
     end
 
     def db_config_filepath(name)
-      "#{base_aro_dir(name)}/#{CONFIG_FILE}"
+      "#{Aro::Db.base_aro_dir(name)}/#{CONFIG_FILE}"
     end
 
     def db_filepath(name)
-      "#{base_aro_dir(name)}/#{SQL_FILE}"
-    end
-
-    def self.is_aro_dir?
-      File.exist?(NAME_FILE)
+      "#{Aro::Db.base_aro_dir(name)}/#{SQL_FILE}"
     end
 
     def self.get_name_from_namefile
-      Aro::Database.is_aro_dir? ? File.read(NAME_FILE).strip : nil
+      Aro::Mancy.is_aro_dir? ? File.read(Aro::Mancy::NAME_FILE).strip : nil
     end
 
     def setup_local_aro(name = nil, force = false)
       # create local .aro/ directory
-      unless File.exist?(base_aro_dir(name)) || force
-        if File.exist?(base_aro_dir(name)) && force
-          rm_cmd = "rm -rf #{base_aro_dir(name)}"
-          Aro::P.p.say(rm_cmd)
+      unless File.exist?(Aro::Db.base_aro_dir(name)) || force
+        if File.exist?(Aro::Db.base_aro_dir(name)) && force
+          rm_cmd = "rm -rf #{Aro::Db.base_aro_dir(name)}"
+          Aro::P.say(rm_cmd)
           system(rm_cmd)
         end
 
-        mk_cmd = "mkdir #{base_aro_dir(name)}"
-        Aro::P.p.say(mk_cmd)
-        system(mk_cmd)
+        mk_cmd = "mkdir #{Aro::Db.base_aro_dir(name)}"
+        Aro::P.say("#{mk_cmd} (result: #{system(mk_cmd)})")
       end
 
       # create database config yaml file
       c = {
         adapter: :sqlite3.to_s,
-        database: "#{Aro::Database.is_aro_dir? ? "." : name}/#{Aro::DIRS[:ARO].call}/#{SQL_FILE}",
+        database: "#{Aro::Db.base_aro_dir(name)}/#{SQL_FILE}",
         username: name,
         password: name
       }.to_yaml
@@ -91,11 +85,11 @@ module Aro
     end
 
     def setup(name)
-      local_migrate_dir = "#{base_aro_dir(name)}/#{MIGRATIONS_DIR}"
+      local_migrate_dir = "#{Aro::Db.base_aro_dir(name)}/#{MIGRATIONS_DIR}"
       unless Dir.exist?(local_migrate_dir)
         gem_dir = Dir[Gem.loaded_specs[:aro.to_s]&.full_gem_path || '.'].first
-        cp_cmd = "cp -R #{gem_dir}/db #{base_aro_dir(name)}"
-        Aro::P.p.say(cp_cmd)
+        cp_cmd = "cp -R #{gem_dir}/db #{Aro::Db.base_aro_dir(name)}"
+        Aro::P.say(cp_cmd)
         system(cp_cmd)
       end
 
@@ -104,7 +98,7 @@ module Aro
       }.max
       ActiveRecord::MigrationContext.new(local_migrate_dir).migrate(migration_version)
       require 'active_record/schema_dumper'
-      filename = "#{base_aro_dir(name)}/#{SCHEMA_FILE}"
+      filename = "#{Aro::Db.base_aro_dir(name)}/#{SCHEMA_FILE}"
       File.open(filename, "w+") do |f|
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection_pool, f)
       end

data/lib/aro/i18n.rb

@@ -3,12 +3,12 @@
 require :i18n.to_s
 
 module Aro
-  # ...
-end
+  LOCALE_DIR = :locale
 
-locale_path = Gem.loaded_specs[:aro.to_s]&.full_gem_path
-if Aro::IS_TEST.call
-  locale_path = Dir.pwd
-end
-I18n.load_path += Dir["#{locale_path}/locale/*.yml"]
-I18n.default_locale = :en
+  locale_path = Gem.loaded_specs[:aro.to_s]&.full_gem_path
+  if Aro::IS_TEST.call
+    locale_path = Dir.pwd
+  end
+  I18n.load_path += Dir["#{locale_path}/#{LOCALE_DIR}/*.yml"]
+  I18n.default_locale = :en
+end

data/lib/aro/prompt.rb

@@ -14,6 +14,10 @@ module Aro
       P.instance.prompt
     end
 
+    def self.say(message)
+      Aro::P::p.say("[#{Aro::Mancy::PS1}@#{Time.now.to_i}]: #{message}")
+    end
+
     def self.less(display_text = "")
       IO.popen("less -X", "w") { |f| f.puts display_text }
     end

data/lib/aro/version.rb

@@ -1,4 +1,4 @@
 module Aro
-  VERSION = :"0.1.2"
-  RELEASE_NOTES = :"fixed bug with deck create."
+  VERSION = :"0.1.3"
+  RELEASE_NOTES = :"added deck show options for count and order."
 end

data/lib/aro.rb

@@ -16,20 +16,21 @@ module Aro
 
     attr_accessor :game
 
+    PS1 = Aro::Mancy.name
+    NAME_FILE = ".name"
+
     def initialize
-      Aro::Create.new(Aro::Database.get_name_from_namefile)
+      Aro::Create.new(Aro::Db.get_name_from_namefile)
       self.game = Aro::Deck.current_deck
     end
 
-    def self.exit_error_missing_args!
-      Aro::P.p.say(I18n.t("cli.errors.header"))
-      Aro::P.p.say(I18n.t("cli.errors.missing_args", cmd: "#{CLI::ARGV0} #{CLI::ARGV1} #{CLI::ARGV2}"))
-      exit(CLI::EXIT_CODES[:INVALID_ARG])
-    end
-
     def self.game
       Mancy.instance.game
     end
+
+    def self.is_aro_dir?
+      File.exist?(Aro::Mancy::NAME_FILE)
+    end
   end
 end
 

data/lib/models/deck.rb

@@ -9,7 +9,7 @@ class Aro::Deck < ActiveRecord::Base
   DEV_TAROT_FILE = "/dev/tarot"
 
   # update this for # of cards you will draw
-  DRAW_COUNT = 10
+  DRAW_COUNT = 7
   
   # do not modify
   DISPLAY_WIDTH = Aro::Deck::DRAW_COUNT*Aro::Deck::DRAW_COUNT
@@ -52,7 +52,7 @@ class Aro::Deck < ActiveRecord::Base
 
   def self.display_selection_menu
     unless Aro::Deck.any?
-      Aro::P.p.say(I18n.t("cli.messages.no_decks"))
+      Aro::P.say(I18n.t("cli.messages.no_decks"))
       exit(CLI::EXIT_CODES[:SUCCESS])
     end
 
@@ -87,16 +87,36 @@ class Aro::Deck < ActiveRecord::Base
     card.gsub(/[+-]/, "").strip
   end
 
-  def show
-    # displays the current deck's cards in their current order.
-    h_text = I18n.t("cli.messages.history_title", deck: name)
-    h_text += "\n"
+  def show(count_n: Aro::Log::DEFAULT_COUNT, order_o: Aro::Log::ORDERING[:DESC])
+    unless count_n.kind_of?(Numeric) && count_n > 0
+      if count_n&.to_s&.downcase&.to_sym == Aro::Log::ALL
+        count_n = logs.count
+      else
+        count_n = Aro::Log::DEFAULT_COUNT
+      end
+    end
+    count_n = [count_n.to_i, logs.count].min
+
+    unless Aro::Log::ORDERING.include?(order_o&.to_s&.upcase&.to_sym)
+      Aro::P.say(I18n.t("cli.warnings.invalid_order"))
+      order_o = Aro::Log::ORDERING[:DESC]
+    end
+
+    # perform query
+    h_logs = logs.order(created_at: order_o.to_s.downcase).first(count_n)
+
+    # for now tests just expect text output
+    return h_logs if Aro::IS_TEST.call
+
+    Aro::P.say(I18n.t("cli.messages.showing", name: name, count: count_n, order: order_o))
+    
+    h_text = "\n"
     h_text += Aro::Deck::HISTORY_SEPARATOR + "\n\n"
     h_text += "#{name.upcase.center(Aro::Deck::DISPLAY_WIDTH)}\n\n"
-    logs.reverse.each_with_index{|l, i|
+    h_logs.each_with_index{|l, i|
       h_text += Aro::Deck::HISTORY_SEPARATOR + "\n"
       h_text += l.created_at.strftime(Aro::Deck::DATE_FORMAT).center(Aro::Deck::DISPLAY_WIDTH) + "\n"
-      h_text += "#{logs.count - i} of #{logs.count}".rjust(Aro::Deck::DISPLAY_WIDTH) + "\n"
+      h_text += "#{order_o.to_sym == Aro::Log::ORDERING[:DESC] ? logs.count - i : 1 + i} of #{logs.count}".rjust(Aro::Deck::DISPLAY_WIDTH) + "\n"
       h_text += Aro::Deck::HISTORY_SEPARATOR + "\n\n"
       h_text += get_display_for_cards(
         Base64::decode64(l.card_data).split(Aro::Deck::CARD_DELIM)
@@ -112,13 +132,19 @@ class Aro::Deck < ActiveRecord::Base
           drawn_cards
         )
         h_text += "\n"
+        h_text += Aro::Deck::HISTORY_SEPARATOR + "\n"
       end
-    }
 
-    # for now tests just expect text output
-    return h_text if Aro::IS_TEST.call
+      3.times do
+        h_text += Aro::Deck::HISTORY_SEPARATOR + "\n"
+      end
+    }
 
-    Aro::P.less(h_text)
+    if count_n == Aro::Log::DEFAULT_COUNT
+      Aro::P.say(h_text)
+    else
+      Aro::P.less(h_text)
+    end
   end
 
   def get_display_for_cards(input = []) # todo:, print_nums: false)
@@ -145,8 +171,7 @@ class Aro::Deck < ActiveRecord::Base
       default: 1
     )
 
-    # TODO: display this nicer
-    Aro::P.p.say(I18n.t("cards.#{Aro::Deck.card_strip(answer)}"))
+    Aro::P.say(I18n.t("cards.#{Aro::Deck.card_strip(answer)}"))
   end
 
   def shuffle

data/lib/models/log.rb

@@ -1,5 +1,12 @@
-require_relative './deck'
+require_relative :"./deck".to_s
 
 class Aro::Log < ActiveRecord::Base
+  ALL = :all
+  DEFAULT_COUNT = 1
+  ORDERING = {
+    ASC: :ASC,
+    DESC: :DESC
+  }
+
   belongs_to :deck, :class_name => :"Aro::Deck".to_s
 end

data/locale/en.usage.yml

@@ -21,7 +21,7 @@ en:
         create
           create an aro directory named <name>. if directory already exists, abort.
 
-          aro create [-h | --help] <name>
+          aro create <name>
 
           examples:
 
@@ -36,9 +36,9 @@ en:
 
             $ aro deck
 
-          deck commands:
+          COMMANDS
 
-            - create
+            create
 
               creates a new deck with the specified name.
 
@@ -46,28 +46,48 @@ en:
 
                   $ aro deck create <name_of_new_deck>
 
-            - show
+            show
 
-              displays the current deck's cards in their current order.
+              displays the current deck's log record(s).
 
-            - shuffle
+              the default behavior is to display only the most recent log record.
+
+              note: 
+              
+                'less' is automatically used to display records if --count > 1
+
+              OPTIONS
+
+                [-n | --count]  specify number of deck logs to show.
+
+                                  default is 1 (latest/current state)
+
+                                  passing 'all' display all logs
+
+                [-o | --order]  specify the output order of the log records.
+
+                                  default is 'desc'
+
+                                  possible values: ['asc', 'desc']
+
+            shuffle
 
               shuffles the current deck and generates a log record.
 
-            - explore
+            explore
 
               allows user to browse each card in the current deck.
 
-            - draw
+            draw
 
               draw a random card from the current deck.
 
-            - replace
+            replace
 
               replaces all drawn cards FIFO and puts them on the bottom of
               the deck. this will preserve all card orientations.
             
-            - reset
+            reset
 
               completely reset the deck. replace all drawn and reset order.
               all orientations will be set to upright.

data/locale/en.yml

@@ -1,30 +1,45 @@
 en:
   cli:
+    config:
+      generating_default_config: "missing config. generating default config file at %{name}."
+      json_format_description: "show aro responses in json format."
+      possible_values: "possible values"
+      text_format_description: "show aro responses in text format (default)"
+      sourcing_config: "loading configuration from %{name}..."
     errors:
       header: "error! something is out of place."
       missing_args: "the command you entered, '%{cmd}', is missing required argument(s)"
+      missing_deck: "no deck selected. use 'aro deck' to select one or 'aro deck create deck_name' to create one."
+    warnings:
+      invalid_order: "the order specified for displaying logs in invalid. using default (desc)."
     messages:
       choose_card: "choose a card."
       confirmation_prompt: "input 'aroyes' to reset %{name}, or enter to cancel (cancel): "
       creating: "creating %{name}..."
-      creation_attempt: "attepting to create aro table named %{name}"
-      deck_created_sucessfully: "[%{name}] deck created successfully"
+      creation_attempt: "attempting to create aro table named %{name}..."
+      creation_failure: "%{name} creation failed!"
+      creation_success: |
+        %{name} created successfully!
+
+        to get started navigate to the %{name} directory:
+        
+          $ cd %{name}
+
+        see aro --help for usage.
+      deck_created_sucessfully: "%{name} deck created successfully"
       drawing: "drawing a card from %{name}..."
-      history_title: "%{deck} deck stream (desc.):$"
       history_drawn: "drawn cards"
-      invalid_name: "-TO"
-      showing: "showing %{name}..."
-      shuffling: "shuffling %{name}'s cards..."
-      replacing_drawn: "all drawn cards to %{name}..."
-      resetting: "resetting %{name}'s cards..."
-      understood: "%{name} says: 'understood.'"
-      welcome: "welcome.to.the.%{name}."
-
       no_decks: |
-
         no decks created yet.
 
         use the following command to create one:
+
           $ aro deck create <deck_name>
 
-        see aro --help for usage.
+        see aro --help for usage.
+      showing: "%{name}: (count: [%{count}], order: [%{order}])..."
+      shuffling: "shuffling %{name}'s cards..."
+      replacing_drawn: "all drawn cards to %{name}..."
+      resetting: "resetting %{name}'s cards..."
+      understood: "%{name} says: 'understood.'"
+      welcome: "welcome.to.the.%{name}."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aro
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - i2097i
@@ -178,6 +178,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/aro
+- bin/cli.rb
+- bin/cli/config.rb
 - bin/cli/constants.rb
 - bin/cli/create.rb
 - bin/cli/deck.rb
@@ -187,7 +189,7 @@ files:
 - lib/aro.rb
 - lib/aro/c.rb
 - lib/aro/create.rb
-- lib/aro/database.rb
+- lib/aro/db.rb
 - lib/aro/environment.rb
 - lib/aro/i18n.rb
 - lib/aro/prompt.rb