timesheets 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c601f6f68e11d6e01651251bf92e0a844ccb7e16
-  data.tar.gz: 8a3d7a5507cafa7f20aefa320a0e603bf850e8ed
+  metadata.gz: c632d977a47f14254837ce09b33af73f1e61725d
+  data.tar.gz: 427c2f8e184c21b261b5ebc4051f6e50ee7551f4
 SHA512:
-  metadata.gz: 88caf9a6424459274e5a36d11ffc8de76350e9f5776f8a6eebdcf6408921a47fa74d6bd294cc1f6177aa8ca7876bdcbb66ee2f072d81b3bd5207c0b3e1a2f458
-  data.tar.gz: e1220935adb1cda7db7ec0d5474f3e70bf66ab5f7ec5fb2d5cfa265c1c0d762a92bff67f789821c27546ac0c737060fcde284e3b6acd4593252493d697482ea2
+  metadata.gz: 90c5365557a0560e2b07d40e576c75da15b59e6898a8f36c27c5468a0f07fffac3e34c21afe3fe2738e1c65abfad25cb15157b2207da63965876b49ec674a8c2
+  data.tar.gz: d87d8e382e56c7f56383a386e201c3b893df17153a3cced8864445224c712436c09537f55b3c484bb8541be06027fed1ec88dbb307d00a9ee0aad26a3d572790

data/.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = spaces
+indent_size  = 2

data/lib/timesheets/cli.rb

@@ -7,6 +7,8 @@ require "timesheets/commands/edit"
 require "timesheets/commands/start"
 require "timesheets/commands/status"
 require "timesheets/commands/stop"
+require 'timesheets/html_table'
+require 'timesheets/csv_table'
 require "timesheets/commands/summary"
 
 module Timesheets
@@ -32,8 +34,12 @@ module Timesheets
     end
 
     desc "summary", "See a summary table of time worked"
+    option :format
+    option :'week-of'
+    option :rate
+    option :template
     def summary
-      Commands::Summary.run
+      Commands::Summary.run(options)
     end
   end
 end

data/lib/timesheets/commands/base.rb

@@ -1,8 +1,14 @@
 module Timesheets
   module Commands
     class Base
-      def self.run
-        new.run
+      attr_accessor :options
+
+      def self.run(options = {})
+        new(options).run
+      end
+
+      def initialize(options = {})
+	@options = options
       end
 
       private

data/lib/timesheets/commands/summary.rb

@@ -7,29 +7,60 @@ module Timesheets
 
       private
 
+      def tableClass
+				{
+					'html' => Timesheets::HTMLTable,
+					'csv'  => Timesheets::CSVTable,
+				}[options[:format]] || Terminal::Table
+      end
+
+      def table_renderer(&block)
+        tableClass.new({ headings: heading, template: options[:template] }, &block)
+      end
+
       def summary_table
-        Terminal::Table.new(headings: heading) {|t|
+        table_renderer {|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
-          }
-
-          t << (heading.length - 2).times.map { '' } + ['Total:', sprintf('%0.02f', total_hours)]
+            rows_for_entries(entries).each {|row| t << row }
+						t << :separator unless index == entries_by_week.length - 1
+					}
+          t << total_row(entries) unless options['week-of']
 
           heading.length.times {|i| t.align_column(i, :right) }
         }
       end
 
+      def rows_for_entries(entries)
+        format_entries(entries) + [
+          :separator,
+          total_row(entries)
+        ]
+      end
+
       def heading
-        ['Weekday', 'Date', 'Time', 'Hour(s)']
+        the_heading = ['Weekday', 'Date', 'Time', 'Hour(s)']
+
+				the_heading += ['Hourly Rate', 'Total']
+
+				the_heading
       end
 
-      def total_hours
-        hours_in_entries(entries)
+      def total_row(entries)
+				padN = heading.length - 2
+				padN -= 2 if options[:rate]
+        the_row = padN.times.map { '' } + ['Total:', sprintf('%0.02f', hours_in_entries(entries))]
+
+				if options[:rate]
+					the_row += ['', "$#{comma_numbers(hours_in_entries(entries).to_f * options[:rate].to_f)}"]
+				end
+
+				the_row
       end
 
+			def comma_numbers(number, delimiter = ',')
+				sprintf('%0.02f', number).reverse.gsub(%r{([0-9]{3}(?=([0-9])))}, "\\1#{delimiter}").reverse
+			end
+
       def hours_in_entries(the_entries)
         the_entries.map {|entry| hours_in_entry(entry) }.reduce(:+)
       end
@@ -38,20 +69,46 @@ module Timesheets
         @entries_by_week ||= entries.group_by {|entry| entry.first.strftime('%U') }.values
       end
 
-      def format_entries(entries)
+      def entries
+        the_entries = super
+
+				if options['week-of']
+          week_num = DateTime.parse(options['week-of']).strftime("%U")
+          the_entries = the_entries.select {|entry| entry.first.strftime("%U") == week_num }
+				end
+
+				the_entries
+      end
+
+      def entries_by_day(entries)
         entries.group_by {|entry|
-            entry.first.strftime('%B %e, %Y')
-        }.map {|day, entries|
-          [
+          entry.first.strftime('%B %e, %Y')
+        }
+      end
+
+      def times_in_entry(entry)
+        entry.map {|time| time.strftime('%l:%M%p') }.join(' - ')
+      end
+
+      def times_for_entries(entries)
+				entries.map {|entry| times_in_entry(entry) }.join(', ')
+      end
+
+      def format_entries(entries)
+				entries_by_day(entries).map {|day, entries|
+          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
+						times_for_entries(entries),
+            sprintf('%0.02f', hours_in_entries(entries))
+					].flatten
+
+					if options[:rate]
+						entry << sprintf('$%0.02f', options[:rate])
+						entry << sprintf('$%0.02f', hours_in_entries(entries).to_f * options[:rate].to_f)
+					end
+
+					entry
         }
       end
     end

data/lib/timesheets/csv_table.rb

@@ -0,0 +1,20 @@
+module Timesheets
+  class CSVTable
+    def initialize(options, &block)
+      @heading = options[:headings]
+      @rows = []
+      block.call(self)
+    end
+
+    def <<(row)
+      @rows << row unless row == :separator
+    end
+
+    def align_column(n, alignment)
+    end
+
+    def to_s
+      ([@heading] + @rows).map {|row| row.map {|cell| "\"#{cell}\"" }.join(",") }.join("\n")
+    end
+  end
+end

data/lib/timesheets/html_table.rb

@@ -0,0 +1,76 @@
+require 'digest'
+
+module Timesheets
+  class HTMLTable
+    def initialize(options, &block)
+      @heading = options[:headings]
+      @template = options[:template]
+      @rows = []
+      @styles = ["table.timesheets-summary-table th { text-align: left; }"]
+      block.call(self)
+    end
+
+    def <<(row)
+      @rows << row
+    end
+
+    def align_column(n, alignment)
+      @styles << "table.timesheets-summary-table td:nth-child(#{n+1}) { text-align: #{alignment}; }"
+    end
+
+    def to_s
+			styles = @styles.join
+			table = [
+        "<table class='timesheets-summary-table'><thead>",
+        @heading.map {|cell| "<th>#{cell}</th>" },
+				"</thead><tbody>",
+        @rows.map {|row|
+          if row == :separator
+						""
+          else
+            ["<tr>", row.map {|cell| "<td>#{cell}</td>" }.join, "</tr>"]
+          end
+        }.join,
+				"</tbody></table>"
+      ].join
+
+			template
+				.gsub("{{styles}}", styles)
+				.gsub("{{table}}", table)
+				.gsub("{{today}}", Time.new.strftime('%Y-%m-%d'))
+				.gsub("{{invoiceID}}", (Digest::SHA2.new << template << Time.new.to_i.to_s).to_s[0...8])
+				.gsub("{{firstDayNice}}", @rows.first[1])
+    end
+
+		private
+
+		def template
+			@template ? File.read(@template) : default_template
+		end
+
+		def default_template
+<<-TEMPLATE
+<!DOCTYPE html>
+<html>
+<head>
+	<style>
+		{{styles}}
+	</style>
+</head>
+<body>
+	<h1>Invoice <small>for the week of {{firstDayNice}}</h1>
+	<p>
+		<strong>Date:</strong><br/>
+		{{today}}
+	</p>
+	<p>
+		<strong>Invoice ID:</strong><br/>
+		{{invoiceID}}
+	</p>
+	{{table}}
+</body>
+</html>
+TEMPLATE
+		end
+  end
+end

data/lib/timesheets/version.rb

@@ -1,3 +1,3 @@
 module Timesheets
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timesheets
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Bradley J. Spaulding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -102,6 +103,8 @@ files:
 - lib/timesheets/commands/status.rb
 - lib/timesheets/commands/stop.rb
 - lib/timesheets/commands/summary.rb
+- lib/timesheets/csv_table.rb
+- lib/timesheets/html_table.rb
 - lib/timesheets/version.rb
 - spec/spec_helper.rb
 - timesheets.gemspec