timekeeper 0.2.0 → 0.2.1

data/lib/timekeeper/keep.rb

@@ -1,8 +1,12 @@
 module Timekeeper
 
   class Keep
+    
+    FIELDS = %w(pk name target title date time description tracked)
   
-    attr_accessor :name, :time, :title, :description, :target, :date, :pk
+    FIELDS.each do |field|
+      attr_accessor field
+    end
   
     def initialize(attributes)
       set_attributes(attributes)
@@ -28,11 +32,15 @@ module Timekeeper
   
     def to_hash
       {:name => name, :time => time, :title => title, :description => description,
-        :target => target, :date => date}
+        :target => target, :date => date, :tracked => tracked}
+    end
+    
+    def values
+      [pk, name, target, title, date, time, description, tracked]
     end
   
     def to_s
-      "#{pk}|#{name}|#{target}|#{title}|#{description}|#{date}|#{time}"
+      "#{pk}|#{name}|#{target}|#{title}|#{description}|#{date}|#{time}|#{tracked}"
     end
   
     private

data/lib/timekeeper/keeper.rb

@@ -23,8 +23,8 @@ module Timekeeper
     end
   
     def store(attributes)
-      attributes.store("name", config["name"])
-      attributes.store("date", Date.today) unless attributes["date"]
+      attributes.store(:name, config["name"])
+      attributes.store(:date, Date.today) unless attributes["date"]
       table[table.genuid] = Keep.new(attributes).to_hash
     end
   
@@ -40,6 +40,12 @@ module Timekeeper
       end
     end
     
+    def track(id, name)
+      tracking_table = Rufus::Tokyo::Table.new(File.join(config["db_path"],"tracking-time.tct"))
+      tracking_table[tracking_table.genuid] = {:keep_id => id, :name => name}
+      tracking_table.close
+    end
+    
     private
     
       def table

data/lib/timekeeper/keeper_options.rb

@@ -12,6 +12,10 @@ module Timekeeper
         o.on("--config FILE", "location of your configuration file - default is ./timekeeper.yml") do |file|
           self[:config] = file
         end
+        
+        o.on('-n', '--name NAME', 'Who did it?') do |name|
+          self[:name] = name
+        end        
 
         o.on('-t', '--title TITLE', 'What do you want to register?') do |title|
           self[:title] = title
@@ -37,9 +41,13 @@ module Timekeeper
           self[:remove] = id
         end
         
-        o.on('--update ID', 'Remove a record.') do |id|
+        o.on('--update ID', 'Update a record.') do |id|
           self[:update] = id
         end
+
+        o.on('--track ID', 'Track a record.') do |id|
+          self[:track] = id
+        end
         
         o.on_tail('-h', '--help', 'Display this help and exit') do
           puts @opts

data/lib/timekeeper/runner.rb

@@ -12,9 +12,12 @@ module Timekeeper
           tk.delete(id)
         elsif id = options.delete(:update)
           tk.update(id, options)
-        else        
+        elsif id = options.delete(:track)
+          tk.track(id, options[:name]) if options[:name]
+        else
           tk.store(options)          
         end
+        tk.close
       else
         puts options.opts
       end
@@ -30,6 +33,7 @@ module Timekeeper
       else
         puts records
       end
+      tv.close
     end
     
   end

data/lib/timekeeper/viewer.rb

@@ -7,11 +7,18 @@ module Timekeeper
     end
 
     def all
-      tables.collect{|table| table.query.collect{|attrs| Keep.new(attrs)}}.flatten!
+      tables.collect{|table| 
+        table.query.collect{|attrs|
+          keep = Keep.new(attrs)
+          keep.tracked = tracked?(keep.name, keep.pk)
+          keep
+        }
+      }.flatten!
     end
   
     def close
       tables.each {|table| table.close}
+      tracking_table.close
     end
   
     def self.export(records, name="timekeeper", type= :csv)
@@ -19,7 +26,7 @@ module Timekeeper
         case type.to_s
         when "csv"
           FasterCSV.open("#{name}.#{type}", "w") do |csv|    
-            csv << records[0].keys
+            csv << Keep::FIELDS
             records.each do |record|
               csv << record.values
             end
@@ -34,5 +41,17 @@ module Timekeeper
         @tables ||= config["team"].collect{|t| Rufus::Tokyo::Table.new(File.join(config["db_path"],"#{t}-time.tct"))}   
       end
       
+      def tracking_table
+        @tracking_table ||= Rufus::Tokyo::Table.new(File.join(config["db_path"],"tracking-time.tct"))
+      end
+      
+      def tracked?(name, id)
+        tracking_table.query{|q|
+          q.limit 1
+          q.add "name", :equals, name.to_s
+          q.add "keep_id", :equals, id.to_s
+        }.any?
+      end
+      
   end    
 end

data/lib/timekeeper/viewer_options.rb

@@ -17,8 +17,8 @@ module Timekeeper
           self[:output] = [(file || "timekeeper"), :csv]
         end        
         
-        o.on('-n', '--name NAME', 'Query on name') do |title|
-          self[:title] = title
+        o.on('-n', '--name NAME', 'Query on name') do |name|
+          self[:name] = name
         end        
 
         o.on('-t', '--title TITLE', 'Query on title') do |title|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timekeeper
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - atog