ptimelog 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72b05fa5e616ace4ab1279b49b23bba94f5130edd06f54a1e8b21bda1a67d35
-  data.tar.gz: 334c78339b815942e0c3155d49ee8bb601603ab682936f240370eeeabe209196
+  metadata.gz: 9ef3bd0d847dd1a258f83f7e1a41123352f4831270d89f550560d0ae802c3f72
+  data.tar.gz: 4a407b654336ca4e37272dffa964e7abeceb478ffb46d1f54926fa2fec0700a8
 SHA512:
-  metadata.gz: 400d45182b50402b0832adb98b4c31ea84ff1c5fb9b815c43ba9d575257f9bb371d7db920270399d74f97a6f2a6bb9d7b57d1a35cff4bdf3e15d0a085a0f7295
-  data.tar.gz: 5b8c16be0f1a3c6b3b4ae01442abaf10c381d860922cf84c58abc097ab9f1d1c82deb235e4857f58ca0b75654bc3df34b716d413a2692876e73e101e0e13f85c
+  metadata.gz: 4441aa2504527e658d29c83903e94a8e939f5f2bfbb529cb2f3cb4dabc57b0766ae0674784888f1696a9a85a5137285064b71edb089218d9bdf38170daf88b47
+  data.tar.gz: 44265b7b8be6540b726e61919f912c1cbd460636b88b3da2296dc4114f940644b72124fa89f893e67bb7823c104a5948d6227ef6f251ee4e1a1ef4179dc64bf1

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2018 Matthias Viehweger
+Copyright (c) 2017-2020 Matthias Viehweger
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/ptimelog/command/base.rb

@@ -9,7 +9,8 @@ module Ptimelog
 
         return unless needs_entries?
 
-        @entries = Ptimelog::Day.new(day).entries
+        @entries = {}
+        self.entries = Ptimelog::Day.new(day).entries
       end
 
       def needs_entries?

data/lib/ptimelog/command/show.rb

@@ -4,17 +4,27 @@ module Ptimelog
   module Command
     # show entries of one day or all of them
     class Show < Base
+      def initialize(*args)
+        @durations = Hash.new(0)
+
+        super
+      end
+
       def needs_entries?
         true
       end
 
       def run
         @entries.each do |date, list|
-          puts date, '----------'
+          puts date,
+               '----------'
           list.each do |entry|
             puts entry
           end
-          puts nil
+          puts '----------',
+               "Total work done: #{duration(date)} hours",
+               '----------------------------',
+               nil
         end
       end
 
@@ -23,19 +33,15 @@ module Ptimelog
           @entries[date] = []
 
           list.each do |entry|
-            @entries[date] << [
-              entry.start_time, '-', entry.finish_time,
-              [
-                entry.ticket,
-                entry.description,
-                entry.tags,
-                entry.account,
-                (entry.billable? ? '$' : nil),
-              ].compact.join(' ∴ '),
-            ].compact.join(' ')
+            @durations[date] += entry.duration
+            @entries[date] << entry.to_s
           end
         end
       end
+
+      def duration(date)
+        Time.at(@durations[date]).utc.strftime('%H:%M')
+      end
     end
   end
 end

data/lib/ptimelog/entry.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module Ptimelog
   # Dataclass to wrap an entry
   class Entry
@@ -70,15 +72,19 @@ module Ptimelog
       @account, @billable = infer_account_and_billable
     end
 
+    def duration
+      (Time.parse(@finish_time) - Time.parse(@start_time)).to_i
+    end
+
     def to_s
+      billable = billable? ? '$' : nil
       [
         @start_time, '-', @finish_time,
-        [@ticket, @description, @tags, @account].compact.join(' : '),
+        [@ticket, @description, @tags, @account, billable].compact.join(' ∴ '),
       ].compact.join(' ')
     end
 
     # make sortable/def <=>
-    # duration if start and finish is set
 
     private
 

data/lib/ptimelog/version.rb

@@ -16,5 +16,5 @@
 # with an improvement. Keep in mind that this is also covered by rspec so I
 # expect (pun intended) 100% test-coverage for any additional code.
 module Ptimelog
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ptimelog
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Matthias Viehweger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naught