time-sheet 0.9.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bacee0db8abe56f89e78df5cfef966da22efcc24e5fff2db291714727815cd4
-  data.tar.gz: 91e6034615db1c7d56ff9e91ba47200c41ac83338ae8049c22c6bf4ea93f67e1
+  metadata.gz: 34d0ef63890eeae177443276610e4537d5dc2cfd138497132e6eb351ef5aa869
+  data.tar.gz: e40b4fc84073bfc67a358e54c72107bd5a2a988969a75a3a5b04261b2574255c
 SHA512:
-  metadata.gz: f3aff4885cc228ce208263dd4f3f2a9c93465b2e819d863595222060ae5c1902ee35c40a93b631bcc9ea6ca38192b8c5e5214712cbb7592145880d3ff33080db
-  data.tar.gz: f01226ee033c0f451d367ad2616601294d3a6a6e2db414a5f3d728cd7f2fa3805bfde8ebc4241fdf2dc1bf8fdde80c15dc9ceee1614708c87bf559cf6fb14628
+  metadata.gz: 1bc92043a7bd4085427ade8981d7e7e014bc6704cec744174b53ec3ce9f6bd5e274d58d740371f08356fc1968207bc8b2c487d01b82fef1c2bbdd294b603cc75
+  data.tar.gz: 4ebf6508e2c23bb2ca6ba88f00c9ab945777f39ec76236a66362908787004c1d339bd6df7405f29f5fcde48f235853b611606e0c7b9d67d61dca8a7398265456

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
@@ -111,12 +117,14 @@ class TimeSheet::Time::Cmd
       o.string '-t', '--to', 'ignore entries more recent than the date given'
       o.string '-p', '--project', 'take only entries of this project into account'
       o.string '-a', '--activity', 'take only entries of this activity into account'
+      o.string '--tags', 'take only entries with these tags into account (comma separated, not case sensitive)'
       o.string '-d', '--description', 'consider only entries matching this description'
       o.string '-e', '--employee', 'consider only entries for this employee'
       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
       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
@@ -148,7 +156,7 @@ class TimeSheet::Time::Cmd
     end
 
     if options[:package]
-      package = data.last.map{|entry| entry[1]}.sum
+      package = (data.last.nil? ? 0 : data.last.map{|entry| entry[1]}.sum)
       total = options[:package] * 60
       percent = (package / total.to_f * 100)
 

data/lib/time_sheet/time/entry.rb

@@ -78,7 +78,7 @@ class TimeSheet::Time::Entry
   end
 
   def tags
-    (@data['tags'] || '').split(/\s*,\s*/)
+    self.class.parse_tags(@data['tags'])
   end
 
   def working_day?
@@ -90,7 +90,9 @@ class TimeSheet::Time::Entry
     from = from.to_time if from.is_a?(Date)
     to = (filters[:to] ? filters[:to] : nil)
     to = (to + 1).to_time if to.is_a?(Date)
+    tags = self.class.parse_tags(filters[:tags])
 
+    has_tags?(tags) &&
     self.class.attrib_matches_any?(employee, filters[:employee]) &&
     self.class.attrib_matches_any?(description, filters[:description]) &&
     self.class.attrib_matches_any?(project, filters[:project]) &&
@@ -99,12 +101,23 @@ class TimeSheet::Time::Entry
     (!to || to >= self.end)
   end
 
+  def has_tags?(tags)
+    return true if tags.empty?
+
+    tags.all? do |tag|
+      self.tags.include?(tag)
+    end
+  end
+
   def valid?
     valid!
     true
   rescue TimeSheet::Time::Exception => e
     self.exception = e
     false
+  rescue StandardError => e
+    binding.pry if Timesheet.options[:debug]
+    false
   end
 
   def valid!
@@ -154,7 +167,8 @@ class TimeSheet::Time::Entry
       'duration' => duration,
       'project' => project,
       'activity' => activity,
-      'description' => description
+      'description' => description,
+      'tags' => tags
     }
   end
 
@@ -170,4 +184,8 @@ class TimeSheet::Time::Entry
     end
   end
 
+  def self.parse_tags(string)
+    (string || '').to_s.downcase.split(/\s*,\s*/).map{|t| t.strip}
+  end
+
 end

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.0"
+  VERSION = "0.11.2"
 end

data/time_sheet.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slop'
   spec.add_dependency 'httpclient'
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  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'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Moritz Schepp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -58,28 +58,28 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: []