fewald-worklog 0.2.31 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1448a0024e80bc4c30592f79384dad240264fe601595f760e6cfd9d239bc3fcf
-  data.tar.gz: 8ac2ece9829a3bce2d6713a2c99fed746142511af900f7ad4129d62289982496
+  metadata.gz: c28fcf1980d7fba6dbe1585ef1ae6d41520329470c4289f427dc8feb689c4cba
+  data.tar.gz: d6db27c34cd1288d19042579426a947b96fa5ca30f7fd7a88887ee220f2adc16
 SHA512:
-  metadata.gz: 0a0c67bfa31766e1e56c5f7a45c9efff5dabbf177f03d1a358054079966228d68b3d0ba37bb19acca8d1d7540f2b89709b1fc03f21d3dac29266bd15b8238f2f
-  data.tar.gz: f664b7b885a37b5c4659e0484b37fb85c3ebba5e81b4ef565d0522e3f8ff925816cd220baba0b3a3b617ceec1db5c65d181fd8597e92d0d9b0d782188cc6dc77
+  metadata.gz: 4116746f5d7df43bfb7764a68c36dfc19d9ed3ccee6c8f1965306db4ffde3e1a7c56608293fc6d8b0c30810149ef0cdbfd83bb9881fb05d84feb0b368079883c
+  data.tar.gz: 0ec8ef405b87a6e07c9ca6a4c0191de9fc0c5fbc19bbd30656e332d9a6489db90fa8ae81532c481c9c3a4169fed3d5f9679a7d9cee4e9f5ee07a3af6d3ebc9d6

data/.version

@@ -1 +1 @@
-0.2.31
+0.2.33

data/lib/cli.rb

@@ -49,7 +49,9 @@ class WorklogCLI < Thor
     an alphanumeric string.
   LONGDESC
   option :date, type: :string, default: DateTime.now.strftime('%Y-%m-%d'), desc: 'Set the date of the entry'
-  option :time, type: :string, default: DateTime.now.strftime('%H:%M:%S'), desc: 'Set the time of the entry'
+  option :time, type: :string, default: DateTime.now.strftime('%H:%M:%S'), desc: <<~DESC
+    Set the time of the entry. Can be provided in HHMM, HH:MM, or HH:MM:SS format.
+  DESC
   option :tags, type: :array, default: [], desc: 'Add tags to the entry'
   option :ticket, type: :string, desc: 'Ticket number associated with the entry. Can be any alphanumeric string.'
   option :url, type: :string, desc: 'URL to associate with the entry'

data/lib/daily_log.rb

@@ -13,7 +13,7 @@ module Worklog
 
     def initialize(params = {})
       @date = params[:date]
-      @entries = params[:entries]
+      @entries = params[:entries] || []
     end
 
     # Returns true if there are people mentioned in any entry of the current day.

data/lib/log_entry.rb

@@ -8,6 +8,8 @@ require 'hash'
 module Worklog
   # A single log entry in a DailyLog.
   # @see DailyLog
+  # @!attribute [rw] key
+  #   @return [String] the unique key of the log entry. The key is generated based on the time and message.
   # @!attribute [rw] time
   #   @return [DateTime] the date and time of the log entry.
   # @!attribute [rw] tags
@@ -27,11 +29,13 @@ module Worklog
 
     include Hashify
 
-    attr_accessor :time, :tags, :ticket, :url, :epic, :message, :project
+    attr_accessor :key, :time, :tags, :ticket, :url, :epic, :message, :project
 
     attr_reader :day
 
     def initialize(params = {})
+      # key can be nil. This is needed for backwards compatibility with older log entries.
+      @key = params[:key]
       @time = params[:time]
       # If tags are nil, set to empty array.
       # This is similar to the CLI default value.
@@ -105,19 +109,12 @@ module Worklog
     end
 
     # Create a LogEntry from a hash with symbolized keys
+    # This is an alias for the constructor and here for consistency with other classes.
     #
     # @param hash [Hash] the hash to convert
     # @return [LogEntry] the created LogEntry object
     def self.from_hash(hash)
-      new(
-        time: hash[:time],
-        tags: hash[:tags],
-        ticket: hash[:ticket],
-        url: hash[:url],
-        epic: hash[:epic],
-        message: hash[:message],
-        project: hash[:project]
-      )
+      new(**hash)
     end
 
     # Convert the log entry to YAML format.

data/lib/worklog.rb

@@ -6,6 +6,7 @@ require 'rainbow'
 require 'yaml'
 
 require 'configuration'
+require 'digest'
 require 'hash'
 require 'daily_log'
 require 'date_parser'
@@ -80,16 +81,17 @@ module Worklog
       date = Date.strptime(options[:date], '%Y-%m-%d')
 
       # Append seconds to time if not provided
-      time = options[:time]
-      time += ':00' if options[:time].split(':').size == 2
-      time = Time.strptime(time, '%H:%M:%S')
+      time = parse_time_string!(options[:time])
       @storage.create_file_skeleton(date)
 
       # Validate that the project exists if provided
       validate_projects!(options[:project]) if options[:project] && !options[:project].empty?
 
+      # Use the first 7 characters of the SHA256 hash of message as the key
+      key = Digest::SHA256.hexdigest(message)[..6]
+
       daily_log = @storage.load_log!(@storage.filepath(date))
-      new_entry = LogEntry.new(time:, tags: options[:tags], ticket: options[:ticket], url: options[:url],
+      new_entry = LogEntry.new(key:, time:, tags: options[:tags], ticket: options[:ticket], url: options[:url],
                                epic: options[:epic], message:, project: options[:project])
       daily_log.entries << new_entry
 
@@ -465,5 +467,27 @@ module Worklog
 
       raise ProjectNotFoundError, "Project with key '#{project_key}' does not exist."
     end
+
+    # Parse a time string in HHMM, HH:MM, or HH:MM:SS format.
+    # @param time_string [String] the time string to parse
+    # @return [Time] the parsed Time object
+    def parse_time_string!(time_string)
+      # Validate the time string format
+      unless time_string.match?(/^\d{1,2}:?\d{2}:?\d{2}?$/)
+        raise ArgumentError, 'Invalid time format. Expected HHMM, HH:MM, or HH:MM:SS.'
+      end
+
+      # Prefix with 0 if needed
+      time_string = "0#{time_string}" if time_string.length == 3
+
+      # Split hours and minutes if in HHMM format
+      if time_string.length == 4 && time_string.match?(/^\d{4}$/)
+        time_string = "#{time_string[0..1]}:#{time_string[2..3]}"
+      end
+
+      # Append seconds to time if not provided
+      time_string += ':00' if time_string.split(':').size == 2
+      Time.strptime(time_string, '%H:%M:%S')
+    end
   end
 end

metadata

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