doing 1.0.26 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3631ac831d0c67d8082a02f66bf733e49bfc759091f235b87464af7ddb163eec
-  data.tar.gz: 9366ddb434383df32e204d409e588915d5e959f5b9c77f6411fb6781f24c6c4a
+  metadata.gz: fe6fb41048c3152bcb7368e8c0c1443a750f2f4c35dcf6b961854d1535ff6d7f
+  data.tar.gz: 77dce944d05f9de577f4fecf1fc4ea95ea408f6cd6d1aef34f2b03f6d64e303c
 SHA512:
-  metadata.gz: 716adc40f91a6b4a637e66fc310bbb70904112a67bd1a28a744bde5f19dbeb21c5040d66e3662fc9a33d5122307fc768a5859858786077ff48b5b5f9a649d3e1
-  data.tar.gz: 42f564a64a07e81b29879f8364df85ae75644875cd752b2274f1481c24791baa97be354de39f1a1b521f82b2e652d6fe11294329d32ad6d314ad8e079c9c8db7
+  metadata.gz: cf4553553485d02e7ebe4bbe8bb538d0fab8172e3d5eb44671d252659ecba2d804c1ff8631eb4eec0c0cdd5867d4108901b36ccd7006ec4dfca7ea49e2a515e5
+  data.tar.gz: ea0efd6dbc79ca4c018e2a252261f727f37d8525c09382ae386a9d90f840faafa9a4b2f409938735317f486879febde14c75e3c0a41cdf583c7b2cd23bf25936

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:
 
@@ -390,7 +393,7 @@ Note that you can include a tag with synonyms in the whitelist as well to tag it
 
 #### Adding entries:
 
-    now      - Add an entry
+    now, did - Add an entry
     later    - Add an item to the Later section
     done     - Add a completed item with @done(date). No argument finishes last entry.
     meanwhile - Finish any @meanwhile tasks and optionally create a new one

data/bin/doing

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'gli'
 require 'doing'
 require 'tempfile'
+require 'pp'
 
 def class_exists?(class_name)
   klass = Module.const_get(class_name)
@@ -42,6 +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
 
@@ -483,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]
@@ -1077,22 +1086,22 @@ command :config do |c|
   c.action do |global_options,options,args|
     if `uname` =~ /Darwins/
       if options[:x]
-        %x{open -a "#{wwid.config['editor_app']}" "#{File.join(Dir.home, wwid.default_config_file)}"}
+        %x{open -a "#{wwid.config['editor_app']}" "#{wwid.config_file}"}
       elsif options[:a] || options[:b]
         if options[:a]
-          %x{open -a "#{options[:a]}" "#{File.join(Dir.home, wwid.default_config_file)}"}
+          %x{open -a "#{options[:a]}" "#{wwid.config_file}"}
         elsif options[:b]
-          %x{open -b #{options[:b]} "#{File.join(Dir.home, wwid.default_config_file)}"}
+          %x{open -b #{options[:b]} "#{wwid.config_file}"}
         end
       else
         raise "No EDITOR variable defined in environment" if options[:e].nil? && ENV['EDITOR'].nil?
         editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
-        system %Q{#{editor} "#{File.join(Dir.home, wwid.default_config_file)}"}
+        system %Q{#{editor} "#{wwid.config_file}"}
       end
     else
       raise "No EDITOR variable defined in environment" if options[:e].nil? && ENV['EDITOR'].nil?
       editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
-      system %Q{#{editor} "#{File.join(Dir.home, wwid.default_config_file)}"}
+      system %Q{#{editor} "#{wwid.config_file}"}
     end
   end
 end
@@ -1111,12 +1120,22 @@ end
 
 
 pre do |global,command,options,args|
+  if global[:config_file]
+    wwid.config_file = global[:config_file]
+    wwid.configure({:ignore_local => true})
+    # wwid.results.push("Override config file #{wwid.config_file}")
+  end
+
   if global[:doing_file]
     wwid.init_doing_file(global[:doing_file])
   else
     wwid.init_doing_file
   end
+
+  wwid.auto_tag = !global[:noauto]
+
   wwid.config[:include_notes] = false unless global[:notes]
+
   if global[:version]
     $stdout.puts "doing v" + Doing::VERSION
   end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.26'
+  VERSION = '1.0.32'
 end

data/lib/doing/wwid.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
 require 'deep_merge'
-require 'pp'
 
 ##
 ## @brief      String helpers
@@ -43,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, :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 +52,66 @@ class WWID
     @doingrc_needs_update = false
     @default_config_file = '.doingrc'
     @interval_cache = {}
+    @results = []
+    @auto_tag = true
+  end
+
+  ##
+  ## @brief      Finds a project-specific configuration file
+  ##
+  ## @return     (String) A file path
+  ##
+  def find_local_config
+
+    config = {}
+    dir = Dir.pwd
+
+    local_config_files = []
+
+    while (dir != '/' && (dir =~ /[A-Z]:\//) == nil)
+      if File.exists? File.join(dir, @default_config_file)
+        local_config_files.push(File.join(dir, @default_config_file))
+      end
+
+      dir = File.dirname(dir)
+    end
+
+    local_config_files
+  end
+
+  ##
+  ## @brief      Reads a configuration.
+  ##
+  def read_config(opt={})
+    unless @config_file
+      if Dir.respond_to?('home')
+        @config_file = File.join(Dir.home, @default_config_file)
+      else
+        @config_file = File.join(File.expand_path("~"), @default_config_file)
+      end
+    end
+
+    if opt[:ignore_local]
+      additional_configs = []
+    else
+      additional_configs = find_local_config
+    end
+
+    begin
+      @local_config = {}
+
+      @config = YAML.load_file(@config_file) || {} if File.exists?(@config_file)
+      additional_configs.each { |cfg|
+        new_config = YAML.load_file(cfg) || {} if cfg
+        @local_config = @local_config.deep_merge(new_config)
+      }
+
+      # @config.deep_merge(@local_config)
+    rescue
+      @config = {}
+      @local_config = {}
+      # raise "error reading config"
+    end
   end
 
   ##
@@ -62,12 +121,17 @@ class WWID
   ##
   def configure(opt={})
     @timers = {}
-    @config_file == File.join(@user_home, @default_config_file)
+    opt[:ignore_local] ||= false
 
-    read_config
+    unless @config_file
+      @config_file = File.join(@user_home, @default_config_file)
+    end
+
+    read_config({:ignore_local => opt[:ignore_local]})
 
     user_config = @config.dup
-    @results = []
+
+    @config = {} if @config.nil?
 
     @config['autotag'] ||= {}
     @config['autotag']['whitelist'] ||= []
@@ -137,13 +201,16 @@ 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
 
@@ -243,58 +310,6 @@ class WWID
     end
   end
 
-  ##
-  ## @brief      Finds a project-specific configuration file
-  ##
-  ## @return     (String) A file path
-  ##
-  def find_local_config
-
-    config = {}
-    dir = Dir.pwd
-
-    local_config_files = []
-
-    while (dir != '/' && (dir =~ /[A-Z]:\//) == nil)
-      if File.exists? File.join(dir, @default_config_file)
-        local_config_files.push(File.join(dir, @default_config_file))
-      end
-
-      dir = File.dirname(dir)
-    end
-
-    local_config_files
-  end
-
-  ##
-  ## @brief      Reads a configuration.
-  ##
-  def read_config
-    if Dir.respond_to?('home')
-      @config_file = File.join(Dir.home, @default_config_file)
-    else
-      @config_file = File.join(File.expand_path("~"), @default_config_file)
-    end
-    # @doingrc_needs_update = true if File.exists? @config_file
-    additional_configs = find_local_config
-
-    begin
-      @local_config = {}
-
-      @config = YAML.load_file(@config_file) || {} if File.exists?(@config_file)
-      additional_configs.each { |cfg|
-        new_config = YAML.load_file(cfg) || {} if cfg
-        @local_config = @local_config.deep_merge(new_config)
-      }
-
-      # @config.deep_merge(@local_config)
-    rescue
-      @config = {}
-      @local_config = {}
-      # raise "error reading config"
-    end
-  end
-
   ##
   ## @brief      Create a process for an editor and wait for the file handle to return
   ##
@@ -567,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']
@@ -717,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
@@ -1653,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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.32
 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: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ homepage: http://brettterpstra.com/project/doing/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - doing
@@ -216,8 +216,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: []