doing 2.1.89 → 2.1.90

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

@@ -17,130 +17,133 @@ module Doing
     end
 
     def self.render(wwid, items, variables: {})
-      Doing.logger.benchmark(:template_render, :start)
-      return if items.nil?
-
-      opt = variables[:options]
-
-      out = ''
-      items.each do |item|
-        if opt[:highlight] && item.title =~ /@#{Doing.setting('marker_tag')}\b/i
-          flag = Doing::Color.send(Doing.setting('marker_color'))
-          reset = Doing::Color.reset + Doing::Color.default
-        else
-          flag = ''
-          reset = ''
-        end
+      Doing.logger.measure(:template_render) do
+        return if items.nil?
+
+        opt = variables[:options]
+
+        out = ''
+        items.each do |item|
+          if opt[:highlight] && item.title =~ /@#{Doing.setting('marker_tag')}\b/i
+            flag = Doing::Color.send(Doing.setting('marker_color'))
+            reset = Doing::Color.reset + Doing::Color.default
+          else
+            flag = ''
+            reset = ''
+          end
 
-        placeholders = {}
+          placeholders = {}
 
-        if !item.note.empty? && Doing.setting('include_notes')
-          note = item.note.map(&:strip).delete_if(&:empty?)
-          note.map! { |line| "#{line.sub(/^\t*/, '')}  " }
+          if !item.note.empty? && Doing.setting('include_notes')
+            note = item.note.map(&:strip).delete_if(&:empty?)
+            note.map! { |line| "#{line.sub(/^\t*/, '')}  " }
 
-          if opt[:wrap_width]&.positive?
-            width = opt[:wrap_width]
-            note.map! do |line|
-              line.simple_wrap(width)
-              # line.chomp.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+            if opt[:wrap_width]&.positive?
+              width = opt[:wrap_width]
+              note.map! do |line|
+                line.simple_wrap(width)
+                # line.chomp.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+              end
+              note.delete_if(&:empty?)
             end
-            note.delete_if(&:empty?)
+          else
+            note = []
           end
-        else
-          note = []
-        end
 
-        placeholders['id'] = item.id
+          placeholders['id'] = item.id
 
-        placeholders['tags'] = item.tags
+          placeholders['tags'] = item.tags
 
-        placeholders['date'] = item.date.strftime(opt[:format])
+          placeholders['date'] = item.date.strftime(opt[:format])
 
-        interval = wwid.get_interval(item, record: true, formatted: false) if opt[:times]
-        if interval
-          interval = case opt[:interval_format].to_sym
-                     when :human
-                       interval.time_string(format: :hm)
-                     when :text
-                       interval.time_string(format: :clock)
-                     else
-                       interval.time_string(format: opt[:interval_format].to_sym)
-                     end
-        end
+          interval = wwid.get_interval(item, record: true, formatted: false) if opt[:times]
+          if interval
+            interval = case opt[:interval_format].to_sym
+                       when :human
+                         interval.time_string(format: :hm)
+                       when :text
+                         interval.time_string(format: :clock)
+                       else
+                         interval.time_string(format: opt[:interval_format].to_sym)
+                       end
+          end
 
-        interval ||= ''
-        placeholders['interval'] = interval
-
-        duration = item.duration if opt[:duration]
-        if duration
-          duration = case opt[:interval_format].to_sym
-                     when :human
-                       duration.time_string(format: :hm)
-                     when :text
-                       duration.time_string(format: :clock)
-                     else
-                       duration.time_string(format: opt[:interval_format].to_sym)
-                     end
-        end
-        duration ||= ''
-        placeholders['duration'] = duration
-
-        placeholders['shortdate'] = format('%13s', item.date.relative_date)
-        placeholders['section'] = item.section || ''
-        placeholders['title'] = item.title
-        placeholders['note'] = note
-        placeholders['idnote'] = note.empty? ? '' : "\n#{note.map { |l| "\t\t#{l.strip}  " }.join("\n")}"
-        placeholders['odnote'] = note.empty? ? '' : "\n#{note.map { |l| "#{l.strip}  " }.join("\n")}"
-
-        chompnote = []
-        unless note.empty?
-          chompnote = note.map do |l|
-            l.gsub(/\n+/, ' ').gsub(/(^\s*|\s*$)/, '').gsub(/\s+/, ' ')
+          interval ||= ''
+          placeholders['interval'] = interval
+
+          duration = item.duration if opt[:duration]
+          if duration
+            duration = case opt[:interval_format].to_sym
+                       when :human
+                         duration.time_string(format: :hm)
+                       when :text
+                         duration.time_string(format: :clock)
+                       else
+                         duration.time_string(format: opt[:interval_format].to_sym)
+                       end
           end
-        end
-        placeholders['chompnote'] = chompnote.join(' ')
-
-        template = opt[:template].dup
-        note_rx = /(?i-m)(?x:^([\s\S]*?)
-                    (%(?:[io]d|(?:\^[\s\S])?
-                    (?:(?:[ _t]|[^a-z0-9])?\d+)?
-                    (?:[\s\S][ _t]?)?)?note)
-                    ([\s\S]*?)$)/
-        template.sub!(note_rx, '\1\3\2')
-        output = Doing::TemplateString.new(template,
-                                           color: flag,
-                                           placeholders: placeholders,
-                                           reset: reset,
-                                           tags_color: opt[:tags_color],
-                                           wrap_width: opt[:wrap_width]).colored
-
-        output.gsub!(/(?<!\\)%(\S)?hr(_under)?/) do
-          o = ''
-          TTY::Screen.columns.to_i.times do
-            char = Regexp.last_match(2).nil? ? '-' : '_'
-            char = Regexp.last_match(1).nil? ? char : Regexp.last_match(1)
-            o += char
+          duration ||= ''
+          placeholders['duration'] = duration
+
+          placeholders['shortdate'] = format('%13s', item.date.relative_date)
+          placeholders['section'] = item.section || ''
+          placeholders['title'] = item.title
+          placeholders['note'] = note
+          placeholders['idnote'] = note.empty? ? '' : "\n#{note.map { |l| "\t\t#{l.strip}  " }.join("\n")}"
+          placeholders['odnote'] = note.empty? ? '' : "\n#{note.map { |l| "#{l.strip}  " }.join("\n")}"
+
+          chompnote = []
+          unless note.empty?
+            chompnote = note.map do |l|
+              l.gsub(/\n+/, ' ').gsub(/(^\s*|\s*$)/, '').gsub(/\s+/, ' ')
+            end
           end
-          o
-        end
-        output.gsub!(/(?<!\\)%n/, "\n")
-        output.gsub!(/(?<!\\)%t/, "\t")
+          placeholders['chompnote'] = chompnote.join(' ')
+
+          template = opt[:template].dup
+          note_rx = /(?i-m)(?x:^([\s\S]*?)
+                      (%(?:[io]d|(?:\^[\s\S])?
+                      (?:(?:[ _t]|[^a-z0-9])?\d+)?
+                      (?:[\s\S][ _t]?)?)?note)
+                      ([\s\S]*?)$)/
+          template.sub!(note_rx, '\1\3\2')
+          output = Doing::TemplateString.new(template,
+                                             color: flag,
+                                             placeholders: placeholders,
+                                             reset: reset,
+                                             tags_color: opt[:tags_color],
+                                             wrap_width: opt[:wrap_width],
+                                             disable_color: opt[:disable_color]).colored
+
+          output.gsub!(/(?<!\\)%(\S)?hr(_under)?/) do
+            o = ''
+            TTY::Screen.columns.to_i.times do
+              char = Regexp.last_match(2).nil? ? '-' : '_'
+              char = Regexp.last_match(1).nil? ? char : Regexp.last_match(1)
+              o += char
+            end
+            o
+          end
+          output.gsub!(/(?<!\\)%n/, "\n")
+          output.gsub!(/(?<!\\)%t/, "\t")
 
-        output.gsub!(/\\%/, '%')
+          output.gsub!(/\\%/, '%')
 
-        output.highlight_search!(opt[:search]) if opt[:output] =~ /^temp/ && opt[:search] && !opt[:not] && opt[:hilite]
+          if opt[:output] =~ /^temp/ && opt[:search] && !opt[:not] && opt[:hilite]
+            output.highlight_search!(opt[:search])
+          end
 
-        out += "#{output}\n"
-      end
+          out += "#{output}\n"
+        end
 
-      # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:output]}")
-      if opt[:totals]
-        out += wwid.tag_times(format: Doing.setting('timer_format').to_sym,
-                              sort_by: opt[:sort_tags],
-                              sort_order: opt[:tag_order])
+        # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:output]}")
+        if opt[:totals]
+          out += wwid.tag_times(format: Doing.setting('timer_format').to_sym,
+                                sort_by: opt[:sort_tags],
+                                sort_order: opt[:tag_order])
+        end
+        out
       end
-      Doing.logger.benchmark(:template_render, :finish)
-      out
     end
 
     Doing::Plugins.register 'template', :export, self

data/lib/doing/plugins/import/calendar_import.rb

@@ -79,7 +79,7 @@ module Doing
 
       new_items = wwid.filter_items(new_items, opt: options)
       filtered = total - new_items.count
-      Doing.logger.debug('Skipped:' , %(#{filtered} items that didn't match filter criteria)) if filtered.positive?
+      Doing.logger.debug('Skipped:', %(#{filtered} items that didn't match filter criteria)) if filtered.positive?
 
       new_items = wwid.dedup(new_items, no_overlap: options[:no_overlap])
       dups = filtered - new_items.count

data/lib/doing/plugins/import/doing_import.rb

@@ -86,8 +86,8 @@ module Doing
           wwid.content[old_index] = new_item
           Hooks.trigger :post_entry_updated, self, new_item, old_item
           updated += 1
-        else
-          imported.push(new_item) if is_match
+        elsif is_match
+          imported.push(new_item)
         end
       end
 

data/lib/doing/plugins/import/timing_import.rb

@@ -79,15 +79,15 @@ module Doing
       end
       total = new_items.count
       skipped = data.count - total
-      Doing.logger.debug('Skipped:' , %(#{skipped} items, invalid type or no time interval)) if skipped.positive?
+      Doing.logger.debug('Skipped:', %(#{skipped} items, invalid type or no time interval)) if skipped.positive?
 
       new_items = wwid.filter_items(new_items, opt: options)
       filtered = skipped - new_items.count
-      Doing.logger.debug('Skipped:' , %(#{filtered} items that didn't match filter criteria)) if filtered.positive?
+      Doing.logger.debug('Skipped:', %(#{filtered} items that didn't match filter criteria)) if filtered.positive?
 
       new_items = wwid.dedup(new_items, no_overlap: options[:no_overlap])
       dups = filtered - new_items.count
-      Doing.logger.debug('Skipped:' , %(#{dups} items with overlapping times)) if dups.positive?
+      Doing.logger.debug('Skipped:', %(#{dups} items with overlapping times)) if dups.positive?
 
       new_items.map { |item| Hooks.trigger :pre_entry_add, self, item }
 

data/lib/doing/prompt/choose.rb

@@ -29,7 +29,7 @@ module Doing
       options.sort! if sorted
 
       res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{default_args.join(' ')}`
-      return false if res.strip.size.zero?
+      return false if res.strip.empty?
 
       res
     end
@@ -72,10 +72,10 @@ module Doing
         ]
         if include_section
           out.concat([
-            ' (',
-            item.section,
-            ') '
-          ])
+                       ' (',
+                       item.section,
+                       ') '
+                     ])
         end
         out.join('')
       end
@@ -98,7 +98,6 @@ module Doing
                   end
       fzf_args << '-e' if opt.fetch(:exact, false)
 
-
       unless opt.fetch(:menu)
         raise InvalidArgument, "Can't skip menu when no query is provided" unless query && !query.empty?
 

data/lib/doing/prompt/fzf.rb

@@ -71,9 +71,10 @@ module Doing
       end
       restore_std
       unless File.exist?(fzf_bin)
-        Doing.logger.error('fzf:', 'unable to install fzf. You can install manually and Doing will use the system version.')
+        Doing.logger.error('fzf:',
+                           'unable to install fzf. You can install manually and Doing will use the system version.')
         Doing.logger.error('fzf:', 'see https://github.com/junegunn/fzf#installation')
-        raise RuntimeError.new('Error installing fzf, please report at https://github.com/ttscoff/doing/issues')
+        raise 'Error installing fzf, please report at https://github.com/ttscoff/doing/issues'
       end
 
       Doing.logger.info('fzf:', "installed to #{fzf}")

data/lib/doing/prompt/input.rb

@@ -79,11 +79,11 @@ module Doing
       Readline.completion_append_character = ' '
       Readline.completion_proc = comp
       puts format(['%<promptcolor>s%<prompt>s %<textcolor>sEnter a blank line',
-        '(%<keycolor>sreturn twice%<textcolor>s)',
-        'to end editing and save,',
-        '%<keycolor>sCTRL-C%<textcolor>s to cancel%<reset>s'].join(' '),
-        { promptcolor: boldgreen, prompt: prompt.sub(/:?$/, ':'),
-          textcolor: yellow, keycolor: boldwhite, reset: reset })
+                   '(%<keycolor>sreturn twice%<textcolor>s)',
+                   'to end editing and save,',
+                   '%<keycolor>sCTRL-C%<textcolor>s to cancel%<reset>s'].join(' '),
+                  { promptcolor: boldgreen, prompt: prompt.sub(/:?$/, ':'),
+                    textcolor: yellow, keycolor: boldwhite, reset: reset })
 
       res = []
 
@@ -116,7 +116,8 @@ module Doing
 
       ask_note = []
       reader = TTY::Reader.new(interrupt: -> { raise Errors::UserCancelled }, track_history: false)
-      puts "#{boldgreen(prompt.sub(/:?$/, ':'))} #{yellow('Hit return for a new line, ')}#{boldwhite('enter a blank line (')}#{boldyellow('return twice')}#{boldwhite(') to end editing')}"
+      puts "#{boldgreen(prompt.sub(/:?$/,
+                                   ':'))} #{yellow('Hit return for a new line, ')}#{boldwhite('enter a blank line (')}#{boldyellow('return twice')}#{boldwhite(') to end editing')}"
       loop do
         res = reader.read_line(green('> '))
         break if res.strip.empty?

data/lib/doing/prompt/yn.rb

@@ -14,7 +14,7 @@ module Doing
     ## @return     [Boolean] yes or no
     ##
     def yn(question, default_response: false)
-      return @force_answer == :yes ? true : false unless @force_answer.nil?
+      return @force_answer == :yes unless @force_answer.nil?
 
       $stdin.reopen('/dev/tty')
 
@@ -31,22 +31,20 @@ module Doing
       return default unless $stdout.isatty
 
       # clear the buffer
-      if ARGV&.length
-        ARGV.length.times do
-          ARGV.shift
-        end
+      ARGV.length&.times do
+        ARGV.shift
       end
       system 'stty cbreak'
 
-      cw = white
-      cbw = boldwhite
-      cbg = boldgreen
+      cw = Color.white
+      cbw = Color.boldwhite
+      cbg = Color.boldgreen
       cd = Color.default
 
-      options = unless default.nil?
-                  "#{cw}[#{default ? "#{cbg}Y#{cw}/#{cbw}n" : "#{cbw}y#{cw}/#{cbg}N"}#{cw}]#{cd}"
-                else
+      options = if default.nil?
                   "#{cw}[#{cbw}y#{cw}/#{cbw}n#{cw}]#{cd}"
+                else
+                  "#{cw}[#{default ? "#{cbg}Y#{cw}/#{cbw}n" : "#{cbw}y#{cw}/#{cbg}N"}#{cw}]#{cd}"
                 end
       $stdout.syswrite "#{cbw}#{question.sub(/\?$/, '')} #{options}#{cbw}?#{cd} "
       res = $stdin.sysread 1

data/lib/doing/string/tags.rb

@@ -111,18 +111,21 @@ module Doing
           title.tag!(rename_to, value: value, single: single)
         elsif m
           title.gsub!(rx) do
-            rename_to ? "@#{rename_to}#{value.nil? ? m['parens'] : "(#{value})"}" : ''
+            if rename_to
+              "@#{rename_to}#{value.nil? ? m['parens'] : "(#{value})"}"
+            else
+              ''
+            end
           end
 
           title.dedup_tags!
           title.chomp!
 
+          f = "@#{tag}".cyan
           if rename_to
-            f = "@#{tag}".cyan
             t = "@#{rename_to}".cyan
             Doing.logger.write(log_level, 'Tag:', %(renamed #{f} to #{t} in "#{title}"))
           else
-            f = "@#{tag}".cyan
             Doing.logger.write(log_level, 'Tag:', %(removed #{f} from "#{title}"))
           end
         else
@@ -145,7 +148,7 @@ module Doing
 
         title.dedup_tags!
         title.chomp!
-        Doing.logger.write(log_level, 'Tag:', %(added #{('@' + tag).cyan} to "#{title}"))
+        Doing.logger.write(log_level, 'Tag:', %(added #{"@#{tag}".cyan} to "#{title}"))
       end
 
       title.gsub(/ +/, ' ')

data/lib/doing/string/transform.rb

@@ -45,7 +45,7 @@ module Doing
     ## @param      prefix  [String] (Optional) A prefix to add to each line
     ##
     def wrap(len, pad: 0, indent: '  ', offset: 0, prefix: '', color: '', after: '', reset: '', pad_first: false)
-      last_color = color.empty? ? '' : after.last_color
+      color.empty? ? '' : after.last_color
       note_rx = /(?mi)(?<!\\)%(?<width>-?\d+)?(?:\^(?<mchar>.))?(?:(?<ichar>[ _t]|[^a-z0-9])(?<icount>\d+))?(?<prefix>.[ _t]?)?note/
       note = ''
       after = after.dup if after.frozen?
@@ -84,13 +84,13 @@ module Doing
       last_color = ''
       out[0] = format("%-#{pad}s%s%s", out[0], last_color, after)
 
-      out.map.with_index { |l, idx|
-        if !pad_first && idx == 0
+      out.map.with_index do |l, idx|
+        if !pad_first && idx.zero?
           "#{color}#{prefix}#{l}#{last_color}"
         else
           "#{left_pad}#{color}#{prefix}#{l}#{last_color}"
         end
-      }.join("\n") + " #{note}".chomp
+      end.join("\n") + " #{note}".chomp
       # res.join("\n").strip + last_color + " #{note}".chomp
     end
 
@@ -100,9 +100,7 @@ module Doing
     ## @return     Capitalized string
     ##
     def cap_first
-      sub(/^\w/) do |m|
-        m.upcase
-      end
+      sub(/^\w/, &:upcase)
     end
 
     ##
@@ -166,9 +164,16 @@ module Doing
     end
 
     def titlecase
-      tr('_', ' ').
-      gsub(/\s+/, ' ').
-      gsub(/\b\w/){ $`[-1,1] == "'" ? $& : $&.upcase }
+      tr('_', ' ')
+        .gsub(/\s+/, ' ')
+        .gsub(/\b\w/) do
+        if ::Regexp.last_match.pre_match[-1,
+                                         1] == "'"
+          ::Regexp.last_match(0)
+        else
+          ::Regexp.last_match(0).upcase
+        end
+      end
     end
   end
 end

data/lib/doing/string/truncate.rb

@@ -61,6 +61,7 @@ module Doing
     ##
     def truncmiddle(len, ellipsis: '...')
       return self if length <= len
+
       len -= (ellipsis.length / 2).to_i
       half = (len / 2).to_i
       start = trunc(half, ellipsis: ellipsis)

data/lib/doing/string/url.rb

@@ -48,7 +48,7 @@ module Doing
       gsub(%r{(?mi)(?x:
       (?<!["'\[(\\])
       (?<protocol>(?:http|https)://)
-      (?<domain>[\w\-]+(?:\.[\w\-]+)+)
+      (?<domain>[\w-]+(?:\.[\w-]+)+)
       (?<path>[\w\-.,@?^=%&;:/~+#]*[\w\-@^=%&;/~+#])?
       )}) do |_match|
         m = Regexp.last_match

data/lib/doing/template_string.rb

@@ -8,11 +8,12 @@ module Doing
     attr_reader :original
 
     include Color
-    def initialize(string, placeholders: {}, force_color: false, wrap_width: 0, color: '', tags_color: '', reset: '')
+    def initialize(string, placeholders: {}, force_color: false, disable_color: false, wrap_width: 0, color: '', tags_color: '', reset: '')
       Color.coloring = true if force_color
+      Color.coloring = false if disable_color
       @colors = nil
       @original = string
-      super(Color.reset + string)
+      super(Doing::Color.coloring? ? Color.reset + string : string)
 
       placeholders.each { |k, v| fill(k, v, wrap_width: wrap_width, color: color, tags_color: tags_color) }
     end
@@ -96,10 +97,13 @@ module Doing
 
     def fill(placeholder, value, wrap_width: 0, color: '', tags_color: '', reset: '')
       reparse
-      rx = /(?mi)(?<!\\)%(?<width>-?\d+)?(?:\^(?<mchar>.))?(?:(?<ichar>[ _t]|[^a-z0-9])(?<icount>\d+))?(?<prefix>.[ _t]?)?#{placeholder.sub(/^%/, '')}(?<after>.*?)$/
+      rx = /(?mi)(?<!\\)%(?<width>-?\d+)?(?:\^(?<mchar>.))?(?:(?<ichar>[ _t]|[^a-z0-9])(?<icount>\d+))?(?<prefix>.[ _t]?)?#{placeholder.sub(
+        /^%/, ''
+      )}(?<after>.*?)$/
       ph = raw.match(rx)
 
       return unless ph
+
       placeholder_offset = ph.begin(0)
       last_colors = parsed_colors[:colors].select { |v| v[:index] <= placeholder_offset + 4 }
 
@@ -148,13 +152,11 @@ module Doing
                                                      after: after,
                                                      reset: reset,
                                                      pad_first: false)
-              out.highlight_tags!(tags_color, last_color: color) if tags_color && !tags_color.empty?
-              out
             else
               out = format("%s%s%#{pad}s%s", prefix, color, value.gsub(/%/, '\%').sub(/\s*$/, ''), after)
-              out.highlight_tags!(tags_color, last_color: color) if tags_color && !tags_color.empty?
-              out
             end
+            out.highlight_tags!(tags_color, last_color: color) if tags_color && !tags_color.empty?
+            out
           elsif placeholder =~ /^note/
             if wrap_width.positive? || pad.positive?
               width = pad.positive? ? pad : wrap_width
@@ -162,14 +164,16 @@ module Doing
                 if l.empty?
                   '  '
                 else
-                  line = l.gsub(/%/, '\%').strip.wrap(width, pad: pad, indent: indent, offset: 0, prefix: prefix, color: last_color, after: after, reset: reset, pad_first: true)
+                  line = l.gsub(/%/, '\%').strip.wrap(width, pad: pad, indent: indent, offset: 0, prefix: prefix,
+                                                             color: last_color, after: after, reset: reset, pad_first: true)
                   line.highlight_tags!(tags_color, last_color: last_color) unless !tags_color || !tags_color.good?
                   "#{line}  "
                 end
               end.join("\n")
               "\n#{last_color}#{mark}#{outstring}  "
             else
-              out = format("\n%s%s%s%#{pad}s%s", indent, prefix, last_color, value.join("\n#{indent}#{prefix}").gsub(/%/, '\%').sub(/\s*$/, ''), after)
+              out = format("\n%s%s%s%#{pad}s%s", indent, prefix, last_color,
+                           value.join("\n#{indent}#{prefix}").gsub(/%/, '\%').sub(/\s*$/, ''), after)
               out.highlight_tags!(tags_color, last_color: last_color) if tags_color && !tags_color.empty?
               out
             end

data/lib/doing/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doing
   ##
   ## Date helpers
@@ -35,7 +37,7 @@ module Doing
       h = (m / 60).floor
       m = (m % 60).floor
       d = (h / 24).floor
-      h = h % 24
+      h %= 24
 
       output = []
       output.push("#{d} #{'day'.to_p(d)}") if d.positive?
@@ -58,7 +60,7 @@ module Doing
         "Yesterday at #{strftime('%_I:%M:%S%P')}"
       elsif self > (Date.today - 6).to_time
         strftime('%a %I:%M:%S%P')
-      elsif self.year == Date.today.year
+      elsif year == Date.today.year
         strftime('%m/%d %I:%M:%S%P')
       else
         strftime('%m/%d/%Y %I:%M:%S%P')

data/lib/doing/util.rb

@@ -3,7 +3,7 @@
 module Doing
   # Utilities
   module Util
-    extend self
+    module_function
 
     def user_home
       if Dir.respond_to?('home')
@@ -119,19 +119,20 @@ module Doing
         puts content
         return
       end
-      Doing.logger.benchmark(:write_file, :start)
-      file = File.expand_path(file)
+      Doing.logger.measure(:write_file) do
+        file = File.expand_path(file)
 
-      Backup.write_backup(file) if backup
+        Backup.write_backup(file) if backup
 
-      File.open(file, 'w+') do |f|
-        f.puts content
-        Doing.logger.debug('Write:', "File written: #{file}")
+        File.open(file, 'w+') do |f|
+          f.puts content
+          Doing.logger.debug('Write:', "File written: #{file}")
+        end
+
+        Doing.logger.measure(:_post_write_hook) do
+          Hooks.trigger :post_write, file
+        end
       end
-      Doing.logger.benchmark(:_post_write_hook, :start)
-      Hooks.trigger :post_write, file
-      Doing.logger.benchmark(:_post_write_hook, :finish)
-      Doing.logger.benchmark(:write_file, :finish)
     end
 
     def safe_load_file(filename)