time-sheet 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea92d1c0f3a85e43472835d723ce7489139dec1efec32b6da558139bdcf9403
-  data.tar.gz: e7c2e958600c472061d767c2334b05ae252ee7ac245955fe586885d687447501
+  metadata.gz: 8ee2eec2ca5623ae8ac25ec63d7b1cec543944f39dae960bfb7db38251de2c99
+  data.tar.gz: 034a75ad6f3b43444bf719c96c5025dd1228defb1c5f2d1cc78c041d29948f28
 SHA512:
-  metadata.gz: 4a5b4644fea3ac676dd841a253694ce1844731b3dcb443a7ab13fd675fe57d5a47d531154b29036f68601efdffb07eee14035c42b194502233814bbc0c3bd183
-  data.tar.gz: 9682e7ebf7cd265bf29092ae45743e541240c007b13a6a345488a52d94e55b22a4ec1ca91332020f89d195eadf39572dd91119a3d4e240ab5d3ada888d7dcb1c
+  metadata.gz: c825f3278431d59904d411eaafd71e42fd827d83931d139aeb36a2c847f02af0edf97e9b55c4eec7bf55367f9c07273d09adfdf89b88938db20ad4a9569e996a
+  data.tar.gz: 9a5fb43cc6a19c7ce85b127621d35895c0a2580aee02f34a1862836885bc957e5e41b29bcfcf1cf6dd4824ba616a30b6d9aaa8fdfe4c02088a1f0abe78fc7f03

data/lib/time_sheet.rb

@@ -1,5 +1,12 @@
 require 'time_sheet/version'
 
+# silence HTTPClient
+module Warning
+  def warn(mgs)
+    # drop
+  end
+end
+
 if defined?(Bundler)
   begin
     require 'pry'
@@ -15,4 +22,12 @@ module TimeSheet
   def self.root
     @root ||= File.expand_path(File.dirname(__FILE__) + '/..')
   end
+
+  def self.options=(options)
+    @options = options
+  end
+
+  def self.options
+    @options
+  end
 end

data/lib/time_sheet/time/cmd.rb

@@ -3,6 +3,8 @@ 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}"
@@ -64,6 +66,10 @@ class TimeSheet::Time::Cmd
           options[:to] = TimeSheet::Time::Util.month_end(-1)
           options[:summary] = true
           report
+        when 'year-to-day', 'year'
+          options[:from] = TimeSheet::Time::Util.year_start(-1)
+          options[:summary] = true
+          report
         when 'overview'
           overview
         else
@@ -117,6 +123,7 @@ class TimeSheet::Time::Cmd
       o.boolean '-s', '--summary', 'when reporting, add summary section'
       o.boolean '--trim', 'compact the output for processing as CSV', default: false
       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.integer '--petty', 'fold records under a certain threshold into a "misc" activity', default: 0

data/lib/time_sheet/time/entry.rb

@@ -105,6 +105,9 @@ class TimeSheet::Time::Entry
   rescue TimeSheet::Time::Exception => e
     self.exception = e
     false
+  rescue StandardError => e
+    binding.pry if Timesheet.options[:debug]
+    false
   end
 
   def valid!

data/lib/time_sheet/time/parser.rb

@@ -68,10 +68,11 @@ class TimeSheet::Time::Parser
 
     Spreadsheet.open(filename).worksheets.each do |sheet|
       headers = sheet.rows.first.to_a
-      sheet.rows[1..-1].each do |row|
+      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)}
 
         record = {}
         row.each_with_index do |value, i|
@@ -84,16 +85,16 @@ class TimeSheet::Time::Parser
     results
   end
 
-  def parse_google_doc(share_url)
-    id = share_url.match(/\/d\/([^\/]+)\//)[1]
-    url = "https://docs.google.com/spreadsheets/d/#{id}/export?exportFormat=tsv"
+  def parse_google_doc(url)
+    # Chart Tools datasource protocol, see 
+    # https://developers.google.com/chart/interactive/docs/querylanguage
     response = HTTPClient.get(url)
 
     if response.status == 200
-      data = CSV.parse(response.body, col_sep: "\t")
+      data = CSV.parse(response.body, liberal_parsing: true)
       headers = data.shift
       data.map do |row|
-        record = headers.zip(row).to_h
+        record = nullify_empties(headers.zip(row).to_h)
         parse_date_and_time(record)
       end
     else
@@ -108,9 +109,16 @@ class TimeSheet::Time::Parser
       'end' => (record['end'] ? DateTime.parse(record['end']) : nil)
     )
   rescue ArgumentError => e
+    binding.pry if TimeSheet.options[:debug]
     puts "current record: #{record.inspect}"
     return {}
     # raise e
   end
 
+  def nullify_empties(record)
+    record.transform_values do |v|
+      v == '' ? nil : v
+    end
+  end
+
 end

data/lib/time_sheet/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/time_sheet.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slop'
   spec.add_dependency 'httpclient'
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Moritz Schepp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.2.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.2.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - moritz.schepp@gmail.com
 executables:
@@ -134,13 +134,13 @@ files:
 - lib/time_sheet/time/util.rb
 - lib/time_sheet/version.rb
 - time_sheet.gemspec
-homepage: 
+homepage:
 licenses:
 - GPL-3.0-only
 metadata:
   bug_tracker_uri: https://github.com/moritzschepp/time-sheet/issues
   documentation_uri: https://github.com/moritzschepp/time-sheet
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: a time tracking solution based on spreadsheets
 test_files: []