fewald-worklog 0.3.14 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7a9c5136dd285ee57cfe1331f6890c244bd99ec989e0c6a48ff19f57c8a0b0
-  data.tar.gz: 7b5fb34ba1ef5dfe6292b0eccf85b3148f0e7de3d2d6406f3d19e5f5633fca50
+  metadata.gz: e593a4c0712fbf4419176cea214fc137b9449e36a1d05e74e9bba4bc9329e106
+  data.tar.gz: 2841ef01cf81a2f9f8c82c07918fe5ec149295d655af19031b8c98082bfe7d84
 SHA512:
-  metadata.gz: 46d5f939c05647cc241c084528b9508fb4abac538484e65576d53558a81bcd4efb6229ea8efb86654d4f2ecb8eb472bb75eba73c045a9a38edd45892eae9adaf
-  data.tar.gz: 1244216988115f3c18d8fffadb19b1908f5e95e2d4eebfc7bd942b1bb009ea79415e9e11e16900174d7b03bf764926687fb760eea4c67931138d6055cdc65fee
+  metadata.gz: 81f2d8cf8527676bc3af134b40f97252c96a464e0fa9c7aaf4f60e7e1463370d2e7cea990df87138ef67d06af4f25e987074ad71f0624abde3db6e4127f4a205
+  data.tar.gz: b1d369a79e34f00306cde60819c5bda650edc48326b0daba96557ce8de98af18b570af461ebb1e61d7cd98cbac612af60ca01641b417c55832a7fe687ffbaf03

data/.version

@@ -1 +1 @@
-0.3.14
+0.3.16

data/lib/cli.rb

@@ -65,7 +65,7 @@ class WorklogCLI < Thor
   end
 
   desc 'edit', 'Edit a day in the work log. By default, the current date is used.'
-  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d')
+  option :date, type: :string, default: Date.today.to_s
   def edit
     worklog = Worklog::Worklog.new
     worklog.edit(options)
@@ -84,7 +84,7 @@ class WorklogCLI < Thor
   end
 
   desc 'remove', 'Remove last entry from the log'
-  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d')
+  option :date, type: :string, default: Date.today.to_s
   def remove
     worklog = Worklog::Worklog.new
     worklog.remove(options)
@@ -94,7 +94,7 @@ class WorklogCLI < Thor
   long_desc <<~LONGDESC
     Show the work log for a specific date or a range of dates. As a default, all items from the current day will be shown.
   LONGDESC
-  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d'),
+  option :date, type: :string, default: Date.today.to_s,
                 desc: <<~DESC
                   Show the work log for a specific date. If this option is provided, --from and --to and --days should not be used.
                 DESC
@@ -105,7 +105,7 @@ class WorklogCLI < Thor
     Inclusive end date of the range. Takes precedence over --date, if defined.
   EOF
   option :days, type: :numeric, desc: <<~EOF
-    Number of days to show starting from --date. Takes precedence over --from and --to if defined.
+    Number of days to show starting from --date. Takes precedence over --from and --to, if defined.
   EOF
   option :epics_only, type: :boolean, default: false, desc: 'Show only entries that are marked as epic'
   option :tags, type: :array, default: [], desc: 'Filter entries by tags. Tags are treated as an OR condition.'
@@ -135,7 +135,7 @@ class WorklogCLI < Thor
   end
 
   desc 'tags', 'Show all tags used in the work log'
-  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d'),
+  option :date, type: :string, default: Date.today.to_s,
                 desc: <<~DESC
                   Show the work log for a specific date. If this option is provided, --from and --to and --days should not be used.
                 DESC

data/lib/printer.rb

@@ -29,7 +29,15 @@ class Printer
     daily_log.date = Date.strptime(daily_log.date, '%Y-%m-%d') unless daily_log.date.respond_to?(:strftime)
 
     date_string = daily_log.date.strftime('%a, %B %-d, %Y')
-    puts "Work log for #{Rainbow(date_string).gold}" unless date_inline
+    preamble = "Work log for #{Rainbow(date_string).gold}"
+    puts preamble unless date_inline
+
+    # Print only if there are entries to show, especially when epics_only is true
+    entries_count = daily_log.entries.count do |entry|
+      (!epics_only || entry.epic?) && filter.compact.all? { |k, v| entry.send(k) == v }
+    end
+
+    puts Rainbow('-' * preamble.gsub(/\e\[[0-9;]*m/, '').length).gold if entries_count.positive?
 
     daily_log.entries.each do |entry|
       next if epics_only && !entry.epic?

data/lib/worklog.rb

@@ -48,6 +48,11 @@ module Worklog
 
     attr_reader :config, :storage
 
+    # The earliest allowed start date for log entries.
+    # By default, filters that do not specify a start date will use this date.
+    # @return [Date] The earliest allowed start date.
+    EARLIEST_START_DATE = Date.new(1980, 1, 1).freeze
+
     def initialize(config = nil)
       # Load or use provided configuration
       @config = config || Configuration.load
@@ -329,7 +334,7 @@ module Worklog
     #   worklog.tags(nil) # Show all tags for all time
     def tags(tag = nil, options = {})
       if tag.nil? || tag.empty?
-        tag_overview
+        tag_overview(options)
       else
         tag_detail(tag, options)
       end
@@ -352,9 +357,16 @@ module Worklog
     end
 
     # Show overview of all tags used in the work log including their count.
-    def tag_overview
-      all_logs = @storage.all_days
-      puts Rainbow('Tags used in the work log:').gold
+    def tag_overview(options)
+      start_date, end_date = start_end_date(options)
+
+      all_logs = @storage.days_between(start_date, end_date)
+      date_string = if start_date == end_date
+                      "on #{start_date}"
+                    else
+                      "from #{start_date} to #{end_date}"
+                    end
+      puts Rainbow("Tags used in the work log #{date_string}:").gold
 
       # Count all tags used in the work log
       tags = all_logs.map(&:entries).flatten.map(&:tags).flatten.compact.tally
@@ -482,9 +494,18 @@ module Worklog
 
         start_date = Date.today - options[:days]
         end_date = Date.today
+      elsif options[:from] && options[:to]
+        # If both from and to are provided
+        start_date = DateParser.parse_date_string!(options[:from], true)
+        end_date = DateParser.parse_date_string!(options[:to], false)
       elsif options[:from]
+        # If only from is provided
         start_date = DateParser.parse_date_string!(options[:from], true)
-        end_date = DateParser.parse_date_string!(options[:to], false) if options[:to]
+        end_date = Date.today
+      elsif options[:to]
+        # If only to is provided
+        start_date = EARLIEST_START_DATE
+        end_date = DateParser.parse_date_string!(options[:to], false)
       elsif options[:date]
         start_date = Date.strptime(options[:date], '%Y-%m-%d')
         end_date = start_date

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fewald-worklog
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.16
 platform: ruby
 authors:
 - Friedrich Ewald