doing 2.0.24 → 2.0.25

data/lib/doing/configuration.rb

@@ -90,21 +90,56 @@ module Doing
     }
 
     def initialize(file = nil, options: {})
-      if file
-        cf = File.expand_path(file)
-        # raise MissingConfigFile, "Config not found (#{cf})" unless File.exist?(cf)
+      @config_file = file.nil? ? default_config_file : File.expand_path(file)
 
-        @config_file = cf
+      @settings = configure(options)
+    end
+
+    def config_file
+      @config_file ||= default_config_file
+    end
+
+    def config_dir
+      @config_dir ||= File.join(Util.user_home, '.config', 'doing')
+      # @config_dir ||= Util.user_home
+    end
+
+    def default_config_file
+      raise DoingRuntimeError, "#{config_dir} exists but is not a directory" if File.exist?(config_dir) && !File.directory?(config_dir)
+
+      unless File.exist?(config_dir)
+        FileUtils.mkdir_p(config_dir)
+        Doing.logger.log_now(:warn, "Config directory created at #{config_dir}")
       end
 
-      @settings = configure(options)
+      # File.join(config_dir, 'config.yml')
+      File.join(config_dir, 'config.yml')
     end
 
+    def config_file=(file)
+      @config_file = file
+    end
+
+
     def additional_configs
       @additional_configs ||= find_local_config
     end
 
-    def value_for_key(keypath = '')
+    def choose_config
+      if @additional_configs.count.positive?
+        choices = [@config_file]
+        choices.concat(@additional_configs)
+        res = Doing::WWID.new.choose_from(choices.uniq.sort.reverse, sorted: false, prompt: 'Local configs found, select which to update > ')
+
+        raise UserCancelled, 'Cancelled' unless res
+
+        res.strip || @config_file
+      else
+        @config_file
+      end
+    end
+
+    def resolve_key_path(keypath)
       cfg = @settings
       real_path = []
       unless keypath =~ /^[.*]?$/
@@ -113,7 +148,8 @@ module Doing
           path = paths.shift
           new_cfg = nil
           cfg.each do |key, val|
-            next unless key =~ path.to_rx(distance: 2)
+            next unless key =~ path.to_rx(distance: 4)
+
             real_path << key
             new_cfg = val
             break
@@ -127,9 +163,20 @@ module Doing
         end
       end
       Doing.logger.debug('Config:', "translated key path #{keypath} to #{real_path.join('.')}")
-      result = {}
-      result[real_path[-1]] = cfg
-      result
+      real_path
+    end
+
+    def value_for_key(keypath = '')
+      cfg = @settings
+      real_path = ['config']
+      unless keypath =~ /^[.*]?$/
+        real_path = resolve_key_path(keypath)
+        return nil unless real_path && real_path.count.positive?
+
+        cfg = cfg.dig(*real_path)
+      end
+
+      cfg.nil? ? nil : { real_path[-1] => cfg }
     end
 
     # It takes the input, fills in the defaults where values do not exist.
@@ -141,12 +188,33 @@ module Doing
       Util.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
     end
 
-    def config_file
-      @config_file ||= File.join(Util.user_home, '.doingrc')
-    end
+    def update_deprecated_config
+      # return # Until further notice
+      return if File.exist?(default_config_file)
 
-    def config_file=(file)
-      @config_file = file
+      old_file = File.join(Util.user_home, '.doingrc')
+      return unless File.exist?(old_file)
+
+      wwid = Doing::WWID.new
+      Doing.logger.log_now(:warn, 'Deprecated:', "main config file location has changed to #{config_file}")
+      res = wwid.yn("Move #{old_file} to new location, preserving settings?", default_response: true)
+
+      if res
+        if File.exist?(default_config_file)
+          res = wwid.yn("#{default_config_file} already exists, overwrite it?", default_response: false)
+
+          unless res
+            @config_file = old_file
+            return
+          end
+        end
+
+        FileUtils.mv old_file, default_config_file, force: true
+        Doing.logger.log_now(:warn, 'Config:', "Config file moved to #{default_config_file}")
+        Doing.logger.log_now(:warn, 'Config:', %(If ~/.config/doing/config.yml exists in the future, it will be considered a local
+                             config and its values will override the default configuration.))
+        Process.exit 0
+      end
     end
 
     ##
@@ -155,6 +223,8 @@ module Doing
     ## @param      opt   [Hash] Additional Options
     ##
     def configure(opt = {})
+      update_deprecated_config if config_file == default_config_file
+
       @ignore_local = opt[:ignore_local] if opt[:ignore_local]
 
       config = read_config.dup

data/lib/doing/string.rb

@@ -392,36 +392,50 @@ module Doing
 
     def link_urls(opt = {})
       opt[:format] ||= :html
-      str = self.dup
-
-      if :format == :markdown
-        # Remove <self-linked> formatting
-        str.gsub!(/<(.*?)>/) do |match|
-          m = Regexp.last_match
-          if m[1] =~ /^https?:/
-            m[1]
-          else
-            match
-          end
+      str = dup
+
+      str = str.remove_self_links if opt[:format] == :markdown
+
+      str.replace_qualified_urls(format: opt[:format]).clean_unlinked_urls
+    end
+
+    # Remove <self-linked> formatting
+    def remove_self_links
+      gsub(/<(.*?)>/) do |match|
+        m = Regexp.last_match
+        if m[1] =~ /^https?:/
+          m[1]
+        else
+          match
         end
       end
+    end
 
-      # Replace qualified urls
-      str.gsub!(%r{(?mi)(?<!["'\[(\\])((http|https)://)([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&amp;:/~+#]*[\w\-@^=%&amp;/~+#])?}) do |_match|
+    # Replace qualified urls
+    def replace_qualified_urls(opt = {})
+      opt[:format] ||= :html
+      gsub(%r{(?mi)(?x:
+      (?<!["'\[(\\])
+      ((http|https)://)
+      ([\w\-]+(\.[\w\-]+)+)
+      ([\w\-.,@?^=%&;:/~+#]*[\w\-@^=%&;/~+#])?
+      )}) do |_match|
         m = Regexp.last_match
         proto = m[1].nil? ? 'http://' : ''
         case opt[:format]
         when :html
-          %(<a href="#{proto}#{m[0]}" title="Link to #{m[0].sub(/^https?:\/\//, '')}">[#{m[3]}]</a>)
+          %(<a href="#{proto}#{m[0]}" title="Link to #{m[0].sub(%r{^https?://}, '')}">[#{m[3]}]</a>)
         when :markdown
           "[#{m[0]}](#{proto}#{m[0]})"
         else
           m[0]
         end
       end
+    end
 
-      # Clean up unlinked <urls>
-      str.gsub!(/<(\w+:.*?)>/) do |match|
+    # Clean up unlinked <urls>
+    def clean_unlinked_urls
+      gsub(/<(\w+:.*?)>/) do |match|
         m = Regexp.last_match
         if m[1] =~ /<a href/
           match
@@ -429,8 +443,6 @@ module Doing
           %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
         end
       end
-
-      str
     end
   end
 end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.24'
+  VERSION = '2.0.25'
 end

data/lib/doing/wwid.rb

@@ -25,10 +25,7 @@ module Doing
       @timers = {}
       @recorded_items = []
       @content = {}
-      @doingrc_needs_update = false
-      @default_config_file = '.doingrc'
       @auto_tag = true
-      @user_home = Util.user_home
     end
 
     ##
@@ -626,7 +623,7 @@ module Doing
       Doing.logger.log_now(:warn, 'Compiling and installing fzf -- this will only happen once')
       Doing.logger.log_now(:warn, 'fzf is copyright Junegunn Choi, MIT License <https://github.com/junegunn/fzf/blob/master/LICENSE>')
 
-      res = system("'#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
+      system("'#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
       unless File.exist?(fzf_bin)
         Doing.logger.log_now(:warn, 'Error installing, trying again as root')
         system("sudo '#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
@@ -1524,7 +1521,7 @@ module Doing
     def restore_backup(file)
       if File.exist?("#{file}~")
         FileUtils.cp("#{file}~", file)
-        logger.warn('File update:', "Restored #{file.sub(/^#{@user_home}/, '~')}")
+        logger.warn('File update:', "Restored #{file.sub(/^#{Util.user_home}/, '~')}")
       else
         logger.error('Restore error:', 'No backup file found')
       end

data/rdoc_to_mmd.rb

@@ -3,18 +3,24 @@
 
 input = IO.read('doing.rdoc')
 
+input.gsub!(/^======= Options/, "###### Options\n\n")
 input.gsub!(/^===== Options/, "##### Options\n\n")
+input.gsub!(/^===== Commands/, "### Commands\n")
 input.gsub!(/^=== Commands/, "## Commands\n")
-input.gsub!(/(?<=\n)===== (.*?)\n+((.|\n)+?)(?=\n=|$)/s) do
+
+input.gsub!(/^(?<pre>={4,6}) Command: <tt>(?<cmd>.*?) (?<arg> .*?)?<\/tt>\n(?<after>.*?)$/) do
   m = Regexp.last_match
-  "`#{m[1]}`\n: #{m[2].gsub(/\|/, '\\|')}"
+  level = m['pre'].length == 6 ? '####' : '###'
+  r = "#{level} #{m['cmd'].sub(/\|(.*?)$/, ' (*or* \1)')}"
+  r += " #{m['arg']}" if m['arg']
+  r += " {##{m['cmd'].gsub(/\|.*?$/, '')}}" if m['pre'].length == 4
+  r += "\n\n"
+  "#{r}**#{m['after']}**{:.description}\n"
 end
-input.gsub!(/^==== Command: <tt>(.*?) ( .*?)?<\/tt>\n(.*?)$/) do
+
+input.gsub!(/(?<=\n)={5,7} (.*?)\n+((.|\n)+?)(?=\n=|$)/s) do
   m = Regexp.last_match
-  r = "### #{m[1].sub(/\|(.*?)$/, ' (*or* \1)')}"
-  r += " #{m[2]}" if m[2]
-  r += " {##{m[1].gsub(/\|.*?$/, '')}}\n\n"
-  "#{r}**#{m[3]}**{:.description}\n"
+  "`#{m[1]}`\n: #{m[2].gsub(/\|/, '\\|')}"
 end
 
 input.gsub!(/^=== Global Options/, "## Global Options\n")
@@ -28,7 +34,7 @@ input.gsub!(/\n  (?=\S)/, ' ')
 input.gsub!(/^([^:`\n#*](.*?))$/, "\\1\n")
 input.gsub!(/\n{3,}/, "\n\n")
 input.gsub!(/^(: .*?)\n\n(:.*?)$/, "\\1\n\\2")
-input.gsub!(/^\[Default Command\] (.*?)$/, '## Default Command: [`\1`](#\1)')
+input.gsub!(/^\[Default Command\] (.*?)$/, '> **Default Command:** [`\1`](#\1)')
 input.gsub!(/\/Users\/ttscoff\/scripts\/editor.sh/, '$EDITOR')
 input.gsub!(/\/Users\/ttscoff/, '~')
 puts %(---

data/scripts/generate_bash_completions.rb

@@ -155,7 +155,7 @@ class BashCompletions
   end
 
   def parse_option(option)
-    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
     {
       short: res['short'],

data/scripts/generate_fish_completions.rb

@@ -100,7 +100,7 @@ class FishCompletions
   end
 
   def parse_option(option)
-    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
     {
       short: res['short'],

data/scripts/generate_zsh_completions.rb

@@ -71,7 +71,7 @@ class ZshCompletions
   end
 
   def parse_option(option)
-    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
 
     {

metadata

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