time-sheet 0.15.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7185c488e563f07f440e280b8344671ab0c2e6236c67e28ef9bfbe3426701c90
-  data.tar.gz: 1c8dbbd8b0f4c80c3dfcddce95a5facc298e96a9c46a048fc8dd8e7b29238092
+  metadata.gz: 461fe4226d6a5980fa168c7c918b01b35fb27aebef3110ff25d6d295709c6551
+  data.tar.gz: 830f66bef87e5925b117e32a2e82647736997381a07efe12a8e8151123e7d9cd
 SHA512:
-  metadata.gz: 617ca0d7081688afdb74b9951b809bae213d5611819bbe1de5337340d27545cc72bd0465870d8675715ae3c3fbf0dabb586792bee7c67636f683d7ce6495b7b9
-  data.tar.gz: 165c6225e5593a0825abebfe1216a10bec2fff7387066b75af9b9a7975dcb28f8d38f939ee6b364a40bd2d79dac89e914fb2b4e53eb2ab795eb24f3dc3742485
+  metadata.gz: 6b99531029582021e5eff7c47a1483e24ad6ceb86b0865c2abd7b6af0496225b9e0f222c958538f073553e6ce5b4e4fe36d8e9ec10d3d2ab9b7ed8e1b83523f7
+  data.tar.gz: 358e04d3c9f16416d451d192ed5ad2a94545ef135250ecb3836ce75d5f551b3295e65b1d44b3a36f9b71ab95386acd466e866e2c27457e61c8ed4b853d311ad5

data/lib/time_sheet/time/entry.rb

@@ -28,7 +28,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 +38,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 +143,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
 

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/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.15.0"
+  VERSION = "1.0.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.0.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="