time-sheet 0.11.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e2d47f0a17abcab7e6b134fd87b176dd753a5dc8022a66d59dcd8b16b3393b
-  data.tar.gz: 3335117c3db218920b623aa6759d231f77867b41db80a4bf532a2ba65d334451
+  metadata.gz: 3eafc5b6d18708b232660dc63e6b27c965c43013c569da732780e72638543644
+  data.tar.gz: 0e11e2d36a118c0db1b5d3f7ff0e5c59fbe8e94df4910e75fd5d2598b84ed326
 SHA512:
-  metadata.gz: 449c5648f9734732fe4f7c89bdfbcba97b847c213460ac66ecaf69601fd90524ba451cc2abed6b3cb87c1ef1a519218843046b63783e01496e4662f80cb9bb42
-  data.tar.gz: cc06940f56f3c29aa6f1dadde4f3c171f9589ffb28abcd3ca1adebfacb5df3b88477d9527b49e5ea7dc44b73a149330489ef84dcf570570e1d6a965ae881543f
+  metadata.gz: bafb5ce2ad3372ced67f0f1b498ad0f4966772c93cae6a455e20ca445c077f95295f254e3dddc41a58d11fe34271610c1557faddd6da4fe9c85167a5a704a3ef
+  data.tar.gz: ad6ccabcfb8a866676cfa9e5cc3659d7dd7ab62913ef63689e5cd4101ccdfdadc5b1390633e9c8c7005c2515b1d6e01a8adba8082e68d976064077dc7652b67f

data/lib/time_sheet/time/cmd.rb

@@ -39,6 +39,8 @@ class TimeSheet::Time::Cmd
           invoice
         when 'report', 'default'
           report
+        when 'verify'
+          verify
         when 'today', 't'
           options[:from] = TimeSheet::Time::Util.today
           options[:summary] = true
@@ -105,6 +107,7 @@ class TimeSheet::Time::Cmd
         'available commands:',
         "  report (default): list entries conforming to given criteria",
         "  invoice: compress similar entries and filter petty ones. Optionally package for e.g. monthly invoicing",
+        "  verify: check syntax and semantics in your input spreadsheets",
         "\n  general options:"
       ].join("\n")
 
@@ -117,7 +120,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
@@ -144,6 +147,26 @@ class TimeSheet::Time::Cmd
     end
   end
 
+  def verify
+    convert_to_time
+
+    entries = TimeSheet::Time::Parser.new(options[:location]).entries
+
+    puts 'checking for changes in project with carried-over description ...'
+    entries.each do |entry|
+      next unless entry.matches?(options)
+
+      if entry.prev && entry.prev.project != entry.project
+        # we check for the same object because that means that the value has
+        # been carried over from the previous entry and that likely represents
+        # an oversight in these circumstances
+        if entry.prev.description.equal?(entry.description)
+          puts "-> | #{entry}"
+        end
+      end
+    end
+  end
+
   def invoice
     convert_to_time
 
@@ -156,11 +179,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

@@ -105,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.1"
+  VERSION = "0.14.0"
 end

metadata

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