time-sheet 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f3f57a31269c965756a1eb5f00eccd8c831ab69bcd2f71cc65ca9242e54dcc
-  data.tar.gz: b5e121a0c379450019c7606ee994c5ea5ebdb5e5cef8afcb3f33f5fe864b8a6f
+  metadata.gz: f9adeab367eb0148cb4955998b48150ee01572c73bb10dae433f06c070522751
+  data.tar.gz: e0574ef0e9cd16b10bea3aed8de0aea289e7e9255211236a30e91ae49fef6b99
 SHA512:
-  metadata.gz: c31004116f099381d80021a34d04c541bc13b221e0d980c9f073f28150dd8843fb837022670ff46015ddc1dd62c9d294d9847b9e4d5207d45249ca8ebf720389
-  data.tar.gz: a7f08110118e2aaacb4569e6d3835b4c40660a0561318490edef9b0023a6c33061bc2ff3c068062ce7d9bfb382926aaae44448e36715ab68988dc6b4d7aeb270
+  metadata.gz: 75e6ea96de075b554cf181d5298fb1527380d6aa3c7e0d982afe0e596849cd521b102add3d1f2e1ad2e45e0fef8ab76effb1815fc9ab8f03d2cc66c825dd0ca6
+  data.tar.gz: 441d49f696d8afc564ff6baf409895f33192c8dd232f4d34c9eb2d11e5fee6eb13d703feeb7f9971a0299fde5ebacfc64ee43d924ca4e77baa2ec07cebe2afac

data/lib/time_sheet/time/cmd.rb

@@ -117,7 +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 '--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
@@ -156,11 +156,15 @@ 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)
 
-      puts "last package duration: #{package}/#{total} (#{percent.round 2}%)"
+      puts [
+        "current package: #{package}/#{total}",
+        "(#{(package / 60.0).round(2)}/#{(total / 60.0).round(2)} hours,",
+        "#{percent.round 2}%)"
+      ].join(' ')
     end
   end
 

data/lib/time_sheet/time/entry.rb

@@ -78,7 +78,6 @@ class TimeSheet::Time::Entry
   end
 
   def tags
-    binding.pry if @data['tags'] == 86
     self.class.parse_tags(@data['tags'])
   end
 
@@ -106,7 +105,12 @@ class TimeSheet::Time::Entry
     return true if tags.empty?
 
     tags.all? do |tag|
-      self.tags.include?(tag)
+      if tag.match?(/^\!/)
+        t = tag.gsub(/\!/, '')
+        !self.tags.include?(t)
+      else
+        self.tags.include?(tag)
+      end
     end
   end
 

data/lib/time_sheet/version.rb

@@ -1,3 +1,3 @@
 module TimeSheet
-  VERSION = "0.11.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-sheet
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet