fewald-worklog 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bd1127e65b1c43b9ae95773b29d5648818940b44cfa82be0e69741148f3b16
-  data.tar.gz: e30b8828d79177651e0179a2a7ec915fd03075de857e47280eaaec8bf682b8b4
+  metadata.gz: 7fab9613b51251c6cc9e6cd0f43dd1bd663db717c4783f2a1863b1441c7d8314
+  data.tar.gz: a73221bf9dec2a5ada555243d7258fe4b68ba1427e6deaf8c303afd71dabdf41
 SHA512:
-  metadata.gz: 05f0bc3f9acd0ebe71b8fd78608c4227c0a54c6b54c711fb657eaa6d1ce24e952bf8e37785327745cfb100a8574705d1441b12110fed80b6103f24b2532761aa
-  data.tar.gz: 31130d1928c6420c7c681d796189ccfc696875e92befb981463034d3d12c299f6aaab0ef3634c87fa787311e0042e3ff2cb8232be0db6a759505753446a998aa
+  metadata.gz: 94922720491591e24299a6da3abdd92e716a6cd61c1e91ea1cb05f880c4b11b0a4de36e04051d548b372653575753a633f279268d7e21b68c5cb895de17e7eaf
+  data.tar.gz: 604b44430a2c1b85856cf461e4d79aa7425acc95694eca1fa557909cb80fbc6b80879b2dec0f61ae5bdf8093dc6483a779e96600716f4606d3f35f237feea219

data/.version

@@ -1 +1 @@
-0.2.19
+0.2.20

data/lib/log_entry.rb

@@ -5,13 +5,27 @@ require 'rainbow'
 require 'daily_log'
 require 'hash'
 
-# A single log entry.
+# A single log entry in a DailyLog.
+# @see DailyLog
+# @!attribute [rw] time
+#   @return [DateTime] the date and time of the log entry.
+# @!attribute [rw] tags
+#   @return [Array<String>] the tags associated with the log entry.
+# @!attribute [rw] ticket
+#   @return [String] the ticket associated with the log entry.
+# @!attribute [rw] url
+#   @return [String] the URL associated with the log entry.
+# @!attribute [rw] epic
+#   @return [Boolean] whether the log entry is an epic.
+# @!attribute [rw] message
+#   @return [String] the message of the log entry.
+# @!attribute [rw] project
+#   @return [String] the project associated with the log entry.
 class LogEntry
   PERSON_REGEX = /(?:\s|^)[~@](\w+)/
 
   include Hashify
 
-  # Represents a single entry in the work log.
   attr_accessor :time, :tags, :ticket, :url, :epic, :message, :project
 
   attr_reader :day
@@ -32,6 +46,7 @@ class LogEntry
   end
 
   # Returns true if the entry is an epic, false otherwise.
+  # @return [Boolean]
   def epic?
     @epic == true
   end
@@ -81,17 +96,22 @@ class LogEntry
     @message.scan(PERSON_REGEX).flatten.uniq.sort.to_set
   end
 
+  # Return true if there are people in the entry.
+  #
+  # @return [Boolean]
   def people?
-    # Return true if there are people in the entry.
-    #
-    # @return [Boolean]
     people.size.positive?
   end
 
+  # Convert the log entry to YAML format.
   def to_yaml
     to_hash.to_yaml
   end
 
+  # Compare two log entries for equality.
+  #
+  # @param other [LogEntry] The other log entry to compare against.
+  # @return [Boolean] True if the log entries are equal, false otherwise.
   def ==(other)
     time == other.time && tags == other.tags && ticket == other.ticket && url == other.url &&
       epic == other.epic && message == other.message

data/lib/printer.rb

@@ -9,7 +9,7 @@ class Printer
   # Initializes the printer with a list of people.
   # @param people [Array<Person>] An array of Person objects.
   def initialize(people = nil)
-    @people = (people || []).to_h { |person| [person.handle, person] }
+    @people = people || {}
   end
 
   # Prints a whole day of work log entries.

data/lib/project.rb

@@ -17,10 +17,18 @@ module Worklog
   #   @return [String, nil] The status of the project, can be nil
   #   Possible values: 'active', 'completed', 'archived', etc.
   #   Indicates the current state of the project.
+  # @!attribute [rw] entries
+  #   These entries are related to the work done on this project.
+  #   Entries are populated dynamically when processing daily logs.
+  #   They are not stored in the project itself.
+  #   @return [Array<LogEntry>] An array of log entries associated with the project.
   # @!attribute [rw] last_activity
-  #  @return [Date, nil] The last activity date or nil if not set.
+  #   The last activity is not stored in the project itself.
+  #   Instead, it is updated dynamically when processing daily logs.
+  #   It represents the most recent log entry time for this project.
+  #   @return [Date, nil] The last activity date or nil if not set.
   class Project
-    attr_accessor :key, :name, :description, :start_date, :end_date, :status, :last_activity
+    attr_accessor :key, :name, :description, :start_date, :end_date, :status, :entries, :last_activity
 
     # Creates a new Project instance from a hash of attributes.
     # @param hash [Hash] A hash containing project attributes

data/lib/storage.rb

@@ -124,6 +124,7 @@ class Storage
     end
   end
 
+  # Load a single log file and return its entries
   def load_single_log_file(file, headline = true)
     daily_log = load_log!(file)
     puts "Work log for #{Rainbow(daily_log.date).gold}:" if headline

data/lib/worklog.rb

@@ -54,6 +54,9 @@ module Worklog
     # Bootstrap the worklog application.
     def bootstrap
       @storage.create_default_folder
+
+      # Load all people as they're used in multiple/most of the methods.
+      @people = @storage.load_people_hash
     end
 
     # Add new entry to the work log.
@@ -89,8 +92,7 @@ module Worklog
 
       @storage.write_log(@storage.filepath(options[:date]), daily_log)
 
-      people_hash = @storage.load_people_hash
-      (new_entry.people - people_hash.keys).each do |handle|
+      (new_entry.people - @people.keys).each do |handle|
         WorkLogger.warn "Person with handle #{handle} not found. Consider adding them to people.yaml"
       end
 
@@ -130,8 +132,7 @@ module Worklog
     #   worklog.show(from: '2023-10-01', to: '2023-10-31')
     #   worklog.show(date: '2023-10-01')
     def show(options = {})
-      people = @storage.load_people!
-      printer = Printer.new(people)
+      printer = Printer.new(@people)
 
       start_date, end_date = start_end_date(options)
 
@@ -145,17 +146,16 @@ module Worklog
       end
     end
 
+    # Show all known people and details about a specific person.
     def people(person = nil, _options = {})
-      all_people = @storage.load_people!
-      people_map = all_people.to_h { |p| [p.handle, p] }
       all_logs = @storage.all_days
 
       if person
-        unless people_map.key?(person)
+        unless @people.key?(person)
           WorkLogger.error Rainbow("No person found with handle #{person}.").red
           return
         end
-        person_detail(all_logs, all_people, people_map[person.strip])
+        person_detail(all_logs, @people, @people[person.strip])
       else
         puts 'People mentioned in the work log:'
 
@@ -169,8 +169,8 @@ module Worklog
         mentions = mentions.to_a.sort_by { |handle, _| handle }
 
         mentions.each do |handle, v|
-          if people_map.key?(handle)
-            person = people_map[handle]
+          if @people.key?(handle)
+            person = @people[handle]
             print "#{Rainbow(person.name).gold} (#{handle})"
             print " (#{person.team})" if person.team
           else
@@ -203,13 +203,43 @@ module Worklog
     def projects(_options = {})
       project_storage = ProjectStorage.new(@config)
       projects = project_storage.load_projects
-      puts Rainbow('Projects:').gold
+
+      # Load all entries to find latest activity for each project
+      @storage.all_days.each do |daily_log|
+        daily_log.entries.each do |entry|
+          if projects.key?(entry.project)
+            project = projects[entry.project]
+            project.entries ||= []
+            project.entries << entry
+            # Update last activity date if entry time is more recent
+            project.last_activity = entry.time if project.last_activity.nil? || entry.time > project.last_activity
+          else
+            WorkLogger.debug "Project with key '#{entry.project}' not found in projects. Skipping."
+          end
+        end
+      end
+      print_projects(projects)
+    end
+
+    def print_projects(projects)
+      puts Rainbow('Active Projects:').gold
       projects.each_value do |project|
+        # Sort entries by descending time
+        project.entries.sort_by!(&:time).reverse!
+
         puts "#{Rainbow(project.name).gold} (#{project.key})"
         puts "  Description: #{project.description}" if project.description
         puts "  Start date: #{project.start_date.strftime('%b %d, %Y')}" if project.start_date
         puts "  End date: #{project.end_date.strftime('%b %d, %Y')}" if project.end_date
         puts "  Status: #{project.status}" if project.status
+        puts "  Last activity: #{project.last_activity.strftime('%b %d, %Y')}" if project.last_activity
+
+        next unless project.entries && !project.entries.empty?
+
+        puts "  Last #{[project.entries&.size, 3].min} entries:"
+        puts "    #{project.entries.last(3).map do |e|
+          "#{e.time.strftime('%b %d, %Y')} #{e.message_string(@people)}"
+        end.join("\n    ")}"
       end
       puts 'No projects found.' if projects.empty?
     end
@@ -254,7 +284,7 @@ module Worklog
     # @example
     #   worklog.tag_detail('example_tag', from: '2023-10-01', to: '2023-10-31')
     def tag_detail(tag, options)
-      printer = Printer.new(@storage.load_people!)
+      printer = Printer.new(@people)
       start_date, end_date = start_end_date(options)
 
       @storage.days_between(start_date, end_date).each do |daily_log|

metadata

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