doing 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3631ac831d0c67d8082a02f66bf733e49bfc759091f235b87464af7ddb163eec
-  data.tar.gz: 9366ddb434383df32e204d409e588915d5e959f5b9c77f6411fb6781f24c6c4a
+  metadata.gz: a6b820922f541c1841b9e3cd6613fcdf20e39f726c455a289b035cd46adad4be
+  data.tar.gz: 03b371b4badb689f42c2132d252b69a592456efd00c26c94c78cde8ebd0091c9
 SHA512:
-  metadata.gz: 716adc40f91a6b4a637e66fc310bbb70904112a67bd1a28a744bde5f19dbeb21c5040d66e3662fc9a33d5122307fc768a5859858786077ff48b5b5f9a649d3e1
-  data.tar.gz: 42f564a64a07e81b29879f8364df85ae75644875cd752b2274f1481c24791baa97be354de39f1a1b521f82b2e652d6fe11294329d32ad6d314ad8e079c9c8db7
+  metadata.gz: a37aa02c0d7b72c9a3ee7fc920b14a90ac930b7b52e0b18aa5669850a5b84e9f99b6ceeda5e0e058d6a4de65d10736a3f4ea803869629617781daeb581b95460
+  data.tar.gz: 54ddce825edf7a8aa32b898c86ae698b29e3dd71b443d2154816b3c40714be8a7d0af35f8010640bab76dd135380779cf0598fcacab8deedab9841878e66b3c0

data/README.md

@@ -390,7 +390,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,10 @@ desc 'Send results report to STDOUT instead of STDERR'
 default_value false
 switch [:stdout], :default_value => false, :negatable => 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
 
@@ -1077,22 +1082,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 +1116,20 @@ 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.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.27'
 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
 
   ##
   ## @brief      Initializes the object.
@@ -53,6 +52,65 @@ class WWID
     @doingrc_needs_update = false
     @default_config_file = '.doingrc'
     @interval_cache = {}
+    @results = []
+  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 +120,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'] ||= []
@@ -145,6 +208,7 @@ class WWID
     @default_template = @config['templates']['default']['template']
     @default_date_format = @config['templates']['default']['date_format']
 
+
   end
 
   ##
@@ -243,58 +307,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
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Brett Terpstra