time-sheet 0.8.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c7858f7734163ab5688073e5ea9fe214a0994bfbf9644dd6a6b8e6d872bdf1c
-  data.tar.gz: 4dc69782f6f4ec97664b5f2cabc941ebc34396a859612c00ccab75e20c314c8e
+  metadata.gz: f5e2d47f0a17abcab7e6b134fd87b176dd753a5dc8022a66d59dcd8b16b3393b
+  data.tar.gz: 3335117c3db218920b623aa6759d231f77867b41db80a4bf532a2ba65d334451
 SHA512:
-  metadata.gz: e44ab0c69ce3c6131259571e8692b54304404a10e1bcc1be20a52b42ec36e08ec239d87ead3429e02c47c2f7a977e0447dc244df74d439401b0475441282f4b3
-  data.tar.gz: 78c49a26b85cce835ef3f8f96b944a2932ea683f7762320981ec8ce60ffcbf9f085fa77edd311a6eb0f1b012cdd3f7eb2ae4543305ec2d60c3fdeeb6552ccf64
+  metadata.gz: 449c5648f9734732fe4f7c89bdfbcba97b847c213460ac66ecaf69601fd90524ba451cc2abed6b3cb87c1ef1a519218843046b63783e01496e4662f80cb9bb42
+  data.tar.gz: cc06940f56f3c29aa6f1dadde4f3c171f9589ffb28abcd3ca1adebfacb5df3b88477d9527b49e5ea7dc44b73a149330489ef84dcf570570e1d6a965ae881543f

data/README.md

@@ -3,6 +3,14 @@
 This gem allows you to parse a spreadsheet with time tracking information to
 generate various statistics suitable for invoices and project effort estimates.
 
+## Changelog
+
+v0.9.0
+
+* introduced employee data column: To use it, add a column "employee" to the
+  spreadsheets and use flag `-e` to filter by it. If employee is not set, it
+  falls back to "Me".
+
 ## Installation
 
 ```bash

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

@@ -41,7 +41,7 @@ module TimeSheet::Time
     unless results['entries'].empty?
       time = (
         (options[:to] || Util.day_end) - 
-        (options[:from] || results['entries'].first[0].to_time)
+        (options[:from] || results['entries'].first[1].to_time)
       ).to_i
       days = (time.to_f / 60 / 60 / 24).round
     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,11 +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

data/lib/time_sheet/time/entry.rb

@@ -41,6 +41,10 @@ class TimeSheet::Time::Entry
     )
   end
 
+  def employee
+    @employee ||= @data['employee'] || (self.prev ? self.prev.employee : 'Me')
+  end
+
   # Experiment to add timezone support. However, this would complicate every day
   # handing because of daylight saving time changes.
   # def start_zone
@@ -74,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?
@@ -86,7 +90,10 @@ 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]) &&
     self.class.attrib_matches_any?(activity, filters[:activity]) &&
@@ -94,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!
@@ -114,14 +132,22 @@ class TimeSheet::Time::Entry
     if (self.start >= self.end) && self.next
       raise TimeSheet::Time::Exception.new('time entry has no end')
     end
+
+    if !employee
+      raise TimeSheet::Time::Exception.new('no employee set')
+    end
   end
 
   def to_row
-    [date, start, self.end, duration.to_i, project, activity, description]
+    [
+      employee, date, start, self.end, duration.to_i, project, activity,
+      description
+    ]
   end
 
   def to_s
     values = [
+      employee,
       date.strftime('%Y-%m-%d'),
       start.strftime('%H:%M'),
       self.end.strftime('%H:%M'),
@@ -134,13 +160,15 @@ class TimeSheet::Time::Entry
 
   def to_hash
     return {
+      'employee' => employee,
       'date' => date,
       'start' => start,
       'end' => self.end,
       'duration' => duration,
       'project' => project,
       'activity' => activity,
-      'description' => description
+      'description' => description,
+      'tags' => tags
     }
   end
 
@@ -156,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.8.0"
+  VERSION = "0.11.1"
 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.8.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Moritz Schepp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-03 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: []