time-sheet 0.15.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7185c488e563f07f440e280b8344671ab0c2e6236c67e28ef9bfbe3426701c90
-  data.tar.gz: 1c8dbbd8b0f4c80c3dfcddce95a5facc298e96a9c46a048fc8dd8e7b29238092
+  metadata.gz: 35406dddfbbe1e74c061171bea36962f3d5632a6cedc75e846a66e53fc2fbd9e
+  data.tar.gz: deab85ae87457cab458141d8a4987ca592a07d0860405d2ecea1190a316e2b9e
 SHA512:
-  metadata.gz: 617ca0d7081688afdb74b9951b809bae213d5611819bbe1de5337340d27545cc72bd0465870d8675715ae3c3fbf0dabb586792bee7c67636f683d7ce6495b7b9
-  data.tar.gz: 165c6225e5593a0825abebfe1216a10bec2fff7387066b75af9b9a7975dcb28f8d38f939ee6b364a40bd2d79dac89e914fb2b4e53eb2ab795eb24f3dc3742485
+  metadata.gz: e262b17d41fbc239710af28d16d6fa00334d5cb691489e0b017f8864db76ce7b4b5ac7ba7fec53d39b821cda78522bd7fc234680ece63c184adf7b9275dcddee
+  data.tar.gz: 03eb5990ebcae8f95d4931a1dcaa7b5469e54f6eac61fcfe20a752c8e0c75146028b066153fed8bb8d46afeff5fa417235418db7ea82120694f224626c9ccbcc

data/README.md

@@ -5,6 +5,11 @@ generate various statistics suitable for invoices and project effort estimates.
 
 ## Changelog
 
+v1.0.0
+
+* input files need to be .xlsx files now because we needed to replace the
+  spreadsheet parser, see [#1](https://github.com/moritzschepp/time-sheet/issues/1)
+
 v0.9.0
 
 * introduced employee data column: To use it, add a column "employee" to the

data/lib/time_sheet/time/cmd.rb

@@ -1,10 +1,10 @@
+require 'yaml'
+
 require 'slop'
 require 'time'
 
 class TimeSheet::Time::Cmd
   def run
-    TimeSheet.options = options
-
     if d = options[:from]
       if d.match(/^\d\d?-\d\d?$/)
         d = "#{TimeSheet::Time::Util.now.year}-#{d}"
@@ -85,17 +85,22 @@ class TimeSheet::Time::Cmd
     end
   end
 
-  def default_location
-    result = []
-    config_file = "#{ENV['HOME']}/.time-sheet.conf"
-    if File.exist?(config_file)
-      File.read(config_file).split("\n").each do |line|
-        if m = line.match(/^([a-z_]+):(.*)$/)
-          result << m[2].strip if m[1] == 'location'
-        end
-      end
+  def config
+    defaults = {
+      'location' => "#{ENV['HOME']}/time",
+      'carry_over_activity' => 'previous'
+    }
+
+    file = "#{ENV['HOME']}/.time-sheet.conf"
+    return defaults unless File.exist?(file)
+
+    result = YAML.load_file(file)
+    result = defaults.merge(result)
+
+    unless result['location'].is_a?(Array)
+      result['location'] = [result['location']]
     end
-    result << "#{ENV['HOME']}/time-sheet" if result.empty?
+
     result
   end
 
@@ -114,7 +119,7 @@ class TimeSheet::Time::Cmd
       o.boolean '-h', '--help', 'show help'
       o.boolean '--version', 'show the version'
       o.array('-l', '--location', 'a location to gather data from (file, directory or google docs share-url)',
-        default: default_location
+        default: config['location']
       )
       o.string '-f', '--from', 'ignore entries older than the date given'
       o.string '-t', '--to', 'ignore entries more recent than the date given'
@@ -123,6 +128,12 @@ class TimeSheet::Time::Cmd
       o.string '--tags', 'filter by tag (comma separated, not case sensitive, prefix tag with ! to exclude)'
       o.string '-d', '--description', 'consider only entries matching this description'
       o.string '-e', '--employee', 'consider only entries for this employee'
+      o.string(
+        '--carry-over-activity',
+        'mode for carrying over activity (previous|same-description)',
+        default: config['carry_over_activity']
+      )
+      o.string '--default-activity', 'default activity', default: config['default_activity']
       o.float '-r', '--rate', 'use an alternative hourly rate (default: 80.0)', default: 80.00
       o.boolean '-s', '--summary', 'when reporting, add summary section'
       o.boolean '--trim', 'compact the output for processing as CSV', default: false
@@ -148,6 +159,8 @@ class TimeSheet::Time::Cmd
   end
 
   def verify
+    TimeSheet.options = options
+
     convert_to_time
 
     entries = TimeSheet::Time::Parser.new(options[:location]).entries
@@ -222,7 +235,7 @@ class TimeSheet::Time::Cmd
           TimeSheet::Time::Util.hours(pdata['total']),
           TimeSheet::Time::Util.price(pdata['total'], options[:rate])
         ]
-        
+
         pdata['activities'].sort_by{|k, v| v}.reverse.to_h.each do |aname, atotal|
           tdata << [
             '',
@@ -250,4 +263,4 @@ class TimeSheet::Time::Cmd
     end
   end
 
-end
+end

data/lib/time_sheet/time/entry.rb

@@ -14,7 +14,20 @@ class TimeSheet::Time::Entry
   end
 
   def activity
-    @data['activity'] ||= self.prev.activity
+    if !@data['activity']
+      carry_mode = TimeSheet.options[:carry_over_activity]
+      use_prev = (
+        carry_mode == 'previous' ||
+        (carry_mode == 'same-description' && self.prev.description == description)
+      )
+      if use_prev
+        @data['activity'] = self.prev.activity
+      end
+
+      @data['activity'] ||= TimeSheet.options[:default_activity] || ''
+    end
+
+    @data['activity']
   end
 
   def description
@@ -28,7 +41,8 @@ class TimeSheet::Time::Entry
   def start
     @start ||= Time.mktime(
       date.year, date.month, date.day,
-      @data['start'].hour, @data['start'].min
+      hour_for(@data['start']),
+      minute_for(@data['start'])
     )
   end
 
@@ -37,10 +51,31 @@ class TimeSheet::Time::Entry
 
     @end ||= Time.mktime(
       date.year, date.month, date.day,
-      ends_at.hour, ends_at.min
+      hour_for(ends_at),
+      minute_for(ends_at)
     )
   end
 
+  def hour_for(timish)
+    case timish
+    when Time then timish.hour
+    when DateTime then timish.hour
+    when Integer then timish / 60 / 60
+    else
+      binding.pry
+    end
+  end
+
+  def minute_for(timish)
+    case timish
+    when Time then timish.min
+    when DateTime then timish.min
+    when Integer then timish / 60 % 60
+    else
+      binding.pry
+    end
+  end
+
   def employee
     @employee ||= @data['employee'] || (self.prev ? self.prev.employee : 'Me')
   end
@@ -121,7 +156,7 @@ class TimeSheet::Time::Entry
     self.exception = e
     false
   rescue StandardError => e
-    binding.pry if Timesheet.options[:debug]
+    binding.pry if TimeSheet.options[:debug]
     false
   end
 
@@ -193,4 +228,4 @@ class TimeSheet::Time::Entry
     (string || '').to_s.downcase.split(/\s*,\s*/).map{|t| t.strip}
   end
 
-end
+end

data/lib/time_sheet/time/parser.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet'
+require 'roo'
 require 'httpclient'
 require 'csv'
 
@@ -12,7 +12,7 @@ class TimeSheet::Time::Parser
     results = []
     @dirs.each do |dir|
       if File.directory?(dir)
-        results += Dir["#{dir}/**/*.xls"]
+        results += Dir["#{dir}/**/*.xlsx"]
       else
         results << dir
       end
@@ -38,7 +38,6 @@ class TimeSheet::Time::Parser
       results.sort!
       results.each do |r|
         unless r.valid?
-          # byebug
           raise r.exception, [
             r.exception.message, ': ',
             r.data.inspect,
@@ -57,28 +56,25 @@ class TimeSheet::Time::Parser
         if f.match(/https:\/\/docs\.google\.com/)
           parse_google_doc(f)
         else
-          parse_xls(f)
+          parse_xlsx(f)
         end
       end
     end
   end
 
-  def parse_xls(filename)
+  def parse_xlsx(filename)
     results = []
 
-    Spreadsheet.open(filename).worksheets.each do |sheet|
-      headers = sheet.rows.first.to_a
-      sheet.rows[1..-1].each.with_index do |row, i|
-        # TODO find a way to guard against xls sheets with 65535 (empty)
-        # lines, perhaps:
-        # break if row[1].nil?
-        next if row.all?{|cell| [nil, ''].include?(cell)}
+    xlsx = Roo::Spreadsheet.open(filename)
+    xlsx.each_with_pagename do |name, sheet|
+      headers = sheet.row(1).to_h{|e| [e, e]}
+      rows = sheet.parse(headers)
 
-        record = {}
-        row.each_with_index do |value, i|
-          record[headers[i]] = value
-        end
-        results << record
+      rows.each do |row|
+        next unless row['start']
+        next if row.values.all?{|v| [nil, ''].include?(v)}
+
+        results << row
       end
     end
 

data/lib/time_sheet/time.rb

@@ -8,6 +8,8 @@ module TimeSheet::Time
   autoload :Util, 'time_sheet/time/util'
 
   def self.report(options)
+    TimeSheet.options = options
+
     results = {
       'entries' => [],
       'total' => 0.0,
@@ -40,7 +42,7 @@ module TimeSheet::Time
 
     unless results['entries'].empty?
       time = (
-        (options[:to] || Util.day_end) - 
+        (options[:to] || Util.day_end) -
         (options[:from] || results['entries'].first[1].to_time)
       ).to_i
       days = (time.to_f / 60 / 60 / 24).round
@@ -65,6 +67,8 @@ module TimeSheet::Time
   end
 
   def self.invoice(options)
+    TimeSheet.options = options
+    
     grouped = {}
     Parser.new(options[:location]).entries.each do |e|
       if e.matches?(options)
@@ -102,7 +106,7 @@ module TimeSheet::Time
           next
         end
       end
-      
+
       packages.last << row
       ptotal += row[1]
     end
@@ -131,4 +135,4 @@ module TimeSheet::Time
     packages
   end
 
-end
+end

data/lib/time_sheet/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.15.0"
+  VERSION = "1.1.0"
 end

data/time_sheet.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 3.1.0'
 
-  spec.add_dependency 'spreadsheet'
+  spec.add_dependency 'roo'
   spec.add_dependency 'slop'
   spec.add_dependency 'httpclient'
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: a time tracking solution based on spreadsheets