timet 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488c0136f2b11a62046a2f507b054d346a5def75dc3a32609ea51872bb411e6b
-  data.tar.gz: c28bbe32a4558ab6755e438ba7c5a53f879d6c036ae68706782b62d8ca26133c
+  metadata.gz: 9e5079b49daa5deed838350e66235ce5301518e928a478f405423f268e431390
+  data.tar.gz: e7ef91dd990022437605bdfe406387e1499b9d08de5f6c233211332d9cb5ea0d
 SHA512:
-  metadata.gz: d1e74dfa8e0d6fdacf0fd8c458ade7667e2f2722376aea9307a5dab7b68b6a0a561b475432cf666564ba6664c18b6f80f94aed0bd88c3f6703ead36aa5d1cf84
-  data.tar.gz: 70608773c6f504e38637b7d4b2d71a852d7ed20c5679170c082d302748e1e3e6e4be2d1d4b909ce49e2ae45052dc3ac2cd02ba9a51106aba723211d3efa3c66a
+  metadata.gz: a6f4a1db83a82e0a0e53787a1b8847b7ceaa2694e0e4fbe318271bfc00a33c078d525d832f3be0b136d11c9b4a580ff3648ef9a1064e8921be6d7e79cb59c910
+  data.tar.gz: 7cd3c8513a161e3864501cec96317b833bdda14d937779b97d0feb680a894284f34d7427ba1197ad8ca0a721ede075b13b549489e5beaaa1cbfb751fa71f927f

data/.deepsource.toml

@@ -0,0 +1,13 @@
+version = 1
+
+[[analyzers]]
+name = "ruby"
+enabled = true
+
+[[analyzers]]
+name = "test-coverage"
+enabled = true
+
+[coverage]
+reporter = "simplecov"
+paths = ["coverage/.resultset.json"]

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## [1.5.9] - 2025-07-30
+
+**Improvements:**
+
+- Replaced Code Climate with DeepSource for static analysis and test coverage reporting.
+- Updated the CI workflow by removing Code Climate steps and adding a .deepsource.toml configuration file.
+- Updated gem dependencies, including rubocop, thor, and various aws-sdk gems.
+- Refactored application.rb to use abort for more idiomatic error handling on invalid arguments.
+- Updated the README to replace the old Code Climate badges with a new DeepSource badge.
+
+**Bug fixes:**
+
+- Fixed a shell injection vulnerability in application_helper.rb by properly escaping notification messages using Shellwords.shellescape.
+- Corrected a timezone-related issue in time_validation_helper.rb by using Time.now.getlocal for future date validation.
+
+## [1.5.8] - 2025-06-28
+
+**Improvements:**
+
+- Updated gem dependencies, including `aws-sdk-s3`, `rake`, `sqlite3`, and `rubocop`.
+- Refactored `update_time_field` method into `TimeHelper` for better code organization.
+- Simplified `TimeStatistics#average_by_tag` to use the more concise `(&:mean)` method in `TimeStatistics`.
+- Improved robustness of `format_time_string` in `TimeHelper`.
+- Enhanced code clarity in `DatabaseSyncHelper` and `WeekInfo`.
+- Added `vendor/bundle` and a test calendar file to `.gitignore`.
+
+**Bug Fixes:**
+
+- Corrected time collision validation in `ValidationEditHelper` to properly handle exact time matches (`>=`).
+
 ## [1.5.7] - 2025-05-16
 
 **Improvements:**

data/README.md

@@ -1,8 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/timet.svg)](https://badge.fury.io/rb/timet)
 ![timet workflow](https://github.com/frankvielma/timet/actions/workflows/ci.yml/badge.svg)
-[![Maintainability](https://api.codeclimate.com/v1/badges/44d57b6c561b9be717f5/maintainability)](https://codeclimate.com/github/frankvielma/timet/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/44d57b6c561b9be717f5/test_coverage)](https://codeclimate.com/github/frankvielma/timet/test_coverage)
-
+[![DeepSource](https://app.deepsource.com/gh/frankvielma/timet.svg/?label=active+issues&show_trend=true&token=RV8_VCNrXIfEU7NL9mk9MSuP)](https://app.deepsource.com/gh/frankvielma/timet/)
 # Timet
 
 ![Timet](timet.webp)

data/lib/timet/application.rb

@@ -85,8 +85,7 @@ module Timet
           if VALID_ARGUMENTS.include?(command_name)
             @db = Database.new
           else
-            warn 'Invalid arguments provided. Please check your input.'
-            exit(1)
+            abort 'Invalid arguments provided. Please check your input.'
           end
         end
       end

data/lib/timet/application_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'shellwords'
+
 module Timet
   # Provides helper methods for the Timet application.
   module ApplicationHelper
@@ -109,7 +111,8 @@ module Timet
     # @param tag [String] A tag or label for the session, used in the notification message.
     # @return [void]
     def run_linux_session(time, tag)
-      notification_command = "notify-send --icon=clock '#{show_message(tag)}'"
+      escaped_message = Shellwords.shellescape(show_message(tag))
+      notification_command = "notify-send --icon=clock #{escaped_message}"
       command = "sleep #{time} && tput bel && tt stop 0 && #{notification_command} &"
       pid = Kernel.spawn(command)
       Process.detach(pid)
@@ -121,7 +124,10 @@ module Timet
     # @param _tag [String] A tag or label for the session, not used in the notification message on macOS.
     # @return [void]
     def run_mac_session(time, tag)
-      notification_command = "osascript -e 'display notification \"#{show_message(tag)}\"'"
+      # Escape double quotes and backslashes for AppleScript, then shell-escape the entire AppleScript command
+      escaped_message_for_applescript = show_message(tag).gsub('\\', '\\\\').gsub('"', '\"')
+      escaped_applescript_command = Shellwords.shellescape("display notification \"#{escaped_message_for_applescript}\"")
+      notification_command = "osascript -e #{escaped_applescript_command}"
       command = "sleep #{time} && afplay /System/Library/Sounds/Basso.aiff && tt stop 0 && #{notification_command} &"
       pid = Kernel.spawn(command)
       Process.detach(pid)

data/lib/timet/database_sync_helper.rb

@@ -40,12 +40,13 @@ module Timet
     #   comparing it with the local database, and handling any differences found
     def self.process_remote_database(local_db, remote_storage, bucket, local_db_path)
       with_temp_file do |temp_file|
-        remote_storage.download_file(bucket, 'timet.db', temp_file.path)
+        file_path = temp_file.path
+        remote_storage.download_file(bucket, 'timet.db', file_path)
 
-        if databases_are_in_sync?(temp_file.path, local_db_path)
+        if databases_are_in_sync?(file_path, local_db_path)
           puts 'Local database is up to date'
         else
-          handle_database_differences(local_db, remote_storage, bucket, local_db_path, temp_file.path)
+          handle_database_differences(local_db, remote_storage, bucket, local_db_path, file_path)
         end
       end
     end

data/lib/timet/time_helper.rb

@@ -115,7 +115,7 @@ module Timet
     #   TimeHelper.format_time_string('127122') # => nil
     #   TimeHelper.format_time_string('abc') # => nil
     def self.format_time_string(input)
-      return nil if input.nil? || input.empty?
+      return nil if input.to_s.empty?
 
       digits = input.gsub(/\D/, '')[0..5]
       return nil if digits.empty?
@@ -264,5 +264,23 @@ module Timet
         parsed_time_component.sec
       )
     end
+
+    # Updates a time field (start or end) of a tracking item with a formatted date value.
+    #
+    # @param item [Array] The tracking item to be updated.
+    # @param field [String] The time field to be updated.
+    # @param new_time [String] The new time value.
+    #
+    # @return [Time] The updated time value.
+    #
+    # @example Update the 'start' field of a tracking item with a formatted date value
+    #   update_time_field(item, 'start', '11:10:00')
+    def self.update_time_field(item, field, new_time)
+      field_index = Timet::Application::FIELD_INDEX[field]
+      timestamp = item[field_index]
+      edit_time = Time.at(timestamp || item[1]).to_s.split
+      edit_time[1] = new_time
+      DateTime.strptime(edit_time.join(' '), '%Y-%m-%d %H:%M:%S %z').to_time
+    end
   end
 end

data/lib/timet/time_statistics.rb

@@ -72,7 +72,7 @@ module Timet
     #
     # @return [Hash<String, Float>] A hash mapping tags to their average durations.
     def average_by_tag
-      @duration_by_tag.transform_values { |durations| durations.sum.to_f / durations.size }
+      @duration_by_tag.transform_values(&:mean)
     end
 
     # Returns a hash where keys are tags and values are the standard deviation of durations for each tag.

data/lib/timet/time_update_helper.rb

@@ -25,7 +25,7 @@ module Timet
 
       return print_error(date_value) unless formatted_date
 
-      new_date = update_time_field(item, field, formatted_date)
+      new_date = TimeHelper.update_time_field(item, field, formatted_date)
       new_value_epoch = new_date.to_i
 
       if valid_time_value?(item, field, new_value_epoch, id)
@@ -47,24 +47,6 @@ module Timet
       puts "Invalid date: #{message}".red
     end
 
-    # Updates a time field (start or end) of a tracking item with a formatted date value.
-    #
-    # @param item [Array] The tracking item to be updated.
-    # @param field [String] The time field to be updated.
-    # @param new_time [String] The new time value.
-    #
-    # @return [Time] The updated time value.
-    #
-    # @example Update the 'start' field of a tracking item with a formatted date value
-    #   update_time_field(item, 'start', '11:10:00')
-    def update_time_field(item, field, new_time)
-      field_index = Timet::Application::FIELD_INDEX[field]
-      timestamp = item[field_index]
-      edit_time = Time.at(timestamp || item[1]).to_s.split
-      edit_time[1] = new_time
-      DateTime.strptime(edit_time.join(' '), '%Y-%m-%d %H:%M:%S %z').to_time
-    end
-
     # Validates if a new time value is valid for a specific time field (start or end).
     #
     # @param item [Array] The tracking item to be validated.

data/lib/timet/time_validation_helper.rb

@@ -103,9 +103,10 @@ module Timet
     #
     # @raise [ArgumentError] If the new datetime is in the future.
     def validate_future_date(new_datetime)
-      return unless new_datetime > Time.now
+      # Ensure the new datetime is not in the future relative to the current time.
+      return unless new_datetime > Time.now.getlocal
 
-      raise ArgumentError, "Cannot set time to a future date: #{new_datetime.strftime('%Y-%m-%d %H:%M:%S')}"
+      raise ArgumentError, "Cannot set time to a future date or time: #{new_datetime.strftime('%Y-%m-%d %H:%M:%S')}"
     end
 
     # Validates that the difference between two timestamps is less than 24 hours.

data/lib/timet/validation_edit_helper.rb

@@ -106,7 +106,7 @@ module Timet
     def check_collision_with_next_item(field, new_epoch, next_item)
       return unless next_item
 
-      if field == 'start' && new_epoch > next_item[1]
+      if field == 'start' && new_epoch >= next_item[1]
         raise ArgumentError,
               'New start time collides with next item (starts at ' \
               "#{Time.at(next_item[1]).strftime('%Y-%m-%d %H:%M:%S')})."

data/lib/timet/version.rb

@@ -6,6 +6,6 @@ module Timet
   # @return [String] The version number in the format 'major.minor.patch'.
   #
   # @example Get the version of the Timet application
-  #   Timet::VERSION # => '1.5.7'
-  VERSION = '1.5.7'
+  #   Timet::VERSION # => '1.5.9'
+  VERSION = '1.5.9'
 end

data/lib/timet/week_info.rb

@@ -22,15 +22,14 @@ module Timet
       @date_string = date_string_for_display # Use the passed string for display
       @current_cweek = date_object.cweek
 
-      # Determine if a separator line should be printed *before* this entry.
-      # A separator is needed if this entry starts a new week group,
-      # and it's not the very first week group in the chart.
-      @print_separator_before_this = !weeks_array_ref.empty? && @current_cweek != weeks_array_ref.last
-
-      # Determine how the week number string should be displayed for this entry.
-      # It's underlined if it's the first time this cweek appears, otherwise blank.
-      is_first_display_of_this_cweek = weeks_array_ref.empty? || @current_cweek != weeks_array_ref.last
-      @week_display_string = if is_first_display_of_this_cweek
+      is_first_entry = weeks_array_ref.empty?
+      is_new_week = is_first_entry || @current_cweek != weeks_array_ref.last
+
+      # A separator is needed if this entry starts a new week group, but it's not the very first one.
+      @print_separator_before_this = is_new_week && !is_first_entry
+
+      # The week number is underlined if it's the first time this week appears.
+      @week_display_string = if is_new_week
                                format('%02d', @current_cweek).underline
                              else
                                '  '

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timet
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.9
 platform: ruby
 authors:
 - Frank Vielma
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-16 00:00:00.000000000 Z
+date: 2025-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,6 +123,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".deepsource.toml"
 - ".reek.yml"
 - ".rspec"
 - ".rubocop.yml"