timet 1.5.9 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5079b49daa5deed838350e66235ce5301518e928a478f405423f268e431390
-  data.tar.gz: e7ef91dd990022437605bdfe406387e1499b9d08de5f6c233211332d9cb5ea0d
+  metadata.gz: 6a2aba5642b2c8c60f5ef5b606723afe9ffe94552490c320ab232e5b0cf23a94
+  data.tar.gz: a8bd210b3ea489a562e567e879c08cf37f113fae09c3126e2ef39840574451d8
 SHA512:
-  metadata.gz: a6f4a1db83a82e0a0e53787a1b8847b7ceaa2694e0e4fbe318271bfc00a33c078d525d832f3be0b136d11c9b4a580ff3648ef9a1064e8921be6d7e79cb59c910
-  data.tar.gz: 7cd3c8513a161e3864501cec96317b833bdda14d937779b97d0feb680a894284f34d7427ba1197ad8ca0a721ede075b13b549489e5beaaa1cbfb751fa71f927f
+  metadata.gz: eee39e94ae55bc98dbcb0a48ee61ecd9833a0e6a6c4837994dfcef6609fb2dfa5e0db379551b80c9565c9db9d12ea6915d7d15385d0bff12249609536184ea57
+  data.tar.gz: 1f65a58025fc48be1ead36f74c8a20990015f7e40b3b4ef754bd6ea395ff784d75d4d8be4ced8ab25ebf3349b36f32318b278f5809d9abe33d46037c333f81a9

data/.deepsource.toml

@@ -11,3 +11,5 @@ enabled = true
 [coverage]
 reporter = "simplecov"
 paths = ["coverage/.resultset.json"]
+
+ignore_issues = ["RB-RL1039", "RB-RL1058", "RB-E1003", "RB-RL1054"]

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [1.6.1] - 2025-10-10
+
+**New Features:**
+
+- **Search Option for Summary Command:** Introduced a new `--search` option for the `summary` command, allowing users to filter time tracking reports by tags or notes.
+- **Discord Integration:** Added support for sending notifications to Discord channels upon Pomodoro timer completion.
+
+**Improvements:**
+
+- **Dependency Updates:** Updated `aws-partitions`, `aws-sdk-kms`, `aws-sdk-s3`, `bigdecimal`, `httparty`, `icalendar`, `json`, `multi_xml`, `prism`, and `rubocop` to their latest versions for better performance and security.
+- **README Updates:** Added new examples for the `--search` option and updated the project homepage URL.
+- **Time Report Filtering:** Enhanced `TimeReport` to incorporate the `--search` option for filtering items by tag or notes.
+
+
+## [1.6.0] - 2025-09-24
+
+**New Features:**
+
+- **Enhanced Summary Report:** Added a new `--report` option to the `summary` command, providing a detailed, color-coded explanation of tag distribution, including percentages, total duration, average duration, and standard deviation.
+- **Improved Edit Command:** The `edit` command now supports editing the last tracked item by simply running `timet edit` without an ID.
+- **Resume Pomodoro Option:** The `resume` command now accepts a `--pomodoro=[min]` option to specify a pomodoro duration when resuming a task.
+- **Bold Text Formatting:** Introduced bold text formatting for improved readability in terminal output.
+
+**Improvements:**
+
+- **Robust Session Management:** Refactored `run_linux_session` and `run_mac_session` to use `fork` and `system` calls, enhancing security and robustness by avoiding complex shell escaping.
+- **Dependency Updates:** Updated `aws-sdk-s3`, `rubocop`, and numerous other gems to their latest versions for better performance and security.
+- **README Updates:** Added new interactive mode examples for the `edit` command and updated the project homepage URL.
+- **Timezone Consistency:** Improved time handling in `ValidationEditHelper` specs by consistently using `Time.parse().getlocal()` for better timezone accuracy.
+
+
 ## [1.5.9] - 2025-07-30
 
 **Improvements:**

data/README.md

@@ -35,8 +35,10 @@
 - **Block Time Plot:** Visualizes the distribution of tracked time across a specified range of dates. Each column represents the amount of time tracked during a specific hour, with a header showing the hours and a row for each date displaying the time blocks for each hour.
 - **Tag Distribution Plot:** Illustrates the proportion of total tracked time allocated to each tag, showing the relative contribution of each tag to the overall time tracked.
 - **Detailed Statistics:** Displays detailed statistics for each tag, including total duration, average duration, and standard deviation.
+- **Enhanced Summary Report:** Provides a detailed, color-coded explanation of tag distribution, including percentages, total duration, average duration, and standard deviation, via the `--report` option in the `summary` command.
 - **iCalendar Export:** Easily export your time tracking data to iCalendar format for integration with calendar applications.
 - **S3 Cloud Backup:** Seamlessly backup and sync your time tracking data with S3-compatible storage services, providing an additional layer of data protection and accessibility.
+- **Discord Integration:** Receive notifications in your Discord channels upon Pomodoro timer completion, enhancing real-time productivity tracking.
 
 ## Examples:
 
@@ -97,7 +99,7 @@ gem install timet
 
   ### Pomodoro Integration
 
-  The `pomodoro` option in the `start` command enhances time tracking by integrating the Pomodoro Technique. Users can specify a Pomodoro session length in minutes, like `pomodoro=25`, to start a 25-minute work interval. The app automatically tracks time and notifies users when the interval ends, helping maintain focus.
+  The `pomodoro` option in the `start` command enhances time tracking by integrating the Pomodoro Technique. Users can specify a Pomodoro session length in minutes, like `pomodoro=25`, to start a 25-minute work interval. The app automatically tracks time and notifies users when the interval ends, helping maintain focus. This notification is now automatically triggered upon the completion of the Pomodoro timer, ensuring timely alerts.
 
   **Benefits:**
 
@@ -105,6 +107,24 @@ gem install timet
   - **Focus:** Encourages disciplined work practices.
   - **Productivity:** Helps achieve higher productivity and better time management.
 
+  ### Discord Integration
+
+  Timet now supports sending notifications to Discord channels upon Pomodoro timer completion. To enable this feature, you need to configure a webhook in your Discord channel and export the webhook URL as an environment variable.
+
+#### Setup:
+
+1.  **Create a Discord Webhook:** In your Discord server, go to `Server Settings` -> `Integrations` -> `Webhooks` -> `New Webhook`. Copy the generated webhook URL.
+2.  **Export Environment Variable:** Before running `timet`, export the webhook URL as `DISCORD_WEBHOOK_URL`:
+
+    ```bash
+    export DISCORD_WEBHOOK_URL="YOUR_DISCORD_WEBHOOK_URL_HERE"
+    ```
+
+    Replace `"YOUR_DISCORD_WEBHOOK_URL_HERE"` with the actual webhook URL you copied from Discord.
+
+Once configured, Timet will automatically send a notification to your Discord channel when a Pomodoro session ends.
+
+---
 ---
 
 - **`timet stop`:** Stops tracking the current task, records the elapsed time, and displays the total time spent on all tasks.
@@ -150,6 +170,12 @@ gem install timet
 
   **Interactive Mode:**
 
+  ```bash
+  timet edit
+  ```
+
+  This will edit the last tracked item.
+
   ```bash
   timet edit 1
   ```
@@ -202,6 +228,8 @@ gem install timet
 | `timet summary month (m)`                    | Display a report of tracked time for the month.                             | `timet su m`                      |
 | `timet su t --csv=[filename]`                | Display a report of tracked time for today and export to CSV file | `timet su t --csv=file.csv`                 |
 | `timet su w --ics=[filename]`                | Display a report of tracked time for week and export to iCalendar file | `timet su w --ics=file.csv`            |
+| `timet su t --report`                        | Display a detailed report of tag distribution for today.            | `timet su t --report`                   |
+| `timet summary [time_scope] --search=[query]`| Display a report of tracked time filtered by tag or notes.          | `timet su week --search="bug"`    |
 | `timet delete [id]`                          | Delete a task by its ID.                                                    | `timet d [id]`                    |
 | `timet cancel`                               | Cancel active time tracking.                                                | `timet c`                         |
 | `timet edit [id]`                            | Update a task's notes, tag, start, or end fields.                           | `timet e [id]`                    |

data/lib/timet/application.rb

@@ -9,6 +9,7 @@ require_relative 'application_helper'
 require_relative 'time_helper'
 require_relative 'version'
 require_relative 'database_sync_helper'
+require_relative 'discord_notifier'
 require 'tempfile'
 require 'digest'
 module Timet
@@ -89,6 +90,14 @@ module Timet
           end
         end
       end
+
+      def resume_complete_task(id)
+        item = id ? @db.find_item(id) : @db.last_item
+        tag = item[3]
+        notes = item[4]
+        pomodoro = options[:pomodoro]
+        start(tag, notes, pomodoro)
+      end
     end
 
     desc "start [tag] --notes='' --pomodoro=[min]",
@@ -129,6 +138,7 @@ module Timet
       return puts 'A task is currently being tracked.' unless VALID_STATUSES_FOR_INSERTION.include?(@db.item_status)
 
       @db.insert_item(start_time, tag, notes, pomodoro, start_time, start_time)
+      DiscordNotifier.pomodoro_started(pomodoro) if pomodoro.positive? # Notify that a Pomodoro session has started
       play_sound_and_notify(pomodoro * 60, tag) if pomodoro.positive?
       summary
     end
@@ -151,12 +161,13 @@ module Timet
       return unless @db.item_status == :in_progress
 
       last_id = @db.fetch_last_id
+      @db.find_item(last_id) # Fetch the item to get pomodoro duration
       @db.update_item(last_id, 'end', TimeHelper.current_timestamp)
-
       summary
     end
 
-    desc 'resume (r) [id]', 'Resume last task (id is an optional parameter) => tt resume'
+    desc 'resume (r) [id] --pomodoro=[min]', 'Resume last task (id is an optional parameter) => tt resume'
+    option :pomodoro, type: :numeric, desc: 'Pomodoro time in minutes'
     # Resumes the last tracking session if it was completed.
     #
     # @return [void] This method does not return a value; it performs side effects such as resuming a tracking session
@@ -188,15 +199,19 @@ module Timet
       end
     end
 
-    desc 'summary (su) [time_scope] [tag] --csv=csv_filename --ics=ics_filename',
+    desc 'summary (su) [time_scope] [tag] --csv=csv_filename --ics=ics_filename --report',
          'Display a summary of tracked time and export to CSV.
-          [time_scope] => [today (t), yesterday (y), week (w), month (m). => tt su yesterday
-          [start_date]..[end_date]] => tt su 2024-10-03..2024-10-20
-          [tag] => tt su Task1
-          --csv=csv_filename => tt su month --csv=myfile
-          --ics=ics_filename => tt su week --csv=mycalendar'
+
+Examples:
+> tt su yesterday [today (t), yesterday (y), week (w), month (m)]
+> tt su 2024-10-03..2024-10-20
+> tt su month --csv=myfile
+> tt su week --csv=mycalendar
+> tt su week --search "bug"'
     option :csv, type: :string, desc: 'Export to CSV'
     option :ics, type: :string, desc: 'Export to iCalendar'
+    option :report, type: :string, desc: 'Display report'
+    option :search, type: :string, desc: 'Filter by tag or notes'
     # Generates a summary of tracking items based on the provided time_scope and tag, and optionally exports the summary
     # to a CSV file and/or an iCalendar file.
     #
@@ -210,12 +225,17 @@ module Timet
       options = build_options(time_scope, tag)
       report = TimeReport.new(@db, options)
       display_and_export_report(report, options)
+      return unless options[:report]
+
+      report.print_tag_explanation_report
     end
 
     desc 'edit (e) [id] [field] [value]',
-         'Edit task, [field] (notes, tag, start or end) and [value] are optional parameters.
-          Update notes => tt edit 12 notes "Update note"
-          Update start time => tt edit 12 start 12:33'
+         'Edit task, [id] [field] (notes, tag, start or end) and [value] are optional parameters. Examples:
+
+Update last item => tt edit
+Update notes => tt edit 12 notes "Update note"
+Update start time => tt edit 12 start 12:33'
     # Edits a specific tracking item by its ID, allowing the user to modify fields such as notes, tag, start time, or
     # end time.
     #
@@ -240,7 +260,8 @@ module Timet
     # a new value.
     # @note The method then validates and updates the item using `validate_and_update(item, field, new_value)`.
     # @note Finally, it displays the updated item details using `display_item(updated_item)`.
-    def edit(id, field = nil, new_value = nil)
+    def edit(id = nil, field = nil, new_value = nil)
+      id = @db.fetch_last_id if id.nil?
       item = @db.find_item(id)
       return puts "No tracked time found for id: #{id}" unless item
 

data/lib/timet/application_helper.rb

@@ -111,10 +111,13 @@ 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)
-      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)
+      pid = fork do
+        sleep Integer(time)
+        system('tput', 'bel')
+        DiscordNotifier.pomodoro_ended(time / 60) # Notify that a Pomodoro session has ended
+        system('tt', 'stop')
+        system('notify-send', '--icon=clock', show_message(tag))
+      end
       Process.detach(pid)
     end
 
@@ -124,12 +127,17 @@ 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)
-      # 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)
+      pid = fork do
+        sleep Integer(time)
+        system('afplay', '/System/Library/Sounds/Basso.aiff')
+        DiscordNotifier.pomodoro_ended(time / 60) # Notify that a Pomodoro session has ended
+        system('tt', 'stop')
+        message = show_message(tag)
+        # Escape for AppleScript
+        escaped_message = message.gsub('\\', '\\\\').gsub('"', '\"')
+        applescript_command = "display notification \"#{escaped_message}\""
+        system('osascript', '-e', applescript_command)
+      end
       Process.detach(pid)
     end
 
@@ -208,7 +216,9 @@ module Timet
         filter: time_scope,
         tag: tag,
         csv: csv_filename,
-        ics: ics_filename
+        ics: ics_filename,
+        report: options[:report],
+        search: options[:search]
       }
     end
 

data/lib/timet/color_codes.rb

@@ -6,6 +6,7 @@ module Timet
     RESET = "\u001b[0m"
     UNDERLINE = "\e[4m"
     BLINK = "\e[5m"
+    BOLD = "\e[1m"
 
     def self.reset
       RESET
@@ -19,6 +20,10 @@ module Timet
       BLINK
     end
 
+    def self.bold
+      BOLD
+    end
+
     def self.color(num)
       "\u001b[38;5;#{num}m"
     end
@@ -51,6 +56,10 @@ class String
     "#{Timet::ColorCodes.blink}#{self}#{Timet::ColorCodes.reset}"
   end
 
+  def bold
+    "#{Timet::ColorCodes.bold}#{self}#{Timet::ColorCodes.reset}"
+  end
+
   def green
     "#{Timet::ColorCodes.color(10)}#{self}#{Timet::ColorCodes.reset}"
   end

data/lib/timet/discord_notifier.rb

@@ -0,0 +1,100 @@
+require 'net/http'
+require 'uri'
+require 'json'
+
+module Timet
+  # Handles sending notifications to Discord via webhooks for Pomodoro events.
+  #
+  # This class provides methods to send structured messages to a Discord channel
+  # when a Pomodoro session starts, ends, or a break ends. It relies on a
+  # Discord webhook URL configured via the `DISCORD_WEBHOOK_URL` environment variable.
+  class DiscordNotifier
+    DISCORD_WEBHOOK_URL = ENV.fetch('DISCORD_WEBHOOK_URL', nil)
+
+    # Sends a notification to the configured Discord webhook.
+    #
+    # @param message_content [String] The main text content of the message.
+    # @param embed_data [Hash, nil] An optional hash representing a Discord embed object.
+    #   See Discord API documentation for embed structure.
+    # @return [void]
+    def self.send_notification(message_content, embed_data = nil)
+      return unless DISCORD_WEBHOOK_URL
+
+      uri = URI.parse(DISCORD_WEBHOOK_URL)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      request = Net::HTTP::Post.new(uri.path, { 'Content-Type' => 'application/json' })
+
+      payload = {
+        content: message_content,
+        username: 'Timet Pomodoro',
+        avatar_url: 'https://gravatar.com/avatar/b4921f111e1d481e3f5f35101432bce5'
+      }
+      payload[:embeds] = [embed_data] if embed_data
+
+      request.body = payload.to_json
+
+      response = http.request(request)
+      unless response.is_a?(Net::HTTPSuccess)
+        puts "Failed to send Discord notification: #{response.code} - #{response.body}"
+      end
+    rescue StandardError => e
+      puts "Error sending Discord notification: #{e.message}"
+    end
+
+    # Sends a notification indicating that a Pomodoro work session has started.
+    #
+    # The notification includes a title, description, color, and fields for duration
+    # and the next scheduled event (short break).
+    #
+    # Sends a notification indicating that a Pomodoro work session has started.
+    #
+    # The notification includes a title, description, color, and fields for duration
+    # and the next scheduled event (short break).
+    #
+    # @param duration [Integer] The duration of the Pomodoro session in minutes.
+    # @return [void]
+    def self.pomodoro_started(duration)
+      embed = {
+        title: 'Pomodoro Session Started! 🍅',
+        description: "Time to focus for #{duration} minutes!",
+        color: 0x00FF00, # Green
+        fields: [
+          { name: 'Duration', value: "#{duration} minutes", inline: true },
+          { name: 'Next Up', value: 'Short Break', inline: true }
+        ],
+        timestamp: Time.now.utc.iso8601
+      }
+      send_notification('Focus time!', embed)
+    end
+
+    # Sends a notification indicating that a Pomodoro work session has ended.
+    #
+    # The notification includes a title, description, color, and fields for duration
+    # and the next scheduled event (work session).
+    #
+    # Sends a notification indicating that a Pomodoro work session has ended.
+    #
+    # The notification includes a title, description, color, and fields for duration
+    # and the next scheduled event (work session).
+    #
+    # @param duration [Integer] The duration of the Pomodoro session in minutes.
+    # @return [void]
+    def self.pomodoro_ended(duration)
+      break_duration = (duration / 5).to_i # Assuming a 1/5th break duration
+      break_duration = 5 if break_duration == 0 # Minimum 5 minute break
+      embed = {
+        title: 'Pomodoro Session Ended! 🎉',
+        description: "Time for a #{break_duration} minute break!",
+        color: 0xFFA500, # Orange
+        fields: [
+          { name: 'Duration', value: "#{break_duration} minutes", inline: true },
+          { name: 'Next Up', value: 'Work Session', inline: true }
+        ],
+        timestamp: Time.now.utc.iso8601
+      }
+      send_notification('Break time!', embed)
+    end
+  end
+end

data/lib/timet/tag_distribution.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'time_statistics'
+require_relative 'color_codes' # Ensure color methods are available
 module Timet
   # The TagDistribution module provides functionality to format and display the distribution of tags based on their
   # durations. This is particularly useful for visualizing how time is distributed across different tags in a project
@@ -54,6 +55,71 @@ module Timet
       puts 'SD:'.rjust(4).red + 'The standard deviation of the durations'.gray
     end
 
+    # Generates and prints an explanation of the time report based on tag distribution.
+    #
+    # @param time_stats [Object] An object containing the time statistics.
+    # @param total [Numeric] The total duration of all tags combined in seconds.
+    # @return [void] This method outputs the explanation to the standard output.
+    def print_explanation(time_stats, total)
+      explanations = []
+      high_sd_threshold = 0.5
+      moderate_sd_threshold = 0.2
+
+      # --- Introduction ---
+      total_duration_hours = (total / 3600.0).round(1)
+      explanations << "\n---"
+      explanations << 'Time Report Summary'.bold
+      explanations << "This report provides a detailed breakdown of time spent across various categories, totaling #{"#{total_duration_hours}h".bold} of tracked work.".white
+      explanations << "\n"
+
+      # --- Individual Category Explanations ---
+      explanations << 'Category Breakdown'.bold
+      time_stats.sorted_duration_by_tag.each do |tag, duration|
+        explanation = "#{"#{tag.capitalize}".bold}:"
+
+        # Percentage
+        percentage = (duration.to_f / total * 100).round(1)
+        explanation += " This category consumed #{"#{percentage}%".bold} of the total tracked time."
+
+        # Total Duration
+        total_hours = (duration / 3600.0).round(1)
+        explanation += " The cumulative time spent was #{"#{total_hours}h".bold}, indicating the overall effort dedicated to this area."
+
+        # Average Duration
+        avg_minutes = (time_stats.average_by_tag[tag] / 60.0).round(1)
+        explanation += " On average, each task took #{"#{avg_minutes}min".bold}, which helps in understanding the typical time commitment per task."
+
+        # Standard Deviation
+        sd_minutes = (time_stats.standard_deviation_by_tag[tag] / 60.0).round(1)
+        avg_duration_seconds = time_stats.average_by_tag[tag]
+
+        if sd_minutes > avg_duration_seconds / 60.0 * high_sd_threshold
+          explanation += " A high standard deviation of #{"#{sd_minutes}min".bold} relative to the average suggests significant variability in task durations. This could imply inconsistent task definitions, varying complexity, or frequent interruptions.".red
+        elsif sd_minutes > avg_duration_seconds / 60.0 * moderate_sd_threshold
+          explanation += " A moderate standard deviation of #{"#{sd_minutes}min".bold} indicates some variation in task durations.".blue
+        else
+          explanation += " A low standard deviation of #{"#{sd_minutes}min".bold} suggests that task durations were quite consistent and predictable.".green
+        end
+
+        explanations << explanation.white
+      end
+
+      # --- Overall Summary ---
+      if time_stats.sorted_duration_by_tag.any?
+        sorted_categories = time_stats.sorted_duration_by_tag.map do |tag, duration|
+          [tag, (duration.to_f / total * 100).round(1)]
+        end.sort_by { |_, percentage| -percentage }
+
+        major_categories = sorted_categories.select { |_, percentage| percentage > 10 }
+        if major_categories.size > 1
+          total_percentage = major_categories.sum { |_, percentage| percentage }
+          category_names = major_categories.map { |c, _| "'#{c.capitalize}'" }.join(' and ')
+          explanations << "\nTogether, #{category_names} dominate the time spent, accounting for nearly #{"#{total_percentage.round}%".bold} of the total.".white
+        end
+      end
+      puts explanations.join("\n")
+    end
+
     # Prints the summary information including total duration, average duration, and standard deviation.
     #
     # @param time_stats [Object] An object containing the time statistics, including totals.

data/lib/timet/time_report.rb

@@ -60,7 +60,8 @@ module Timet
       @csv_filename = options[:csv]
       @ics_filename = options[:ics]
       @filter = formatted_filter(options[:filter])
-      @items = options[:filter] ? filter_items(@filter, options[:tag]) : @db.all_items
+      @search_query = options[:search]
+      @items = options[:filter] ? filter_items(@filter, options[:tag], @search_query) : @db.all_items
       @table = Table.new(@filter, @items, @db)
     end
 
@@ -94,6 +95,17 @@ module Timet
       tag_distribution(colors)
     end
 
+    # Prints the tag distribution explanation.
+    # This method is a public wrapper for the private `print_explanation` method
+    # from the `TagDistribution` module.
+    #
+    # @return [void] This method outputs the explanation to the standard output.
+    def print_tag_explanation_report
+      time_stats = TimeStatistics.new(@items)
+      total = time_stats.total_duration
+      print_explanation(time_stats, total) if total.positive?
+    end
+
     # Displays a single row of the report.
     #
     # This method formats and prints a single row of the report, including the table header, the specified row,
@@ -165,13 +177,13 @@ module Timet
     #   filter_items('2021-10-01..2021-10-31', 'work')
     #
     # @note The method filters the items based on the specified date range and tag.
-    def filter_items(filter, tag)
+    def filter_items(filter, tag, search_query)
       if Timet::Utils.date_ranges.key?(filter)
         start_date, end_date = Timet::Utils.date_ranges[filter]
-        filter_by_date_range(start_date, end_date, tag)
+        filter_by_date_range(start_date, end_date, tag, search_query)
       elsif Timet::Utils.valid_date_format?(filter)
         start_date, end_date = filter.split('..').map { |x| Date.parse(x) }
-        filter_by_date_range(start_date, end_date, tag)
+        filter_by_date_range(start_date, end_date, tag, search_query)
       else
         puts 'Invalid filter. Supported filters: today, yesterday, week, month'
         []
@@ -190,15 +202,17 @@ module Timet
     #   filter_by_date_range(Date.new(2021, 10, 1), Date.new(2021, 10, 31), 'work')
     #
     # @note The method filters the items based on the specified date range and tag.
-    def filter_by_date_range(start_date, end_date = nil, tag = nil)
+    def filter_by_date_range(start_date, end_date = nil, tag = nil, search_query = nil)
       start_time = TimeHelper.date_to_timestamp(start_date)
       end_time = TimeHelper.calculate_end_time(start_date, end_date)
-      query = [
+      query_parts = [
         "start >= #{start_time}",
         "start < #{end_time}",
-        "tag like '%#{tag}%'",
         '(deleted IS NULL OR deleted = 0)'
-      ].join(' and ')
+      ]
+      query_parts << "tag like '%#{tag}%'" if tag
+      query_parts << "(tag LIKE '%#{search_query}%' OR notes LIKE '%#{search_query}%')" if search_query
+      query = query_parts.join(' and ')
       @db.execute_sql(
         "select * from items where #{query} ORDER BY id DESC"
       )

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.9'
-  VERSION = '1.5.9'
+  #   Timet::VERSION # => '1.6.1'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timet
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.1
 platform: ruby
 authors:
 - Frank Vielma
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-30 00:00:00.000000000 Z
+date: 2025-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,6 +142,7 @@ files:
 - lib/timet/database.rb
 - lib/timet/database_sync_helper.rb
 - lib/timet/database_syncer.rb
+- lib/timet/discord_notifier.rb
 - lib/timet/item_data_helper.rb
 - lib/timet/s3_supabase.rb
 - lib/timet/table.rb
@@ -158,11 +159,11 @@ files:
 - lib/timet/version.rb
 - lib/timet/week_info.rb
 - sig/timet.rbs
-homepage: https://frankvielma.github.io/posts/timet-a-powerful-command-line-tool-for-tracking-your-time/
+homepage: https://timet.frankv.top
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://frankvielma.github.io/posts/timet-a-powerful-command-line-tool-for-tracking-your-time/
+  homepage_uri: https://timet.frankv.top
   source_code_uri: https://github.com/frankvielma/timet
   changelog_uri: https://github.com/frankvielma/timet/blob/main/CHANGELOG.md
   documentation_uri: https://rubydoc.info/gems/timet