doing 2.1.30 → 2.1.31pre

data/lib/doing.rb

@@ -66,10 +66,67 @@ module Doing
       @logger ||= LogAdapter.new((ENV['DOING_LOG_LEVEL'] || :info).to_sym)
     end
 
+    ##
+    ## Holds a Configuration object with methods and a @settings hash
+    ##
+    ## @return     [Configuration] Configuration object
+    ##
     def config
       @config ||= Configuration.new
     end
 
+    ##
+    ## Shortcut for Doing.config.settings
+    ##
+    ## @return     [Hash] Settings hash
+    ##
+    def settings
+      config.settings
+    end
+
+    ##
+    ## Fetch a config setting using a dot-separated keypath
+    ## or array of keys
+    ##
+    ## @param      keypath  [String|Array] Either a
+    ##                      dot-separated key path
+    ##                      (search.case) or array of keys
+    ##                      (['search', 'case'])
+    ## @param      default  A default value to return if the
+    ##                      provided path returns nil result
+    ##
+    def setting(keypath, default = nil)
+      cfg = config.settings
+      case keypath
+      when Array
+        cfg.dig(*keypath) || default
+      when String
+        unless keypath =~ /^[.*]?$/
+          real_path = config.resolve_key_path(keypath, create: false)
+          return default unless real_path&.count&.positive?
+
+          cfg = cfg.dig(*real_path)
+        end
+
+        cfg.nil? ? default : cfg
+      end
+    end
+
+    def set(keypath, value)
+      real_path = config.resolve_key_path(keypath, create: false)
+      return nil unless real_path&.count&.positive?
+
+      config.settings.deep_set(real_path, value)
+    end
+
+    ##
+    ## Update configuration from specified file
+    ##
+    ## @param      file     [String] Path to new config file
+    ## @param      options  [Hash] options
+    ##
+    ## @option options :ignore_local Ignore local configuration files
+    ##
     def config_with(file, options = {})
       @config = Configuration.new(file, options: options)
     end

data/lib/examples/commands/wiki.rb

@@ -35,7 +35,7 @@ command :wiki do |c|
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
-  c.action do |global, options, args|
+  c.action do |_global, options, _args|
     tags = @wwid.tag_groups([], opt: options)
 
     wiki = Doing::Plugins.plugins.dig(:export, 'wiki', :class)
@@ -43,38 +43,46 @@ command :wiki do |c|
     tags.each do |tag, items|
       export_options = { page_title: tag, is_single: false, options: options }
 
-      raise RuntimeError, 'Missing plugin "wiki"' unless wiki
+      raise 'Missing plugin "wiki"' unless wiki
 
       out = wiki.render(@wwid, items, variables: export_options)
 
       if out
         FileUtils.mkdir_p('doing_wiki')
-        File.open(File.join('doing_wiki', tag + '.html'), 'w') do |f|
-          f.puts out
-        end
+        File.open(File.join('doing_wiki', "#{tag}.html"), 'w') { |f| f.puts out }
       end
     end
 
-    template = if @settings['export_templates']['wiki_index'] && File.exist?(File.expand_path(@settings['export_templates']['wiki_index']))
-                 IO.read(File.expand_path(@settings['export_templates']['wiki_index']))
-               else
-                 wiki.template('wiki_index')
-               end
-    style = if @settings['export_templates']['wiki_css'] && File.exist?(File.expand_path(@settings['export_templates']['wiki_css']))
-              IO.read(File.expand_path(@settings['export_templates']['wiki_css']))
-            else
-              wiki.template('wiki_css')
-            end
-    tags_out = tags.map { |t| {url: "#{t}.html"} }
-    engine = Haml::Engine.new(template)
+    engine = Haml::Engine.new(wiki_template(wiki))
+    tag_arr = tags.each_with_object([]) { |(tag, items), arr| arr << { name: tag, count: items.count } }
     index_out = engine.render(Object.new,
-                       { :@tags => tags.each_with_object([]) { |(tag, items), arr| arr << { name: tag, count: items.count } }, :@page_title => "Tags wiki", :@style => style })
+                              { :@tags => tag_arr,
+                                :@page_title => 'Tags wiki',
+                                :@style => wiki_style(wiki) })
 
     if index_out
       File.open(File.join('doing_wiki', 'index.html'), 'w') do |f|
         f.puts index_out
       end
-      Doing.logger.warn("Wiki written to doing_wiki directory")
+      Doing.logger.warn('Wiki written to doing_wiki directory')
+    end
+  end
+
+  def wiki_template(wiki)
+    if Doing.setting('export_templates.wiki_index') &&
+       File.exist?(File.expand_path(Doing.setting('export_templates.wiki_index')))
+      IO.read(File.expand_path(Doing.setting('export_templates.wiki_index')))
+    else
+      wiki.template('wiki_index')
+    end
+  end
+
+  def wiki_style(wiki)
+    if Doing.setting('export_templates.wiki_css') &&
+       File.exist?(File.expand_path(Doing.setting('export_templates.wiki_css')))
+      IO.read(File.expand_path(Doing.setting('export_templates.wiki_css')))
+    else
+      wiki.template('wiki_css')
     end
   end
 end

data/scripts/setting_replace.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+content = IO.read(ARGV[0])
+
+content.gsub!(/Doing.settings((\[.*?\])+)/) do
+  m = Regexp.last_match
+  keypath = m[0].scan(/\['([^\]]+)'\]/).map { |e| e[0] }.join('.')
+  "Doing.setting('#{keypath}')"
+end
+
+puts content

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.30
+  version: 2.1.31pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -602,6 +602,7 @@ files:
 - lib/completion/doing.bash
 - lib/completion/doing.fish
 - lib/doing.rb
+- lib/doing/add_options.rb
 - lib/doing/array/array.rb
 - lib/doing/array/nested_hash.rb
 - lib/doing/array/tags.rb
@@ -778,6 +779,7 @@ files:
 - scripts/generate_fish_completions.rb
 - scripts/generate_zsh_completions.rb
 - scripts/runtests.sh
+- scripts/setting_replace.rb
 - scripts/sort_commands.rb
 - yard_templates/default/method_details/setup.rb
 homepage: http://brettterpstra.com/project/doing/
@@ -802,9 +804,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.16
 signing_key: