dsu 3.0.0.alpha.12 → 3.0.0.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b0eee10983a1ccd33981f635c7bc267dd8db84cfe8496c39fa5386c57096d2
-  data.tar.gz: f65368dfbb2de3512a73f766f82958de92255e4a72b3e5f58389d0db2ccd86ad
+  metadata.gz: 480ee218003cde2deef47853915e5a59a396ca0ea62d65b243e2c789fdffaeb1
+  data.tar.gz: 34fcb64b9dfcedf87a3b3ffdd49e6504e4a1662952d027dc9855e7c2e4a17b72
 SHA512:
-  metadata.gz: 9c91fa9f3916538d244ffca9456ea089a258fb0701f182d6e40e0fad5c51deec986ac0835e611a3b042cf8c0dc84b27b0a7175a388a9ed38ee34bc34de0a865d
-  data.tar.gz: 940939975bb206402a13f5c4b1dd8a9f0308fe787fada7e0d59e70a6769eeb960755fd3d4aba7aa480b45cdf9a4c837dfda5382b284c7e5bbb4631d98d4f01ef
+  metadata.gz: 40b201d06c9f7271bf3c5c4f962901682c54ec7509dee80156dfed39aa613bf928caa020d24416c0e600504b223e0f1146f7e44a1049711660d639d2524711d5
+  data.tar.gz: 56a459e90ea910802709e1893bbd7e8cccb33e9e110f3b5fae7dc118fd393a9873b5953e19ea1d415dd71d42505a31b92e7011b4ed00c44bdfb4ffebd00ac3d1

data/CHANGELOG.md

@@ -42,6 +42,7 @@ dsu x dd -f n -t -257
 dsu-export-default-20240129125946-entry-groups-2023-05-17-thru-2024-01-29.csv
 
 ### Bug Fixes
+[x] Fix bug that did not gracefully handle invalid DATEs for the `dsu add --date DATE` command.
 
 
 ## [2.4.4] - 2024-01-28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dsu (3.0.0.alpha.4)
+    dsu (3.0.0.alpha.13)
       activemodel (>= 7.0.8, < 8.0)
       activesupport (>= 7.0.8, < 8.0)
       colorize (>= 1.1, < 2.0)
@@ -32,7 +32,7 @@ GEM
     colorize (1.1.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     dotenv (2.8.1)
     drb (2.2.0)
@@ -64,7 +64,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    factory_bot (6.4.5)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     ffaker (2.23.0)
     i18n (1.14.1)
@@ -72,7 +72,7 @@ GEM
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    minitest (5.21.2)
+    minitest (5.22.2)
     mutex_m (0.2.0)
     os (1.1.4)
     parallel (1.24.0)
@@ -95,19 +95,19 @@ GEM
       rexml (~> 3.1)
     regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.0)
     rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -145,7 +145,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   x86_64-darwin-19

data/lib/dsu/cli.rb

@@ -40,7 +40,8 @@ module Dsu
     desc I18n.t('commands.add.desc'), I18n.t('commands.add.usage')
     long_desc I18n.t('commands.add.long_desc',
       date_option_description: date_option_description, mnemonic_option_description: mnemonic_option_description)
-    option I18n.t('options.date.name'), aliases: I18n.t('options.date.aliases'), type: :string
+    option I18n.t('options.date_or_mnemonic.name'), aliases: I18n.t('options.date_or_mnemonic.aliases'),
+      type: :string, banner: I18n.t('options.date_or_mnemonic.banner')
     option I18n.t('options.tomorrow.name'), aliases: I18n.t('options.tomorrow.aliases'), type: :boolean
     option I18n.t('options.yesterday.name'), aliases: I18n.t('options.yesterday.aliases'), type: :boolean
     option I18n.t('options.today.name'), aliases: I18n.t('options.today.aliases'), type: :boolean, default: true

data/lib/dsu/crud/json_file.rb

@@ -2,6 +2,7 @@
 
 require 'active_model'
 require 'json'
+require_relative '../migration/version'
 
 module Dsu
   module Crud
@@ -14,6 +15,10 @@ module Dsu
         @file_path = file_path
       end
 
+      def update_version!
+        @version = Migration::VERSION
+      end
+
       def delete
         self.class.delete(file_path: file_path)
       end

data/lib/dsu/migration/factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../models/migration_version'
-require_relative 'service_20230613121411'
+require_relative 'service_20240210161248'
 require_relative 'version'
 
 module Dsu
@@ -11,14 +11,14 @@ module Dsu
         def migrate_if!(options: {})
           version = options.fetch(:version, migration_version)
           if version == 20230613121411 # rubocop:disable Style/NumericLiterals
-            Service20230613121411.new(options: options).migrate!
+            Service20240210161248.new(options: options).migrate!
           end
         end
 
         private
 
         def migration_version
-          @migration_version ||= Models::MigrationVersion.new.version
+          Models::MigrationVersion.new.version
         end
       end
     end

data/lib/dsu/migration/{service_20230613121411.rb → service_20240210161248.rb}

@@ -3,16 +3,9 @@
 require_relative '../support/fileable'
 require_relative 'version'
 
-# TODO: Read raw configuration .json file
-# If default_project is not set...
-#   - Add default_project to configuration .json file and write it out.
-#   - Reload the configuration file.
-#   - Create a Models::Project object for the default project and initialize/save it.
-#   - Move the old entries folder into the default project folder.
-# TODO: Add default_project to configuration .json file
 module Dsu
   module Migration
-    class Service20230613121411
+    class Service20240210161248
       include Support::Fileable
 
       def initialize(options: {})
@@ -56,11 +49,12 @@ module Dsu
 
         %w[light.json christmas.json].each do |theme_file|
           destination_theme_file_path = File.join(Dsu::Support::Fileable.themes_folder, theme_file)
-          next if File.exist?(destination_theme_file_path)
+          # next if 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) unless pretend?
-          puts I18n.t('migrations.information.theme_copied', from: source_theme_file_path, to: destination_theme_file_path)
+          puts I18n.t('migrations.information.theme_copied',
+            from: source_theme_file_path, to: destination_theme_file_path)
         end
       end
 
@@ -121,20 +115,20 @@ module Dsu
         puts 'Updating color themes...'
         puts
 
-        return if pretend? || Dir.exist?(themes_folder)
-
         puts 'Copying color themes...'
         puts
 
-        FileUtils.mkdir_p(themes_folder)
-        FileUtils.cp_r(File.join(backup_folder, 'themes', '.'), themes_folder)
+        unless pretend?
+          FileUtils.mkdir_p(themes_folder)
+          FileUtils.cp_r(File.join(backup_folder, 'themes', '.'), themes_folder)
+        end
 
         puts 'Updating color theme version...'
         puts
 
         Models::ColorTheme.all.each do |color_theme|
           puts "Updating color theme version: #{color_theme.theme_name}..."
-          color_theme.version = Dsu::Migration::VERSION
+          color_theme.update_version!
           color_theme.save! unless pretend?
         end
       end

data/lib/dsu/models/configuration.rb

@@ -81,6 +81,12 @@ module Dsu
         write! unless exist?
       end
 
+      class << self
+        def exist?
+          File.exist?(Support::Fileable.config_path)
+        end
+      end
+
       # Temporarily sets the configuration to the given config_hash.
       # To reset the configuration to its original state, call #reload
       def replace!(config_hash: {})

data/lib/dsu/presenters/project/defaultable.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Dsu
+  module Presenters
+    module Project
+      module Defaultable
+        private
+
+        def make_default?
+          options.fetch(:default, false)
+        end
+      end
+    end
+  end
+end

data/lib/dsu/presenters/project/use_by_number_presenter.rb

@@ -2,11 +2,14 @@
 
 require_relative '../../models/project'
 require_relative '../base_presenter_ex'
+require_relative 'defaultable'
 
 module Dsu
   module Presenters
     module Project
       class UseByNumberPresenter < BasePresenterEx
+        include Defaultable
+
         attr_reader :project_number
 
         delegate :project_name, to: :project, allow_nil: true
@@ -23,6 +26,7 @@ module Dsu
         def respond(response:)
           return false unless response
 
+          project.default! if make_default? && project&.present?
           project.use! if project&.present?
         end
 

data/lib/dsu/presenters/project/use_presenter.rb

@@ -2,11 +2,14 @@
 
 require_relative '../../models/project'
 require_relative '../base_presenter_ex'
+require_relative 'defaultable'
 
 module Dsu
   module Presenters
     module Project
       class UsePresenter < BasePresenterEx
+        include Defaultable
+
         attr_reader :project_name
 
         delegate :description, to: :project, prefix: true, allow_nil: true
@@ -22,6 +25,7 @@ module Dsu
         def respond(response:)
           return false unless response
 
+          project.default! if make_default? && project&.present?
           project.use! if project&.present?
         end
 

data/lib/dsu/subcommands/project.rb

@@ -23,7 +23,6 @@ module Dsu
 
       desc I18n.t('subcommands.project.create.desc'), I18n.t('subcommands.project.create.usage')
       long_desc I18n.t('subcommands.project.create.long_desc')
-      option :prompts, type: :hash, default: {}, hide: true, aliases: '-p'
       def create(project_name = nil, description = nil)
         project_name = project_name.to_s.strip
         description = description.to_s.strip
@@ -41,7 +40,6 @@ module Dsu
 
       desc I18n.t('subcommands.project.delete.desc'), I18n.t('subcommands.project.delete.usage')
       long_desc I18n.t('subcommands.project.delete.long_desc')
-      option :prompts, type: :hash, default: {}, hide: true, aliases: '-p'
       def delete(project_name_or_number = nil)
         options = configuration.to_h.merge(self.options).with_indifferent_access
         presenter = delete_presenter_for(project_name_or_number, options: options)
@@ -50,7 +48,6 @@ module Dsu
 
       desc I18n.t('subcommands.project.list.desc'), I18n.t('subcommands.project.list.usage')
       long_desc I18n.t('subcommands.project.list.long_desc')
-      option :prompts, type: :hash, default: {}, hide: true, aliases: '-p'
       def list
         options = configuration.to_h.merge(self.options).with_indifferent_access
         presenter = Presenters::Project::ListPresenter.new(options: options)
@@ -59,7 +56,6 @@ module Dsu
 
       desc I18n.t('subcommands.project.rename.desc'), I18n.t('subcommands.project.rename.usage')
       long_desc I18n.t('subcommands.project.rename.long_desc')
-      option :prompts, type: :hash, default: {}, hide: true, aliases: '-p'
       def rename(project_name_or_number = nil, new_project_name = nil, new_project_description = nil)
         project_name_or_number = project_name_or_number.to_s.strip
         new_project_name = new_project_name&.to_s&.strip
@@ -77,9 +73,10 @@ module Dsu
         rename_view_for(project_name_or_number, presenter: presenter, options: options).render
       end
 
-      desc I18n.t('subcommands.project.use.desc'), I18n.t('subcommands.project.use.usage')
+      desc I18n.t('subcommands.project.use.desc'),
+        I18n.t('subcommands.project.use.usage')
       long_desc I18n.t('subcommands.project.use.long_desc')
-      option :prompts, type: :hash, default: {}, hide: true, aliases: '-p'
+      option :default, type: :boolean, required: false, default: false, aliases: '-d', banner: 'DEFAULT_PROJECT'
       def use(project_name_or_number = nil)
         options = configuration.to_h.merge(self.options).with_indifferent_access
         presenter = use_presenter_for(project_name_or_number, options: options)

data/lib/dsu/support/project_file_system.rb

@@ -39,6 +39,8 @@ module Dsu
         end
 
         def default_project_name
+          return Models::Configuration::DEFAULT_CONFIGURATION[:default_project] unless Models::Configuration.exist?
+
           Models::Configuration.new.default_project
         end
 
@@ -78,11 +80,6 @@ module Dsu
         end
         alias current_project_file_persisted? current_project_file_exist?
 
-        # Does dsu/projects folder exist?
-        def projects_folder_exist?
-          Dir.exist?(projects_folder)
-        end
-
         # Does dsu/projects/<project_name> folder exist?
         def project_folder_exist?(project_name:)
           Dir.exist?(project_folder_for(project_name: project_name))

data/lib/dsu/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Dsu
-  VERSION_REGEX = /\A\d+\.\d+\.\d+(\.(alpha|rc)\.\d+)?\z/
-  VERSION = '3.0.0.alpha.12'
+  VERSION_REGEX = /\A\d+\.\d+\.\d+(\.(alpha|beta|rc)\.\d+)?\z/
+  VERSION = '3.0.0.beta.0'
 end

data/lib/dsu.rb

@@ -25,6 +25,8 @@ Dir.glob("#{__dir__}/dsu/**/*.rb").each do |file|
 end
 
 unless Dsu.env.test? || Dsu.env.development?
+  # TODO: This is upgrading from migrations version 0 to 20230613121411
+  # Move this to to its own class and call from Migration::Factory.
   if Dsu::Migration::Service.run_migrations?
     begin
       Dsu::Migration::Service.new.call

data/lib/locales/en/commands.yml

@@ -120,6 +120,10 @@ en:
     date:
       aliases: -d
       name: 'date'
+    date_or_mnemonic:
+      aliases: -d
+      name: 'date'
+      banner: 'DATE|MNEMONIC'
     today:
       aliases: -n
       name: 'today'

data/lib/locales/en/subcommands.yml

@@ -553,11 +553,11 @@ en:
 
           PROJECT_NUMBER
 
-          The number of the project to delete. If PROJECT_NUMBER is used, the project equating to the nth project in the list of projects will be used (see `dsu project list`).
+          The number of the project to delete. If PROJECT_NUMBER is used, the project equating to the nth project in the list of projects will be deleted (see `dsu project list`).
 
           NOTES
 
-          PROJECT_NAME and PROJECT_NUMBER are optional. If neither are provided, the current, default project will be used.
+          PROJECT_NAME and PROJECT_NUMBER are optional. If neither are provided, the current, default project will be deleted.
 
           EXAMPLES
 
@@ -614,7 +614,7 @@ en:
 
           PROJECT_NUMBER
 
-          The number of the project to rename. If PROJECT_NUMBER is used, the project equating to the nth project in the list of projects will be used (see `dsu project list`).
+          The number of the project to rename. If PROJECT_NUMBER is used, the project equating to the nth project in the list of projects will be renamed (see `dsu project list`).
 
           NEW_PROJECT_NAME
 
@@ -648,14 +648,18 @@ en:
             - Y
             - n
       use:
-        desc: use|u [PROJECT_NAME|PROJECT_NUMBER]
+        desc: use|u [OPTIONS] [PROJECT_NAME|PROJECT_NUMBER]
         usage: Selects the DSU project to use, based on the given PROJECT_NAME or PROJECT_NUMBER
         long_desc: |
           Selects the DSU project to use, based on the given PROJECT_NAME or PROJECT_NUMBER.
 
-          dsu project use [PROJECT_NAME|PROJECT_NUMBER]
+          dsu project use [OPTIONS] [PROJECT_NAME|PROJECT_NUMBER]
 
-          dsu p u [PROJECT_NAME|PROJECT_NUMBER]
+          dsu p u [OPTIONS] [PROJECT_NAME|PROJECT_NUMBER]
+
+          OPTIONS:
+
+          -d|--default true|false (default: false): If true, the PROJECT_NAME|PROJECT_NUMBER will become the default project.
 
           PROJECT_NAME
 
@@ -688,6 +692,12 @@ en:
           $ dsu project use 2
 
           $ dsu p u 2
+
+          These will use "Project A" and make it the default project if it is not the default project.
+
+          $ dsu project use --default "Project A"
+
+          $ dsu p u -d "Project A"
         messages:
           using_project: Now using project "%{project_name}".
         prompts:

data/lib/seed_data/themes/light.json

@@ -32,7 +32,7 @@
     "background": "default"
   },
   "footer": {
-    "color": "light_default",
+    "color": "default",
     "mode": "default",
     "background": "default"
   },
@@ -42,7 +42,7 @@
     "background": "default"
   },
   "index": {
-    "color": "light_default",
+    "color": "default",
     "mode": "italic",
     "background": "default"
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.12
+  version: 3.0.0.beta.0
 platform: ruby
 authors:
 - Gene M. Angelo, Jr.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,7 +171,7 @@ files:
 - lib/dsu/env.rb
 - lib/dsu/migration/factory.rb
 - lib/dsu/migration/service.rb
-- lib/dsu/migration/service_20230613121411.rb
+- lib/dsu/migration/service_20240210161248.rb
 - lib/dsu/migration/version.rb
 - lib/dsu/models/color_theme.rb
 - lib/dsu/models/configuration.rb
@@ -197,6 +197,7 @@ files:
 - lib/dsu/presenters/import/import_entry.rb
 - lib/dsu/presenters/import/import_file.rb
 - lib/dsu/presenters/project/create_presenter.rb
+- lib/dsu/presenters/project/defaultable.rb
 - lib/dsu/presenters/project/delete_by_number_presenter.rb
 - lib/dsu/presenters/project/delete_presenter.rb
 - lib/dsu/presenters/project/list_presenter.rb