dsu 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daab696fe0b9d10062e74dedfba4605ac8d8917d9213188011250def3925a7d7
-  data.tar.gz: 50b7e48562ef821a547d3ff7468cd92fe2cc6a6af2090fa27b4d3c3f9a853b47
+  metadata.gz: 2c8163f812eaded6f88a8fd25e501ebca51e820f7d93b06ab349a9fb4facecde
+  data.tar.gz: e18ed74fa803102a3cc957d0b9ce420831ed4054d23d431338af2681a012d236
 SHA512:
-  metadata.gz: cd0028f5f8004b5078961725ca5297d0a962fb9d1d40f45bf452e5af0c3feb76992bad84a54c47bf22b0b3b3662946df5354e5c7fe781ad097c38b95bdf82887
-  data.tar.gz: 97f7f616664a2b406f196c08bfdd283ad5f184d6d9b357e12a59cdb1b4138ca2562859166618b443a73da5e276ae6229a70c6a4114fa8e023cadde8161fb8d25
+  metadata.gz: b69dce6d25a7bba32473a8cfbe1c82130ffd19f37a34b8a2c1514f9397add35611dbd8d08da642b03f2eb0c5eab42a2f0b35d20335ed0f9c3f98f19ceeaef9be
+  data.tar.gz: 353119cd18d19d9d4f77afcf437a35f1ca262aa9da5cdc91d0477a7d7d373490bac75a2d91d21ebd7dca76930bb3fbde53e4e8fa53693e4364239c8942020cd9

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.4.3] 2024-01-07
+
+Changes
+
+- Code refactors, nothing discernable to the end user.
+
+Bug fixes
+
+- Fixed bug that failed to display the correct editor if the editor session failed to open. For example, if the editor session failed to open and the EDITOR environment variable was used, the editor in the configuration file would be displayed instead of the EDITOR environment variable value.
+
 ## [2.4.2] 2024-01-06
 
 Changes

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dsu (2.4.2)
+    dsu (2.4.3)
       activemodel (>= 7.0.8, < 8.0)
       activesupport (>= 7.0.8, < 8.0)
-      colorize (>= 0.8.1, < 1.0)
+      colorize (>= 1.1, < 2.0)
       os (>= 1.1, < 2.0)
       thor (>= 1.2, < 2.0)
       thor_nested_subcommand (>= 1.0, < 2.0)
@@ -29,7 +29,7 @@ GEM
     bigdecimal (3.1.5)
     byebug (11.1.3)
     coderay (1.1.3)
-    colorize (0.8.1)
+    colorize (1.1.0)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     diff-lcs (1.5.0)
@@ -93,7 +93,7 @@ GEM
       parser (~> 3.2.0)
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -123,9 +123,9 @@ GEM
       parser (>= 3.2.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.0)
-      rubocop (~> 1.33)
-    rubocop-performance (1.20.1)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.26.1)
@@ -141,7 +141,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     thor (1.3.0)
-    thor_nested_subcommand (1.0.5)
+    thor_nested_subcommand (1.0.6)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)

data/README.md

@@ -1,8 +1,8 @@
 # `dsu`
 
 [![Ruby](https://github.com/gangelo/dsu/actions/workflows/ruby.yml/badge.svg)](https://github.com/gangelo/dsu/actions/workflows/ruby.yml)
-[![GitHub version](http://badge.fury.io/gh/gangelo%2Fdsu.svg?refresh=6)](https://badge.fury.io/gh/gangelo%2Fdsu)
-[![Gem Version](https://badge.fury.io/rb/dsu.svg?refresh=6)](https://badge.fury.io/rb/dsu)
+[![GitHub version](http://badge.fury.io/gh/gangelo%2Fdsu.svg?refresh=9)](https://badge.fury.io/gh/gangelo%2Fdsu)
+[![Gem Version](https://badge.fury.io/rb/dsu.svg?refresh=9)](https://badge.fury.io/rb/dsu)
 [![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/dsu/)
 [![Report Issues](https://img.shields.io/badge/report-issues-red.svg)](https://github.com/gangelo/dsu/issues)
 [![License](http://img.shields.io/badge/license-MIT-yellowgreen.svg)](#license)
@@ -12,6 +12,9 @@
 - `dsu` uses _no_ network connections whatsoever.
 - `dsu` stores all of its data _locally_, in .json files.
 - `dsu` is a simple (but powerful) command-line tool for users who _love_ to work within the terminal.
+- `dsu` versioning follows the [semantic versioning standard](https://semver.org/) (MAJOR.MINOR.PATCH).
+  - See the [CHANGELOG.md](https://github.com/gangelo/dsu/blob/main/CHANGELOG.md) before upgrading to a MAJOR `dsu` version.
+  - See the [Exporting DSU entries](https://github.com/gangelo/dsu/wiki/Exporting-DSU-entries) wiki on how to export (backup) your data.
 
 # Installation
 ```shell
@@ -22,9 +25,15 @@ gem install dsu
 [https://github.com/gangelo/dsu/wiki](https://github.com/gangelo/dsu/wiki)
 
 # Examples
-TODO
+The [dsu wiki](https://github.com/gangelo/dsu/wiki) is repleat with practical examples on how to use `dsu`.
+
+It you're interested in how _I personally_ use `dsu` every day, I blog about it [here](https://genemangelojr.blogspot.com/2024/01/the-dsu-ruby-gem-workflow-how-to-use-it.html).
 
 # Supported ruby versions
-TODO
+`dsu` _should_ work with any ruby version `['>= 3.0.1', '< 4.0']`; however, `dsu` is currently tested against the following ruby versions:
+- 3.0.1
+- 3.0.6
+- 3.1.4
+- 3.2.2
 
-Copyright (c) 2023-2024 Erik Gene Angelo. See [LICENSE](https://github.com/gangelo/dsu/LICENSE.txt) for details.
+Copyright (c) 2023-2024 Erik Gene Angelo. See [LICENSE](https://github.com/gangelo/dsu/blob/main/LICENSE.txt) for details.

data/lib/dsu/base_cli.rb

@@ -10,7 +10,6 @@ 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'
 require_relative 'views/entry_group/show'
@@ -20,7 +19,6 @@ module Dsu
     include Support::ColorThemable
     include Support::CommandHelpColorizable
     include Support::CommandHookable
-    include Support::EntryGroupViewable
     include Support::TimesSortable
 
     class_option :debug, type: :boolean, default: false

data/lib/dsu/cli.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'time'
 require_relative 'base_cli'
+require_relative 'presenters/entry_group/list/date_presenter'
 require_relative 'subcommands/browse'
 require_relative 'subcommands/config'
 require_relative 'subcommands/delete'
@@ -11,6 +12,7 @@ require_relative 'subcommands/export'
 require_relative 'subcommands/import'
 require_relative 'subcommands/list'
 require_relative 'subcommands/theme'
+require_relative 'views/entry_group/list'
 
 module Dsu
   # The `dsu` command.
@@ -46,7 +48,9 @@ module Dsu
       end
       entry = Models::Entry.new(description: description)
       CommandServices::AddEntryService.new(entry: entry, time: time).call
-      view_entry_group(time: time)
+      presenter = Presenters::EntryGroup::List::DatePresenter.new(times: [time], options: options)
+      # TODO: Refactor View::EntryGroup::Show to accept a presenter and use it here
+      Views::EntryGroup::List.new(presenter: presenter).render
     end
 
     desc I18n.t('commands.browse.desc'), I18n.t('commands.browse.usage')

data/lib/dsu/crud/json_file.rb

@@ -2,7 +2,6 @@
 
 require 'active_model'
 require 'json'
-require_relative 'raw_json_file'
 
 module Dsu
   module Crud
@@ -23,12 +22,12 @@ module Dsu
         self.class.delete!(file_path: file_path)
       end
 
-      def exist?
-        self.class.exist?(file_path: file_path)
+      def file_exist?
+        self.class.file_exist?(file_path: file_path)
       end
 
       def persisted?
-        exist?
+        file_exist?
       end
 
       # Override this method to reload data from the file
@@ -67,16 +66,20 @@ module Dsu
       alias save! write!
 
       class << self
-        def exist?(file_path:)
-          RawJsonFile.exist?(file_path: file_path)
+        def file_exist?(file_path:)
+          File.exist?(file_path)
         end
 
         def delete(file_path:)
-          RawJsonFile.delete(file_path: file_path)
+          return false unless file_exist?(file_path: file_path)
+
+          File.delete(file_path)
+
+          true
         end
 
         def delete!(file_path:)
-          RawJsonFile.delete!(file_path: file_path)
+          raise file_does_not_exist_message(file_path: file_path) unless delete(file_path: file_path)
         end
 
         def parse(json)
@@ -86,54 +89,65 @@ module Dsu
         end
 
         def read(file_path:)
-          hash = parse(RawJsonFile.read(file_path: file_path))
+          json = File.read(file_path) if file_exist?(file_path: file_path)
+          hash = parse(json)
           return yield hash if hash && block_given?
 
           hash
         end
 
         def read!(file_path:)
-          hash = parse(RawJsonFile.read!(file_path: file_path))
+          raise file_does_not_exist_message(file_path: file_path) unless file_exist?(file_path: file_path)
+
+          hash = read(file_path: file_path)
           return yield hash if hash && block_given?
 
           hash
         end
 
         def write(file_data:, file_path:)
-          Crud::RawJsonFile.write(file_data: file_data, file_path: file_path)
+          raise ArgumentError, 'file_data is nil' if file_data.nil?
+          raise ArgumentError, "file_data is the wrong object type:\"#{file_data}\"" unless file_data.is_a?(Hash)
+
+          file_data = JSON.pretty_generate(file_data)
+          File.write(file_path, file_data)
         end
 
         def write!(file_data:, file_path:)
           write(file_data: file_data, file_path: file_path)
         end
+
+        def file_does_not_exist_message(file_path:)
+          "File \"#{file_path}\" does not exist"
+        end
       end
 
       private
 
+      attr_writer :file_path, :version
+
       def read
-        hash = self.class.parse(RawJsonFile.read(file_path: file_path))
+        hash = self.class.read(file_path: file_path)
         return yield hash if block_given?
 
         hash
       end
 
       def read!
-        hash = self.class.parse(RawJsonFile.read!(file_path: file_path))
+        hash = self.class.read!(file_path: file_path)
         return yield hash if hash && block_given?
 
         hash
       end
 
       def read_version
-        return 0 unless exist?
+        return 0 unless file_exist?
 
         hash = read
         return 0 if hash.nil?
 
         hash.fetch(:version, 0).to_i
       end
-
-      attr_writer :file_path, :version
     end
   end
 end

data/lib/dsu/env.rb

@@ -2,7 +2,7 @@
 
 module Dsu
   class << self
-    def env
+    def env # rubocop:disable Metrics/MethodLength
       @env ||= Struct.new(:env) do
         def test?
           env.fetch('DSU_ENV', nil) == 'test'
@@ -19,6 +19,25 @@ module Dsu
         def production?
           env.fetch('DSU_ENV', 'production') == 'production'
         end
+
+        def screen_shot_mode?
+          development? && (env.fetch('SCREEN_SHOT_USERNAME', '').present? ||
+            env.fetch('SCREEN_SHOT_HOSTNAME', '').present?)
+        end
+
+        def screen_shot_prompt
+          username = screen_shot_username
+          hostname = screen_shot_hostname
+          "#{username}@#{hostname}:~ $"
+        end
+
+        def screen_shot_username
+          env.fetch('SCREEN_SHOT_USERNAME', 'username')
+        end
+
+        def screen_shot_hostname
+          env.fetch('SCREEN_SHOT_HOSTNAME', 'hostname')
+        end
       end.new(ENV)
     end
   end

data/lib/dsu/models/color_theme.rb

@@ -160,7 +160,7 @@ module Dsu
         end
 
         def exist?(theme_name:)
-          superclass.exist?(file_path: themes_path_for(theme_name: theme_name))
+          superclass.file_exist?(file_path: themes_path_for(theme_name: theme_name))
         end
 
         def find(theme_name:)

data/lib/dsu/models/configuration.rb

@@ -63,6 +63,8 @@ module Dsu
 
       attr_reader :options
 
+      alias exist? file_exist?
+
       def initialize(options: {})
         super(config_path)
 

data/lib/dsu/models/entry_group.rb

@@ -150,7 +150,7 @@ module Dsu
         end
 
         def exist?(time:)
-          superclass.exist?(file_path: entries_path_for(time: time))
+          superclass.file_exist?(file_path: entries_path_for(time: time))
         end
 
         def entry_group_times(between: nil)

data/lib/dsu/models/migration_version.rb

@@ -13,6 +13,8 @@ module Dsu
 
       attr_reader :options
 
+      alias exist? file_exist?
+
       def initialize(version: nil, options: {})
         super(migration_version_path)
 

data/lib/dsu/presenters/base_presenter_ex.rb

@@ -10,7 +10,7 @@ module Dsu
       include Support::ColorThemable
 
       def initialize(options: {})
-        @options = options || {}
+        @options = options&.dup || {}
         @color_theme = Models::ColorTheme.find(theme_name: theme_name)
       end
 

data/lib/dsu/presenters/configuration_presenter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../env'
 require_relative '../support/color_themable'
 require_relative 'base_presenter'
 
@@ -28,7 +29,11 @@ module Dsu
       private
 
       def config_path
-        @config_path ||= config.file_path
+        @config_path ||= if Dsu.env.screen_shot_mode?
+          "/Users/#{Dsu.env.screen_shot_username}/.dsu"
+        else
+          config.file_path
+        end
       end
 
       def formatted_config_entry_with_index(config_entry, index:, theme_color:)

data/lib/dsu/presenters/entry_group/list/date_presenter.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require_relative '../../../models/configuration'
+require_relative '../../../models/entry_group'
+require_relative '../../../views/entry_group/shared/no_entries_to_display'
+require_relative '../../base_presenter_ex'
+require_relative 'messages'
+require_relative 'nothing_to_list'
+
+module Dsu
+  module Presenters
+    module EntryGroup
+      module List
+        class DatePresenter < BasePresenterEx
+          include Messages
+          include NothingToList
+
+          def initialize(times:, options: {})
+            raise ArgumentError, 'times must be an Array' unless times.is_a?(Array)
+            raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
+
+            super(options: options)
+
+            @times = times
+          end
+
+          def render
+            return if nothing_to_list?
+
+            entry_groups.each do |entry_group|
+              Views::EntryGroup::Show.new(entry_group: entry_group).render
+              puts
+            end
+          end
+
+          def display_nothing_to_list_message
+            # This presenter will ALWAYS have something to list (display) since the first
+            # and last (if different) entry groups will always be displayed.
+            raise 'display_nothing_to_list_message called when there are entries to display'
+          end
+
+          private
+
+          attr_reader :times
+
+          def entry_groups
+            @entry_groups ||= begin
+              options = configuration.to_h.merge(self.options).with_indifferent_access
+
+              times.filter_map do |time|
+                view_options = options.dup
+                # Always show the first and last entry groups.
+                view_options[:include_all] = true if times_min_max.include?(time)
+
+                next unless show_entry_group?(time: time, options: view_options)
+
+                Models::EntryGroup.find_or_initialize(time: time)
+              end
+            end
+          end
+
+          def times_min_max
+            @times_min_max ||= times.minmax
+          end
+
+          def configuration
+            @configuration ||= Models::Configuration.new
+          end
+
+          def show_entry_group?(time:, options:)
+            Models::EntryGroup.exist?(time: time) || options[:include_all]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dsu/presenters/entry_group/list/dates_presenter.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative '../../../models/entry_group'
+require_relative '../../../views/entry_group/shared/no_entries_to_display'
+require_relative '../../base_presenter_ex'
+require_relative 'messages'
+require_relative 'nothing_to_list'
+
+module Dsu
+  module Presenters
+    module EntryGroup
+      module List
+        class DatesPresenter < BasePresenterEx
+          include Messages
+          include NothingToList
+
+          def initialize(times:, options: {})
+            raise ArgumentError, 'times must be an Array' unless times.is_a?(Array)
+            raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
+
+            super(options: options)
+
+            @times = times
+          end
+
+          def render
+            return if nothing_to_list?
+
+            entry_groups.each do |entry_group|
+              Views::EntryGroup::Show.new(entry_group: entry_group).render
+              puts
+            end
+          end
+
+          def display_nothing_to_list_message
+            raise 'display_nothing_to_list_message called when there are entries to display' unless nothing_to_list?
+
+            Views::EntryGroup::Shared::NoEntriesToDisplay.new(times: times, options: options).render
+          end
+
+          private
+
+          attr_reader :times
+
+          def entry_groups
+            @entry_groups ||= times.filter_map do |time|
+              next unless show_entry_group?(time: time, options: options)
+
+              Models::EntryGroup.find_or_initialize(time: time)
+            end
+          end
+
+          def show_entry_group?(time:, options:)
+            Models::EntryGroup.exist?(time: time) || options[:include_all]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dsu/presenters/entry_group/list/messages.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Dsu
+  module Presenters
+    module EntryGroup
+      module List
+        module Messages
+          def display_nothing_to_list_message
+            raise NotImplementedError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dsu/presenters/entry_group/list/nothing_to_list.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Dsu
+  module Presenters
+    module EntryGroup
+      module List
+        module NothingToList
+          def nothing_to_list?
+            entry_groups.none?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -65,7 +65,7 @@ module Dsu
               process_entry_group!(entry_group_with_edits)
             else
               message_array = I18n.t('services.editor_service.errors.temp_file_error',
-                editor: configuration.editor,
+                editor: ENV.fetch('EDITOR', configuration.editor),
                 status: $CHILD_STATUS).split("\n")
               puts apply_theme(message_array, theme_color: color_theme.error)
             end

data/lib/dsu/subcommands/list.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require_relative '../presenters/entry_group/list/date_presenter'
+require_relative '../presenters/entry_group/list/dates_presenter'
 require_relative '../services/entry_group/counter_service'
 require_relative '../support/command_options/dsu_times'
 require_relative '../support/command_options/time_mnemonic'
 require_relative '../support/time_formatable'
-require_relative '../views/entry_group/shared/no_entries_to_display'
+require_relative '../views/entry_group/list'
 require_relative '../views/shared/error'
 require_relative 'base_subcommand'
 
@@ -25,7 +27,8 @@ module Dsu
       def today
         time = Time.now
         times = sorted_dsu_times_for(times: [time.yesterday, time])
-        view_list_for(times: times, options: options)
+        presenter = Presenters::EntryGroup::List::DatePresenter.new(times: times, options: options)
+        Views::EntryGroup::List.new(presenter: presenter).render
       end
 
       desc I18n.t('subcommands.list.tomorrow.desc'), I18n.t('subcommands.list.tomorrow.usage')
@@ -33,7 +36,8 @@ module Dsu
       def tomorrow
         time = Time.now
         times = sorted_dsu_times_for(times: [time, time.tomorrow])
-        view_list_for(times: times, options: options)
+        presenter = Presenters::EntryGroup::List::DatePresenter.new(times: times, options: options)
+        Views::EntryGroup::List.new(presenter: presenter).render
       end
 
       desc I18n.t('subcommands.list.yesterday.desc'), I18n.t('subcommands.list.yesterday.usage')
@@ -41,7 +45,8 @@ module Dsu
       def yesterday
         time = Time.now
         times = sorted_dsu_times_for(times: [time.yesterday, time.yesterday.yesterday])
-        view_list_for(times: times, options: options)
+        presenter = Presenters::EntryGroup::List::DatePresenter.new(times: times, options: options)
+        Views::EntryGroup::List.new(presenter: presenter).render
       end
 
       desc I18n.t('subcommands.list.date.desc'), I18n.t('subcommands.list.date.usage')
@@ -55,7 +60,8 @@ module Dsu
           Time.parse(date_or_mnemonic)
         end
         times = sorted_dsu_times_for(times: [time, time.yesterday])
-        view_list_for(times: times, options: options)
+        presenter = Presenters::EntryGroup::List::DatePresenter.new(times: times, options: options)
+        Views::EntryGroup::List.new(presenter: presenter).render
       rescue ArgumentError => e
         Views::Shared::Error.new(messages: e.message).render
       end
@@ -79,11 +85,8 @@ 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
-          if Services::EntryGroup::CounterService.new(times: times).call.zero?
-            Views::EntryGroup::Shared::NoEntriesToDisplay.new(times: times, options: options).render
-          end
-        end
+        presenter = Presenters::EntryGroup::List::DatesPresenter.new(times: times, options: options)
+        Views::EntryGroup::List.new(presenter: presenter).render
       rescue ArgumentError => e
         Views::Shared::Error.new(messages: e.message).render
       end

data/lib/dsu/support/command_hookable.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../env'
 require_relative '../models/color_theme'
 require_relative '../services/stderr_redirector_service'
 require_relative '../views/shared/error'
@@ -26,6 +27,10 @@ module Dsu
         end
 
         def display_dsu_header
+          if Dsu.env.screen_shot_mode?
+            puts apply_theme('Running screen shot mode!', theme_color: color_theme.warning)
+            puts "#{Dsu.env.screen_shot_prompt} dsu #{ARGV.join(' ')}"
+          end
         end
 
         def display_dsu_footer

data/lib/dsu/support/entry_group_browsable.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require_relative '../models/configuration'
+require_relative '../presenters/entry_group/list/dates_presenter'
 require_relative '../services/entry_group/browse_service'
 require_relative '../services/entry_group/counter_service'
+require_relative '../views/entry_group/list'
 
 module Dsu
   module Support
@@ -23,7 +25,8 @@ module Dsu
           header = browse_header_for(time: time, options: options)
           Views::Shared::Info.new(messages: header).render
           puts
-          view_entry_groups(times: times, options: options)
+          presenter = Presenters::EntryGroup::List::DatesPresenter.new(times: times, options: options)
+          Views::EntryGroup::List.new(presenter: presenter).render
           self.class.display_dsu_footer
         end
         output_with_pager output: output, options: options

data/lib/dsu/version.rb

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

data/lib/dsu/views/entry_group/list.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Dsu
+  module Views
+    module EntryGroup
+      class List
+        def initialize(presenter:)
+          @presenter = presenter
+        end
+
+        def render
+          return presenter.display_nothing_to_list_message if presenter.nothing_to_list?
+
+          presenter.render
+        end
+
+        private
+
+        attr_reader :presenter
+      end
+    end
+  end
+end

data/lib/dsu/views/entry_group/show.rb

@@ -36,7 +36,11 @@ module Dsu
           puts presenter.formatted_time
 
           entry_group.validate!
-          puts presenter.no_entries_available and return if entry_group.entries.empty?
+          if entry_group.entries.empty?
+            puts presenter.no_entries_available
+
+            return
+          end
 
           entry_group.entries.each_with_index do |entry, index|
             entry_presenter = entry.presenter

data/lib/locales/en/services.yml

@@ -4,7 +4,7 @@ en:
       errors:
         temp_file_error: |
           Failed to open temporary file in editor '%{editor}'; the system error returned was: '%{status}'.
-          Either set the EDITOR environment variable or set the dsu editor configuration option (`$ dsu config info`).
-          Run `$ dsu help config` for more information.
+          Check your EDITOR environment variable and the dsu editor configuration option (run `dsu config info`).
+          Run `dsu help config` for more information.
       messages:
         editing: "Editing entry group %{formatted_time}..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Gene M. Angelo, Jr.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -130,14 +130,13 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: "    Get ready to jazz and snazz up your daily stand-ups with dsu, the
-  agile developer's new best friend! This handy command-line gem is all about making
-  your Daily Stand-Up (DSU) participation smooth, fun, and super efficient. Effortlessly
-  create, update, and organize your DSU entries, turning the task of tracking and
-  sharing your daily activities into a breeze. With its intuitive interface and smart
-  date management, dsu ensures you’re always ready to inform your team about your
-  recent progress and upcoming plans. Perfect for command-line tool enthusiasts, dsu
-  brings a dash of simplicity and fun, fun, fun to your daily agile routine!\n"
+description: |2
+      dsu is ruby gem that enables anyone practicing Agile methodology to record, keep track of, and manage their daily standup (DSU) activities.
+
+      * dsu uses no network connections whatsoever.
+      * dsu stores all of its data locally, in .json files.
+      * dsu is a simple (but powerful) command-line tool for users who love to work within the terminal.
+      * dsu versioning follows the semantic versioning standard (MAJOR.MINOR.PATCH).
 email:
 - public.gma@gmail.com
 executables:
@@ -169,7 +168,6 @@ files:
 - lib/dsu/cli.rb
 - lib/dsu/command_services/add_entry_service.rb
 - lib/dsu/crud/json_file.rb
-- lib/dsu/crud/raw_json_file.rb
 - lib/dsu/env.rb
 - lib/dsu/migration/service.rb
 - lib/dsu/migration/version.rb
@@ -183,6 +181,10 @@ files:
 - lib/dsu/presenters/color_theme_presenter.rb
 - lib/dsu/presenters/color_theme_show_presenter.rb
 - lib/dsu/presenters/configuration_presenter.rb
+- lib/dsu/presenters/entry_group/list/date_presenter.rb
+- lib/dsu/presenters/entry_group/list/dates_presenter.rb
+- lib/dsu/presenters/entry_group/list/messages.rb
+- lib/dsu/presenters/entry_group/list/nothing_to_list.rb
 - lib/dsu/presenters/entry_group_presenter.rb
 - lib/dsu/presenters/entry_presenter.rb
 - lib/dsu/presenters/export/all_presenter.rb
@@ -229,7 +231,6 @@ files:
 - 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
 - lib/dsu/support/presentable.rb
@@ -247,6 +248,7 @@ files:
 - lib/dsu/views/color_theme/show.rb
 - lib/dsu/views/configuration/show.rb
 - lib/dsu/views/entry_group/edit.rb
+- lib/dsu/views/entry_group/list.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
@@ -290,25 +292,28 @@ 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 import command! Try it out by running `dsu import help`.
-  Dsu now has a export command! Try it out by running `dsu export help`.
-  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.
+  Using dsu? dsu is made available free of charge. Please consider giving dsu a STAR on GitHub as well as sharing dsu with your fellow developers on social media.
 
-  :)
+  Knowing that dsu is being used and appreciated is a great motivator to continue developing and improving dsu.
 
-  Happy New Year 2024 from dsu!
+  >>> Star it on github: https://github.com/gangelo/dsu
+  >>> Share on social media: https://rubygems.org/gems/dsu
 
-   *        *        *
-   *     *  .     *  .     *
-  *  *      *   *      *   *
-   *     *     *     *     *
-      *        *        *
+  Thank you!
 
-  May your year be filled with sparks of joy and innovation!
+  <3 Gene
 rdoc_options: []
 require_paths:
 - lib

data/lib/dsu/crud/raw_json_file.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'fileutils'
-
-module Dsu
-  module Crud
-    module RawJsonFile
-      class << self
-        def delete(file_path:)
-          return false unless exist?(file_path: file_path)
-
-          File.delete(file_path)
-
-          true
-        end
-
-        def delete!(file_path:)
-          raise file_does_not_exist_message(file_path: file_path) unless delete(file_path: file_path)
-        end
-
-        def exist?(file_path:)
-          File.exist?(file_path)
-        end
-
-        def read(file_path:)
-          File.read(file_path) if exist?(file_path: file_path)
-        end
-
-        def read!(file_path:)
-          raise file_does_not_exist_message(file_path: file_path) unless exist?(file_path: file_path)
-
-          read(file_path: file_path)
-        end
-
-        def write(file_data:, file_path:)
-          raise ArgumentError, 'file_data is nil' if file_data.nil?
-          raise ArgumentError, "file_data is the wrong object type:\"#{file_data}\"" unless file_data.is_a?(Hash)
-
-          file_data = JSON.pretty_generate(file_data)
-          File.write(file_path, file_data)
-        end
-
-        private
-
-        def file_does_not_exist_message(file_path:)
-          "File \"#{file_path}\" does not exist"
-        end
-      end
-    end
-  end
-end

data/lib/dsu/support/entry_group_viewable.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Dsu
-  module Support
-    module EntryGroupViewable
-      def view_entry_groups(times:, options: {})
-        raise ArgumentError, 'times must be an Array' unless times.is_a?(Array)
-        raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
-
-        total_viewable_entry_groups = 0
-
-        times.each do |time|
-          view_entry_group(time: time, options: options) do
-            total_viewable_entry_groups += 1
-            puts
-          end
-        end
-
-        total_unviewable_entry_groups = times.size - total_viewable_entry_groups
-        yield total_viewable_entry_groups, total_unviewable_entry_groups if block_given?
-      end
-
-      def view_entry_group(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)
-
-        return unless show_entry_group?(time: time, options: options)
-
-        entry_group = Models::EntryGroup.find_or_initialize(time: time)
-        Views::EntryGroup::Show.new(entry_group: entry_group).render
-
-        yield if block_given?
-      end
-
-      # This method will unconditionally display the FIRST and LAST entry groups
-      # associated with the times provided by the <times> argument. All other
-      # entry groups will be conditionally displayed based on the :include_all
-      # value in the <options> argument.
-      def view_list_for(times:, options:)
-        configuration = Models::Configuration.new unless defined?(configuration) && configuration
-        options = configuration.to_h.merge(options).with_indifferent_access
-        times_first_and_last = [times.first, times.last]
-        times.each do |time|
-          view_options = options.dup
-          view_options[:include_all] = true if times_first_and_last.include?(time)
-          view_entry_group(time: time, options: view_options) do
-            puts
-          end
-        end
-      end
-
-      private
-
-      def show_entry_group?(time:, options:)
-        Models::EntryGroup.exist?(time: time) || options[:include_all]
-      end
-
-      module_function :view_entry_group, :view_entry_groups, :view_list_for, :show_entry_group?
-    end
-  end
-end