dsu 2.1.4 → 2.2.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f96d328d7aa210c34ec21066d11d393bfab30cc18575b404c65ee1c20b8594b
-  data.tar.gz: da67601c29bee6c44d10d52561ccfd5196452539158dbf78137de54590654929
+  metadata.gz: cbc51c0376177977ba4f3c3d06ad2cfe42150c2122eaa826e19ec9074cc52889
+  data.tar.gz: 7647b24eb4ba59f8bfc78457a68935c9e469a893597de2e3930ba4f80e2173ba
 SHA512:
-  metadata.gz: 13654ef47f6b35b8fcc3c27e0f7cdeca43791220001e24157dae4ab9d47964c3c3b08f8d961fbfd8458dd804e1e9e23e00306538b4f8ff5786abdde8d377465f
-  data.tar.gz: '0233403599e4a3b82266b4fe68a4d31cfb4c539572e321d5fb79e8539d0eaa1864d9ea348bd40b3fb2c26c2d835d4050847a88ca4c2d201e84a7ff085408e429'
+  metadata.gz: 774f2bbfaf2bb32e6e5653f6c3e917b7b63e19f5d223e9e29cb3cc28d62e076694a58780644de2101b254d672cd8a89fce35ae61183756ca2e72d193ced41d02
+  data.tar.gz: c4359560a4589bc360239dbc8b53cef1405f444fec5dffcfba7c50be0b95607a48c84aaee7dd7b68f6c7ef5b519b664431399c7db222fa798a165dc5b8a4a35a

data/.env.test

@@ -0,0 +1 @@
+DSU_ENV=test

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [2.2.0.rc.1] 2023-12-23
+
+Enhancements
+
+- Added `dsu browse` command to interactively page through DSU entries.
+- Added "light" theme for terminals with light backgrounds, see `dsu theme list` or `dsu theme show light` for more information.
+
+Changes
+
+- Refactors to use activesupport Time#in_time_zone, including tests.
+- Various code refactors to support the aforementioned change.
+
 ## [2.1.4] 2023-12-19
 
 Changes
@@ -33,7 +45,6 @@ Bug fixes
 
 - Fix bug that did not included I18n locale files in yanked version 2.1.0.
 
-
 ## [2.1.0] 2023-12-16
 
 Enhancements
@@ -215,6 +226,7 @@ Changes
 - `dsu config info` now displays the default configuration being used if no configuration file is being used.
 
 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dsu (2.1.4)
+    dsu (2.2.0.rc.1)
       activemodel (>= 7.0.8, < 8.0)
       activesupport (>= 7.0.8, < 8.0)
       colorize (>= 0.8.1, < 1.0)
@@ -122,6 +122,7 @@ GEM
 PLATFORMS
   x86_64-darwin-19
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   dotenv (~> 2.8, >= 2.8.1)

data/README.md

@@ -37,6 +37,7 @@ After installation (`gem install dsu`), the first thing you may want to do is ru
 #=>
 Commands:
   dsu add|a [OPTIONS] DESCRIPTION  # Adds a DSU entry...
+  dsu browse|b SUBCOMMAND          # Browse DSU entries...
   dsu config|c SUBCOMMAND          # Manage configuration...
   dsu delete|d SUBCOMMAND          # Delete DSU entries...
   dsu edit|e SUBCOMMAND            # Edit DSU entries...
@@ -176,6 +177,18 @@ This can be accomplished MUCH easier by using the `yesterday` mnemonic. This wil
 `$ dsu list dates --from yesterday --to -6`
 `$ dsu l dd -f y -t -6`
 
+## Browsing DSU Entries
+You can browse DSU entries for the current week, month and year using any of the following commands. `dsu browse` somewhat similar to `dsu list` with added `week`, `month` and `year` convenience SUBCOMMANDs. `dsu browse` also pipes the output to the terminal, so you can conveniently scroll through the listed entries using your keyboard or mouse:
+
+**NOTE:** Keyboard and/or mouse behavior while browsing (scrolling), is operating system dependent; `dsu browse` pipes its output to the terminal using `less` on nix systems, and `more` on Windows systems.
+
+- `$ dsu browse week`
+- `$ dsu b w` # Equivalent to the above, only using shortcuts
+- `$ dsu browse month`
+- `$ dsu b m` # Equivalent to the above, only using shortcuts
+- `$ dsu browse year`
+- `$ dsu b y` # Equivalent to the above, only using shortcuts
+
 ## Editing DSU Entries
 
 You can edit DSU entry groups by date. `dsu` will allow you to edit a DSU entry group using the `dsu edit SUBCOMMAND` date (`n|today|t|tomorrow|y|yesterday|date DATE`) you specify. `dsu edit` will open your DSU entry group entries in your editor, where you'll be able to perform editing functions against one or all of the entries.

data/lib/dsu/cli.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'time'
 require_relative 'base_cli'
+require_relative 'subcommands/browse'
 require_relative 'subcommands/config'
 require_relative 'subcommands/delete'
 require_relative 'subcommands/edit'
@@ -13,6 +14,7 @@ module Dsu
   # The `dsu` command.
   class CLI < BaseCLI
     map I18n.t('commands.add.key_mappings') => :add
+    map I18n.t('commands.browse.key_mappings') => :browse
     map I18n.t('commands.config.key_mappings') => :config
     map I18n.t('commands.delete.key_mappings') => :delete
     map I18n.t('commands.edit.key_mappings') => :edit
@@ -43,6 +45,9 @@ module Dsu
       view_entry_group(time: time)
     end
 
+    desc I18n.t('commands.browse.desc'), I18n.t('commands.browse.usage')
+    subcommand :browse, Subcommands::Browse
+
     desc I18n.t('commands.list.desc'), I18n.t('commands.list.usage')
     subcommand :list, Subcommands::List
 

data/lib/dsu/models/entry_group.rb

@@ -155,6 +155,18 @@ module Dsu
           superclass.exist?(file_path: entries_path_for(time: time))
         end
 
+        def entry_group_times(between: nil)
+          entry_files.filter_map do |file_path|
+            entry_file_name = File.basename(file_path)
+            next unless entry_file_name.match?(ENTRIES_FILE_NAME_REGEX)
+
+            time = File.basename(entry_file_name, '.*')
+            next if between && !Time.parse(time).between?(between.min, between.max)
+
+            time
+          end
+        end
+
         def find(time:)
           file_path = entries_path_for(time: time)
           entry_group_hash = read!(file_path: file_path)
@@ -200,7 +212,8 @@ module Dsu
       private
 
       def ensure_local_time(time)
-        time.nil? ? Time.now : time.dup.localtime
+        time ||= Time.now
+        time.in_time_zone
       end
     end
   end

data/lib/dsu/services/entry_group/browse_service.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require_relative '../../models/entry_group'
+require_relative '../../support/time_formatable'
+require_relative '../../support/times_sortable'
+
+module Dsu
+  module Services
+    module EntryGroup
+      # This service is responsible for returning an array of
+      # sorted entry group dates as Time objects. The Time objects
+      # returned, and the sort order are determined by the options
+      # passed in.
+      class BrowseService
+        include Support::TimeFormatable
+        include Support::TimesSortable
+
+        def initialize(time:, options: {})
+          raise ArgumentError, 'Argument time is nil' if time.nil?
+          raise ArgumentError, 'Argument options is nil' if options.nil?
+
+          @time = time
+          @options = options
+        end
+
+        def call
+          return [] if entry_group_times.empty?
+
+          times_sort(times: entry_group_times, entries_display_order: entries_display_order)
+        end
+
+        private
+
+        attr_reader :time, :options
+
+        def entry_group_times
+          @entry_group_times ||= (min_time.to_i..max_time.to_i).step(1.day).each_with_object([]) do |time_step, times|
+            time = Time.at(time_step)
+            next unless include_all? || entry_group_count(time).positive?
+
+            times << time
+          end
+        end
+
+        def entry_group_count(time)
+          entry_group = Models::EntryGroup.find_or_initialize(time: time)
+          entry_group.persisted? ? entry_group.entries.count : 0
+        end
+
+        def min_time
+          @min_time ||= if week?
+            time.beginning_of_week
+          elsif month?
+            time.beginning_of_month
+          elsif year?
+            time.beginning_of_year
+          end
+        end
+
+        def max_time
+          @max_time ||= if week?
+            time.end_of_week
+          elsif month?
+            time.end_of_month
+          elsif year?
+            time.end_of_year
+          end
+        end
+
+        def entries_display_order
+          options[:entries_display_order] || default_entries_display_order
+        end
+
+        def default_entries_display_order
+          :asc
+        end
+
+        def week?
+          options.fetch(:browse, default_browse) == :week
+        end
+
+        def month?
+          options[:browse] == :month
+        end
+
+        def year?
+          options[:browse] == :year
+        end
+
+        def default_browse
+          :week
+        end
+
+        def include_all?
+          options.fetch(:include_all, false)
+        end
+      end
+    end
+  end
+end

data/lib/dsu/subcommands/browse.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'io/console'
+
+require_relative '../services/stdout_redirector_service'
+require_relative '../support/command_options/dsu_times'
+require_relative '../support/command_options/time_mnemonic'
+require_relative '../support/entry_group_browsable'
+require_relative '../support/time_formatable'
+require_relative '../views/entry_group/shared/no_entries_to_display'
+require_relative '../views/shared/error'
+require_relative 'base_subcommand'
+
+module Dsu
+  module Subcommands
+    class Browse < BaseSubcommand
+      include Support::EntryGroupBrowsable
+      include Support::CommandOptions::TimeMnemonic
+      include Support::TimeFormatable
+
+      # TODO: I18n.
+      map %w[w] => :week
+      map %w[m] => :month
+      map %w[y] => :year
+
+      class_option :include_all, default: nil, type: :boolean, aliases: '-a',
+        desc: I18n.t('options.include_all')
+
+      desc I18n.t('subcommands.browse.week.desc'), I18n.t('subcommands.browse.week.usage')
+      long_desc I18n.t('subcommands.browse.week.long_desc')
+      def week
+        browse_entry_groups time: Time.now, options: options.merge({ browse: :week })
+      end
+
+      desc I18n.t('subcommands.browse.month.desc'), I18n.t('subcommands.browse.month.usage')
+      long_desc I18n.t('subcommands.browse.month.long_desc')
+      def month
+        browse_entry_groups time: Time.now, options: options.merge({ browse: :month })
+      end
+
+      desc I18n.t('subcommands.browse.year.desc'), I18n.t('subcommands.browse.year.usage')
+      long_desc I18n.t('subcommands.browse.year.long_desc')
+      def year
+        browse_entry_groups time: Time.now, options: options.merge({ browse: :year })
+      end
+    end
+  end
+end

data/lib/dsu/subcommands/delete.rb

@@ -15,6 +15,7 @@ module Dsu
       include Support::CommandOptions::TimeMnemonic
       include Support::TimeFormatable
 
+      # TODO: I18n.
       map %w[d] => :date
       map %w[dd] => :dates
       map %w[n] => :today

data/lib/dsu/subcommands/edit.rb

@@ -7,6 +7,7 @@ require_relative '../views/entry_group/show'
 module Dsu
   module Subcommands
     class Edit < BaseSubcommand
+      # TODO: I18n.
       map %w[d] => :date
       map %w[n] => :today
       map %w[t] => :tomorrow

data/lib/dsu/subcommands/list.rb

@@ -79,7 +79,7 @@ module Dsu
         # NOTE: special sort here, unlike the other commands where rules for
         # displaying DSU entries are applied; this is more of a list command.
         times = times_sort(times: times, entries_display_order: options[:entries_display_order])
-        view_entry_groups(times: times, options: options) do |_total_entry_groups, _total_entry_groups_not_shown|
+        view_entry_groups(times: times, options: options) do
           if Services::EntryGroup::CounterService.new(times: times).call.zero?
             Views::EntryGroup::Shared::NoEntriesToDisplay.new(times: times, options: options).render
           end

data/lib/dsu/subcommands/theme.rb

@@ -11,6 +11,7 @@ require_relative 'base_subcommand'
 module Dsu
   module Subcommands
     class Theme < BaseSubcommand
+      # TODO: I18n.
       map %w[c] => :create if Dsu.env.local?
       map %w[d] => :delete if Dsu.env.local?
       map %w[l] => :list

data/lib/dsu/support/command_hookable.rb

@@ -30,6 +30,13 @@ module Dsu
           puts
         end
 
+        def display_dsu_footer
+          puts apply_theme('_' * 35, theme_color: color_theme.dsu_footer)
+          # TODO: I18n.
+          footer = apply_theme("Theme: #{color_theme.theme_name}", theme_color: color_theme.dsu_footer)
+          puts footer
+        end
+
         private
 
         def suspend_header?(args, _options)
@@ -39,13 +46,6 @@ module Dsu
           true if args[0] == 'theme' && %w[use delete].include?(args[1])
         end
 
-        def display_dsu_footer
-          puts apply_theme('_' * 35, theme_color: color_theme.dsu_footer)
-          # TODO: I18n.
-          footer = apply_theme("Theme: #{color_theme.theme_name}", theme_color: color_theme.dsu_footer)
-          puts footer
-        end
-
         def display_errors_if(stderror_string)
           stderror_string = stderror_string.strip
           return unless stderror_string.present?

data/lib/dsu/support/entry_group_browsable.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require_relative '../models/configuration'
+require_relative '../services/entry_group/browse_service'
+require_relative '../services/entry_group/counter_service'
+
+module Dsu
+  module Support
+    module EntryGroupBrowsable
+      def browse_entry_groups(time:, options: {})
+        raise ArgumentError, 'time must be a Time object' unless time.is_a?(Time)
+        raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
+
+        options = configuration.to_h.merge(options).with_indifferent_access
+        times = browse_service(time: time, options: options).call
+        if times.empty? || (options.fetch(:include_all, false) && no_entries_for?(times: times, options: options))
+          display_no_entries_to_display_message time: time, options: options
+          return
+        end
+
+        output = Services::StdoutRedirectorService.call do
+          self.class.display_dsu_header
+          header = browse_header_for(time: time, options: options)
+          Views::Shared::Info.new(messages: header).render
+          puts
+          view_entry_groups(times: times, options: options)
+          self.class.display_dsu_footer
+        end
+        output_with_pager output: output, options: options
+      end
+
+      private
+
+      def no_entries_for?(times:, options:)
+        Services::EntryGroup::CounterService.new(times: times, options: options).call.zero?
+      end
+
+      def browse_header_for(time:, options:)
+        of, times = case options[:browse]
+        when :week
+          [
+            I18n.t('subcommands.browse.headers.week_of', week: time.beginning_of_week.to_date),
+            [time.beginning_of_week, time.end_of_week]
+          ]
+        when :month
+          [
+            I18n.t('subcommands.browse.headers.month_of', month: I18n.l(time, format: '%B')),
+            [time.beginning_of_month, time.end_of_month]
+          ]
+        when :year
+          [
+            I18n.t('subcommands.browse.headers.year_of', year: time.to_date.year),
+            [time.beginning_of_year, time.end_of_year]
+          ]
+        end
+
+        I18n.t('subcommands.browse.headers.browsing', of: of, from: times.min.to_date.to_s, to: times.max.to_date.to_s)
+      end
+
+      def output_with_pager(output:, options:)
+        if options[:pager] == :no_pager
+          puts output
+          return
+        end
+
+        pager_command = if RUBY_PLATFORM.match?(/win32|windows/i)
+          'more' # Windows command
+        else
+          'less' # Unix-like command
+        end
+
+        IO.popen(pager_command, 'w') do |pipe|
+          pipe.puts output
+          pipe.close_write
+        end
+      rescue Errno::ENOENT
+        message = "Operating system pager command (#{pager_command}) not found. Falling back to direct output."
+        Views::Shared::Error.new(messages: message).render
+        puts output
+      end
+
+      def display_no_entries_to_display_message(time:, options:)
+        case options[:browse]
+        when :week
+          Views::EntryGroup::Shared::NoEntriesToDisplayForWeekOf.new(time: time, options: options).render
+        when :month
+          Views::EntryGroup::Shared::NoEntriesToDisplayForMonthOf.new(time: time, options: options).render
+        when :year
+          Views::EntryGroup::Shared::NoEntriesToDisplayForYearOf.new(time: time, options: options).render
+        else
+          raise NotImplementedError, 'Unhandled option; ' \
+                                     "expected :week, :month, or :year but received #{options[:browse]}"
+        end
+      end
+
+      def browse_service(time:, options: {})
+        Services::EntryGroup::BrowseService.new(time: time, options: options)
+      end
+    end
+  end
+end

data/lib/dsu/support/time_comparable.rb

@@ -10,7 +10,7 @@ module Dsu
       end
 
       def time_equal_compare_string_for(time:)
-        time = time.localtime if time.utc?
+        time = time.in_time_zone
 
         time.strftime(TIME_COMPARABLE_FORMAT_SPECIFIER)
       end

data/lib/dsu/support/time_formatable.rb

@@ -12,7 +12,7 @@ module Dsu
 
       # TODO: I18n.
       def formatted_time(time:)
-        time = time.localtime if time.utc?
+        time = time.in_time_zone
 
         today_yesterday_or_tomorrow = if time.today?
           'Today'
@@ -39,6 +39,10 @@ module Dsu
         time.strftime("%m#{separator}%d#{separator}%Y")
       end
 
+      def dd_mm_yyyy(time:, separator: '/')
+        time.strftime("%d#{separator}%m#{separator}%Y")
+      end
+
       def timezone_for(time:)
         time.zone
       end

data/lib/dsu/support/times_sortable.rb

@@ -23,10 +23,9 @@ module Dsu
         # in ascending order. If the sort is descending, then in order to
         # properly reverse the times array, it needs to first be sorted in
         # ascending order before being reversed.
-        times.sort!
-        times.reverse! if entries_display_order == :desc
+        return times.sort if entries_display_order == :asc
 
-        times
+        times.sort_by { |time| -time.to_i }
       end
 
       def times_for(times:)

data/lib/dsu/validators/time_validator.rb

@@ -18,7 +18,7 @@ module Dsu
           return
         end
 
-        record.errors.add(:time, 'is not in localtime format.') if time.utc?
+        record.errors.add(:time, 'is not in localtime format.') unless time == time.in_time_zone
       end
     end
   end

data/lib/dsu/version.rb

@@ -2,5 +2,5 @@
 
 module Dsu
   VERSION_REGEX = /\A\d+\.\d+\.\d+(\.alpha\.\d+)?\z/
-  VERSION = '2.1.4'
+  VERSION = '2.2.0.rc.1'
 end

data/lib/dsu/views/entry_group/shared/no_entries_to_display.rb

@@ -23,10 +23,6 @@ module Dsu
 
           # TODO: I18n.
           def render
-            times.sort!
-            time_range = "#{formatted_time(time: times.first)} " \
-                         "through #{formatted_time(time: times.last)}"
-            message = "(nothing to display for #{time_range})"
             puts apply_theme(message, theme_color: color_theme.info)
           end
 
@@ -34,6 +30,15 @@ module Dsu
 
           attr_reader :times, :options
 
+          def message
+            "(nothing to display for #{time_range})"
+          end
+
+          def time_range
+            "#{formatted_time(time: times.min)} " \
+              "through #{formatted_time(time: times.max)}"
+          end
+
           def color_theme
             @color_theme ||= Models::ColorTheme.current_or_default
           end

data/lib/dsu/views/entry_group/shared/no_entries_to_display_for_month_of.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'no_entries_to_display'
+
+module Dsu
+  module Views
+    module EntryGroup
+      module Shared
+        class NoEntriesToDisplayForMonthOf < NoEntriesToDisplay
+          def initialize(time:, options: {})
+            super(times: [time.beginning_of_month, time.end_of_month], options: options)
+
+            @time = time
+          end
+
+          private
+
+          attr_reader :time
+
+          # TODO: I18n.
+          def message
+            "(nothing to display for the month of #{month_string}, #{time_range})"
+          end
+
+          def month_string
+            I18n.l(time, format: '%B')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dsu/views/entry_group/shared/no_entries_to_display_for_week_of.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'no_entries_to_display'
+
+module Dsu
+  module Views
+    module EntryGroup
+      module Shared
+        class NoEntriesToDisplayForWeekOf < NoEntriesToDisplay
+          def initialize(time:, options: {})
+            super(times: [time.beginning_of_week, time.end_of_week], options: options)
+
+            @time = time
+          end
+
+          private
+
+          attr_reader :time
+
+          # TODO: I18n.
+          def message
+            "(nothing to display for week of #{week_of_string}, #{time_range})"
+          end
+
+          # TODO: I18n.
+          def week_of_string
+            time.to_date
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dsu/views/entry_group/shared/no_entries_to_display_for_year_of.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'no_entries_to_display'
+
+module Dsu
+  module Views
+    module EntryGroup
+      module Shared
+        class NoEntriesToDisplayForYearOf < NoEntriesToDisplay
+          def initialize(time:, options: {})
+            super(times: [time.beginning_of_year, time.end_of_year], options: options)
+
+            @time = time
+          end
+
+          private
+
+          attr_reader :time
+
+          # TODO: I18n.
+          def message
+            "(nothing to display for the year of #{year_string}, #{time_range})"
+          end
+
+          # TODO: I18n.
+          def year_string
+            time.year
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dsu.rb

@@ -24,11 +24,22 @@ Dir.glob("#{__dir__}/dsu/**/*.rb").each do |file|
   require file
 end
 
-if !(Dsu.env.test? || Dsu.env.development?) && Dsu::Migration::Service.run_migrations?
-  begin
-    Dsu::Migration::Service.new.call
-  rescue StandardError => e
-    puts I18n.t('errors.migration.error', message: e.message)
-    exit 1
+unless Dsu.env.test? || Dsu.env.development?
+  if Dsu::Migration::Service.run_migrations?
+    begin
+      Dsu::Migration::Service.new.call
+    rescue StandardError => e
+      puts I18n.t('migrations.error.failed', message: e.message)
+      exit 1
+    end
+  end
+  # TODO: Hack. Integrate this into the migration service
+  # so that this runs only if the migration version changes.
+  theme_file = 'light.json'
+  destination_theme_file_path = File.join(Dsu::Support::Fileable.themes_folder, theme_file)
+  unless File.exist?(destination_theme_file_path)
+    source_theme_file_path = File.join(Dsu::Support::Fileable.seed_data_folder, 'themes', theme_file)
+    FileUtils.cp(source_theme_file_path, destination_theme_file_path)
+    puts I18n.t('migrations.information.theme_copied', from: source_theme_file_path, to: destination_theme_file_path)
   end
 end

data/lib/locales/en/commands.yml

@@ -49,6 +49,10 @@ en:
         DESCRIPTION
 
         Must be be between 2 and 256 characters (inclusive) in length.
+    browse:
+      key_mappings: b
+      desc: browse|b SUBCOMMAND
+      usage: Browse DSU entries by the given SUBCOMMAND
     config:
       key_mappings: c
       desc: config|c SUBCOMMAND
@@ -115,11 +119,18 @@ en:
     date_option_description: |
       DATE
 
-      This may be any date string that can be parsed using `Time.parse`.
-      Consequently, you may use also use '/' as date separators,
+      In the format of: [d]d-|/[m]m-|/[-|/yyyy].
+
+      This may be any date string that can be parsed using ruby's `Time.parse`.
+      Consequently, you may use use '-' or '/' as date separators,
       as well as omit the 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.`
+      current year (e.g. <month>/<day>, or 1/31). Leading zeroes are optional.
+      For example: `require 'time'; Time.parse('1/2') # etc.`
+
+      IMPORTANT: If you include the year as part of your date string, the format of
+      the date must be <day>/<month>/<year>, where <day> and <month> may include optional
+      leading zeroes, and <year> must be in the format of yyyy. For example
+      `require 'time'; Time.parse('31/1/2023') # etc.`
     mnemonic_option_description: |
       MNEMONIC
 

data/lib/locales/en/miscellaneous.yml

@@ -6,8 +6,6 @@ en:
     error: "Error: %{message}"
     from_option_invalid: Option -f, [--from=DATE|MNEMONIC] value is invalid ["%{from_option}"]
     to_option_invalid: Option -t, [--to=DATE|MNEMONIC] value is invalid ["%{to_option}"]
-    migration:
-      error: "Error running migrations: %{message}"
   headers:
     entry:
       could_not_be_added: "An error was encountered; the entry could not be added:"
@@ -21,3 +19,8 @@ en:
   information:
     dates:
       through: "%{from} thru %{to}"
+  migrations:
+    error:
+      failed: "Error running migrations: %{message}"
+    information:
+      theme_copied: Theme copied from %{from} to %{to}.

data/lib/locales/en/subcommands.yml

@@ -1,6 +1,39 @@
 # lib/dsu/subcommands
 en:
   subcommands:
+    browse:
+      week:
+        desc: week|w
+        usage: Browse DSU entries for the current week
+        long_desc: |
+          Browse DSU entries for the current week.
+
+          $ dsu browse w
+
+          $ dsu browse w
+      month:
+        desc: month|m
+        usage: Browse DSU entries for the current month
+        long_desc: |
+          Browse DSU entries for the current month.
+
+          $ dsu browse month
+
+          $ dsu browse m
+      year:
+        desc: year|y
+        usage: Browse DSU entries for the current year
+        long_desc: |
+          Browse DSU entries for the current year.
+
+          $ dsu browse year
+
+          $ dsu browse y
+      headers:
+        browsing: Browsing DSU entries for %{of} (%{from} thru %{to})
+        week_of: Week of %{week}
+        month_of: Month of %{month}
+        year_of: Year of %{year}
     config:
       delete:
         desc: delete

data/lib/seed_data/themes/light.json

@@ -0,0 +1,79 @@
+{
+  "version": 20230613121411,
+  "description": "Theme for Light backgrounds",
+  "help": {
+    "color": "default",
+    "mode": "default",
+    "background": "default"
+  },
+  "dsu_header": {
+    "color": "white",
+    "mode": "bold",
+    "background": "black"
+  },
+  "dsu_footer": {
+    "color": "default",
+    "mode": "default",
+    "background": "default"
+  },
+  "header": {
+    "color": "default",
+    "mode": "bold",
+    "background": "default"
+  },
+  "subheader": {
+    "color": "default",
+    "mode": "underline",
+    "background": "default"
+  },
+  "body": {
+    "color": "default",
+    "mode": "default",
+    "background": "default"
+  },
+  "footer": {
+    "color": "light_default",
+    "mode": "default",
+    "background": "default"
+  },
+  "date": {
+    "color": "default",
+    "mode": "bold",
+    "background": "default"
+  },
+  "index": {
+    "color": "light_default",
+    "mode": "italic",
+    "background": "default"
+  },
+  "info": {
+    "color": "white",
+    "mode": "bold",
+    "background": "blue"
+  },
+  "success": {
+    "color": "white",
+    "mode": "bold",
+    "background": "green"
+  },
+  "warning": {
+    "color": "default",
+    "mode": "bold",
+    "background": "yellow"
+  },
+  "error": {
+    "color": "light_yellow",
+    "mode": "default",
+    "background": "red"
+  },
+  "prompt": {
+    "color": "default",
+    "mode": "bold",
+    "background": "default"
+  },
+  "prompt_options": {
+    "color": "default",
+    "mode": "bold",
+    "background": "default"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0.rc.1
 platform: ruby
 authors:
 - Gene M. Angelo, Jr.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,6 +145,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.test"
 - ".reek.yml"
 - ".rspec"
 - ".rubocop.yml"
@@ -186,6 +187,7 @@ files:
 - lib/dsu/services/color_theme/hydrator_service.rb
 - lib/dsu/services/configuration/hydrator_service.rb
 - lib/dsu/services/entry/hydrator_service.rb
+- lib/dsu/services/entry_group/browse_service.rb
 - lib/dsu/services/entry_group/counter_service.rb
 - lib/dsu/services/entry_group/deleter_service.rb
 - lib/dsu/services/entry_group/editor_service.rb
@@ -196,6 +198,7 @@ files:
 - lib/dsu/services/temp_file/reader_service.rb
 - lib/dsu/services/temp_file/writer_service.rb
 - lib/dsu/subcommands/base_subcommand.rb
+- lib/dsu/subcommands/browse.rb
 - lib/dsu/subcommands/config.rb
 - lib/dsu/subcommands/delete.rb
 - lib/dsu/subcommands/edit.rb
@@ -210,6 +213,7 @@ files:
 - lib/dsu/support/command_options/time_mnemonic.rb
 - lib/dsu/support/command_options/time_mnemonics.rb
 - lib/dsu/support/descriptable.rb
+- lib/dsu/support/entry_group_browsable.rb
 - lib/dsu/support/entry_group_viewable.rb
 - lib/dsu/support/field_errors.rb
 - lib/dsu/support/fileable.rb
@@ -229,6 +233,9 @@ files:
 - lib/dsu/views/configuration/show.rb
 - lib/dsu/views/entry_group/edit.rb
 - lib/dsu/views/entry_group/shared/no_entries_to_display.rb
+- lib/dsu/views/entry_group/shared/no_entries_to_display_for_month_of.rb
+- lib/dsu/views/entry_group/shared/no_entries_to_display_for_week_of.rb
+- lib/dsu/views/entry_group/shared/no_entries_to_display_for_year_of.rb
 - lib/dsu/views/entry_group/show.rb
 - lib/dsu/views/shared/error.rb
 - lib/dsu/views/shared/info.rb
@@ -245,6 +252,7 @@ files:
 - lib/seed_data/themes/cherry.json
 - lib/seed_data/themes/default.json
 - lib/seed_data/themes/lemon.json
+- lib/seed_data/themes/light.json
 - lib/seed_data/themes/matrix.json
 - lib/seed_data/themes/whiteout.json
 - sig/dsu.rbs
@@ -264,11 +272,26 @@ post_install_message: |
   View the dsu README.md here: https://github.com/gangelo/dsu
   View the dsu CHANGELOG.md: https://github.com/gangelo/dsu/blob/main/CHANGELOG.md
 
+  Dsu now has a browse command! Try it out by running `dsu browse help`.
+
+  Dsu now has a "light" theme for light background terminals! Try it out by running `dsu theme use light`.
+
   Dsu now has a delete command! Try it out by running `dsu delete help`.
 
   Try a dsu theme by running `dsu theme list` and then `dsu theme use THEME_NAME` where THEME_NAME is the name of the theme you want to try.
 
   :)
+
+  Merry CHRISTmas, New Years and Happy holidays from dsu!
+       *
+      /*\
+     */*|\*
+    /*/|\*\
+   */**|\*\*
+  *//*|*\*\*\
+      |||
+      |||
+      |||
 rdoc_options: []
 require_paths:
 - lib
@@ -279,9 +302,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.0.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.15
 signing_key: