watcard 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c946b3c141c0d0328ab669444e0951bc2b00c26c
-  data.tar.gz: 7b0d61a8e48afdb344daf73878db59536fa525ef
+  metadata.gz: db3eab6c54d46f00699e1609a490e8bd91be61c5
+  data.tar.gz: dd23c5e11ed1919b58905d2cccb9a9f88f570d6a
 SHA512:
-  metadata.gz: c1af6fc7a297b00374378dd5457d4b5fbf6ae651dea5a6b283f0bd97f4cf61ef3dabe3352d295807d6551f0beb2fa4d8693d6bace46b9a8ed6518f271ee5dfab
-  data.tar.gz: 46072efbe62a64a58802a15fd2c9faecec9f82e7ba561149d44eabcf3afbf5d31e509f630b8f663536903c3d98c0ad6bf96de1a61618d024610c0ea8dcc019be
+  metadata.gz: b2f2b029ea8f200283845408e96dd423d32c5c15619ecb3c62f88194be8426853c15e760ca5d3c1dbceb296d3c056dc31303fdf7199a31083b06df09a549b5ed
+  data.tar.gz: b4ad1d09d230aa841ba932f7790bb249a5acbce658ba7ff30c2aac995bdfc37c118ab4832505785dfd315e3f2d28a853ac0b35d4322ddcd5b76c420c54bde9dc

data/bin/watcard

@@ -15,15 +15,20 @@ rescue Exception => e
 end
 
 command = ARGV.shift
+days_ago = (ARGV.shift || 0).to_i
+hist = Watcard::History.new(conf)
 case command
 when "hist"
-  hist = Watcard::History.new(conf)
-  days_ago = (ARGV.shift || 0).to_i
   hist.output_history(days_ago)
 when "ledger"
-  hist = Watcard::History.new(conf)
-  days_ago = (ARGV.shift || 0).to_i
   hist.output_ledger(days_ago)
+when "ledgerall"
+  hist.output_ledger_all
+when "rawhist"
+  hist.output_raw_history(days_ago)
+when "lastadd"
+  date = hist.last_ledger_add
+  puts "#{(Date.today-date).to_i} days ago on #{date}"
 else
   puts "Watcard CLI v#{Watcard::VERSION}"
   puts "By Tristan Hume"

data/lib/watcard/history.rb

@@ -3,6 +3,7 @@ require "net/http"
 require "uri"
 require "time"
 require "facets"
+require "yaml"
 
 module Watcard
   class History
@@ -36,6 +37,7 @@ module Watcard
       return "V1 Cafeteria" if loc =~ /WAT-FS-V1/
       return "Liquid Assets" if loc =~ /WAT-FS-LA/
       return "V1 Laundry" if loc =~ /V1 LAUNDRY/
+      return "Media.Doc" if loc =~ /MEDIA.DOC/
       loc
     end
 
@@ -51,17 +53,19 @@ module Watcard
           time: Time.parse(cols[1], date),
           amount: -(cols[2].strip.to_f)*mult,
           loc: parse_loc(cols.last),
+          raw_loc: cols.last,
           balance: cols[3].to_i
         }
       end.compact.reverse
     end
 
-    def bundle_transactions(hist)
-      return hist if hist.empty?
+    def add_transaction_types(hist)
       hist.each do |a|
         h = a[:time].hour
         type = if a[:loc] =~ /laundry/i
           "Laundry"
+        elsif a[:loc] =~ /media/i
+          "Printing"
         elsif h < 11
           "Breakfast"
         elsif h < 17
@@ -71,6 +75,10 @@ module Watcard
         end
         a[:meal] = type
       end
+    end
+
+    def bundle_transactions(hist)
+      return hist if hist.empty?
       meals = [hist.shift]
       hist.each do |a|
         # if last meal is same type treat them as one
@@ -96,6 +104,7 @@ module Watcard
         log "No Transactions"
         exit
       end
+      add_transaction_types(hist)
       bundle_transactions(hist)
     end
 
@@ -109,11 +118,7 @@ module Watcard
 END
     end
 
-    def output_ledger(days_ago)
-      meals = fetch_meals(days_ago)
-      add_accounts(meals)
-      log "# Transactions:"
-      out = meals.map {|m| ledger_transaction(m)}.join('')
+    def ledger_append_prompt(out)
       puts out
       if STDIN.tty? && @conf['ledger']
         print "# Add to file [yN]: "
@@ -125,6 +130,29 @@ END
       end
     end
 
+    def ledger_transactions(days_ago)
+      meals = fetch_meals(days_ago)
+      add_accounts(meals)
+      meals.map {|m| ledger_transaction(m)}.join('')
+    end
+
+    def output_ledger(days_ago)
+      log "# Transactions for #{days_ago} days ago"
+      out = ledger_transactions(days_ago)
+      ledger_append_prompt(out)
+    end
+
+    def output_ledger_all
+      start = (Date.today - last_ledger_add).to_i - 1
+      days = []
+      start.downto(0).each do |days_ago|
+        days << ledger_transactions(days_ago)
+      end
+      out = days.join('')
+      log "# Transactions since #{start} days ago:"
+      ledger_append_prompt(out)
+    end
+
     def output_history(days_ago)
       meals = fetch_meals(days_ago)
       total = 0
@@ -137,5 +165,18 @@ END
       print " out of $#{budget} surplus: #{sprintf('%.2f',budget-total)}" if budget
       puts ''
     end
+
+    def output_raw_history(days_ago)
+      hist = history(Time.now.less(days_ago, :days))
+      add_transaction_types(hist)
+      puts YAML.dump(hist)
+    end
+
+    def last_ledger_add
+      return Date.today unless @conf['ledger']
+      file = File.expand_path(@conf['ledger'])
+      ledger = IO.read(file)
+      Date.parse(ledger.scan(/\d+\/\d+\/\d+/).last)
+    end
   end
 end

data/lib/watcard/version.rb

@@ -1,3 +1,3 @@
 module Watcard
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watcard
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tristan Hume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri