time-sheet 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee2eec2ca5623ae8ac25ec63d7b1cec543944f39dae960bfb7db38251de2c99
-  data.tar.gz: 034a75ad6f3b43444bf719c96c5025dd1228defb1c5f2d1cc78c041d29948f28
+  metadata.gz: c1f3f57a31269c965756a1eb5f00eccd8c831ab69bcd2f71cc65ca9242e54dcc
+  data.tar.gz: b5e121a0c379450019c7606ee994c5ea5ebdb5e5cef8afcb3f33f5fe864b8a6f
 SHA512:
-  metadata.gz: c825f3278431d59904d411eaafd71e42fd827d83931d139aeb36a2c847f02af0edf97e9b55c4eec7bf55367f9c07273d09adfdf89b88938db20ad4a9569e996a
-  data.tar.gz: 9a5fb43cc6a19c7ce85b127621d35895c0a2580aee02f34a1862836885bc957e5e41b29bcfcf1cf6dd4824ba616a30b6d9aaa8fdfe4c02088a1f0abe78fc7f03
+  metadata.gz: c31004116f099381d80021a34d04c541bc13b221e0d980c9f073f28150dd8843fb837022670ff46015ddc1dd62c9d294d9847b9e4d5207d45249ca8ebf720389
+  data.tar.gz: a7f08110118e2aaacb4569e6d3835b4c40660a0561318490edef9b0023a6c33061bc2ff3c068062ce7d9bfb382926aaae44448e36715ab68988dc6b4d7aeb270

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', '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

data/lib/time_sheet/time/entry.rb

@@ -78,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?
@@ -90,7 +91,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 +102,14 @@ 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
@@ -157,7 +168,8 @@ class TimeSheet::Time::Entry
       'duration' => duration,
       'project' => project,
       'activity' => activity,
-      'description' => description
+      'description' => description,
+      'tags' => tags
     }
   end
 
@@ -173,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/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.10.0"
+  VERSION = "0.11.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.11.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet