doing 1.0.27 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b820922f541c1841b9e3cd6613fcdf20e39f726c455a289b035cd46adad4be
-  data.tar.gz: 03b371b4badb689f42c2132d252b69a592456efd00c26c94c78cde8ebd0091c9
+  metadata.gz: 381d875c7e4b8f3782e081c3a4bd6f0551c420b02d7dad20be8e2217b2dc4d59
+  data.tar.gz: dae9efcc7453831ff1c33e1d03a61986fed1540d33b0eb3a9990522b5e4452f1
 SHA512:
-  metadata.gz: a37aa02c0d7b72c9a3ee7fc920b14a90ac930b7b52e0b18aa5669850a5b84e9f99b6ceeda5e0e058d6a4de65d10736a3f4ea803869629617781daeb581b95460
-  data.tar.gz: 54ddce825edf7a8aa32b898c86ae698b29e3dd71b443d2154816b3c40714be8a7d0af35f8010640bab76dd135380779cf0598fcacab8deedab9841878e66b3c0
+  metadata.gz: 6420c68b41773a9d3c54a0185c26fd972df2f69ad11cd17bd30d5c83789ed5b405172170a30e8f483c6cd164ac13e6c851a583dfbf0e3ec9bfd273606849ca71
+  data.tar.gz: eb0f1d56e64e731f341879840ca592d3c55402e3e6f2467567cb7f513811a172ac3d605f3358c75f75d0ed5d28126a50ffdfba1165510b5073745ccdf8c1948d

data/README.md

@@ -54,6 +54,8 @@ When using the `now` and `later` commands on the command line, you can start the
 
 Notes can be prevented from ever appearing in output with the global option `--no-notes`: `doing --no-notes show all`.
 
+Auto tagging (adding tags listed in .doingrc under `autotag` and `default_tags`) can be skipped for an entry with the `-x` global option: `doing -x done skipping some automatic tagging`.
+
 ## Configuration
 
 A basic configuration looks like this:
@@ -382,6 +384,7 @@ Note that you can include a tag with synonyms in the whitelist as well to tag it
     --[no-]notes         - Output notes if included in the template (default: enabled)
     --stdout             - Send results report to STDOUT instead of STDERR
     --version            - Display the program version
+    -x, --[no-]noauto    - Exclude auto tags and default tags
 
 ### Commands:
 

data/bin/doing

@@ -43,10 +43,14 @@ desc 'Send results report to STDOUT instead of STDERR'
 default_value false
 switch [:stdout], :default_value => false, :negatable => false
 
+desc 'Exclude auto tags and default tags'
+switch [:x,:noauto], :default_value => false
+
 desc 'Use a specific configuration file'
 default_value false
 flag [:config_file]
 
+
 # desc 'Wrap notes at X chars (0 for no wrap)'
 # flag [:w,:wrapwidth], :must_match => /^\d+$/, :type => Integer
 
@@ -488,23 +492,23 @@ desc 'Tag last entry'
 arg_name 'tag1 [tag2...]'
 command :tag do |c|
   c.desc 'Section'
-  c.flag [:s,:section], :default_value => "All"
+  c.flag [:s, :section], :default_value => "All"
 
   c.desc 'How many recent entries to tag (0 for all)'
   c.default_value 1
-  c.flag [:c,:count], :default_value => 1
+  c.flag [:c, :count], :default_value => 1
 
   c.desc 'Include current date/time with tag'
   c.default_value false
-  c.switch [:d,:date], :negatable => false, :default_value => false
+  c.switch [:d, :date], :negatable => false, :default_value => false
 
   c.desc 'Remove given tag(s)'
   c.default_value false
-  c.switch [:r,:remove], :negatable => false, :default_value => false
+  c.switch [:r, :remove], :negatable => false, :default_value => false
 
   c.desc 'Autotag entries based on autotag configuration in ~/.doingrc'
   c.default_value false
-  c.switch [:a,:autotag], :negatable => false, :default_value => false
+  c.switch [:a, :autotag], :negatable => false, :default_value => false
 
   c.action do |global_options,options,args|
     if args.length == 0 && !options[:a]
@@ -1128,6 +1132,8 @@ pre do |global,command,options,args|
     wwid.init_doing_file
   end
 
+  wwid.auto_tag = !global[:noauto]
+
   wwid.config[:include_notes] = false unless global[:notes]
 
   if global[:version]

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.27'
+  VERSION = '1.0.33'
 end

data/lib/doing/wwid.rb

@@ -42,7 +42,7 @@ end
 ## @brief      Main "What Was I Doing" methods
 ##
 class WWID
-  attr_accessor :content, :sections, :current_section, :doing_file, :config, :user_home, :default_config_file, :config_file, :results
+  attr_accessor :content, :sections, :current_section, :doing_file, :config, :user_home, :default_config_file, :config_file, :results, :auto_tag
 
   ##
   ## @brief      Initializes the object.
@@ -53,6 +53,7 @@ class WWID
     @default_config_file = '.doingrc'
     @interval_cache = {}
     @results = []
+    @auto_tag = true
   end
 
   ##
@@ -200,13 +201,15 @@ class WWID
     #   end
     # end
 
-    File.open(@config_file, 'w') { |yf| YAML::dump(@config, yf) } unless @config == user_config
+    unless File.exists?(@config_file)
+      File.open(@config_file, 'w') { |yf| YAML::dump(@config, yf) }
+    end
 
     @config = @local_config.deep_merge(@config)
 
     @current_section = @config['current_section']
     @default_template = @config['templates']['default']['template']
-    @default_date_format = @config['templates']['default']['date_format']
+    @default_date_format = @config['templates']['default']['date_format'];
 
 
   end
@@ -579,21 +582,26 @@ class WWID
     opt[:timed] ||= false
 
     title = [title.strip.cap_first]
-    title = autotag(title.join(' '))
-    unless @config['default_tags'].empty?
-      title += @config['default_tags'].map{|t|
-        unless t.nil?
-          dt = t.sub(/^ *@/,'').chomp
-          if title =~ /@#{dt}/
-            ""
-          else
-            ' @' + dt
+    title = title.join(' ')
+
+    if @auto_tag
+      title = autotag(title)
+      unless @config['default_tags'].empty?
+        title += @config['default_tags'].map{|t|
+          unless t.nil?
+            dt = t.sub(/^ *@/,'').chomp
+            if title =~ /@#{dt}/
+              ""
+            else
+              ' @' + dt
+            end
           end
-        end
-      }.delete_if {|t| t == "" }.join(" ")
+        }.delete_if {|t| t == "" }.join(" ")
+      end
     end
+    title.gsub!(/ +/,' ')
     entry = {'title' => title.strip, 'date' => opt[:back]}
-    unless opt[:note] =~ /^\s*$/s
+    unless opt[:note].join('').strip == ''
       entry['note'] = opt[:note].map {|n| n.gsub(/ *$/,'')}
     end
     items = @content[section]['items']
@@ -729,7 +737,7 @@ class WWID
             }
             item['title'] = title
           else
-            new_title = autotag(item['title'])
+            new_title = autotag(item['title']) if @auto_tag
             unless new_title == item['title']
               @results.push("Tags updated: #{new_title}")
               item['title'] = new_title
@@ -1665,6 +1673,7 @@ EOS
   #
   def autotag(text)
     return unless text
+    return text unless @auto_tag
     current_tags = text.scan(/@\w+/)
     whitelisted = []
     @config['autotag']['whitelist'].each {|tag|

metadata

@@ -1,63 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.33
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 6.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -78,40 +72,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.19.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +155,7 @@ dependencies:
         version: 1.8.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +165,7 @@ dependencies:
         version: 1.8.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.1
 description: A tool for managing a TaskPaper-like file of recent activites. Perfect
   for the late-night hacker on too much caffeine to remember what they accomplished
   at 2 in the morning.
@@ -193,7 +187,7 @@ homepage: http://brettterpstra.com/project/doing/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - doing
@@ -216,8 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A command line tool for managing What Was I Doing reminders
 test_files: []