time-sheet 0.14.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d983250fe5929d2a5de7f868b2b55d88b2fe3ba4b0bef3f3083d814f7d033e3
-  data.tar.gz: d521c6398e4264bec7e4e67e261ec10ba7d045218f6c1247dfaee517ea0ae072
+  metadata.gz: 461fe4226d6a5980fa168c7c918b01b35fb27aebef3110ff25d6d295709c6551
+  data.tar.gz: 830f66bef87e5925b117e32a2e82647736997381a07efe12a8e8151123e7d9cd
 SHA512:
-  metadata.gz: 0e3e8635a39e198c69c14bb3d2727eb117a7ec2c681b7c92352328063cc3eecf10c766fa432bf75d23ac919a4153d4083a09dc1cc5a8faaed94724769856feab
-  data.tar.gz: 2ce3cfea3bf0728d95278ba0e57de0874bd2d141f85c2cd728246e05f1f7cf840c1d79479a36540ff6c1a2eb96e744fa75e32ac7495154ed8e924b54f65f91a8
+  metadata.gz: 6b99531029582021e5eff7c47a1483e24ad6ceb86b0865c2abd7b6af0496225b9e0f222c958538f073553e6ce5b4e4fe36d8e9ec10d3d2ab9b7ed8e1b83523f7
+  data.tar.gz: 358e04d3c9f16416d451d192ed5ad2a94545ef135250ecb3836ce75d5f551b3295e65b1d44b3a36f9b71ab95386acd466e866e2c27457e61c8ed4b853d311ad5

data/lib/time_sheet/time/cmd.rb

@@ -129,7 +129,7 @@ class TimeSheet::Time::Cmd
       o.boolean '-v', '--verbose', 'be more verbose'
       o.boolean '--debug', 'drop into a REPL on errors'
       o.separator "\n  invoice options:"
-      o.integer '--package', 'for invoice output: build packages of this duration in hours', default: 0
+      o.float '--package', 'for invoice output: build packages of this duration in hours', default: 0.0
       o.integer '--petty', 'fold records under a certain threshold into a "misc" activity', default: 0
     end
   end

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.14.1"
+  VERSION = "1.0.0"
 end

data/time_sheet.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Moritz Schepp"]
   spec.email         = ["moritz.schepp@gmail.com"]
   spec.license       = 'GPL-3.0-only'
+  spec.homepage      = 'https://github.com/moritzschepp/time-sheet'
 
   spec.summary       = "a time tracking solution based on spreadsheets"
 
@@ -23,12 +24,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   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'
 
-  spec.add_development_dependency "bundler", "~> 2.2.16"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'pry'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-04 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:
     - - ">="
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +120,7 @@ files:
 - lib/time_sheet/time/util.rb
 - lib/time_sheet/version.rb
 - time_sheet.gemspec
-homepage:
+homepage: https://github.com/moritzschepp/time-sheet
 licenses:
 - GPL-3.0-only
 metadata:
@@ -148,14 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: a time tracking solution based on spreadsheets