doing 2.1.10 → 2.1.11

data/lib/doing/configuration.rb

@@ -152,17 +152,23 @@ module Doing
     ##
     ## @return     [String] file path
     ##
-    def choose_config
+    def choose_config(create: false)
       return @config_file if @force_answer
 
-      if @additional_configs.count.positive?
+      if @additional_configs.count.positive? || create
         choices = [@config_file].concat(@additional_configs)
+        choices.push('Create a new .doingrc in the current directory') if create && !File.exist?('.doingrc')
         res = Doing::Prompt.choose_from(choices.uniq.sort.reverse,
                                         sorted: false,
                                         prompt: 'Local configs found, select which to update > ')
 
         raise UserCancelled, 'Cancelled' unless res
 
+        if res =~ /^Create a new/
+          res = File.expand_path('.doingrc')
+          FileUtils.touch(res)
+        end
+
         res.strip || @config_file
       else
         @config_file
@@ -249,7 +255,8 @@ module Doing
     #             defaults.
     #
     def from(user_config)
-      Util.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
+      # Util.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
+      Configuration[user_config].stringify_keys.deep_merge(DEFAULTS, { extend_existing_arrays: true, sort_merged_arrays: true })
     end
 
     ##
@@ -320,8 +327,8 @@ module Doing
 
       Hooks.trigger :post_config, self
 
-      # config = local_config.deep_merge(config) unless @ignore_local
-      config = Util.deep_merge_hashes(config, local_config) unless @ignore_local
+      config = local_config.deep_merge(config, { extend_existing_arrays: true, sort_merged_arrays: true }) unless @ignore_local
+      # config = Util.deep_merge_hashes(config, local_config) unless @ignore_local
 
       Hooks.trigger :post_local_config, self
 
@@ -397,7 +404,7 @@ module Doing
 
       begin
         additional_configs.each do |cfg|
-          local_configs.deep_merge(Util.safe_load_file(cfg))
+          local_configs.deep_merge(Util.safe_load_file(cfg), { extend_existing_arrays: true, sort_merged_arrays: true })
         end
       rescue StandardError
         Doing.logger.error('Config:', 'Error reading local configuration(s)')
@@ -416,15 +423,18 @@ module Doing
       end
 
       begin
+
         user_config = Util.safe_load_file(config_file)
+        raise StandardError, 'Invalid config file format' unless user_config.is_a?(Hash)
+
         if user_config.key?('html_template')
           user_config['export_templates'] ||= {}
-          user_config['export_templates'].deep_merge(user_config.delete('html_template'))
+          user_config['export_templates'].deep_merge(user_config.delete('html_template'), { extend_existing_arrays: true, sort_merged_arrays: true })
         end
 
         user_config['include_notes'] = user_config.delete(':include_notes') if user_config.key?(':include_notes')
 
-        user_config.deep_merge(DEFAULTS)
+        user_config.deep_merge(DEFAULTS, { extend_existing_arrays: true, sort_merged_arrays: true })
       rescue StandardError => e
         Doing.logger.error('Config:', 'Error reading default configuration')
         Doing.logger.error('Error:', e.message)

data/lib/doing/hooks.rb

@@ -6,11 +6,16 @@ module Doing
     DEFAULT_PRIORITY = 20
 
     @registry = {
-      post_config: [],
-      post_local_config: [],
-      post_read: [],
-      pre_write: [],
-      post_write: []
+      post_config: [],        # wwid
+      post_local_config: [],  # wwid
+      post_read: [],          # wwid
+      pre_entry_add: [],      # wwid, new_entry
+      post_entry_added: [],   # wwid, new_entry.dup
+      post_entry_updated: [], # wwid, entry
+      post_entry_removed: [], # wwid, entry.dup
+      pre_export: [],         # wwid, format, entries
+      pre_write: [],          # wwid, file
+      post_write: []          # wwid, file
     }
 
     # map of all hooks and their priorities

data/lib/doing/items.rb

@@ -69,7 +69,7 @@ module Doing
       if section =~ /^all$/i
         dup
       else
-        items = Items.new.concat(select { |item| item.section == section })
+        items = Items.new.concat(select { |item| !item.nil? && item.section == section })
         items.add_section(section, log: false)
         items
       end
@@ -84,6 +84,7 @@ module Doing
       deleted = delete(item)
       Doing.logger.count(:deleted)
       Doing.logger.info('Entry deleted:', deleted.title) if single
+      deleted
     end
 
     ##
@@ -111,6 +112,20 @@ module Doing
       end
     end
 
+    ##
+    ## Return Items containing items that don't exist in receiver
+    ##
+    ## @param      items  [Items] Receiver
+    ##
+    def diff(items)
+      diff = Items.new
+      each do |item|
+        res = items.select { |i| i.equal?(item) }
+        diff.push(item) unless res.count.positive?
+      end
+      diff
+    end
+
     # Output sections and items in Doing file format
     def to_s
       out = []

data/lib/doing/pager.rb

@@ -64,22 +64,8 @@ module Doing
 
       private
 
-      def command_exist?(command)
-        exts = ENV.fetch("PATHEXT", "").split(::File::PATH_SEPARATOR)
-        if Pathname.new(command).absolute?
-          ::File.exist?(command) ||
-            exts.any? { |ext| ::File.exist?("#{command}#{ext}")}
-        else
-          ENV.fetch("PATH", "").split(::File::PATH_SEPARATOR).any? do |dir|
-            file = ::File.join(dir, command)
-            ::File.exist?(file) ||
-              exts.any? { |ext| ::File.exist?("#{file}#{ext}") }
-          end
-        end
-      end
-
       def git_pager
-        command_exist?("git") ? `git config --get-all core.pager` : nil
+        TTY::Which.exist?('git') ? `#{TTY::Which.which('git')} config --get-all core.pager` : nil
       end
 
       def pagers
@@ -91,11 +77,7 @@ module Doing
         execs = commands.empty? ? pagers : commands
         execs
           .compact.map(&:strip).reject(&:empty?).uniq
-          .find { |cmd| command_exist?(cmd.split.first) }
-      end
-
-      def exec_available?(*commands)
-        !find_executable(*commands).nil?
+          .find { |cmd| TTY::Which.exist?(cmd.split.first) }
       end
 
       def which_pager

data/lib/doing/plugins/import/calendar_import.rb

@@ -73,7 +73,12 @@ module Doing
       dups = filtered - new_items.count
       Doing.logger.info(%(Skipped #{dups} items with overlapping times)) if dups.positive?
 
+      new_items.map { |item| Hooks.trigger :pre_entry_add, self, item }
+
       wwid.content.concat(new_items)
+
+      new_items.map { |item| Hooks.trigger :post_entry_added, self, item.dup }
+
       Doing.logger.info(%(Imported #{new_items.count} items to #{section}))
     end
 

data/lib/doing/plugins/import/doing_import.rb

@@ -80,7 +80,9 @@ module Doing
 
       imported.each do |item|
         wwid.content.add_section(item.section) unless wwid.content.section?(item.section)
+        Hooks.trigger :pre_entry_add, self, item
         wwid.content.push(item)
+        Hooks.trigger :post_entry_added, self, item.dup
       end
 
       Doing.logger.info('Imported:', "#{imported.count} items")

data/lib/doing/plugins/import/timing_import.rb

@@ -77,7 +77,12 @@ module Doing
       dups = filtered - new_items.count
       Doing.logger.debug('Skipped:' , %(#{dups} items with overlapping times)) if dups.positive?
 
+      new_items.map { |item| Hooks.trigger :pre_entry_add, self, item }
+
       wwid.content.concat(new_items)
+
+      new_items.map { |item| Hooks.trigger :post_entry_added, self, item.dup }
+
       Doing.logger.info('Imported:', %(#{new_items.count} items to #{section}))
     end
 

data/lib/doing/util_backup.rb

@@ -37,6 +37,19 @@ module Doing
         end
       end
 
+      ##
+      ## Retrieve the most recent backup
+      ##
+      ## @param      filename  The filename
+      ## @return     [String] filename
+      ##
+      def last_backup(filename = nil, count: 1)
+        filename ||= Doing.config.settings['doing_file']
+
+        backup = get_backups(filename).slice(count - 1)
+        backup.nil? ? nil : File.join(backup_dir, backup)
+      end
+
       ##
       ## Restore the most recent backup. If a filename is
       ## provided, only backups of that filename will be used.
@@ -48,15 +61,13 @@ module Doing
         Doing.logger.benchmark(:restore_backup, :start)
         filename ||= Doing.config.settings['doing_file']
 
-        result = get_backups(filename).slice(count - 1)
-        raise DoingRuntimeError, 'End of undo history' if result.nil?
-
-        backup_file = File.join(backup_dir, result)
+        backup_file = last_backup(filename, count: count)
+        raise DoingRuntimeError, 'End of undo history' if backup_file.nil?
 
         save_undone(filename)
         FileUtils.mv(backup_file, filename)
         prune_backups_after(File.basename(backup_file))
-        Doing.logger.warn('File update:', "restored from #{result}")
+        Doing.logger.warn('File update:', "restored from #{backup_file}")
         Doing.logger.benchmark(:restore_backup, :finish)
       end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.10'
+  VERSION = '2.1.11'
 end