doing 2.0.2.pre → 2.0.7.pre

data/lib/doing/log_adapter.rb

@@ -18,17 +18,17 @@ module Doing
       error: ::Logger::ERROR
     }.freeze
 
-    COUNT_KEYS = [
-      :added_tags,
-      :removed_tags,
-      :added,
-      :updated,
-      :deleted,
-      :completed,
-      :archived,
-      :moved,
-      :completed_archived,
-      :skipped
+    COUNT_KEYS = %i[
+      added_tags
+      removed_tags
+      added
+      updated
+      deleted
+      completed
+      archived
+      moved
+      completed_archived
+      skipped
     ].freeze
 
     #
@@ -293,6 +293,22 @@ module Doing
       end
     end
 
+    def output_results
+      total_counters
+
+      results = @results.select { |msg| write_message?(msg[:level]) }.uniq
+
+      if @logdev == $stdout
+        $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
+      else
+        results.each do |msg|
+          @logdev.puts color_message(msg[:level], msg[:message])
+        end
+      end
+    end
+
+    private
+
     def color_message(level, topic, message = nil, &block)
       colors = Doing::Color
       message = message(topic, message, &block)
@@ -324,19 +340,5 @@ module Doing
 
       "#{prefix} #{message.highlight_tags}#{colors.reset}"
     end
-
-    def output_results
-      total_counters
-
-      results = @results.select { |msg| write_message?(msg[:level]) }.uniq
-
-      if @logdev == $stdout
-        $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
-      else
-        results.each do |msg|
-          @logdev.puts color_message(msg[:level], msg[:message])
-        end
-      end
-    end
   end
 end

data/lib/doing/plugin_manager.rb

@@ -113,7 +113,7 @@ module Doing
       ##
       def list_plugins(options = {})
         separator = options[:column] ? "\n" : "\t"
-        type = options[:type].nil? || options[:type] =~ /all/i ? 'all' : [valid_type(options[:type])]
+        type = options[:type].nil? || options[:type] =~ /all/i ? 'all' : valid_type(options[:type])
 
         case type
         when :import

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

@@ -56,7 +56,7 @@ module Doing
             end_date: end_date,
             title: title.strip, #+ " #{note}"
             note: note.instance_of?(Array) ? note.to_s : note,
-            time: '%02d:%02d:%02d' % wwid.fmt_time(interval),
+            time: '%02d:%02d:%02d' % wwid.format_time(interval),
             tags: tags
           }
 
@@ -68,7 +68,7 @@ module Doing
           new_item = {
             'id' => index + 1,
             'content' => title.strip, #+ " #{note}"
-            'title' => title.strip + " (#{'%02d:%02d:%02d' % wwid.fmt_time(interval)})",
+            'title' => title.strip + " (#{'%02d:%02d:%02d' % wwid.format_time(interval)})",
             'start' => i.date.strftime('%F %T'),
             'type' => 'box',
             'style' => 'color:#4c566b;background-color:#d8dee9;'

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

@@ -132,7 +132,7 @@ module Doing
         out += "#{output}\n"
       end
       # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:template]}")
-      out += wwid.tag_times(format: :text, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
+      out += wwid.tag_times(format: wwid.config['timer_format'].to_sym, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
       out
     end
 

data/lib/doing/string.rb

@@ -209,11 +209,12 @@ module Doing
       title
     end
 
-    def tag!(tag, value: nil, remove: false, rename_to: nil, regex: false)
-      replace tag(tag, value: value, remove: remove, rename_to: rename_to, regex: regex)
+    def tag!(tag, value: nil, remove: false, rename_to: nil, regex: false, single: false)
+      replace tag(tag, value: value, remove: remove, rename_to: rename_to, regex: regex, single: single)
     end
 
-    def tag(tag, value: nil, remove: false, rename_to: nil, regex: false)
+    def tag(tag, value: nil, remove: false, rename_to: nil, regex: false, single: false)
+      log_level = single ? :info : :debug
       title = dup
       title.chomp!
       tag = tag.sub(/^@?/, '')
@@ -241,10 +242,10 @@ module Doing
           if rename_to
             f = "@#{tag}".cyan
             t = "@#{rename_to}".cyan
-            Doing.logger.debug('Tag:', %(renamed #{f} to #{t} in "#{title}"))
+            Doing.logger.write(log_level, 'Tag:', %(renamed #{f} to #{t} in "#{title}"))
           else
             f = "@#{tag}".cyan
-            Doing.logger.debug('Tag:', %(removed #{f} from "#{title}"))
+            Doing.logger.write(log_level, 'Tag:', %(removed #{f} from "#{title}"))
           end
         else
           Doing.logger.debug('Skipped:', "not tagged #{"@#{tag}".cyan}")
@@ -255,14 +256,15 @@ module Doing
       else
         add = tag
         add += "(#{value})" unless value.nil?
+        title.chomp!
         title += " @#{add}"
 
         title.dedup_tags!
         title.chomp!
-        # Doing.logger.debug('Added tag:', %(#{('@' + tag).cyan} to "#{title}"))
+        Doing.logger.write(log_level, 'Tag:', %(added #{('@' + tag).cyan} to "#{title}"))
       end
 
-      title
+      title.gsub(/ +/, ' ')
     end
 
     ##

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.2.pre'
+  VERSION = '2.0.7.pre'
 end