timet 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec76070c29c2eab4a2a5792084a9980c1cd29c0ab3ac80dbae2c6310e74d78a
-  data.tar.gz: 551fe37b00ac0ca015e28fcdd37810216c0ff00ea4b800c97bd0fb539af1df7b
+  metadata.gz: 5e9f44f4ee2f1ae5aab382b308364ffeaffa5e09bf21d1578e8f5267ff715f0f
+  data.tar.gz: 13becd17288c93925e91a3c49dcdc7f4f7e7afe41d1469a10a7f931930b2d26d
 SHA512:
-  metadata.gz: 290e56a65e8c9e163d1558efe87fb93c8d74522c9aa1410f77a21ea6fe81d4a8270ec03947deb959699940c1c40ff91b4749f9512f1de4e005ac822cb564934a
-  data.tar.gz: 0e27f41ad71bca972355c70c235d900ae0c4ec571c47f9fd7324b979b3036b02f4cd6dd5aaa0464d4dd5ac12f2989ae38aed5e15613c496eb182dacb92f3bf11
+  metadata.gz: 27fca2e9adef3a4695a497b21106a400e7448caff946efccba034f9bbfcb29962822a632f17e3ab51856de764826257f5d6b33458d69fd9b56eebeb91946e5b8
+  data.tar.gz: df46d99862c3366f63f4ad007fbece638f88ca997fa2085070a78c065306b23888ecbbd5b610ba99582898395201dd00a1a8871de0ef8983d24c9ec3edefe32b

data/README.md

@@ -106,7 +106,7 @@ gem install timet
   +-------+------------+--------+----------+----------+----------+--------------------------+
   ```
 ---
-- **timet resume**: It allows users to quickly resume tracking a task that was previously in progress.
+- **timet resume [id]**: This command allows users to quickly resume tracking a task that was previously in progress. If an id is provided, it resumes the tracking session for the specified task. If no id is provided, it resumes the last completed task.
 
   ```
   Tracked time report [today]:
@@ -177,9 +177,10 @@ gem install timet
 | `timet summary resume (r)`          | Resume tracking the last task.                                              | `timet su r`                      |
 | `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 [1]`                     |
+| `timet edit [id]`                   | Update a task's notes, tag, start or end fields.                            | `timet e [id]`                    |
 | `timet su [date]`                   | Display a report of tracked time for a specific date.                       | `timet su 2024-01-03`             |
 | `timet su [start_date]..[end_date]` | Display a report of tracked time for a date range.                          | `timet su 2024-01-02..2024-01-03` |
+| `timet resume [id]`                 | Resume tracking a task by ID or the last completed task.                    | `timet resume [id]`               |
 
 ### Date Range in Summary
 

data/lib/timet/application.rb

@@ -69,9 +69,7 @@ module Timet
       notes = options[:notes] || notes
       pomodoro = (options[:pomodoro] || pomodoro).to_i
 
-      unless VALID_STATUSES_FOR_INSERTION.include?(@db.last_item_status)
-        return puts 'A task is currently being tracked.'
-      end
+      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)
       play_sound_and_notify(pomodoro * 60, tag) if pomodoro.positive?
@@ -87,13 +85,13 @@ module Timet
     # @example Stop the current tracking session
     #   stop
     #
-    # @note The method checks if the last tracking item is in progress by calling `@db.last_item_status`.
+    # @note The method checks if the last tracking item is in progress by calling `@db.item_status`.
     # @note If the last item is in progress, it fetches the last item's ID using `@db.fetch_last_id` and updates it
     # with the current timestamp.
     # @note The method then fetches the last item using `@db.last_item` and generates a summary if the result
     # is not nil.
     def stop(display = nil)
-      return unless @db.last_item_status == :in_progress
+      return unless @db.item_status == :in_progress
 
       last_id = @db.fetch_last_id
       @db.update_item(last_id, 'end', TimeHelper.current_timestamp)
@@ -101,7 +99,7 @@ module Timet
       summary unless display
     end
 
-    desc 'resume (r)', 'resume last task'
+    desc 'resume (r) [id]', 'resume last task'
     # 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
@@ -110,23 +108,26 @@ module Timet
     # @example Resume the last tracking session
     #   resume
     #
-    # @note The method checks the status of the last tracking item using `@db.last_item_status`.
+    # @example Resume a specific task by ID
+    #   resume(123)
+    #
+    # @note The method checks the status of the last tracking item using `@db.item_status`.
     # @note If the last item is in progress, it prints a message indicating that a task is currently being tracked.
-    # @note If the last item is complete, it fetches the last item using `@db.last_item`, retrieves the tag and notes,
+    # @note If the last item is complete, it fetches the last item using `@db.find_item` or `@db.last_item`,
+    # retrieves the tag and notes,
     # and calls the `start` method to resume the tracking session.
-    def resume
-      status = @db.last_item_status
-
-      case status
+    #
+    # @param id [Integer, nil] The ID of the tracking item to resume. If nil, the last item is used.
+    #
+    # @see Database#item_status
+    # @see Database#find_item
+    # @see #start
+    def resume(id = nil)
+      case @db.item_status(id)
       when :in_progress
         puts 'A task is currently being tracked.'
       when :complete
-        last_item = @db.last_item
-        if last_item
-          tag = last_item[FIELD_INDEX['tag']]
-          notes = last_item[FIELD_INDEX['notes']]
-          start(tag, notes)
-        end
+        resume_complete_task(id)
       end
     end
 
@@ -247,13 +248,13 @@ module Timet
     #   cancel
     #
     # @note The method fetches the ID of the last tracking item using `@db.fetch_last_id`.
-    # @note It checks if the last item is in progress by comparing `@db.last_item_status` with `:complete`.
+    # @note It checks if the last item is in progress by comparing `@db.item_status` with `:complete`.
     # @note If the last item is in progress, it deletes the item and prints a confirmation message using
     # `delete_item_and_print_message(id, "Canceled active time tracking #{id}")`.
     # @note If there is no active time tracking, it prints a message indicating that there is no active time tracking.
     def cancel
       id = @db.fetch_last_id
-      return puts 'There is no active time tracking' if @db.last_item_status == :complete
+      return puts 'There is no active time tracking' if @db.item_status == :complete
 
       delete_item_and_print_message(id, "Canceled active time tracking #{id}")
     end

data/lib/timet/application_helper.rb

@@ -157,5 +157,32 @@ module Timet
       @db.delete_item(id)
       puts message
     end
+
+    # Resumes a tracking session for a completed task.
+    #
+    # @param id [Integer, nil] The ID of the tracking item to resume. If nil, the last completed item is used.
+    #
+    # @return [void] This method does not return a value; it performs side effects such as resuming a tracking session.
+    #
+    # @example Resume the last completed task
+    #   resume_complete_task
+    #
+    # @example Resume a specific task by ID
+    #   resume_complete_task(123)
+    #
+    # @note The method fetches the specified or last completed item using `@db.find_item` or `@db.last_item`.
+    # @note If the item is found, it retrieves the tag and notes and calls the `start` method to resume the
+    # tracking session.
+    #
+    # @see Database#find_item
+    # @see Database#last_item
+    # @see #start
+    def resume_complete_task(id)
+      item = id ? @db.find_item(id) : @db.last_item
+      return unless item
+
+      tag, notes = item.values_at(Application::FIELD_INDEX['tag'], Application::FIELD_INDEX['notes'])
+      start(tag, notes)
+    end
   end
 end

data/lib/timet/database.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 require 'sqlite3'
-require_relative 'status_helper'
 module Timet
   # Provides database access for managing time tracking data.
   class Database
-    include StatusHelper
-
     # The default path to the SQLite database file.
     DEFAULT_DATABASE_PATH = File.join(Dir.home, '.timet.db')
 
@@ -158,12 +155,15 @@ module Timet
     # @return [Symbol] The status of the last item. Possible values are :no_items, :in_progress, or :complete.
     #
     # @example Determine the status of the last item
-    #   last_item_status
+    #   item_status
     #
     # @note The method executes SQL to fetch the last item and determines its status using the `StatusHelper` module.
-    def last_item_status
-      result = execute_sql('SELECT id, end FROM items ORDER BY id DESC LIMIT 1')
-      StatusHelper.determine_status(result)
+    #
+    # @param id [Integer, nil] The ID of the item to check. If nil, the last item in the table is used.
+    #
+    def item_status(id = nil)
+      id = fetch_last_id if id.nil?
+      determine_status(find_item(id))
     end
 
     # Finds an item in the items table by its ID.
@@ -241,5 +241,33 @@ module Timet
 
       format '%<hours>02d:%<minutes>02d:%<seconds>02d', hours: hours, minutes: minutes, seconds: seconds
     end
+
+    # Determines the status of a time tracking result based on the presence and end time of items.
+    #
+    # @param result [Array] The result set containing time tracking items.
+    #
+    # @return [Symbol] The status of the time tracking result. Possible values are
+    # :no_items, :in_progress, or :complete.
+    #
+    # @example Determine the status of an empty result set
+    #   StatusHelper.determine_status([]) # => :no_items
+    #
+    # @example Determine the status of a result set with an in-progress item
+    #   StatusHelper.determine_status([[1, nil]]) # => :in_progress
+    #
+    # @example Determine the status of a result set with a completed item
+    #   StatusHelper.determine_status([[1, 1633072800]]) # => :complete
+    #
+    # @note The method checks if the result set is empty and returns :no_items if true.
+    # @note If the last item in the result set has no end time, it returns :in_progress.
+    # @note If the last item in the result set has an end time, it returns :complete.
+    def determine_status(result)
+      return :no_items if result.nil?
+
+      last_item_end = result[2]
+      return :in_progress unless last_item_end
+
+      :complete
+    end
   end
 end

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.4.0'
-  VERSION = '1.4.0'
+  #   Timet::VERSION # => '1.4.1'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timet
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Frank Vielma
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -82,7 +82,6 @@ files:
 - lib/timet/application_helper.rb
 - lib/timet/color_codes.rb
 - lib/timet/database.rb
-- lib/timet/status_helper.rb
 - lib/timet/table.rb
 - lib/timet/tag_distribution.rb
 - lib/timet/time_block_chart.rb

data/lib/timet/status_helper.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Timet
-  # Provides helper methods to determine the status of time tracking results.
-  module StatusHelper
-    # Determines the status of a time tracking result based on the presence and end time of items.
-    #
-    # @param result [Array] The result set containing time tracking items.
-    #
-    # @return [Symbol] The status of the time tracking result. Possible values are
-    # :no_items, :in_progress, or :complete.
-    #
-    # @example Determine the status of an empty result set
-    #   StatusHelper.determine_status([]) # => :no_items
-    #
-    # @example Determine the status of a result set with an in-progress item
-    #   StatusHelper.determine_status([[1, nil]]) # => :in_progress
-    #
-    # @example Determine the status of a result set with a completed item
-    #   StatusHelper.determine_status([[1, 1633072800]]) # => :complete
-    #
-    # @note The method checks if the result set is empty and returns :no_items if true.
-    # @note If the last item in the result set has no end time, it returns :in_progress.
-    # @note If the last item in the result set has an end time, it returns :complete.
-    def self.determine_status(result)
-      return :no_items if result.empty?
-
-      last_item_end = result.first[1]
-      return :in_progress unless last_item_end
-
-      :complete
-    end
-  end
-end