dsu 1.2.1 → 2.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce3877d498ca52f9395b713e062dd3448ef447028823b880d5a3e514009d8a9
-  data.tar.gz: 3c3a7ea5fd481d5d1e2ff409a812d5581d779d9061c736a8bd1994276c67e343
+  metadata.gz: 86c89574cfe53ed9ee0769415f67b6eebc9d7d87c45cd7d5d706765983feecdc
+  data.tar.gz: 9bc71761a554f022605bed9891c251ed8df0ad2d9d2c920056a3c655b4cbfd25
 SHA512:
-  metadata.gz: e25b5428fa6779df05b47b37323e5ae25ae776dfa9eb78463f79c2332d84e338b3f668f805ac5c9f24e5702db4d2802e46ee8439fa94d01ffafc6e15093f650a
-  data.tar.gz: 46aa0bbd606a025f9ffc458c98cc59d0070caac1d89d73eafec90d57da7cc7aedc552ece986fbede7bf7f7977d9afbbd314027f61c371d637d5187ae2968cbd2
+  metadata.gz: 4edfddb2a4444d32156db40fe8151f28dd87f08d06ecfef37afd6d0dd7cbc93eee03ff7bcba4cbac420186ed4dfa866b9584875ebcff57ff87755eab8536cfcb
+  data.tar.gz: c2702a1537539c022adcd8a684868b5b64e8f4d0c583e81d11feae7eab126b73b3d4c80649b6cba746104a51d67973230b2b2f342374f2b9b796ab16251e347f

data/CHANGELOG.md

@@ -1,30 +1,56 @@
+## 2.0.0.alpha.1 - 2023-08-16
+
+- Changes
+  - Major refactors to the `dsu` codebase.
+  - Added `dsu theme` command to incorporate color themes. See `dsu help theme` for more information.
+  - Added `dsu info` command to display details about the current dsu release. See `dsu help info` for more information.
+  - Added "migrations", which is really a method of backup whereby user data is backed up to the dsu folder under `backup/<migration version>`. Backups will occur whenever a breaking change is made to any of the dsu models (ColorTheme, Configuration, EntryGroup or MigrationVersion). In this way, users can create their own scripts to migrate their associated model `.json`` files to the latest model version, and move them back into the appropriate dsu folder structure so data can be retained.
+  - Changes to command help to be more uniform.
+- Bug fixes
+  - Various bug fixes.
+
+## 2.0.0.alpha.0 - 2023-06-26 (yanked)
+
 ## [1.2.1] 2023-06-02
-* Bug fixes
+
+- Bug fixes
   - Fixed a bug that raises an error `NoMethodError` for `entry_group_file_exists?` if the `carry_over_entries_to_today` configuration option is set to true, and attempting to edit today's dsu entries.
+
 ## [1.2.0] 2023-05-26
-* Changes
+
+- Changes
   - Various refactors.
   - Bring test coverage to >= 85%.
+
 ## [1.1.2] 2023-05-26
-* Changes
+
+- Changes
   - Various refactors.
   - Add more test coverage.
+
 ## [1.1.1] - 2023-05-23
-* See previous alpha releases for changes.
+
+- See previous alpha releases for changes.
+
 ## [1.1.1.alpha.2] - 2023-05-23
-* Changes
+
+- Changes
   - For convenience, the `dsu list date` command now takes a MNEUMONIC in addition to a DATE. See `dsu list help date` for more information.
-* Bug fixes
+- Bug fixes
   - Fix a bug that did not display `dsu list dates SUBCOMMAND` date list properly when the `--from` option was a date mneumonic and the `--to` optoin was a relative time mneumonic (e.g. `dsu list dates -f today -t +1`). In this case, DSU dates `Time.now` and `Time.now.tomorrow` should be displayed; instead, the bug would consider the `--to` option as relative to `Time.now`, so only 1 DSU date (`Time.now` would be returned).
+
 ## [1.1.0.alpha.1] - 2023-05-23
-* Changes
-  - Added new configuration option `carry_over_entries_to_today` (`true|false`, default: `false`); if true, when editing DSU entries **for the first time** on any  given day (e.g. `dsu edit today`), DSU entries from the previous day will be copied to the editing session. If there are no DSU entries from the previous day, `dsu` will search backwards up to 7 days to find a DSU date that has entries to copy. If after searching back 7 days, no DSU entries are found, the editor session will simply start with no previous DSU entries.
+
+- Changes
+  - Added new configuration option `carry_over_entries_to_today` (`true|false`, default: `false`); if true, when editing DSU entries **for the first time** on any given day (e.g. `dsu edit today`), DSU entries from the previous day will be copied to the editing session. If there are no DSU entries from the previous day, `dsu` will search backwards up to 7 days to find a DSU date that has entries to copy. If after searching back 7 days, no DSU entries are found, the editor session will simply start with no previous DSU entries.
   - Added new configuration option `include_all` (`true|false`, default: `false`); if true, when using dsu commands that list date ranges (e.g. `dsu list dates`), the displayed list will include dates that have no dsu entries. If false, the displayed list will only include dates that have dsu entries. For all other `dsu list` commands, if true, this option will behave in the aforementioned manner. If false, the displayed list will unconditionally display the first and last dates regardless of whether or not the DSU date has entries or not; all other dates will not be displayed if the DSU date has no entries.
   - Changed the look of the editor template when editing entry group entries.
+
 ## [1.0.0] - 2023-05-18
-* First official release.
-* NOTE: If you have been using the alpha version of `dsu`, you will need to delete the `entries` folder (e.g. `/Users/<whoami>/dsu/entries` on a nix os) as the old entries .json files are incompatible with this official release.
-* Changes from the alpha version
+
+- First official release.
+- NOTE: If you have been using the alpha version of `dsu`, you will need to delete the `entries` folder (e.g. `/Users/<whoami>/dsu/entries` on a nix os) as the old entries .json files are incompatible with this official release.
+- Changes from the alpha version
   - When editing an entry group, editor commands are no longer necessary. Simply add, remove or change entries as needed. See the README.md for more information.
   - When editing an entry group and saving the results, take note of the folowing behavior:
     - Entering duplicate entries are not allowed, only one entry with a given description is allowed per entry group.
@@ -32,34 +58,42 @@
     - When editing and encountering any of the aforementioned, the errors will be displayed to the console after the editor file is saved.
   - Sha's are no longer being used, as I've not found a good use (currently) to use them. I may add them back in the future if I find a good use for them (tracking entries across entry groups, etc.).
   - When adding an entry (`dsu add OPTION`), it used to be that after the entry was added, the entry group for the date being edited would be displayed, as well as "yesterday's" date. This is no longer the case; now, only the entry group for the date being edited is displayed.
+
 ## [0.1.0.alpha.5] - 2023-05-12
-* Changes
+
+- Changes
   - `dsu edit SUBCOMMAND` will now allow editing of an entry group for a date that does not yet exist. This will allow you to add entries in the editor using `+|a|add DESCRIPTION`. Be sure to follow the instructions in the editor when editing entry group entries.
   - `dsu edit SUBCOMMAND` will gracefully display an error if the entry sha (Entry#uuid) or entry discription (Entry#description) are not unique. In this case, the entry will not be added to the entry group.
-  NOTE: Not all edge cases are being handled currently by `dsu edit SUBCOMMAND`.
+    NOTE: Not all edge cases are being handled currently by `dsu edit SUBCOMMAND`.
   - `dsu add OPTION` will raise an error if the entry discription (Entry#description) are not unique. This will be handled gracefully in a future release.
+
 ## [0.1.0.alpha.4] - 2023-05-09
-* Changes
+
+- Changes
   - Gemfile gemspec description changes.
+
 ## [0.1.0.alpha.3] - 2023-05-09
-* Changes
+
+- Changes
   - Entry groups are now editable using the `dsu edit SUBCOMMAND` command. See the README.md or `dsu help edit` for more information.
   - Added `editor` configuration option to specify the editor to use when editing an entry group. This configuration option is used if the $EDITOR environment variable is not set.
-* Bug fixes
+- Bug fixes
   - Fix bug that failed to load default configuration values properly when provided (surfaced in specs).
 
 ## [0.1.0.alpha.2] - 2023-05-08
-* ATTENTION: After installing this pre-release, run `dsu config info` and take note of the `entries_folder` config option value (e.g. something like '/Users/<whoami>/dsu/entries' on a nix os). You'll need to delete the entry group files therein ( \<YYYY\>\-\<MM\>\-\<DD\>.json e.g. 2023-05-07.json) to avoid errors when running this version of `dsu`.
-* WIP (not fully implemented yet)
+
+- ATTENTION: After installing this pre-release, run `dsu config info` and take note of the `entries_folder` config option value (e.g. something like '/Users/<whoami>/dsu/entries' on a nix os). You'll need to delete the entry group files therein ( \<YYYY\>\-\<MM\>\-\<DD\>.json e.g. 2023-05-07.json) to avoid errors when running this version of `dsu`.
+- WIP (not fully implemented yet)
   - Added `dsu edit` command to edit an existing entry.
-* Changes
+- Changes
   - Remove Entry#long_description and make Entry#description longer (to 256 bytes max).
   - Added `dsu` short-cut commands|options `a|-a`, `c|-c`, `e|-e` and `l|-l` for `add`, `config`, `edit` and `list` commands respectively. For example, can now do `dsu a` or `dsu -a` instead of `dsu add`.
-   - Added `dsu list` short-cut subcommand|options `d|-d`, `n|-n`, `t|-t` and `y|-y` for `date DATE`, `today`, `tomorrow` and `yesterday` subcommands respectively. For example, can now do `dsu n` or `dsu -n` instead of `dsu today` to list your DSU entries for "today".
+  - Added `dsu list` short-cut subcommand|options `d|-d`, `n|-n`, `t|-t` and `y|-y` for `date DATE`, `today`, `tomorrow` and `yesterday` subcommands respectively. For example, can now do `dsu n` or `dsu -n` instead of `dsu today` to list your DSU entries for "today".
   - `dsu list` commands now lists all DSU entries from the date being requested (SUBCOMMAND i.e. `today`, `tomorrow`, `yesterday` or `date`), back to and including the previous Friday IF the date being being requested falls on a Monday or weekend. This is so that the DSU entries for the weekend and previous Friday can be shared at DSU if you hold a DSU on the weekend (if you're insane enough to work and have DSU on the weekend) or on a Monday if you happened to work on the weekend as well.
   - `dsu config info` now displays the default configuration being used if no configuration file is being used.
-* Bug fixes
+- Bug fixes
   - Fix bug that fails to load/use configuration file options when a config file exists.
 
 ## [0.1.0.alpha.1] - 2023-05-06
+
 - Initial (alpha) release. See README.md for instructions.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dsu (1.2.1)
+    dsu (2.0.0.alpha.1)
       activemodel (~> 7.0, >= 7.0.4.3)
       activesupport (~> 7.0, >= 7.0.4)
       colorize (~> 0.8.1)
@@ -12,9 +12,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -30,7 +30,7 @@ GEM
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     ffaker (2.21.0)
-    i18n (1.13.0)
+    i18n (1.14.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
     kwalify (0.7.2)
@@ -67,7 +67,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.51.0)
+    rubocop (1.52.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -77,7 +77,7 @@ GEM
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.18.0)
       rubocop (~> 1.41)

data/README.md

@@ -23,7 +23,9 @@ Commands:
   dsu config, -c SUBCOMMAND          # Manage configuration...
   dsu edit, -e SUBCOMMAND            # Edit DSU entries...
   dsu help [COMMAND]                 # Describe available...
+  dsu info, -i                       # Displays information...
   dsu list, -l SUBCOMMAND            # Displays DSU entries...
+  dsu theme, -t SUBCOMMAND           # Manage DSU themes...
   dsu version, -v                    # Displays this gem version
 
 Options:
@@ -230,32 +232,36 @@ from: Interative planning meeting 11:00AM.
 
 ## Customizing the `dsu` Configuration File
 
-It is **not** recommended that you create and customize a `dsu` configuration file while this gem is in alpha release. This is because changes to what configuration options are available may take place while in alpha that could break `dsu`. If you *do* want to create and customize the `dsu` configuration file reglardless, you may do the following.
+It is **not** recommended that you get too attached to the `dsu` configuration options when this gem is in pre-release (e.g. `n.n.n.alpha.n`, `n.n.n.beta.n`, etc.). This is because changes to the configuration file options could change; however, if you're curious, ambitious, or just like living on the edge, have at it. However, just keep in mind that things could change. With an official release (`n.n.n.n`), edit all you want. Regardless, if you *do* want to customize the `dsu` configuration file, you may do the following:
 
-### Initializing/Customizing the `dsu` Configuration File
+### Customizing the `dsu` Configuration File
 
 ```shell
-# Creates a dsu configuration file in your home folder.
-$ dsu config init
-
+# Locate the dsu configuration file in your home folder.
+$ dsu config info
 #=>
-Configuration file (/Users/<whoami>/.dsu) created.
-Config file (/Users/<whoami>/.dsu) contents:
----
-editor: nano
-entries_display_order: desc
-entries_file_name: "%Y-%m-%d.json"
-entries_folder: "/Users/gangelo/dsu/entries"
-carry_over_entries_to_today: false
-include_all: false
+Dsu v2.0.0
+
+Configuration file contents (/Users/<whoami>/dsu/.dsu)
+ 1.  version: '20230613121411'
+ 2.  editor: 'nano'
+ 3.  entries_display_order: 'desc'
+ 4.  carry_over_entries_to_today: 'false'
+ 5.  include_all: 'false'
+ 6.  theme_name: 'default'
+___________________________________
+Theme: default
 ```
 
 Where `<whoami>` would be your username (`$ whoami` on nix systems)
 
-Once the configuration file is created, you can locate where the `dsu` configuration file is located by running `$ dsu config info` and taking note of the confiruration file path. You may then edit this file using your favorite editor.
+Taking note of the confiruration file path above, you may then edit this file using your favorite editor.
 
 #### Configuration File Options
 
+##### version
+_DO NOT_ edit this value. This value coincides with the `dsu` migration version and should not be edited.
+
 ##### editor
 This is the default editor to use when editing entry groups if the EDITOR environment variable on your system is not set.
 
@@ -266,31 +272,18 @@ Valid values are 'asc' and 'desc', and will sort listed DSU entries in ascending
 
 Default: `'desc'`
 
-##### entries_file_name
-The entries file name format. It is recommended that you do not change this. The file name must include `%Y`, `%m` and `%d` `Time` formatting specifiers to make sure the file name is unique and able to be located by `dsu` functions. For example, the default file name is `%Y-%m-%d.json`; however, something like `%m-%d-%Y.json` or `entry-group-%m-%d-%Y.json` would work as well.
-
-ATTENTION: Please keep in mind that if you change this value `dsu` will not recognize entry files using a different format. You would (at this time), have to manually rename any existing entry file names to the new format.
-
-Default: `'%Y-%m-%d.json'`
-
-##### entries_folder
-This is the folder where `dsu` stores entry files. You may change this to anything you want. `dsu` will create this folder for you, as long as your system's write permissions allow this.
-
-ATTENTION: Please keep in mind that if you change this value `dsu` will not be able to find entry files in any previous folder. You would (at this time), have to manually mode any existing entry files to this new folder.
-
-Default: `'/Users/<whoami>/dsu/entries'` on nix systems.
-
-Where `<whoami>` would be your username (`$ whoami` on nix systems)
-
 ##### carry_over_entries_to_today
-Applicable to the `dsu edit` command.  Valid values are `true|false`. If `true`, when editing DSU entries *for the first time* on any  given day (e.g. `dsu edit today`), DSU entries from the previous day will be copied into the editing session. If there are no DSU entries from the previous day, `dsu` will search backwards up to 7 days to find a DSU date that has entries to copy. If after searching back 7 days, no DSU entries are found, the editor session will simply start with no previous DSU entries.
+Applicable to the `dsu edit` command.  Valid values are `true|false`. If `true`, when editing DSU entries *for the first time* on any  given day (e.g. `dsu edit today`), DSU entries from the previous day will be copied into the current editing session. If there are no DSU entries from the previous day, `dsu` will search backwards up to 7 days to find a DSU date that has entries to copy. If after searching back 7 days, no DSU entries are found, the editor session will simply provide no previous DSU entries.
 
-Default: false
+Default: `false`
 
 ##### include_all
-Applicable to `dsu` commands that display DSU date lists (e.g. `dsu list` commands). Valid values are `true|false`. If `true`, all DSU dates within the specified range will be displayed. If `false`, DSU dates between the first and last DSU dates that have NO entries *will NOT be displayed*. The default is taken from the dsu configuration setting `:include_all`, see `dsu config info`.
+Applicable to `dsu` commands that display DSU date lists (e.g. `dsu list` commands). Valid values are `true|false`. If `true`, all DSU dates within the specified range will be displayed, regardless of whether or not a particular date has entries. If `false`, only DSU dates between the first and last DSU dates that have entries *will be displayed*.
+
+Default: `false`
 
-Default: false
+##### theme_name
+Valid values are any theme names available as a result of running `dsu theme list`. For example: "cherry", default", "lemon", "matrix" and "whiteout".
 
 ## Dates
 

data/bin/console

@@ -2,8 +2,14 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'dsu'
 
+if File.exist?('.env.development')
+  # This loads our development environment when running dev.
+  require 'dotenv'
+  Dotenv.load('.env.development')
+end
+
+require 'dsu'
 require 'pry-byebug'
 
 # So we can use FactoryBot in the console.
@@ -11,4 +17,20 @@ require 'factory_bot'
 require 'ffaker'
 FactoryBot.find_definitions
 
+if Dsu.env.development?
+  # This simply allows us to use a folder other than dsu folder for the production
+  # release, so we don't mess with our current production dsu folder.
+  module Dsu
+    module Support
+      module Fileable
+        def root_folder
+          File.join(gem_dir, '.development_home')
+        end
+      end
+    end
+  end
+
+  puts "ATTENTION: Dsu root folder is: #{Dsu::Support::Fileable.root_folder}!"
+end
+
 Pry.start

data/bin/dsu

@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+bundle exec exe/dsu "$@"

data/bin/setup

@@ -1,8 +1,19 @@
 #!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
-set -vx
+# set -vx
 
-bundle install
+# This makes sure all of the scripts we need to load are loaded from
+# the executing script folder so they can be found
+DIR="$( cd "$( dirname $0 )" >/dev/null 2>&1 && pwd )"
+pushd $DIR >/dev/null 2>&1
+ruby ./migrate
+popd >/dev/null 2>&1
+
+exit_code=$?
+if [ $exit_code -ne 0 ]; then
+  exit $exit_code
+fi
 
-# Do any other automated setup that you need to do here
+set -vx
+bundle install

data/exe/dsu

@@ -6,6 +6,28 @@ require 'rubygems'
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
+if File.exist?('.env.development')
+  # This loads our development environment when running dev.
+  require 'dotenv'
+  Dotenv.load('.env.development')
+end
+
 require 'dsu'
 
-Dsu::CLI.start
+if Dsu.env.development?
+  # This simply allows us to use a folder other than dsu folder for the production
+  # release, so we don't mess with our current production dsu folder.
+  module Dsu
+    module Support
+      module Fileable
+        def root_folder
+          File.join(gem_dir, '.development_home')
+        end
+      end
+    end
+  end
+
+  puts "ATTENTION: Dsu root folder is: #{Dsu::Support::Fileable.root_folder}!"
+end
+
+Dsu::CLI.start(ARGV)

data/exe/dsu_migrate.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'bundler/setup'
+# require 'highline'
+require 'dsu'
+
+# def run_migrations?
+#   puts '***********************************************'
+#   puts '***        Migrations are pending!          ***'
+#   puts '***  This is a pre-release version of dsu.  ***'
+#   puts '***    It is highly recommended you exit    ***'
+#   puts '***           this installation!            ***'
+#   puts '***********************************************'
+#   prompt = 'What do you want to do?' \
+#            "\n  c = Continue (install and run migrations)." \
+#            "\n  x = Exit (recommended)." \
+#            "\n> "
+#   input = HighLine.new.ask(prompt, String) do |question|
+#     question.default = 'x'
+#     question.readline = true
+#     question.in = %w[x c]
+#   end
+#   input == 'c'
+# end
+
+def run_migrations!
+  # return 1 unless run_migrations?
+
+  puts 'Running migrations...'
+  Dsu::Migration::Service.run_migrations!
+  0
+rescue StandardError => e
+  puts "Error running migrations: #{e.message}"
+  1
+end
+
+if Dsu::Migration::Service.run_migrations?
+  exit run_migrations!
+else
+  exit 0
+end

data/lib/core/ruby/color_theme_colors.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ColorThemeColors
+  DEFAULT_THEME_COLORS = { color: :default, mode: :default, background: :default }.freeze
+
+  # Ensures that default colors and mode are represented in the returned Hash.
+  def merge_default_colors
+    # TODO: Error checking.
+    DEFAULT_THEME_COLORS.merge(dup)
+  end
+
+  def merge_default_colors!
+    # TODO: Error checking.
+    merge!(merge_default_colors)
+  end
+end

data/lib/core/ruby/color_theme_mode.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# TODO: Error checking.
+# TODO: Keep <method>! (bang)?
+module ColorThemeMode
+  def default!
+    dup.merge({ mode: :default })
+  end
+
+  def bold!
+    dup.merge({ mode: :bold })
+  end
+
+  def italic!
+    dup.merge({ mode: :italic })
+  end
+
+  def underline!
+    dup.merge({ mode: :underline })
+  end
+
+  def blink!
+    dup.merge({ mode: :blink })
+  end
+
+  def swap!
+    dup.merge({ mode: :swap })
+  end
+
+  def hide!
+    dup.merge({ mode: :hide })
+  end
+
+  def mode!(mode)
+    dup.merge({ mode: mode })
+  end
+
+  def light!
+    light_color = "light_#{self[:color].to_s.gsub('light_', '')}".to_sym
+    dup.merge({ color: light_color })
+  end
+end

data/lib/core/ruby/not_today.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module NotToday
+  def not_today?
+    !today?
+  end
+end

data/lib/core/ruby/wrap_and_join.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module WrapAndJoin
+  class << self
+    def included(base)
+      base.const_set(:WRAP_AND_JOIN_JOIN_TOKEN, ', ')
+    end
+  end
+
+  def wrap_and_join(wrapper: %w["], join: Array::WRAP_AND_JOIN_JOIN_TOKEN)
+    validate_wrapper!(wrapper)
+    validate_join!(join)
+
+    wrapper << wrapper.first if wrapper.count == 1
+    map { |element| "#{wrapper[0]}#{element}#{wrapper[1]}" }.join(join)
+  end
+
+  private
+
+  def validate_wrapper!(wrapper)
+    raise ArgumentError, 'wrapper is nil' if wrapper.nil?
+    raise ArgumentError, 'wrapper must be an Array' unless wrapper.is_a?(Array)
+    raise ArgumentError, 'wrapper must be an Array of 1 or 2 wrapper elements' unless wrapper.count.between?(1, 2)
+  end
+
+  def validate_join!(join)
+    return if join.nil?
+
+    raise ArgumentError, 'join must be a String' unless join.is_a?(String)
+  end
+end

data/lib/dsu/base_cli.rb

@@ -3,12 +3,13 @@
 require 'bundler'
 require 'thor'
 require_relative 'command_services/add_entry_service'
+require_relative 'models/color_theme'
+require_relative 'models/configuration'
 require_relative 'models/entry_group'
-require_relative 'services/configuration_loader_service'
-require_relative 'services/entry_group_hydrator_service'
-require_relative 'services/entry_group_reader_service'
-require_relative 'support/colorable'
-require_relative 'support/configuration'
+require_relative 'services/stdout_redirector_service'
+require_relative 'support/color_themable'
+require_relative 'support/command_help_colorizeable'
+require_relative 'support/command_hookable'
 require_relative 'support/entry_group_viewable'
 require_relative 'support/times_sortable'
 require_relative 'version'
@@ -16,7 +17,9 @@ require_relative 'views/entry_group/show'
 
 module Dsu
   class BaseCLI < ::Thor
-    include Support::Colorable
+    include Support::ColorThemable
+    include Support::CommandHelpColorizable
+    include Support::CommandHookable
     include Support::EntryGroupViewable
     include Support::TimesSortable
 
@@ -24,6 +27,12 @@ module Dsu
 
     default_command :help
 
+    def initialize(*args)
+      super
+
+      @configuration = Models::Configuration.new
+    end
+
     class << self
       def exit_on_failure?
         false
@@ -32,7 +41,7 @@ module Dsu
       def date_option_description
         <<-OPTION_DESC
           DATE
-          \x5
+
           This may be any date string that can be parsed using `Time.parse`. Consequently, you may use also use '/' as date separators, as well as omit thee year if the date you want to display is the current year (e.g. <month>/<day>, or 1/31). For example: `require 'time'; Time.parse('01/02/2023'); Time.parse('1/2') # etc.`
         OPTION_DESC
       end
@@ -40,37 +49,24 @@ module Dsu
       def mneumonic_option_description
         <<-OPTION_DESC
           MNEUMONIC
-          \x5
+
           This may be any of the following: n|today|t|tomorrow|y|yesterday|+n|-n.
 
-          \x5
           Where n, t, y are aliases for today, tomorrow, and yesterday, respectively.
 
-          \x5
           Where +n, -n are relative date mneumonics (RDNs). Generally speaking, RDNs are relative to the current date. For example, a RDN of +1 would be equal to `Time.now + 1.day` (tomorrow), and a RDN of -1 would be equal to `Time.now - 1.day` (yesterday).
 
-          \x5
           In some cases the behavior RDNs have on some commands are context dependent; in such cases the behavior will be noted.
         OPTION_DESC
       end
     end
 
-    def initialize(*args)
-      super
-
-      @configuration = Services::ConfigurationLoaderService.new.call
-    end
-
     private
 
     attr_reader :configuration
 
-    def sorted_dsu_times_for(times:)
-      times_sort(times: times_for(times: times), entries_display_order: entries_display_order)
-    end
-
-    def entries_display_order
-      @entries_display_order ||= configuration[:entries_display_order]
+    def color_theme
+      Models::ColorTheme.current_or_default
     end
   end
 end