dsu 3.0.0.alpha.12 → 3.0.0.beta.1

data/lib/dsu/models/color_theme.rb

@@ -20,6 +20,8 @@ module Dsu
       include Support::Fileable
       include Support::Presentable
 
+      THEME_FILE_NAME_REGEX = /.+.json/
+
       VERSION = Migration::VERSION
 
       DEFAULT_THEME_NAME = 'default'

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/models/project.rb

@@ -25,9 +25,9 @@ module Dsu
 
       VERSION = Migration::VERSION
       MIN_PROJECT_NAME_LENGTH = 2
-      MAX_PROJECT_NAME_LENGTH = 24
+      MAX_PROJECT_NAME_LENGTH = 32
       MIN_DESCRIPTION_LENGTH = 2
-      MAX_DESCRIPTION_LENGTH = 32
+      MAX_DESCRIPTION_LENGTH = 64
 
       attr_reader :project_name, :current_project_file, :description, :version, :options
 

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/fileable.rb

@@ -77,16 +77,14 @@ module Dsu
         Gem.loaded_specs['dsu'].gem_dir
       end
 
-      # Back up folder
+      # Seed data files and folders
 
-      def backup_folder(version:)
-        File.join(dsu_folder, 'backup', version.to_s)
+      def seed_data_dsu_folder_for(migration_version:)
+        File.join(gem_dir, 'lib/seed_data', migration_version.to_s, 'dsu')
       end
 
-      # Seed data folders
-
-      def seed_data_folder
-        File.join(gem_dir, 'lib/seed_data')
+      def seed_data_dsu_configuration_for(migration_version:)
+        File.join(gem_dir, 'lib/seed_data', migration_version.to_s, '.dsu')
       end
 
       # Projects
@@ -126,6 +124,12 @@ module Dsu
       end
       alias project_file project_file_for
 
+      # Backup folders
+
+      def backup_folder_for(migration_version:)
+        File.join(root_folder, "dsu-#{migration_version}-backup")
+      end
+
       extend self # rubocop:disable Style/ModuleFunction
     end
   end

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.1'
 end

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

@@ -8,10 +8,10 @@ module Dsu
       # TODO: I18n.
       class List < Views::BaseListView
         NO_JUSTIFICATION = 4
-        PROJECT_JUSTIFICATION = 15
-        DEFAULT_JUSTIFICATION = 10
-        CURRENT_JUSTIFICATION = 10
-        DESCRIPTION_JUSTIFICATION = 10
+        PROJECT_JUSTIFICATION = 15 + 10
+        DEFAULT_JUSTIFICATION = 10 + 10
+        CURRENT_JUSTIFICATION = 10 + 10
+        DESCRIPTION_JUSTIFICATION = 10 + 10
 
         DETAIL_HEADER_STRING = "#{'No.'.ljust(NO_JUSTIFICATION)} " \
                                "#{'Project'.ljust(PROJECT_JUSTIFICATION)} " \

data/lib/dsu.rb

@@ -20,19 +20,14 @@ Hash.include(ColorThemeMode)
 require_relative 'dsu/env'
 require 'pry-byebug' if Dsu.env.development?
 
-Dir.glob("#{__dir__}/dsu/**/*.rb").each do |file|
-  require file
-end
+Dir.glob("#{__dir__}/dsu/**/*.rb").each { |file| require file }
 
 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
-
-  Dsu::Migration::Factory.migrate_if!(options: { pretend: false })
+  # NOTE: Add a new migration service to the array whenever a new migration is created.
+  options = { pretend: false }
+  migration_services = [
+    V20230613121411::Service.new(options: options),
+    V20240210161248::Service.new(options: options)
+  ]
+  Dsu::Migration::Migrator.migrate_if!(migration_services: migration_services)
 end

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/miscellaneous.yml

@@ -25,6 +25,5 @@ en:
       try_again: "Please try again. Valid options are [%{options}]."
   migrations:
     error:
+      missing_current_migration_service: "No migration service handles the current migration: %{migration_version}."
       failed: "Error running migrations: %{message}"
-    information:
-      theme_copied: Theme copied from %{from} to %{to}.

data/lib/locales/en/subcommands.yml

@@ -511,11 +511,11 @@ en:
 
           PROJECT_NAME
 
-          The name of the project to create. PROJECT_NAME must be between 2 and 24 characters (inclusive) in length.
+          The name of the project to create. PROJECT_NAME must be between 2 and 32 characters (inclusive) in length.
 
           PROJECT_DESCRIPTION
 
-          Optional. The description of the project. PROJECT_DESCRIPTION must be between 2 and 32 characters (inclusive) in length. If PROJECT_DESCRIPTION is not provided, the project description will be "<PROJECT_NAME> project" where <PROJECT_NAME> = the name of the project.
+          Optional. The description of the project. PROJECT_DESCRIPTION must be between 2 and 64 characters (inclusive) in length. If PROJECT_DESCRIPTION is not provided, the project description will be "<PROJECT_NAME> project" where <PROJECT_NAME> = the name of the project.
 
           EXAMPLES
 
@@ -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
 
@@ -610,19 +610,19 @@ en:
 
           PROJECT_NAME
 
-          The name of the project to create. PROJECT_NAME must be between 2 and 24 characters (inclusive) in length.
+          The name of the project to create. PROJECT_NAME must be between 2 and 32 characters (inclusive) in length.
 
           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
 
-          The new name of the project. NEW_PROJECT_NAME must be between 2 and 24 characters (inclusive) in length.
+          The new name of the project. NEW_PROJECT_NAME must be between 2 and 32 characters (inclusive) in length.
 
           NEW_PROJECT_DESCRIPTION
 
-          Optional. The description of the project. NEW_PROJECT_DESCRIPTION must be between 2 and 32 characters (inclusive) in length. If NEW_PROJECT_DESCRIPTION is not provided, the project description will be "<NEW_PROJECT_NAME> project" where <NEW_PROJECT_NAME> = the name of the project.
+          Optional. The description of the project. NEW_PROJECT_DESCRIPTION must be between 2 and 64 characters (inclusive) in length. If NEW_PROJECT_DESCRIPTION is not provided, the project description will be "<NEW_PROJECT_NAME> project" where <NEW_PROJECT_NAME> = the name of the project.
 
           EXAMPLES
 
@@ -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/20230613121411/dsu/migration_version.json

@@ -0,0 +1,3 @@
+{
+  "version": 20230613121411
+}

data/lib/seed_data/{themes → 20230613121411/dsu/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"
   },

data/lib/seed_data/20240210161248/dsu/current_project.json

@@ -0,0 +1,4 @@
+{
+  "version": 20240210161248,
+  "project_name": "default"
+}

data/lib/seed_data/20240210161248/dsu/migration_version.json

@@ -0,0 +1,3 @@
+{
+  "version": 20240210161248
+}

data/lib/seed_data/20240210161248/dsu/projects/default/project.json

@@ -0,0 +1,5 @@
+{
+  "version": 20240210161248,
+  "project_name": "default",
+  "description": "default project"
+}

data/lib/seed_data/20240210161248/dsu/themes/cherry.json

@@ -0,0 +1,79 @@
+{
+  "version": 20240210161248,
+  "description": "Cherry color theme",
+  "help": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "dsu_header": {
+    "color": "white",
+    "mode": "bold",
+    "background": "red"
+  },
+  "dsu_footer": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "header": {
+    "color": "red",
+    "mode": "bold",
+    "background": "default"
+  },
+  "subheader": {
+    "color": "red",
+    "mode": "underline",
+    "background": "default"
+  },
+  "body": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "footer": {
+    "color": "light_red",
+    "mode": "default",
+    "background": "default"
+  },
+  "date": {
+    "color": "red",
+    "mode": "bold",
+    "background": "default"
+  },
+  "index": {
+    "color": "light_red",
+    "mode": "italic",
+    "background": "default"
+  },
+  "info": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "success": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "warning": {
+    "color": "yellow",
+    "mode": "default",
+    "background": "default"
+  },
+  "error": {
+    "color": "light_yellow",
+    "mode": "default",
+    "background": "red"
+  },
+  "prompt": {
+    "color": "red",
+    "mode": "bold",
+    "background": "default"
+  },
+  "prompt_options": {
+    "color": "white",
+    "mode": "bold",
+    "background": "default"
+  }
+}

data/lib/seed_data/20240210161248/dsu/themes/christmas.json

@@ -0,0 +1,79 @@
+{
+  "version": 20240210161248,
+  "description": "Christmas theme ho ho ho!",
+  "help": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "dsu_header": {
+    "color": "white",
+    "mode": "bold",
+    "background": "red"
+  },
+  "dsu_footer": {
+    "color": "red",
+    "mode": "default",
+    "background": "default"
+  },
+  "header": {
+    "color": "light_green",
+    "mode": "bold",
+    "background": "red"
+  },
+  "subheader": {
+    "color": "red",
+    "mode": "underline",
+    "background": "default"
+  },
+  "body": {
+    "color": "red",
+    "mode": "italic",
+    "background": "default"
+  },
+  "footer": {
+    "color": "red",
+    "mode": "italic",
+    "background": "default"
+  },
+  "date": {
+    "color": "white",
+    "mode": "bold",
+    "background": "green"
+  },
+  "index": {
+    "color": "white",
+    "mode": "bold",
+    "background": "red"
+  },
+  "info": {
+    "color": "white",
+    "mode": "bold",
+    "background": "light_red"
+  },
+  "success": {
+    "color": "white",
+    "mode": "bold",
+    "background": "green"
+  },
+  "warning": {
+    "color": "default",
+    "mode": "bold",
+    "background": "yellow"
+  },
+  "error": {
+    "color": "light_yellow",
+    "mode": "default",
+    "background": "red"
+  },
+  "prompt": {
+    "color": "white",
+    "mode": "bold",
+    "background": "green"
+  },
+  "prompt_options": {
+    "color": "red",
+    "mode": "bold",
+    "background": "default"
+  }
+}

data/lib/seed_data/20240210161248/dsu/themes/default.json

@@ -0,0 +1,79 @@
+{
+  "version": 20240210161248,
+  "description": "Default color theme",
+  "help": {
+    "color": "cyan",
+    "mode": "default",
+    "background": "default"
+  },
+  "dsu_header": {
+    "color": "white",
+    "mode": "bold",
+    "background": "cyan"
+  },
+  "dsu_footer": {
+    "color": "cyan",
+    "mode": "default",
+    "background": "default"
+  },
+  "header": {
+    "color": "cyan",
+    "mode": "bold",
+    "background": "default"
+  },
+  "subheader": {
+    "color": "cyan",
+    "mode": "underline",
+    "background": "default"
+  },
+  "body": {
+    "color": "cyan",
+    "mode": "default",
+    "background": "default"
+  },
+  "footer": {
+    "color": "light_cyan",
+    "mode": "default",
+    "background": "default"
+  },
+  "date": {
+    "color": "cyan",
+    "mode": "bold",
+    "background": "default"
+  },
+  "index": {
+    "color": "light_cyan",
+    "mode": "default",
+    "background": "default"
+  },
+  "info": {
+    "color": "cyan",
+    "mode": "default",
+    "background": "default"
+  },
+  "success": {
+    "color": "green",
+    "mode": "default",
+    "background": "default"
+  },
+  "warning": {
+    "color": "yellow",
+    "mode": "default",
+    "background": "default"
+  },
+  "error": {
+    "color": "light_yellow",
+    "mode": "default",
+    "background": "red"
+  },
+  "prompt": {
+    "color": "cyan",
+    "mode": "bold",
+    "background": "default"
+  },
+  "prompt_options": {
+    "color": "white",
+    "mode": "bold",
+    "background": "default"
+  }
+}