time-sheet 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c7858f7734163ab5688073e5ea9fe214a0994bfbf9644dd6a6b8e6d872bdf1c
-  data.tar.gz: 4dc69782f6f4ec97664b5f2cabc941ebc34396a859612c00ccab75e20c314c8e
+  metadata.gz: 0bacee0db8abe56f89e78df5cfef966da22efcc24e5fff2db291714727815cd4
+  data.tar.gz: 91e6034615db1c7d56ff9e91ba47200c41ac83338ae8049c22c6bf4ea93f67e1
 SHA512:
-  metadata.gz: e44ab0c69ce3c6131259571e8692b54304404a10e1bcc1be20a52b42ec36e08ec239d87ead3429e02c47c2f7a977e0447dc244df74d439401b0475441282f4b3
-  data.tar.gz: 78c49a26b85cce835ef3f8f96b944a2932ea683f7762320981ec8ce60ffcbf9f085fa77edd311a6eb0f1b012cdd3f7eb2ae4543305ec2d60c3fdeeb6552ccf64
+  metadata.gz: f3aff4885cc228ce208263dd4f3f2a9c93465b2e819d863595222060ae5c1902ee35c40a93b631bcc9ea6ca38192b8c5e5214712cbb7592145880d3ff33080db
+  data.tar.gz: f01226ee033c0f451d367ad2616601294d3a6a6e2db414a5f3d728cd7f2fa3805bfde8ebc4241fdf2dc1bf8fdde80c15dc9ceee1614708c87bf559cf6fb14628

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/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

@@ -112,6 +112,7 @@ class TimeSheet::Time::Cmd
       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 '-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

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
@@ -87,6 +91,7 @@ class TimeSheet::Time::Entry
     to = (filters[:to] ? filters[:to] : nil)
     to = (to + 1).to_time if to.is_a?(Date)
 
+    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]) &&
@@ -114,14 +119,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,6 +147,7 @@ class TimeSheet::Time::Entry
 
   def to_hash
     return {
+      'employee' => employee,
       'date' => date,
       'start' => start,
       'end' => self.end,

data/lib/time_sheet/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet