doing 2.1.40 → 2.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd8641c5280331189462c44f52c5bc4437c77610072d3c142cf7a56a6e75be6
-  data.tar.gz: 40a53127983360a0b7720dd4b27c71d5b783d23d22790bfbcdc8b7f49556ce2d
+  metadata.gz: 9165fde649301eddb5bf5fc4fd9e1b52b67e1a7614102a752b0946b12e76ed07
+  data.tar.gz: 817142e7ea8be0f74355e5988bf6b857147e76f37b2a876feb19527c49807934
 SHA512:
-  metadata.gz: 4d47d3a88086dd579b3b0f1f37a7e17890dd5969487bebd00f92f6194b6281987056b792ece88718c1a4da35803a9748d7cddb7e72f5c908fb0056e299ff9ef3
-  data.tar.gz: b2ba0a2c7a3b21e09c1da73c959895fb4dff4f72244cc5c6f855a1d44668d8b5620292881bbb47a7c1896c0fb68430fe33d1e5509a657c5c1fd870c1f5211028
+  metadata.gz: c52235f05bedf4b2aded1700df34032a57ce5b21ccbf87ad9372a3e0ab239dfb19154d95420642a81d854d54a2da013720e8c092393937698a470e9ce9920c4f
+  data.tar.gz: 01f885b23f2d984fa40a37c6f256da01649c9974d6dd8bd1dc2603e9c749579c640dc2c0f8d86f98675f0624cfb9a13225a1594d2663e4ed35bb46f1b4aebf83

data/.yardopts

@@ -1 +1 @@
---output-dir docs/doc --markup-provider=redcarpet --markup=markdown --no-private --exclude=README.md lib/doing/*.rb
+--output-dir docs/doc --markup-provider=redcarpet --markup=markdown --no-private --exclude=README.md lib/doing/**/*.rb

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+### 2.1.41
+
+2022-03-16 09:29
+
+#### NEW
+
+- Filter methods available to plugins on Items collection - #in_section, #search, #tagged, #between_dates
+
+#### IMPROVED
+
+- Better comparison methods for Items and Sections
+- `doing tag_dir -r TAG` can remove an indivudal tag from default_tags (--clear removes all)
+- `doing tag_dir` accepts `--editor` to edit tag list in default editor
+- `doing tag_dir` without arguments requests input via readline
+- Use `.txt` instead of `.md` for editor temp file to avoid incorrect syntax higlighting in editor
+- Further API documentation
+
+#### FIXED
+
+- Security warnings related to regular expressions
+- Items.diff method returning too many changes
+
 ### 2.1.40
 
 2022-03-14 19:56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.40)
+    doing (2.1.41)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)

data/Rakefile

@@ -71,16 +71,16 @@ task :dockertest, :version, :login do |_, args|
     Process.exit 0
   when /^3/
     img = 'doingtest3'
-    file = 'Dockerfile-3.0'
+    file = 'docker/Dockerfile-3.0'
   when /6$/
     img = 'doingtest26'
-    file = 'Dockerfile-2.6'
+    file = 'docker/Dockerfile-2.6'
   when /(^2|7$)/
     img = 'doingtest27'
-    file = 'Dockerfile-2.7'
+    file = 'docker/Dockerfile-2.7'
   else
     img = 'doingtest'
-    file = 'Dockerfile'
+    file = 'docker/Dockerfile'
   end
 
   puts `docker build . --file #{file} -t #{img}`

data/bin/commands/changes.rb

@@ -14,7 +14,7 @@ MARKDOWN_THEME = {
   comment: :bright_black
 }.deep_freeze
 
-CHANGE_RX = /^(?:(?:(?:[<>=]+|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[0-9.*?]+ *)+|(?:[\d.]+ *(?:-|to)+ *[0-9.]+))$/
+CHANGE_RX = /^(?:(?:(?:[<>=]+|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[0-9.*?]{1,10} *)+|(?:[\d.]+ *(?:-|to)+ *[0-9.]{1,10}))$/
 
 desc 'List recent changes in Doing'
 long_desc %(Display a formatted list of changes in recent versions.

data/bin/commands/tag_dir.rb

@@ -6,43 +6,77 @@ manually editing the .doingrc file.'
 arg_name 'TAG [TAG..]'
 command :tag_dir do |c|
   c.example 'doing tag_dir project1 project2', desc: 'Add @project1 and @project2 to to any entries created from the current directory'
-  c.example 'doing tag_dir --remove', desc: 'Clear the default tags for the directory'
+  c.example 'doing tag_dir --clear', desc: 'Clear the default tags for the directory'
 
   c.desc 'Remove all default_tags from the local .doingrc'
+  c.switch %i[clear], negatable: false
+
+  c.desc 'Delete tag(s) from the current list'
   c.switch %i[r remove], negatable: false
 
+  c.desc 'Use default editor to edit tag list'
+  c.switch %i[e editor], negatable: false
+
   c.action do |global, options, args|
-    tags = args.join(' ').gsub(/ *, */, ' ').split(' ')
+    if args.empty? && !options[:clear] && !options[:editor]
+      all_tags = @wwid.content.all_tags
+      $stderr.puts Doing::Color.boldwhite('Enter tags separated by spaces, tab to complete')
+      input = Doing::Prompt.read_line(prompt: "Tags to #{options[:remove] ? 'remove' : 'add'}", completions: all_tags)
+      tags = input.split_tags
+    else
+      tags = args.join(' ').split_tags
+    end
 
     cfg_cmd = commands[:config]
     set_cmd = cfg_cmd.commands[:set]
 
     set_options = { local: true }
-    if options[:remove]
+
+    if options[:clear]
       set_args = ['default_tags']
       set_options[:remove] = true
     else
-      current_tags = Doing.setting('default_tags')
+      unless options[:remove]
+        current_tags = Doing.setting('default_tags')
 
-      tags.delete_if do |tag|
-        if current_tags.include?(tag)
-          Doing.logger.info('Skipped:', "#{tag} is already applied by existing config")
-          true
-        else
-          false
+        tags.delete_if do |tag|
+          if current_tags.include?(tag)
+            Doing.logger.info('Skipped:', "#{tag} is already applied by existing config")
+            true
+          else
+            false
+          end
         end
-      end
 
-      raise EmptyInput, 'No new tags provided' if tags.empty?
+        raise EmptyInput, 'No new tags provided' if tags.empty? && !options[:editor]
+
+      end
 
       if File.exist?('.doingrc')
         local = Doing::Util.safe_load_file('.doingrc')
         dir_tags = local['default_tags'] || []
 
-        tags.concat(dir_tags)
-        tags.sort!.uniq!
+        if options[:remove]
+          tags.each { |tag| dir_tags.delete(tag) }
+          tags = dir_tags.sort
+        else
+          tags.concat(dir_tags)
+          tags.sort!.uniq!
+        end
+
+        if tags == dir_tags.sort && !options[:remove] && !options[:editor]
+          raise UserCancelled, 'Tag(s) already exist for directory'
+
+        end
+
+      end
+
+      if options[:editor]
+        input = @wwid.fork_editor(tags.join(' '), message: '# Enter tags separated by spaces')
+        input_lines = input.split(/[\n\r]+/).delete_if(&:ignore?)
+        edited = input_lines[0]&.strip
 
-        raise UserCancelled, 'Tag(s) already exist for directory' if tags == dir_tags.sort
+        tags = edited.nil? ? [] : edited.split_tags
       end
 
       set_args = ['default_tags', tags.join(',')]

data/{Dockerfile → docker/Dockerfile}

@@ -5,5 +5,7 @@ WORKDIR /doing
 # COPY ./ /doing/
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
-RUN apt-get install -y less
+RUN apt-get install -y less vim
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/{Dockerfile-2.6 → docker/Dockerfile-2.6}

@@ -6,6 +6,6 @@ WORKDIR /doing
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
 RUN apt-get install -y less vim
-COPY ./inputrc /root/.inputrc
-COPY ./bash_profile /root/.bash_profile
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/{Dockerfile-2.7 → docker/Dockerfile-2.7}

@@ -6,6 +6,6 @@ WORKDIR /doing
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
 RUN apt-get install -y less vim
-COPY ./inputrc /root/.inputrc
-COPY ./bash_profile /root/.bash_profile
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/{Dockerfile-3.0 → docker/Dockerfile-3.0}

@@ -6,6 +6,6 @@ WORKDIR /doing
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
 RUN apt-get install -y less vim
-COPY ./inputrc /root/.inputrc
-COPY ./bash_profile /root/.bash_profile
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/docs/doc/Array.html

@@ -87,6 +87,11 @@
   
   
   
+  <dl>
+      <dt>Includes:</dt>
+      <dd>ArrayNestedHash, ArrayTags, <span class='object_link'><a href="Doing/ChronifyArray.html" title="Doing::ChronifyArray (module)">Doing::ChronifyArray</a></span></dd>
+  </dl>
+  
   
 
   
@@ -94,7 +99,9 @@
   
   <dl>
     <dt>Defined in:</dt>
-    <dd>lib/doing/good.rb</dd>
+    <dd>lib/doing/good.rb<span class="defines">,<br />
+  lib/doing/array/array.rb,<br /> lib/doing/chronify/chronify.rb</span>
+</dd>
   </dl>
   
 </div>
@@ -138,6 +145,29 @@
     <span class="summary_desc"><div class='inline'><p>Tests if object is nil or empty.</p>
 </div></span>
   
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#utf8-instance_method" title="#utf8 (instance method)">#<strong>utf8</strong>  &#x21d2; Array </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'><p>Force UTF-8 encoding of strings in array.</p>
+</div></span>
+  
 </li>
 
       
@@ -145,6 +175,19 @@
   
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  <h3 class="inherited">Methods included from <span class='object_link'><a href="Doing/ChronifyArray.html" title="Doing::ChronifyArray (module)">Doing::ChronifyArray</a></span></h3>
+  <p class="inherited"><span class='object_link'><a href="Doing/ChronifyArray.html#time_string-instance_method" title="Doing::ChronifyArray#time_string (method)">#time_string</a></span>, <span class='object_link'><a href="Doing/ChronifyArray.html#to_abbr-instance_method" title="Doing::ChronifyArray#to_abbr (method)">#to_abbr</a></span>, <span class='object_link'><a href="Doing/ChronifyArray.html#to_natural-instance_method" title="Doing::ChronifyArray#to_natural (method)">#to_natural</a></span>, <span class='object_link'><a href="Doing/ChronifyArray.html#to_years-instance_method" title="Doing::ChronifyArray#to_years (method)">#to_years</a></span></p>
+
+  
+  
 
   <div id="instance_method_details" class="method_details_list">
     <h2>Instance Method Details</h2>
@@ -187,6 +230,45 @@ has content</p>
   
 </ul>
 
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="utf8-instance_method">
+  
+    #<strong>utf8</strong>  &#x21d2; <tt><span class='object_link'><a href="" title="Array (class)">Array</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Force UTF-8 encoding of strings in array</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="" title="Array (class)">Array</a></span></tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>Encoded lines</p>
+</div>
+      
+    </li>
+  
+</ul>
+
 </div>
 </div>
     
@@ -195,7 +277,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:29 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Clause.html

@@ -283,7 +283,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:30 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Operator.html

@@ -162,7 +162,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:30 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Query.html

@@ -407,7 +407,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:30 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryParser.html

@@ -125,7 +125,7 @@ parser. In order to do that, a new "clause" node is added to the parse
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:30 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryTransformer.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:30 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 15 11:14:29 2022 by
+  Generated on Wed Mar 16 09:42:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/Doing/ArrayNestedHash.html

@@ -0,0 +1,198 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Module: Doing::ArrayNestedHash
+  
+    &mdash; Documentation by YARD 0.9.27
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Doing::ArrayNestedHash";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (A)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../Doing.html" title="Doing (module)">Doing</a></span></span>
+     &raquo; 
+    <span class="title">ArrayNestedHash</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Module: Doing::ArrayNestedHash
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>lib/doing/array/nested_hash.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    <p>Array helpers</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div>
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#nested_hash-instance_method" title="#nested_hash (instance method)">#<strong>nested_hash</strong>(value = nil)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'><p>Convert array to nested hash, setting last key to value.</p>
+</div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="nested_hash-instance_method">
+  
+    #<strong>nested_hash</strong>(value = nil)  &#x21d2; <tt><span class='object_link'><a href="../Object.html" title="Object (class)">Object</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Convert array to nested hash, setting last key to value</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>value</span>
+      
+      
+        <span class='type'></span>
+      
+      
+        <em class="default">(defaults to: <tt>nil</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'><p>The value to set</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      <div id="footer">
+  Generated on Wed Mar 16 09:42:15 2022 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.27 (ruby-3.0.1).
+</div>
+
+    </div>
+  </body>
+</html>