doing 2.1.2pre → 2.1.3

data/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Nov 28 05:27:33 2021 by
+  Generated on Thu Dec 16 11:02:39 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.2pre
+v2.1.3
 
 === Global Options
 === --config_file arg

data/lib/doing/configuration.rb

@@ -7,7 +7,7 @@ module Doing
   class Configuration
     attr_reader :settings
 
-    attr_writer :ignore_local
+    attr_writer :ignore_local, :config_file
 
     MissingConfigFile = Class.new(RuntimeError)
 
@@ -100,24 +100,21 @@ module Doing
       @config_file ||= default_config_file
     end
 
-    def config_file=(file)
-      @config_file = 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)
+      if File.exist?(config_dir) && !File.directory?(config_dir)
+        raise DoingRuntimeError, "#{config_dir} exists but is not a directory"
+
+      end
 
       unless File.exist?(config_dir)
         FileUtils.mkdir_p(config_dir)
         Doing.logger.log_now(:warn, "Config directory created at #{config_dir}")
       end
 
-      # File.join(config_dir, 'config.yml')
       File.join(config_dir, 'config.yml')
     end
 

data/lib/doing/item.rb

@@ -116,7 +116,7 @@ module Doing
     ## Add (or remove) tags from the title of the item
     ##
     ## @param      tags    [Array] The tags to apply
-    ## @param      **options Additional options
+    ## @param      options Additional options
     ##
     ## @option options :date       [Boolean] Include timestamp?
     ## @option options :single     [Boolean] Log as a single change?

data/lib/doing/plugins/export/template_export.rb

@@ -36,7 +36,10 @@ module Doing
 
           if opt[:wrap_width]&.positive?
             width = opt[:wrap_width]
-            note.map! { |line| line.chomp.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") }
+            note.map! do |line|
+              line.simple_wrap(width)
+              # line.chomp.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+            end
             note = note.join("\n").split(/\n/).delete_if(&:empty?)
           end
         else

data/lib/doing/prompt.rb

@@ -127,16 +127,16 @@ module Doing
       ## Create an interactive menu to select from a set of Items
       ##
       ## @param      items            [Array] list of items
-      ## @param      opt              [Hash] options
-      ## @param      include_section  [Boolean] include section
+      ## @param      opt              Additional options
       ##
-      ## @option opt [String] :header
-      ## @option opt [String] :prompt
-      ## @option opt [String] :query
-      ## @option opt [Boolean] :show_if_single
-      ## @option opt [Boolean] :menu
-      ## @option opt [Boolean] :sort
-      ## @option opt [Boolean] :multiple
+      ## @option opt [Boolean] :include_section Include section name for each item in menu
+      ## @option opt [String] :header A custom header string
+      ## @option opt [String] :prompt A custom prompt string
+      ## @option opt [String] :query Initial query
+      ## @option opt [Boolean] :show_if_single Show menu even if there's only one option
+      ## @option opt [Boolean] :menu Show menu
+      ## @option opt [Boolean] :sort Sort options
+      ## @option opt [Boolean] :multiple Allow multiple selections
       ## @option opt [Symbol] :case (:sensitive, :ignore, :smart)
       ##
       def choose_from_items(items, **opt)

data/lib/doing/string.rb

@@ -162,6 +162,29 @@ module Doing
       replace uncolor
     end
 
+    def simple_wrap(width)
+      str = gsub(/@\S+\(.*?\)/) { |tag| tag.gsub(/\s/, '%%%%') }
+      words = str.split(/ /).map { |word| word.gsub(/%%%%/, ' ') }
+      out = []
+      line = []
+
+      words.each do |word|
+        if word.uncolor.length >= width
+          chars = word.uncolor.split('')
+          out << chars.slice!(0, width - 1).join('') while chars.count >= width
+          line << chars.join('')
+          next
+        elsif line.join(' ').uncolor.length + word.uncolor.length + 1 > width
+          out.push(line.join(' '))
+          line.clear
+        end
+
+        line << word.uncolor
+      end
+      out.push(line.join(' '))
+      out.join("\n")
+    end
+
     ##
     ## Wrap string at word breaks, respecting tags
     ##
@@ -177,8 +200,14 @@ module Doing
       words = str.split(/ /).map { |word| word.gsub(/%%%%/, ' ') }
       out = []
       line = []
+
       words.each do |word|
-        if line.join(' ').uncolor.length + word.uncolor.length + 1 > len
+        if word.uncolor.length >= len
+          chars = word.uncolor.split('')
+          out << chars.slice!(0, len - 1).join('') while chars.count >= len
+          line << chars.join('')
+          next
+        elsif line.join(' ').uncolor.length + word.uncolor.length + 1 > len
           out.push(line.join(' '))
           line.clear
         end
@@ -187,6 +216,7 @@ module Doing
       end
       out.push(line.join(' '))
       note = ''
+      after = after.dup if after.frozen?
       after.sub!(note_rx) do
         note = Regexp.last_match(0)
         ''

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.2pre'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.2pre
+  version: 2.1.3
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -581,9 +581,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.16
 signing_key: