timekeeper 0.2.1 → 0.2.2

data/lib/timekeeper/keeper.rb

@@ -24,7 +24,7 @@ module Timekeeper
   
     def store(attributes)
       attributes.store(:name, config["name"])
-      attributes.store(:date, Date.today) unless attributes["date"]
+      attributes.store(:date, Date.today) unless (attributes["date"] || attributes[:date])
       table[table.genuid] = Keep.new(attributes).to_hash
     end
   

data/lib/timekeeper/runner.rb

@@ -26,8 +26,16 @@ module Timekeeper
     def self.tv(args)
       options = ViewerOptions.new(args)
       tv = Viewer.new
-      tv.config(options.delete(:config)) if options[:config]      
-      records = tv.all
+      tv.config(options.delete(:config)) if options[:config]
+      records = begin
+        if options[:name]
+          tv.by_name(options[:name])
+        elsif options[:month]
+          tv.by_month(options[:month])
+        else
+          tv.all
+        end
+      end
       if output = options.delete(:output)
         Viewer.export(records, output[0], output[1])
       else

data/lib/timekeeper/viewer.rb

@@ -5,15 +5,41 @@ module Timekeeper
     def config(file="timekeeper.yml")
       @config ||= YAML.load_file(file)
     end
+    
+    def by_month(m=nil)
+      today = Date.today
+      y, m = today.year, m || today.month
+      select{|q|
+        q.add "date", :starts_with, "#{y}-#{sprintf("%02d", m)}"
+      }.sort!{|x,y| y.date <=> x.date }
+    end
+    
+    def by_name(name)
+      select{|q|
+        q.add "name", :eq, name
+      }.sort!{|x,y| y.date <=> x.date }
+    end
+    
+    def select(&block)
+      tables.collect{|table|
+        table.query{|q|
+          yield q     
+        }.collect{|attrs|
+          keep = Keep.new(attrs)
+          keep.tracked = tracked?(keep.name, keep.pk)
+          keep
+        }
+      }.flatten
+    end
 
     def all
-      tables.collect{|table| 
+      tables.collect{|table|
         table.query.collect{|attrs|
           keep = Keep.new(attrs)
           keep.tracked = tracked?(keep.name, keep.pk)
           keep
         }
-      }.flatten!
+      }.flatten.sort!{|x,y| y.date <=> x.date }
     end
   
     def close

data/lib/timekeeper/viewer_options.rb

@@ -21,20 +21,20 @@ module Timekeeper
           self[:name] = name
         end        
 
-        o.on('-t', '--title TITLE', 'Query on title') do |title|
-          self[:title] = title
-        end
+        # o.on('-t', '--title TITLE', 'Query on title') do |title|
+        #   self[:title] = title
+        # end
 
-        o.on('-c', '--target TARGET', 'Query on target') do |target|
-          self[:target] = target
-        end
+        # o.on('-c', '--target TARGET', 'Query on target') do |target|
+        #   self[:target] = target
+        # end
 
-        o.on('-m', '--description DESCRIPTION', 'Query on description') do |description|
-          self[:description] = description
-        end
+        # o.on('-m', '--description DESCRIPTION', 'Query on description') do |description|
+        #   self[:description] = description
+        # end
 
-        o.on('-d', '--date DATE', 'Query on date') do |date|
-          self[:date] = date
+        o.on('--month [month]', 'Query on month') do |month|
+          self[:month] = month || Date.today.month
         end
 
         o.on_tail('-h', '--help', 'Display this help and exit') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timekeeper
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - atog
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 +02:00
+date: 2009-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency