dsu 0.1.0.alpha.5 → 1.1.0.alpha.1

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

@@ -1,19 +1,13 @@
 # frozen_string_literal: true
 
-require 'time'
-require 'active_support/core_ext/numeric/time'
 require_relative '../../models/entry_group'
-require_relative '../../support/colorable'
-require_relative '../../support/say'
-require_relative '../../support/time_formatable'
+require_relative '../../support/configurable'
 
 module Dsu
   module Views
     module EntryGroup
       class Edit
-        include Support::Colorable
-        include Support::Say
-        include Support::TimeFormatable
+        include Support::Configurable
 
         def initialize(entry_group:, options: {})
           raise ArgumentError, 'entry_group is nil' if entry_group.nil?
@@ -25,46 +19,102 @@ module Dsu
           @options = options || {}
         end
 
-        def call
-          # Just in case the entry group is invalid, we'll
-          # validate it before displaying it.
+        def render
+          puts render_as_string
+        end
+
+        def render_as_string
+          # Just in case the entry group is invalid, we'll validate it before displaying it.
           entry_group.validate!
-          render_entry_group!
-        rescue ActiveModel::ValidationError
-          puts "Error(s) encountered: #{entry_group.errors.full_messages}"
-          raise
+
+          <<~EDIT_VIEW
+            #{banner_line}
+            # Editing DSU Entries for #{entry_group.time_formatted}
+            #{banner_line}
+
+            #{entry_group_view&.chomp}
+
+            #{banner_line}
+            # INSTRUCTIONS
+            #{banner_line}
+            #    ADD a DSU entry: type an ENTRY DESCRIPTION on a new line.
+            #   EDIT a DSU entry: change the existing ENTRY DESCRIPTION.
+            # DELETE a DSU entry: delete the ENTRY DESCRIPTION.
+            #  NOTE: deleting all of the ENTRY DESCRIPTIONs will delete the entry group file;
+            #        this is preferable if this is what you want to do :)
+            # REORDER a DSU entry: reorder the ENTRY DESCRIPTIONs in order preference.
+            #
+            # *** When you are done, save and close your editor ***
+            #{banner_line}
+          EDIT_VIEW
         end
-        alias render call
 
         private
 
         attr_reader :entry_group, :options
 
-        def render_entry_group!
-          say "# Editing DSU Entries for #{formatted_time(time: entry_group.time)}"
-          # TODO: Display entry group entries from the previous DSU date so they can be
-          # easily copied over; or, add them to the current entry group entries below as
-          # a "# [+|a|add] <entry group from previous DSU entry description>" (e.g. commented
-          # out) by default?
-          say ''
-          say '# [SHA/COMMAND] [DESCRIPTION]'
-
-          entry_group.entries.each do |entry|
-            say "#{entry.uuid} #{entry.description.strip}"
+        def time
+          @time ||= entry_group.time
+        end
+
+        def banner_line
+          '#' * 80
+        end
+
+        def entry_group_view
+          return entry_group_entry_lines if entry_group.entries.any?
+          return previous_entry_group_entry_lines if carry_over_entries_to_today? && previous_entry_group?
+
+          <<~EDIT_VIEW
+            #{banner_line}
+            # ENTER DSU ENTRIES BELOW
+            #{banner_line}
+
+          EDIT_VIEW
+        end
+
+        def entry_group_entry_lines
+          raise 'No entries in entry group' if entry_group.entries.empty?
+
+          <<~EDIT_VIEW
+            #{banner_line}
+            # DSU ENTRIES
+            #{banner_line}
+
+            #{entry_group.entries.map(&:description).join("\n").chomp}
+          EDIT_VIEW
+        end
+
+        def previous_entry_group_entry_lines
+          raise 'carry_over_entries_to_today? is false' unless carry_over_entries_to_today?
+          raise 'Entries exist in entry_group' if entry_group.entries.any?
+          raise 'No previous entry group exists' unless previous_entry_group?
+
+          <<~EDIT_VIEW
+            #{banner_line}
+            # PREVIOUS DSU ENTRIES FROM #{previous_entry_group.time_formatted}
+            #{banner_line}
+
+            #{previous_entry_group.entries.map(&:description).join("\n").chomp}
+          EDIT_VIEW
+        end
+
+        def previous_entry_group?
+          previous_entry_group.present?
+        end
+
+        def previous_entry_group
+          # Go back a max of 7 days to find the previous entry group.
+          # TODO: Make this configurable or accept an option?
+          @previous_entry_group ||= (1..7).each do |days|
+            t = time.days_ago(days)
+            return Models::EntryGroup.load(time: t) if Support::EntryGroupFileable.entry_group_file_exists?(time: t)
           end
+          nil
+        end
 
-          say ''
-          say '# INSTRUCTIONS:'
-          say '# ADD a DSU entry: use one of the following commands: [+|a|add] ' \
-              'followed by the description.'
-          say '# EDIT a DSU entry: change the description.'
-          say '# DELETE a DSU entry: delete the entry or replace the sha with one ' \
-              'of the following commands: [-|d|delete].'
-          say '# NOTE: deleting all the entries will delete the entry group file; '
-          say '#       this is preferable if this is what you want to do :)'
-          say '# REORDER a DSU entry: reorder the DSU entries in order preference.'
-          say '#'
-          say '# *** When you are done, save and close your editor ***'
+        def carry_over_entries_to_today?
+          configuration[:carry_over_entries_to_today]
         end
       end
     end

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

@@ -26,7 +26,7 @@ module Dsu
         end
 
         def call
-          render_entry_group!
+          render!
         end
         alias render call
 
@@ -34,18 +34,24 @@ module Dsu
 
         attr_reader :entry_group, :options
 
-        def render_entry_group!
+        def render!
           say formatted_time(time: entry_group.time), HIGHLIGHT
           say('(no entries available for this day)') and return if entry_group.entries.empty?
 
           entry_group.entries.each_with_index do |entry, index|
-            prefix = "#{format('%03s', index + 1)}. #{entry.uuid}"
+            prefix = "#{format('%03s', index + 1)}. "
             description = colorize_string(string: entry.description, mode: :bold)
             entry_info = "#{prefix} #{description}"
-            entry_info = "#{entry_info} (validation failed)" unless entry.valid?
+            unless entry.valid?
+              entry_info = "#{entry_info} (validation failed: #{entry_errors(entry_group_deleter_service)})"
+            end
             say entry_info
           end
         end
+
+        def entry_errors(entry)
+          entry.errors.full_messages.join(', ')
+        end
       end
     end
   end

data/lib/dsu/views/shared/messages.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require_relative '../../support/colorable'
+require_relative '../../support/say'
+
+module Dsu
+  module Views
+    module Shared
+      class Messages
+        include Support::Colorable
+        include Support::Say
+
+        MESSAGE_TYPES = %i[error info success warning].freeze
+
+        def initialize(messages:, message_type:, options: {})
+          messages = [messages] unless messages.is_a?(Array)
+
+          validate_arguments!(messages, message_type, options)
+
+          @messages = messages.select(&:present?)
+          @message_type = message_type
+          # We've inluded Support::Colorable, so simply upcase the message_type
+          # and convert it to a symbol; this will equate to the color we want.
+          @message_color = self.class.const_get(message_type.to_s.upcase)
+          @options = options || {}
+          @header = options[:header]
+        end
+
+        def render
+          return if messages.empty?
+
+          say header, message_color if header.present?
+
+          messages.each_with_index do |message, index|
+            say "#{index + 1}. #{message}", message_color
+          end
+        end
+
+        private
+
+        attr_reader :messages, :message_color, :message_type, :header, :options
+
+        def validate_arguments!(messages, message_type, options)
+          raise ArgumentError, 'messages is nil' if messages.nil?
+          raise ArgumentError, 'messages is the wrong object type' unless messages.is_a?(Array)
+          raise ArgumentError, 'messages elements are the wrong object type' unless messages.all?(String)
+          raise ArgumentError, 'message_type is nil' if message_type.nil?
+          raise ArgumentError, 'message_type is the wrong object type' unless message_type.is_a?(Symbol)
+          raise ArgumentError, 'message_type is not a valid message type' unless MESSAGE_TYPES.include?(message_type)
+          raise ArgumentError, 'options is nil' if options.nil?
+          raise ArgumentError, 'options is the wrong object type' unless options.is_a?(Hash)
+        end
+      end
+    end
+  end
+end

data/lib/dsu.rb

@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
-require 'time'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/object/blank'
+require 'pry-byebug' if ENV['DEV_ENV']
+require 'thor'
+require 'time'
+
+Dir.glob("#{__dir__}/lib/core/**/*.rb").each do |file|
+  require file
+end
 
 Dir.glob("#{__dir__}/dsu/**/*.rb").each do |file|
   require file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.5
+  version: 1.1.0.alpha.1
 platform: ruby
 authors:
 - Gene M. Angelo, Jr.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,33 +31,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.4
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.4.3
 - !ruby/object:Gem::Dependency
-  name: deco_lite
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +155,7 @@ files:
 - lib/dsu/base_cli.rb
 - lib/dsu/cli.rb
 - lib/dsu/command_services/add_entry_service.rb
+- lib/dsu/core/ruby/not_today.rb
 - lib/dsu/models/entry.rb
 - lib/dsu/models/entry_group.rb
 - lib/dsu/services/configuration_loader_service.rb
@@ -158,6 +165,7 @@ files:
 - lib/dsu/services/entry_group_reader_service.rb
 - lib/dsu/services/entry_group_writer_service.rb
 - lib/dsu/services/entry_hydrator_service.rb
+- lib/dsu/services/stdout_redirector_service.rb
 - lib/dsu/services/temp_file_reader_service.rb
 - lib/dsu/services/temp_file_writer_service.rb
 - lib/dsu/subcommands/config.rb
@@ -165,9 +173,11 @@ files:
 - lib/dsu/subcommands/list.rb
 - lib/dsu/support/ask.rb
 - lib/dsu/support/colorable.rb
-- lib/dsu/support/commander/command.rb
-- lib/dsu/support/commander/command_help.rb
-- lib/dsu/support/commander/subcommand.rb
+- lib/dsu/support/command_options/dsu_times.rb
+- lib/dsu/support/command_options/time.rb
+- lib/dsu/support/command_options/time_mneumonic.rb
+- lib/dsu/support/command_options/time_mneumonics.rb
+- lib/dsu/support/configurable.rb
 - lib/dsu/support/configuration.rb
 - lib/dsu/support/descriptable.rb
 - lib/dsu/support/entry_group_fileable.rb
@@ -175,15 +185,17 @@ files:
 - lib/dsu/support/entry_group_viewable.rb
 - lib/dsu/support/field_errors.rb
 - lib/dsu/support/folder_locations.rb
-- lib/dsu/support/interactive/cli.rb
 - lib/dsu/support/say.rb
 - lib/dsu/support/time_formatable.rb
 - lib/dsu/support/times_sortable.rb
+- lib/dsu/validators/description_validator.rb
 - lib/dsu/validators/entries_validator.rb
 - lib/dsu/validators/time_validator.rb
 - lib/dsu/version.rb
+- lib/dsu/views/edited_entries/shared/errors.rb
 - lib/dsu/views/entry_group/edit.rb
 - lib/dsu/views/entry_group/show.rb
+- lib/dsu/views/shared/messages.rb
 - sig/dsu.rbs
 homepage: https://github.com/gangelo/dsu
 licenses:

data/lib/dsu/support/commander/command.rb

@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'command_help'
-require_relative 'subcommand'
-
-module Dsu
-  module Support
-    module Commander
-      # https://www.toptal.com/ruby/ruby-dsl-metaprogramming-guide
-      module Command
-        class << self
-          def included(base)
-            base.extend ClassMethods
-            base.engine.command_namespace to_command_namespace_symbol base.name
-            base.engine.command_prompt base.engine.command_namespace
-            binding.pry
-            base.singleton_class.delegate :command_namespace, :command_namespaces, :commands,
-              :command_add, :command_subcommand_add, :command_prompt, :command_parent,
-              :help, to: :engine
-          end
-
-          private
-
-          def to_command_namespace_symbol(namespace, join_token: '_')
-            namespace.delete(':').split(/(?=[A-Z])/).join(join_token).downcase
-          end
-        end
-
-        module ClassMethods
-          def command_subcommand_create(command_parent:)
-            new.tap do |subcommand|
-              subcommand.extend Subcommand
-              subcommand.command_parent command_parent
-            end
-          end
-
-          def engine
-            @engine ||= Engine.new(owning_command: self)
-          end
-
-          class Engine
-            include CommandHelp
-
-            attr_reader :owning_command
-
-            def initialize(owning_command:)
-              @owning_command = owning_command
-            end
-
-            def command_add(command:, desc:, long_desc: nil, options: {}, commands: [])
-              self.commands[command_namespace] ||= {}
-              self.commands[command_namespace][command] = {
-                desc: desc,
-                long_desc: long_desc,
-                options: options,
-                commands: commands,
-                help: command_help_for(command: command, desc: desc,
-                  long_desc: long_desc, options: options, commands: commands)
-              }
-            end
-
-            def command_subcommand_add(subcommand, command_parent: nil)
-              command_parent ||= @owning_command
-              subcommand = subcommand.command_subcommand_create command_parent: command_parent
-              commands[command_namespace] ||= {}
-              binding.pry
-              subcommand.command_namespaces.each_with_index do |namespace, index|
-                next if index.zero?
-
-                target = commands.dig(*subcommand.command_namespaces[1..index])
-                target ||= commands.dig(*subcommand.command_namespaces[0..index - 1])
-                target[namespace] ||= {}
-              end
-              commands.dig(*subcommand.command_namespaces[0..])[subcommand.command_namespaces.last] = subcommand
-
-              # subcommand.commands.each do |command_namespace, command|
-              #   command.each do |subcommand_command, data|
-              #     commands[self.command_namespace][command_namespace] ||= {}
-              #     commands[self.command_namespace][command_namespace][subcommand_command] = {
-              #       desc: data[:desc],
-              #       long_desc: data[:long_desc],
-              #       options: data[:options],
-              #       commands: data[:commands],
-              #       help: command_help_for(command: subcommand_command, namespaces: subcommand.command_namespaces, desc: data[:desc],
-              #         long_desc: data[:long_desc], options: data[:options], commands: data[:commands])
-              #     }
-              #   end
-              # end
-            end
-
-            def command_namespaces(namespaces = [])
-              command_parent&.command_namespaces(namespaces)
-
-              namespaces << command_namespace
-              namespaces
-            end
-
-            def command_namespace(namespace = nil)
-              return @command_namespace || name if namespace.nil?
-
-              @command_namespace = namespace
-            end
-
-            def command_prompt(value = nil)
-              return @command_prompt || name if value.nil?
-
-              @command_prompt = value
-            end
-
-            def command_parent(parent = nil)
-              return @command_parent if parent.nil?
-
-              @command_parent = parent
-            end
-
-            def commands
-              @commands ||= {}
-            end
-
-            def help
-              commands.each do |_command, command_data|
-                puts "#{command_namespaces.join(' ')} #{command_data[:help]}"
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dsu/support/commander/command_help.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-module Dsu
-  module Support
-    module Commander
-      module CommandHelp
-        private
-
-        # rubocop:disable Lint/UnusedMethodArgument
-        def command_help_for(command:, desc:, namespaces: nil, long_desc: nil, options: {}, commands: [])
-          namespaces ||= command_namespaces
-          help =
-            <<~HELP
-              #{namespaces&.join(' ')} #{command}#{' [OPTIONS]' if options&.any?} - #{desc}
-              #{'OPTIONS:' if options&.any?}
-              #{options_help_for options}
-              #{'OPTION ALIASES:' if any_option_aliases_for?(options)}
-              #{options_aliases_help_for options}
-              #{'---' unless long_desc.blank?}
-              #{long_desc}
-            HELP
-          help.gsub(/\n{2,}/, "\n")
-        end
-        # rubocop:enable Lint/UnusedMethodArgument
-
-        def options_help_for(options)
-          return [] if options.blank?
-
-          options.map do |option, data|
-            type = option_to_a(data[:type])&.join(' | ')
-            type = :boolean if type.blank?
-            "#{option} <#{type}>, default: #{data[:default]}"
-          end.join("\n")
-        end
-
-        def options_aliases_help_for(options)
-          return unless any_option_aliases_for?(options)
-
-          options.filter_map do |option, data|
-            aliases = option_to_a(data[:aliases])&.join(' | ')
-            <<~HELP
-              #{option} aliases: [#{aliases}]
-            HELP
-          end.join("\n")
-        end
-
-        def any_option_aliases_for?(options)
-          return false if options.blank?
-
-          options.keys.any? { |key| options.dig(key, :aliases).any? }
-        end
-
-        def option_to_a(option)
-          return [] if option.blank?
-          return option if option.is_a? Array
-
-          [option]
-        end
-      end
-    end
-  end
-end

data/lib/dsu/support/commander/subcommand.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Dsu
-  module Support
-    module Commander
-      # Subcommands should extend this module once they are instantiated
-      # so that the Subcommand instance has access to all necessary
-      # class methods for this subcommand to work.
-      module Subcommand
-        class << self
-          def extended(mod)
-            mod.singleton_class.delegate :command_namespace, :commands,
-              :command_add, :command_subcommand_add, :command_prompt, :help, to: mod.class
-          end
-        end
-
-        # Subcommand-specific instance methods.
-        #
-        # Define Subcommand-specific method equivalents of the Command class
-        # methods needed to make this Subcommand instance unique.
-
-        # def command_namespace(namespace = nil)
-        #   return @command_namespace || name if namespace.nil?
-
-        #   @command_namespace = namespace
-        # end
-
-        # Subcommands can be used by any Command, so the :command_parent needs
-        # to be unique to this Subcommand instance.
-        def command_parent(parent = nil)
-          return @command_prompt if parent.nil?
-
-          @command_prompt = parent
-        end
-
-        def command_namespaces(namespaces = [])
-          command_parent&.command_namespaces(namespaces)
-
-          namespaces << command_namespace
-          namespaces
-        end
-      end
-    end
-  end
-end