watcard 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3eab6c54d46f00699e1609a490e8bd91be61c5
-  data.tar.gz: dd23c5e11ed1919b58905d2cccb9a9f88f570d6a
+  metadata.gz: d2bbcede77261b23a5ce0fa61a6b559afb7aaac7
+  data.tar.gz: e24ce3df5490d72ecec90ba9ebc7e2fbe61a8d53
 SHA512:
-  metadata.gz: b2f2b029ea8f200283845408e96dd423d32c5c15619ecb3c62f88194be8426853c15e760ca5d3c1dbceb296d3c056dc31303fdf7199a31083b06df09a549b5ed
-  data.tar.gz: b4ad1d09d230aa841ba932f7790bb249a5acbce658ba7ff30c2aac995bdfc37c118ab4832505785dfd315e3f2d28a853ac0b35d4322ddcd5b76c420c54bde9dc
+  metadata.gz: 416101087dcef732329cea8e8ec87385c21234aea4eaa6ed14e13847a4e488ad1918272064f0c8a898c0c9f2c91806384e46370ee2428790f88c6761462a7c1c
+  data.tar.gz: 459b8fd2d3ee391f8e3cd48875e7d618c23055f9c2fae0a5d8c72a8834e1979a12bd2cdd7b9a37b163e0b8368c5d83be6527bd54fc696886e2383a2d26bf9d74

data/bin/watcard

@@ -3,6 +3,19 @@
 require "watcard"
 require "yaml"
 
+MSG = <<END
+Watcard CLI v#{Watcard::VERSION}
+By Tristan Hume (http://thume.ca/)
+
+# Commands:
+hist [days ago]: Output meals for day
+ledger [days ago]: Output ledger for day and optionally send to file.
+ledgerall [days ago]: Like ledger but for all days since last add.
+rawhist [days ago]: Output YAML transaction data for day, no bundling
+lastadd: Output date history was added to ledger
+
+END
+
 FILE = File.expand_path("~/.watcard.yml")
 
 begin
@@ -30,8 +43,5 @@ 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"
-  puts ""
-  puts "Unknown command"
+  puts MSG
 end

data/lib/watcard/history.rb

@@ -37,8 +37,10 @@ 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 "V1 Front Desk" if loc =~ /V1DESK/
       return "Media.Doc" if loc =~ /MEDIA.DOC/
-      loc
+      return "Student Health Pharmacy" if loc =~ /STUDENT HEALTH/
+      loc.strip
     end
 
     def history(date)
@@ -64,8 +66,10 @@ module Watcard
         h = a[:time].hour
         type = if a[:loc] =~ /laundry/i
           "Laundry"
-        elsif a[:loc] =~ /media/i
+        elsif a[:loc] =~ /media|desk/i
           "Printing"
+        elsif a[:loc] =~ /pharmacy/i
+          "Health Supplies"
         elsif h < 11
           "Breakfast"
         elsif h < 17

data/lib/watcard/version.rb

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

metadata

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