time-sheet 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee2eec2ca5623ae8ac25ec63d7b1cec543944f39dae960bfb7db38251de2c99
-  data.tar.gz: 034a75ad6f3b43444bf719c96c5025dd1228defb1c5f2d1cc78c041d29948f28
+  metadata.gz: 5ca95455a7df9dfb1262804ff2c325b25cea1336b75320b86881ebb9f96a9f8d
+  data.tar.gz: a85d3aa69e2d335b37e54bf210fe28a6f83ae1f78aa178ebe08aa4822542ce8d
 SHA512:
-  metadata.gz: c825f3278431d59904d411eaafd71e42fd827d83931d139aeb36a2c847f02af0edf97e9b55c4eec7bf55367f9c07273d09adfdf89b88938db20ad4a9569e996a
-  data.tar.gz: 9a5fb43cc6a19c7ce85b127621d35895c0a2580aee02f34a1862836885bc957e5e41b29bcfcf1cf6dd4824ba616a30b6d9aaa8fdfe4c02088a1f0abe78fc7f03
+  metadata.gz: e7eb8b409573f45e1098b262b207bf09b6557fb8372ee31a75514ee77320526fb1f46ef9e8e55927f218bcf7142697e768d3f15e345466eded9163beaa92fb67
+  data.tar.gz: 7b78b9d314aa531c452d677fd725b07ea7471c62a3b1999af5cfd577f8a5644416d5173000f380dd7620fd9660d9bb2e300ca6c12f8e034d49def97c2e2c69c6

data/lib/time_sheet/time/cmd.rb

@@ -117,6 +117,7 @@ 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', 'filter by tag (comma separated, not case sensitive, prefix tag with ! to exclude)'
       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
@@ -155,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,6 +101,19 @@ class TimeSheet::Time::Entry
     (!to || to >= self.end)
   end
 
+  def has_tags?(tags)
+    return true if tags.empty?
+
+    tags.all? do |tag|
+      if tag.match?(/^\!/)
+        t = tag.gsub(/\!/, '')
+        !self.tags.include?(t)
+      else
+        self.tags.include?(tag)
+      end
+    end
+  end
+
   def valid?
     valid!
     true
@@ -157,7 +172,8 @@ class TimeSheet::Time::Entry
       'duration' => duration,
       'project' => project,
       'activity' => activity,
-      'description' => description
+      'description' => description,
+      'tags' => tags
     }
   end
 
@@ -173,4 +189,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet