timesheets 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 241b39acbe35ef74faa2c26862450110707d6e7f
-  data.tar.gz: e8034b7b0ff1da83f69ce7a8543b4801ff4b560b
+  metadata.gz: 91fa9830d81f3444ceed62b779739f22631af3cd
+  data.tar.gz: 77acf5e415da7ffe0ed07181e906b5eda6540c90
 SHA512:
-  metadata.gz: 791d4e86169ca723076c548a6e154c9267473cf5413a4ed0bf858d842706af447477a283902b16c636ce2ce5d68f461929f4b7b8588f8d157b31387e71f25737
-  data.tar.gz: e3657439a1b06d7122b2c21ebc6b1fdc51da25955e4c15bfa6e0718e37fe3ab5b58c4f8ce965859cf15b9f6ffdacf2693cf9f0e80b617d54a13353f172db8c53
+  metadata.gz: 6c39ed7579ec8decbf16c59d1fa04e8e69ef9e5faba32523f089f555db48fb112307fee5ce2cec80db9fff6465cf60e74d1dab474faadeb72896d584e2134e74
+  data.tar.gz: 84b8a4acc632c600efc2c4545c1e3abaab8a9a206543009929557372b5e1426cdc5c9273294c8baeba6eec412f9c90dec90d3a021b8330788356b646004125f1

data/lib/timesheets/commands/base.rb

@@ -19,6 +19,14 @@ module Timesheets
         @entries ||= rows.map {|row| row.map {|dt| DateTime.parse(dt || Time.now.to_s).to_time } }
       end
 
+      def todays_entries
+        entries.select {|entry| entry.first.strftime('%Y%m%d') == today }
+      end
+
+      def today
+        @today ||= Time.new.strftime('%Y%m%d')
+      end
+
       def rows
         @rows ||= CSV.read(filepath)[1..-1]
       end

data/lib/timesheets/commands/status.rb

@@ -2,17 +2,20 @@ module Timesheets
   module Commands
     class Status < Base
       def run
+        strings = []
         if session_in_progress?
-          puts "Current work session has been active for #{active_time}"
+          strings << "Current work session has been active for #{active_time}."
         else
-          puts "Not currently working"
+          strings << "Not currently working."
         end
+        strings << "Total time today is #{total_time_today}."
+        puts strings.join(' ')
       end
 
       private
 
-      def active_time
-        hoursf = hours_in_entry(entries.last)
+      def active_time(the_entries = [entries.last])
+        hoursf = the_entries.map {|entry| hours_in_entry(entry) }.reduce(:+)
         hours = hoursf.to_i
         mins = ((hoursf - hours) * 60).to_i
 
@@ -21,6 +24,10 @@ module Timesheets
           .join(', ')
       end
 
+      def total_time_today
+        active_time(todays_entries)
+      end
+
       def pluralize(word, n)
         n == 1 && "#{n} #{word}" || "#{n} #{word}s"
       end

data/lib/timesheets/commands/summary.rb

@@ -8,28 +8,49 @@ module Timesheets
       private
 
       def summary_table
-        Terminal::Table.new(headings: ['Weekday', 'Date', 'Start Time', 'End Time', 'Hour(s)']) {|t|
-          formatted_entries.each {|entry| t << entry }
-          t << :separator
-          t << (formatted_entries.first.length - 1).times.map { '' } + [sprintf('%0.02f', total_hours)]
+        Terminal::Table.new(headings: heading) {|t|
+          entries_by_week.each_with_index {|entries, index|
+            format_entries(entries).each {|entry| t << entry }
+            t << :separator
+            t << (heading.length - 2).times.map { '' } + ['Weekly Total:', sprintf('%0.02f', hours_in_entries(entries))]
+            t << :separator
+          }
 
-          formatted_entries.first.length.times {|i| t.align_column(i, :right) }
+          t << (heading.length - 2).times.map { '' } + ['Total:', sprintf('%0.02f', total_hours)]
+
+          heading.length.times {|i| t.align_column(i, :right) }
         }
       end
 
+      def heading
+        ['Weekday', 'Date', 'Time', 'Hour(s)']
+      end
+
       def total_hours
-        entries.map {|entry| hours_in_entry(entry) }.reduce(:+)
+        hours_in_entries(entries)
+      end
+
+      def hours_in_entries(the_entries)
+        the_entries.map {|entry| hours_in_entry(entry) }.reduce(:+)
+      end
+
+      def entries_by_week
+        @entries_by_week ||= entries.group_by {|entry| entry.first.strftime('%U') }.values
       end
 
-      def formatted_entries
-        @formatted_entries ||= entries.map {|entry|
+      def format_entries(entries)
+        entries.group_by {|entry|
+            entry.first.strftime('%B %e, %Y')
+        }.map {|day, entries|
           [
-            entry.first.strftime('%A'),
-            entry.first.strftime('%B %e, %Y'),
-            entry.map {|time|
-              time.strftime('%l:%M%p')
-            },
-            sprintf('%0.02f', hours_in_entry(entry))
+            entries.first.first.strftime('%A'),
+            day,
+            entries.map {|entry|
+              entry.map {|time|
+                time.strftime('%l:%M%p')
+              }.join(' - ')
+            }.join(', '),
+            sprintf('%0.02f', entries.map {|entry| hours_in_entry(entry) }.reduce(:+))
           ].flatten
         }
       end

data/lib/timesheets/version.rb

@@ -1,3 +1,3 @@
 module Timesheets
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timesheets
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Bradley J. Spaulding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor