doing 2.1.41 → 2.1.44

data/lib/doing/wwid/editor.rb

@@ -12,7 +12,7 @@ module Doing
 
       raise MissingEditor, 'No EDITOR variable defined in environment' if Util.default_editor.nil?
 
-      tmpfile = Tempfile.new(['doing', '.txt'])
+      tmpfile = Tempfile.new(['doing_temp', '.doing'])
 
       File.open(tmpfile.path, 'w+') do |f|
         f.puts input
@@ -134,14 +134,15 @@ module Doing
       end
       divider = "-----------"
       notice =<<~EONOTICE
+
       # - You may delete entries, but leave all divider lines (---) in place.
       # - Start and @done dates replaced with a time string (yesterday 3pm) will
       #   be parsed automatically. Do not delete the pipe (|) between start date
       #   and entry title.
       EONOTICE
-      input =  "#{editable_items.map(&:strip).join("\n#{divider}\n")}\n\n#{notice}"
+      input =  "#{editable_items.map(&:strip).join("\n#{divider}\n")}\n"
 
-      new_items = fork_editor(input).split(/^#{divider}/).map(&:strip)
+      new_items = fork_editor(input, message: notice).split(/^#{divider}/).map(&:strip)
 
       new_items.each_with_index do |new_item, i|
         input_lines = new_item.split(/[\n\r]+/).delete_if(&:ignore?)
@@ -190,6 +191,8 @@ module Doing
       content = ["#{item.date.strftime('%F %R')} | #{item.title.dup}"]
       content << item.note.strip_lines.join("\n") unless item.note.empty?
       new_item = fork_editor(content.join("\n"))
+      raise UserCancelled, 'No change' if new_item.strip == content.join("\n").strip
+
       date, title, note = format_input(new_item)
       date ||= item.date
 

data/lib/doing/wwid/interactive.rb

@@ -92,22 +92,21 @@ module Doing
 
         actions.concat(['resume/repeat', 'begin/reset']) if items.count == 1
 
-        choice = Prompt.choose_from(actions,
+        choice = Prompt.choose_from(actions.map(&:titlecase),
                                     prompt: 'What do you want to do with the selected items? > ',
                                     multiple: true,
                                     sorted: false,
                                     fzf_args: ["--height=#{actions.count + 3}", '--tac', '--no-sort', '--info=hidden'])
         return unless choice
 
-        to_do = choice.strip.split(/\n/)
+        to_do = choice.strip.split(/\n/).map(&:downcase)
+
         to_do.each do |action|
           case action
-          when /resume/
-            opt[:resume] = true
-          when /reset/
-            opt[:reset] = true
-          when /autotag/
-            opt[:autotag] = true
+          when /(resume|reset|autotag|archive|delete|finish|cancel|flag)/
+            opt[action.to_sym] = true
+          when /edit/
+            opt[:editor] = true
           when /(add|remove) tag/
             type = action =~ /^add/ ? 'add' : 'remove'
             raise InvalidArgument, "'add tag' and 'remove tag' can not be used together" if opt[:tag]
@@ -149,21 +148,9 @@ module Doing
 
               opt[:save_to] = filename
             end
-          when /archive/
-            opt[:archive] = true
-          when /delete/
-            opt[:delete] = true
-          when /edit/
-            opt[:editor] = true
-          when /finish/
-            opt[:finish] = true
-          when /cancel/
-            opt[:cancel] = true
           when /move/
             section = choose_section.strip
             opt[:move] = section.strip unless section =~ /^ *$/
-          when /flag/
-            opt[:flag] = true
           end
         end
       end
@@ -263,6 +250,9 @@ module Doing
       write(@doing_file)
 
       if opt[:editor]
+        sleep 2 # This seems to be necessary between running fzf
+                # and forking the editor, otherwise vim gets all
+                # screwy and I can't figure out why
         edit_items(items) # hooked
 
         write(@doing_file)

data/lib/doing/wwid/modify.rb

@@ -509,6 +509,8 @@ module Doing
             new_tag = r
 
             m.to_a.slice(1, m.length - 1).each_with_index do |v, idx|
+              next if v.nil?
+
               new_tag.gsub!("\\#{idx + 1}", v)
             end
             # Replace original tag if /r

data/lib/doing/wwid/wwid.rb

@@ -100,10 +100,28 @@ module Doing
     ##
     ## @param      title  [String] The title of the view to retrieve
     ##
-    def get_view(title)
-      return Doing.setting(['views', title], nil)
+    def get_view(title, fallback: nil)
+      Doing.setting(['views', title], fallback)
+    end
+
+    def rename_view_keys(view)
+      options = view.symbolize_keys
+      # options.rename_key(:tags, :tag, keep: true)
+      options.rename_key(:output_format, :output)
+      options.rename_key(:tags_bool, :bool)
+      options.rename_key(:tag_sort, :sort_tags)
+      options.rename_key(:negate, :not)
+      options.rename_key(:order, :sort)
+
+      options
+    end
 
-      false
+    def view_to_options(title)
+      view = rename_view_keys(get_view(guess_view(title)))
+      view.deep_merge(rename_view_keys(get_view(guess_view(view[:parent]), fallback: {}))) if view.key?(:parent)
+      view.deep_merge(rename_view_keys(get_view(view[:config_template], fallback: {}))) if view.key?(:config_template)
+      view.deep_merge(Doing.setting('templates.default').symbolize_keys)
+      view
     end
 
     private

data/lib/doing.rb

@@ -24,10 +24,9 @@ require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
 
-require_relative 'doing/changelog/changelog'
-require_relative 'doing/hash'
-require_relative 'doing/types'
 require_relative 'doing/colors'
+require_relative 'doing/types'
+require_relative 'doing/hash'
 require_relative 'doing/template_string'
 require_relative 'doing/string/string'
 require_relative 'doing/time'
@@ -35,6 +34,7 @@ require_relative 'doing/array/array'
 require_relative 'doing/good'
 require_relative 'doing/normalize'
 require_relative 'doing/util'
+require_relative 'doing/changelog/changelog'
 require_relative 'doing/util_backup'
 require_relative 'doing/configuration'
 require_relative 'doing/section'
@@ -85,6 +85,15 @@ module Doing
       config.settings
     end
 
+    def original_options
+      @original_options ||= {
+        date_begin: nil,
+        date_end: nil,
+        date_range: nil,
+        date_interval: nil
+      }
+    end
+
     ##
     ## Fetch a config setting using a dot-separated keypath
     ## or array of keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.41
+  version: 2.1.44
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -489,6 +489,7 @@ files:
 - docs/doc/BooleanTermParser/QueryParser.html
 - docs/doc/BooleanTermParser/QueryTransformer.html
 - docs/doc/Doing.html
+- docs/doc/Doing/ArrayCleanup.html
 - docs/doc/Doing/ArrayNestedHash.html
 - docs/doc/Doing/ArrayTags.html
 - docs/doc/Doing/CLIFormat.html
@@ -623,6 +624,7 @@ files:
 - lib/doing.rb
 - lib/doing/add_options.rb
 - lib/doing/array/array.rb
+- lib/doing/array/cleanup.rb
 - lib/doing/array/nested_hash.rb
 - lib/doing/array/tags.rb
 - lib/doing/boolean_term_parser.rb