timet 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7754392fd614ebc62c53293166db637a9593f8497b4cc22ea3ea602bc51546f7
-  data.tar.gz: e4f699cf2725be5cf6849a5946323270d078ab1d6fa13892877f17ce161b1d1b
+  metadata.gz: beb4b20fdb1c0ba5b1a6161997c2aee3cb2fd897fb260a6e3c0519a8e8c76dc7
+  data.tar.gz: 506dcd2c9e67642f227b411d29d562dc01e028944116cee047056d970e416214
 SHA512:
-  metadata.gz: 2a8be74697ff40c179a0546662fc7b067d0ceddf4da159ea3107c87fef68b3f6cb7a7c3e61ff9c9115bcc799d5d5278fe209629a892077783aa56c77c772c81f
-  data.tar.gz: bd9131bccca060ea7d8a7710d9a96b6c784cfeca7312a9146f8fa5c31d8bd0e40b3a58e82ec670328baf5e92d0d2f8b3fa8e80a47a25a0f771c2cb1a6c5e667b
+  metadata.gz: c513cd6ebceb8aa6519945be0b2af95a48df688e8d9bae79b3dca13051529c43ac11278c11311da7cf7f688ea6e34a5fb8e9ebef7d8c4c38ced259f280ead537
+  data.tar.gz: 4d03f8544328bc6b84fd2cc52b43f4d6a75bbebb062a6ee9b4944a91276bf0448d4b50c6b04e2d4eb6b4cbb69c0ee60271987b58c0f0dea2af79397387a6b534

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 ## [Unreleased]
 
+## [1.4.5] - 2024-11-18
+
+**Improvements:**
+- Added `base64` gem to the Gemfile to ensure compatibility with Ruby 3.4.0.
+- Updated the `json` gem from version 2.8.1 to 2.8.2.
+- Updated the `rubocop-ast` gem from version 1.35.0 to 1.36.1.
+- Added the `icalendar` gem to the application.
+
+**Bug Fixes:**
+- Fixed the deprecation warning related to `base64` being removed from the Ruby standard library in Ruby 3.4.0.
+
+
+## [1.4.4] - 2024-11-12
+
+**Improvements:**
+- Refactored tag distribution and time statistics methods:
+  - Split `process_and_print_tags` into `print_summary` and `print_tags_info` for better modularity and readability.
+  - Added Yardoc comments to document the new methods and updated existing comments for clarity.
+  - Introduced `totals` method in `TimeStatistics` to calculate and return total duration, average duration, and standard deviation.
+- Refactored export methods to `TimeReportHelper`:
+  - Moved `export_csv` and `export_icalendar` methods from `TimeReport` to `TimeReportHelper`.
+  - Created private methods `add_events`, `create_event`, and `convert_to_datetime` in `TimeReportHelper` to handle iCalendar event creation and conversion.
+  - Ensured that the iCalendar file generation logic is encapsulated within the `TimeReportHelper` module.
+
+**Tasks:**
+- Bumped version to 1.4.4.
+- Updated `Gemfile.lock`.
+
+## [1.4.3] - 2024-11-06
+
+**Improvements:**
+- **Refactor export logic**: Introduced a new `ReportExporter` class to handle the export of reports to CSV and iCalendar formats, addressing the Feature Envy code smell and making the `ApplicationHelper` module more modular.
+- **Update gem dependencies**: Updated several gems to their latest versions, including `icalendar`, `sqlite3`, `json`, `parser`, `rubocop`, and `rubocop-ast`.
+- **Refactor `TimeReport` initialization**: Refactored `TimeReport` initialization to use an options hash instead of individual parameters, and added support for exporting tracking summaries to iCalendar format.
+- **Enhance command descriptions**: Improved the descriptions of the `start`, `stop`, `resume`, `summary`, `edit`, `delete`, and `cancel` commands, and added an `--ics` option to the `summary` command for iCalendar export.
+- **Add `icalendar` gem**: Added the `icalendar` gem to support iCalendar functionality and updated the `timet` gem version to `1.4.3`.
+
+**Bug Fixes:**
+- Corrected platform names in the lockfile.
+- Updated the `TimeReport` spec to use the new options hash in the `TimeReport` initialization.
+
+
 ## [1.4.2] - 2024-11-01
 
 **Improvements:**

data/lib/timet/application.rb

@@ -3,6 +3,7 @@
 require_relative 'version'
 require 'thor'
 require 'tty-prompt'
+require 'icalendar'
 require_relative 'validation_edit_helper'
 require_relative 'application_helper'
 require_relative 'time_helper'

data/lib/timet/tag_distribution.rb

@@ -34,31 +34,43 @@ module Timet
 
     # Processes and prints the tag distribution information.
     #
-    # @param sorted_duration_by_tag [Array<Array(String, Numeric)>] An array of arrays where each inner array contains a
-    # tag and its corresponding duration, sorted by duration in descending order.
+    # @param time_stats [Object] An object containing the time statistics, including totals and sorted durations by tag.
     # @param total [Numeric] The total duration of all tags combined.
+    # @param colors [Object] An object containing color formatting methods.
     # @return [void] This method outputs the tag distribution information to the standard output.
     def process_and_print_tags(time_stats, total, colors)
-      time_stats.sorted_duration_by_tag.each do |tag, duration|
-        print_tag_info(tag, duration, total, time_stats, colors)
-      end
+      print_summary(time_stats, total)
+      print_tags_info(time_stats, total, colors)
     end
 
-    # Prints the detailed information for a specific tag.
+    # Prints the summary information including total duration, average duration, and standard deviation.
     #
-    # @param tag [String] The tag for which to print the information.
-    # @param duration [Numeric] The duration associated with the tag.
+    # @param time_stats [Object] An object containing the time statistics, including totals.
     # @param total [Numeric] The total duration of all tags combined.
-    # @param time_stats [Object] An object containing time statistics for the tags.
-    # @param colors [Hash] A hash mapping tags to color indices for display.
-    # @return [void] This method outputs the tag information to the standard output.
-    def print_tag_info(tag, duration, total, time_stats, colors)
-      value, bar_length = calculate_value_and_bar_length(duration, total)
-      horizontal_bar = generate_horizontal_bar(bar_length, colors[tag])
-      formatted_tag = tag[0...TAG_SIZE].rjust(TAG_SIZE)
-      stats = generate_stats(tag, time_stats)
+    # @return [void] This method outputs the summary information to the standard output.
+    def print_summary(time_stats, total)
+      avg = (time_stats.totals[:avg] / 60.0).round(1)
+      sd = (time_stats.totals[:sd] / 60.0).round(1)
+      summary = "#{' ' * TAG_SIZE} #{'Summary'.underline}: "
+      summary += "[T: #{(total / 3600.0).round(1)}h, AVG: #{avg}min SD: #{sd}min]".white
+      puts summary
+    end
 
-      puts "#{formatted_tag}: #{value.to_s.rjust(5)}%  #{horizontal_bar} [#{stats}]"
+    # Prints the detailed information for each tag.
+    #
+    # @param time_stats [Object] An object containing the time statistics, including sorted durations by tag.
+    # @param total [Numeric] The total duration of all tags combined.
+    # @param colors [Object] An object containing color formatting methods.
+    # @return [void] This method outputs the detailed tag information to the standard output.
+    def print_tags_info(time_stats, total, colors)
+      time_stats.sorted_duration_by_tag.each do |tag, duration|
+        value, bar_length = calculate_value_and_bar_length(duration, total)
+        horizontal_bar = generate_horizontal_bar(bar_length, colors[tag])
+        formatted_tag = tag[0...TAG_SIZE].rjust(TAG_SIZE)
+        stats = generate_stats(tag, time_stats)
+
+        puts "#{formatted_tag}: #{value.to_s.rjust(5)}%  #{horizontal_bar} [#{stats}]"
+      end
     end
 
     # Generates a horizontal bar for display based on the bar length and color index.

data/lib/timet/time_report.rb

@@ -96,47 +96,6 @@ module Timet
       total
     end
 
-    # Exports the report to a CSV file.
-    #
-    # @return [void] This method does not return a value; it performs side effects such as writing the CSV file.
-    #
-    # @example Export the report to a CSV file
-    #   time_report.export_csv
-    #
-    # @note The method writes the items to a CSV file and prints a confirmation message.
-    def export_csv
-      file_name = "#{csv_filename}.csv"
-      write_csv(file_name)
-
-      puts "The #{file_name} has been exported."
-    end
-
-    def export_icalendar
-      file_name = "#{ics_filename}.ics"
-
-      cal = Icalendar::Calendar.new
-      items.each do |item|
-        dtstart = Time.at(item[1]).to_datetime
-        end_time = item[2] || TimeHelper.current_timestamp
-        dtend = Time.at(end_time).to_datetime
-
-        tag = item[3]
-        notes = item[4]
-        cal.event do |e|
-          e.dtstart     = dtstart
-          e.dtend       = dtend
-          e.summary     = tag
-          e.description = notes
-          e.ip_class    = 'PRIVATE'
-        end
-      end
-      cal.publish
-
-      File.write(file_name, cal.to_ical)
-
-      puts "The #{file_name} has been generated."
-    end
-
     private
 
     # Writes the items to a CSV file.

data/lib/timet/time_report_helper.rb

@@ -80,5 +80,72 @@ module Timet
         [summed_number, old_value[1]]
       end
     end
+
+    # Exports the report to a CSV file.
+    #
+    # @return [void] This method does not return a value; it performs side effects such as writing the CSV file.
+    #
+    # @example Export the report to a CSV file
+    #   time_report.export_csv
+    #
+    # @note The method writes the items to a CSV file and prints a confirmation message.
+    def export_csv
+      file_name = "#{csv_filename}.csv"
+      write_csv(file_name)
+
+      puts "The #{file_name} has been exported."
+    end
+
+    # Generates an iCalendar file and writes it to disk.
+    #
+    # @return [void]
+    def export_icalendar
+      file_name = "#{ics_filename}.ics"
+      cal = add_events
+
+      File.write(file_name, cal.to_ical)
+
+      puts "The #{file_name} has been generated."
+    end
+
+    private
+
+    # Creates an iCalendar object and adds events to it.
+    #
+    # @return [Icalendar::Calendar] the populated iCalendar object
+    def add_events
+      cal = Icalendar::Calendar.new
+      items.each do |item|
+        event = create_event(item)
+        cal.add_event(event)
+      end
+      cal.publish
+      cal
+    end
+
+    # Creates an iCalendar event from the given item.
+    #
+    # @param item [Array] the item containing event details
+    # @return [Icalendar::Event] the created event
+    def create_event(item)
+      dtstart = convert_to_datetime(item[1])
+      dtend = convert_to_datetime(item[2] || TimeHelper.current_timestamp)
+
+      Icalendar::Event.new.tap do |e|
+        e.dtstart     = dtstart
+        e.dtend       = dtend
+        e.summary     = item[3]
+        e.description = item[4]
+        e.ip_class    = 'PRIVATE'
+      end
+    end
+
+    # Converts a timestamp to a DateTime object.
+    #
+    # @param timestamp [Integer] the timestamp to convert
+    # @return [DateTime] the converted DateTime object
+    def convert_to_datetime(timestamp)
+      Time.at(timestamp).to_datetime
+    end
   end
 end

data/lib/timet/time_statistics.rb

@@ -27,6 +27,19 @@ module Timet
       calculate_durations_by_tag
     end
 
+    # Returns a hash containing the total duration, average duration, and standard deviation of durations.
+    #
+    # @return [Hash] A hash with the following keys:
+    #   - :total [Numeric] The total duration.
+    #   - :avg [Numeric] The average duration.
+    #   - :sd [Numeric] The standard deviation of the durations.
+    def totals
+      @duration_by_tag.values.flatten
+
+      durations = @duration_by_tag.values.flatten
+      { total: @total_duration, avg: durations.mean, sd: durations.standard_deviation }
+    end
+
     # Calculates the duration for each tag and updates the @duration_by_tag and @total_duration attributes.
     #
     # @return [void]

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.3'
-  VERSION = '1.4.3'
+  #   Timet::VERSION # => '1.4.5'
+  VERSION = '1.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timet
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Frank Vielma
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,6 +58,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: icalendar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: descriptive_statistics
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Timet is a command-line time tracker that keeps track of your activities.
 email:
 - frankvielma@gmail.com
@@ -116,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Command line time tracker with reports