dsu 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8d5e213674fcc08f03c21defe8712674ebf58ce5d68910d36a8e149f287f8d3
-  data.tar.gz: ebba09045768d12985eecba52f432edd9461d2814b2f437518f829e6aa3dc9cd
+  metadata.gz: '00852090ac540e878e139eb7abf19fbb28c62876c75ff5e4f94f7eeec2ab63df'
+  data.tar.gz: 911334c622bbfe95ed7a424089f02e641fa1908528201370013ad0ba97f51802
 SHA512:
-  metadata.gz: b4d11fe31ae4bf5e783f3c3b5c064a052f537f23423fd7cb290a8d6d325820bf202ee33dd0b41ab8928651e3272522974efdae58a4ba474d5116cedd2a3fc4a7
-  data.tar.gz: 174da97c30f0d3467e0c2e22f7d573de4131507f6a26a6be0591c1051457a0edb2bc81ed10b6d54016d019952cfcd705a3beba3029f8fcc259d66d5839b30c68
+  metadata.gz: 9337dd2eed163e9a19981b001eeb90b48576dc229d62c14ff0f5a5fffd08b41a666d2ab2c4395db035cc439e96ad5c069e66c92b60fb69cb92fe994285bcc1ad
+  data.tar.gz: 26cc17c475cca588a06f2065427e98dd981f830f936729554fd66fb57c57344741a0792e452fab564babd49f8b14c0e25af619b65d32ecb76165b5ce139c3332

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.3.2] 2023-12-30
+
+Changes
+
+- Display a "Nothing to export" message if no entries are found, rather than prompting the user "export 0 entry groups" when using the `dsu export` command.
+- Add specs for Export::AllPresenter and Export::DatesPresenter
+
 ## [2.3.1] 2023-12-25
 
 Changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dsu (2.3.1)
+    dsu (2.3.2)
       activemodel (>= 7.0.8, < 8.0)
       activesupport (>= 7.0.8, < 8.0)
       colorize (>= 0.8.1, < 1.0)
@@ -114,7 +114,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     thor (1.3.0)
-    thor_nested_subcommand (1.0.4)
+    thor_nested_subcommand (1.0.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)

data/README.md

@@ -1,8 +1,8 @@
 # `dsu`- Streamline Your Daily Stand-Up Meeting Participation!
 
 [![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=2)](https://badge.fury.io/gh/gangelo%2Fdsu)
-[![Gem Version](https://badge.fury.io/rb/dsu.svg?refresh=2)](https://badge.fury.io/rb/dsu)
+[![GitHub version](http://badge.fury.io/gh/gangelo%2Fdsu.svg?refresh=3)](https://badge.fury.io/gh/gangelo%2Fdsu)
+[![Gem Version](https://badge.fury.io/rb/dsu.svg?refresh=3)](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)

data/lib/dsu/models/entry_group.rb

@@ -191,13 +191,19 @@ module Dsu
         end
 
         def write(file_data:, file_path:)
-          delete(file_path: file_path) and return true if file_data[:entries].empty?
+          if file_data[:entries].empty?
+            superclass.delete(file_path: file_path)
+            return true
+          end
 
           super
         end
 
         def write!(file_data:, file_path:)
-          delete!(file_path: file_path) and return if file_data[:entries].empty?
+          if file_data[:entries].empty?
+            superclass.delete!(file_path: file_path)
+            return
+          end
 
           super
         end

data/lib/dsu/presenters/export/all_presenter.rb

@@ -5,6 +5,7 @@ require_relative '../../services/entry_group/exporter_service'
 require_relative '../../support/ask'
 require_relative '../base_presenter_ex'
 require_relative 'messages'
+require_relative 'nothing_to_export'
 require_relative 'service_callable'
 
 module Dsu
@@ -12,6 +13,7 @@ module Dsu
     module Export
       class AllPresenter < BasePresenterEx
         include Messages
+        include NothingToExport
         include ServiceCallable
         include Support::Ask
 
@@ -25,7 +27,7 @@ module Dsu
         end
 
         def display_export_prompt
-          yes?(prompt_with_options(prompt: export_prompt, options: export_prompt_options))
+          yes?(prompt_with_options(prompt: export_prompt, options: export_prompt_options), options: options)
         end
 
         private

data/lib/dsu/presenters/export/dates_presenter.rb

@@ -4,6 +4,7 @@ require_relative '../../models/entry_group'
 require_relative '../../support/ask'
 require_relative '../base_presenter_ex'
 require_relative 'messages'
+require_relative 'nothing_to_export'
 require_relative 'service_callable'
 
 module Dsu
@@ -11,6 +12,7 @@ module Dsu
     module Export
       class DatesPresenter < BasePresenterEx
         include Messages
+        include NothingToExport
         include ServiceCallable
         include Support::Ask
 
@@ -31,7 +33,7 @@ module Dsu
         end
 
         def display_export_prompt
-          yes?(prompt_with_options(prompt: export_prompt, options: export_prompt_options))
+          yes?(prompt_with_options(prompt: export_prompt, options: export_prompt_options), options: options)
         end
 
         private

data/lib/dsu/presenters/export/messages.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../models/entry_group'
-require_relative '../base_presenter_ex'
-
 module Dsu
   module Presenters
     module Export
@@ -11,6 +8,10 @@ module Dsu
           raise NotImplementedError
         end
 
+        def display_nothing_to_export_message
+          puts apply_theme(I18n.t('subcommands.export.messages.nothing_to_export'), theme_color: color_theme.info)
+        end
+
         private
 
         def display_cancelled_message

data/lib/dsu/presenters/export/nothing_to_export.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Dsu
+  module Presenters
+    module Export
+      module NothingToExport
+        def nothing_to_export?
+          entry_groups.empty?
+        end
+      end
+    end
+  end
+end

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

@@ -11,51 +11,69 @@ module Dsu
         include Support::Fileable
 
         def initialize(entry_groups:, options: {})
-          raise ArgumentError, 'Argument entry_groups is nil' if entry_groups.nil?
+          raise ArgumentError, 'Argument entry_groups is blank' if entry_groups.blank?
+          raise ArgumentError, 'Argument entry_groups are not all valid' unless entry_groups.all?(&:valid?)
+
+          validate_entry_group_entries_present! entry_groups
 
           @entry_groups = entry_groups
           @options = options
         end
 
         def call
-          CSV.open(export_file_name, 'w') do |csv|
+          CSV.open(export_file_path, 'w') do |csv|
             csv << %i[version entry_group entry_no total_entries entry_group_entry]
 
             entry_groups.each do |entry_group|
-              next unless entry_group.exist?
-
-              entry_group.entries.each_with_index do |entry, index|
-                csv << [
-                  entry_group.version,
-                  entry_group.time.to_date,
-                  index + 1,
-                  entry_group.entries.count,
-                  entry.description
-                ]
-              end
+              export_entry_group(entry_group: entry_group, csv: csv)
             end
           end
 
-          export_file_name
+          export_file_path
         end
 
-        def export_file_name
-          @export_file_name ||= begin
-            file_name = "dsu-#{export_timestamp}-#{times.min.to_date}-thru-#{times.max.to_date}.csv"
-            File.join(temp_folder, file_name)
-          end
+        def export_file_path
+          @export_file_path ||= File.join(temp_folder, export_file_name)
         end
 
         private
 
         attr_reader :entry_groups, :options
 
+        def export_entry_data(entry_group:, entry:, entry_index:)
+          [
+            entry_group.version,
+            entry_group.time.to_date,
+            entry_index + 1,
+            entry_group.entries.count,
+            entry.description
+          ]
+        end
+
+        def export_entry_group(entry_group:, csv:)
+          entry_group.entries.each_with_index do |entry, index|
+            csv << export_entry_data(entry_group: entry_group, entry: entry, entry_index: index)
+          end
+        end
+
+        def export_file_name
+          "dsu-#{timestamp}-#{times.min.to_date}-thru-#{times.max.to_date}.csv"
+        end
+
         def times
           @times ||= entry_groups.map(&:time)
         end
 
-        def export_timestamp
-          Time.now.in_time_zone.strftime('%Y%m%d%H%M%S')
+        def timestamp
+          @timestamp ||= Time.now.in_time_zone.strftime('%Y%m%d%H%M%S')
+        end
+
+        def validate_entry_group_entries_present!(entry_groups)
+          entry_groups.each do |entry_group|
+            next if entry_group.entries.present?
+
+            raise ArgumentError, "Argument entry_groups entry group for #{entry_group.time_yyyy_mm_dd} has no entries"
+          end
         end
       end
     end

data/lib/dsu/support/ask.rb

@@ -13,7 +13,10 @@ module Dsu
       def yes?(prompt, options: {})
         auto_prompt = auto_prompt(prompt, options)
 
-        return auto_prompt unless auto_prompt.nil?
+        unless auto_prompt.nil?
+          puts prompt
+          return auto_prompt
+        end
 
         Thor::Base.shell.new.yes?(prompt)
       end
@@ -21,9 +24,10 @@ module Dsu
       private
 
       def auto_prompt(prompt, options)
+        options = options.with_indifferent_access
         prompt = Utils.strip_escapes(prompt)
         @auto_prompt ||= begin
-          value = options.dig('prompts', prompt) || options.dig('prompts', 'any')
+          value = options.dig(:prompts, prompt) || options.dig(:prompts, :any)
           value = (value == 'true' unless value.nil?)
           value
         end

data/lib/dsu/validators/entries_validator.rb

@@ -6,6 +6,7 @@ require_relative '../support/field_errors'
 # https://guides.rubyonrails.org/active_record_validations.html#validates-with
 module Dsu
   module Validators
+    # TODO: I18n.
     class EntriesValidator < ActiveModel::Validator
       include Support::FieldErrors
 

data/lib/dsu/version.rb

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

data/lib/dsu/views/export.rb

@@ -14,6 +14,8 @@ module Dsu
       end
 
       def render
+        return presenter.display_nothing_to_export_message if presenter.nothing_to_export?
+
         response = presenter.display_export_prompt
         presenter.render response: response
       end

data/lib/locales/en/subcommands.yml

@@ -280,6 +280,7 @@ en:
       messages:
         exported: Export successful.
         exported_to: Entry groups exported to %{file_path}.
+        nothing_to_export: No entry groups to export.
         cancelled: Cancelled.
       prompts:
         export_all_confirm: Export all the entries (%{count} entry groups)?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Gene M. Angelo, Jr.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2023-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -188,6 +188,7 @@ files:
 - lib/dsu/presenters/export/all_presenter.rb
 - lib/dsu/presenters/export/dates_presenter.rb
 - lib/dsu/presenters/export/messages.rb
+- lib/dsu/presenters/export/nothing_to_export.rb
 - lib/dsu/presenters/export/service_callable.rb
 - lib/dsu/services/color_theme/hydrator_service.rb
 - lib/dsu/services/configuration/hydrator_service.rb