fewald-worklog 0.2.35 → 0.2.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a7037fb7f1b5194e72152f812ef7e2defdcbe46e9845935a64b9e6fffbce32
-  data.tar.gz: d2b005c1399811835d84fc9f53bc341a3cf4a861f898ede71c706defb895e63f
+  metadata.gz: c8a2feb90b202dad33157a6dfb35bc78d980efce61ec0a9cf369fb45b552308b
+  data.tar.gz: 9ff8b56050dca9ec76ea27d24da8ba21efde809da211d9db7429906eaf106799
 SHA512:
-  metadata.gz: 7186e4bf2fd4978e5245cfbb7e798d70d37c9002eec9dc4a9c259798e4df87abb07ae3af12ea58e7febca6b5e33d8be5acabe61cffbf5e3db037ecd1bccc7e60
-  data.tar.gz: 7699e19686d0e6a15d47ee9b2e12f2fe0da07f1e7ba70b1d90e8a967d295eba13ca0cd0c2892ad8f9f8bac0d2f0ba96180b44947616dd7b0c0c7998e39418175
+  metadata.gz: dcf962ca95d50c20cd715c29a562b259c93c0f292ecc7c3820d40321f02bf73b8c9a58f48bebdc8eefef3a83286676e999ca3a24e5cb690e9d34f1713a1bec90
+  data.tar.gz: b730874e4acf1840e1704924b062eeca2a2163394f481e2efc4fd5ef1c5dbd997fa8a1062e1c1f1dafb9f45af48148b6adc27c0e401186399a68de2c63cc0781

data/.version

@@ -1 +1 @@
-0.2.35
+0.2.37

data/lib/cli.rb

@@ -36,6 +36,7 @@ class WorklogCLI < Thor
     super
   end
 
+  # Set the exit on failure behavior from Thor to true
   def self.exit_on_failure?
     true
   end
@@ -48,9 +49,10 @@ class WorklogCLI < Thor
     People can be referenced either by using the tilde "~" or the at symbol "@", followed by
     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: <<~DESC
+  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d'), desc: 'Set the date of the entry'
+  option :time, type: :string, default: Time.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.
+    By default, the system time zone is used and converted to UTC for storage.
   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.'
@@ -63,14 +65,14 @@ 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: DateTime.now.strftime('%Y-%m-%d')
+  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d')
   def edit
     worklog = Worklog::Worklog.new
     worklog.edit(options)
   end
 
   desc 'remove', 'Remove last entry from the log'
-  option :date, type: :string, default: DateTime.now.strftime('%Y-%m-%d')
+  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d')
   def remove
     worklog = Worklog::Worklog.new
     worklog.remove(options)
@@ -80,7 +82,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: DateTime.now.strftime('%Y-%m-%d'),
+  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d'),
                 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
@@ -120,7 +122,7 @@ class WorklogCLI < Thor
   end
 
   desc 'tags', 'Show all tags used in the work log'
-  option :date, type: :string, default: DateTime.now.strftime('%Y-%m-%d'),
+  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d'),
                 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
@@ -160,7 +162,7 @@ class WorklogCLI < Thor
   end
 
   desc 'summary', 'Generate a summary of the work log entries'
-  option :date, type: :string, default: DateTime.now.strftime('%Y-%m-%d')
+  option :date, type: :string, default: Time.now.strftime('%Y-%m-%d')
   option :from, type: :string, desc: <<-EOF
     'Inclusive start date of the range. Takes precedence over --date if defined.'
   EOF

data/lib/daily_log.rb

@@ -73,5 +73,16 @@ module Worklog
 
       @entries.find { |entry| entry.key == key }
     end
+
+    # Add a log entry to the daily log in the entries array at the end.
+    # At this point, the log is not checked for duplicates and not sorted.
+    # @param entry [LogEntry] the log entry to add
+    def <<(entry) = @entries << entry
+
+    def size = @entries.size
+    def length = @entries.length
+    def empty? = @entries.empty?
+    def clear = @entries.clear
+    def key?(key) = @entries.any? { |entry| entry.key == key }
   end
 end

data/lib/log_entry.rb

@@ -11,7 +11,7 @@ module Worklog
   # @!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.
+  #   @return [Time] the date and time of the log entry.
   # @!attribute [rw] tags
   #   @return [Array<String>] the tags associated with the log entry.
   # @!attribute [rw] ticket

data/lib/worklog.rb

@@ -6,17 +6,17 @@ require 'rainbow'
 require 'yaml'
 
 require 'configuration'
-require 'digest'
-require 'hash'
 require 'daily_log'
 require 'date_parser'
+require 'hash'
+require 'hasher'
 require 'log_entry'
-require 'storage'
 require 'worklogger'
 require 'string_helper'
 require 'printer'
 require 'project_storage'
 require 'statistics'
+require 'storage'
 require 'summary'
 require 'takeout'
 
@@ -46,7 +46,10 @@ module Worklog
     attr_reader :config, :storage
 
     def initialize(config = nil)
-      @config = config || Configuration.new
+      # Load or use provided configuration
+      @config = config || Configuration.load
+
+      # Initialize storage
       @storage = Storage.new(@config)
 
       WorkLogger.level = @config.log_level == :debug ? Logger::Severity::DEBUG : Logger::Severity::INFO
@@ -88,12 +91,12 @@ module Worklog
       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]
+      key = Hasher.sha256(message)
 
       daily_log = @storage.load_log!(@storage.filepath(date))
-      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
+      new_entry = LogEntry.new(key:, source: 'manual', time:, tags: options[:tags], ticket: options[:ticket],
+                               url: options[:url], epic: options[:epic], message:, project: options[:project])
+      daily_log << new_entry
 
       # Sort by time in case an entry was added later out of order.
       daily_log.entries.sort_by!(&:time)
@@ -107,6 +110,7 @@ module Worklog
       WorkLogger.info Rainbow("Added entry on #{options[:date]}: #{message}").green
     end
 
+    # Edit an existing work log entry for a specific date.
     def edit(options = {})
       date = Date.strptime(options[:date], '%Y-%m-%d')
 
@@ -470,7 +474,7 @@ module Worklog
 
     # 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
+    # @return [Time] the parsed Time object in UTC
     def parse_time_string!(time_string)
       # Validate the time string format
       unless time_string.match?(/^\d{1,2}:?\d{2}:?\d{2}?$/)
@@ -487,7 +491,7 @@ module Worklog
 
       # Append seconds to time if not provided
       time_string += ':00' if time_string.split(':').size == 2
-      Time.strptime(time_string, '%H:%M:%S')
+      Time.strptime(time_string, '%H:%M:%S').utc
     end
   end
 end

metadata

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