time-sheet 0.7.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790973ca70322810e9000108c07cc90d32fe466c1e34eb5afeb0120afb438296
-  data.tar.gz: 1ee803b2a25bd8d30c43987bf332fbfa398043ac6a8485d8e3733eb9a46b4dc8
+  metadata.gz: c1f3f57a31269c965756a1eb5f00eccd8c831ab69bcd2f71cc65ca9242e54dcc
+  data.tar.gz: b5e121a0c379450019c7606ee994c5ea5ebdb5e5cef8afcb3f33f5fe864b8a6f
 SHA512:
-  metadata.gz: f9eaa5dd328e9e952d394cadd895a8151f567a4ee28a7885f53287ec8b2beae8203c97f315fdc45da5d066bc81283ff2b691324c4f02f7fd8b872b296aa75d40
-  data.tar.gz: 50da6fcc3e30a29269aa52347eba0cc320dc3efe1140222aca130179f77f99e85df2293c56eb60ba93305a35297486e9036fa5581e7bcd675801b26a24f06759
+  metadata.gz: c31004116f099381d80021a34d04c541bc13b221e0d980c9f073f28150dd8843fb837022670ff46015ddc1dd62c9d294d9847b9e4d5207d45249ca8ebf720389
+  data.tar.gz: a7f08110118e2aaacb4569e6d3835b4c40660a0561318490edef9b0023a6c33061bc2ff3c068062ce7d9bfb382926aaae44448e36715ab68988dc6b4d7aeb270

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
@@ -104,18 +110,21 @@ class TimeSheet::Time::Cmd
 
       o.boolean '-h', '--help', 'show help'
       o.boolean '--version', 'show the version'
-      o.array('-l', '--location', 'a location to gather data from (file or directory)',
+      o.array('-l', '--location', 'a location to gather data from (file, directory or google docs share-url)',
         default: default_location
       )
       o.string '-f', '--from', 'ignore entries older than the date given'
       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,8 @@ class TimeSheet::Time::Entry
   end
 
   def tags
-    (@data['tags'] || '').split(/\s*,\s*/)
+    binding.pry if @data['tags'] == 86
+    self.class.parse_tags(@data['tags'])
   end
 
   def working_day?
@@ -86,7 +91,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 +102,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 +133,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 +161,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 +185,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

@@ -1,4 +1,6 @@
 require 'spreadsheet'
+require 'httpclient'
+require 'csv'
 
 class TimeSheet::Time::Parser
 
@@ -52,24 +54,71 @@ class TimeSheet::Time::Parser
   def hashes_per_file
     @hashes_per_file ||= begin
       files.map do |f|
-        results = []
-        Spreadsheet.open(f).worksheets.each do |sheet|
-          headers = sheet.rows.first.to_a
-          sheet.rows[1..-1].each do |row|
-            # TODO find a way to guard against xls sheets with 65535 (empty)
-            # lines, perhaps:
-            # break if row[1].nil?
+        if f.match(/https:\/\/docs\.google\.com/)
+          parse_google_doc(f)
+        else
+          parse_xls(f)
+        end
+      end
+    end
+  end
 
-            record = {}
-            row.each_with_index do |value, i|
-              record[headers[i]] = value
-            end
-            results << record
-          end
+  def parse_xls(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)}
+
+        record = {}
+        row.each_with_index do |value, i|
+          record[headers[i]] = value
         end
-        results
+        results << record
       end
     end
+
+    results
+  end
+
+  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, liberal_parsing: true)
+      headers = data.shift
+      data.map do |row|
+        record = nullify_empties(headers.zip(row).to_h)
+        parse_date_and_time(record)
+      end
+    else
+      raise "request to google docs failed (#{response.status}):\n#{response.body}"
+    end
+  end
+
+  def parse_date_and_time(record)
+    record.merge(
+      'date' => (record['date'] ? Date.parse(record['date']) : nil),
+      'start' => (record['start'] ? DateTime.parse(record['start']) : nil),
+      '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.7.0"
+  VERSION = "0.11.0"
 end

data/time_sheet.gemspec

@@ -26,9 +26,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'spreadsheet'
   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.7.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Moritz Schepp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-13 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -38,34 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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
@@ -94,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - moritz.schepp@gmail.com
 executables:
@@ -120,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
@@ -141,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: a time tracking solution based on spreadsheets
 test_files: []