habiter 0.1.5 → 0.2

data/README

@@ -13,8 +13,24 @@ clean_room is not a habit yet. create and complete it? (y/n) y
 ~$ habiter did jog
 jog is not a habit yet. create and complete it? (y/n) y
 ~$ habiter log
-       jog | ------------------------------+
-clean_room | ------------------------------+
+           jog |----------------------------+|(1/28)
+       project |-------------------------++-+|(3/28)
+practice_music |-----------------------+++++-|(5/28)
+      read_30m |-----------------------+--++-|(3/28)
+    clean_room |-----------------------+-+---|(2/28)
+
+Scalars
+-------
+
+Habiter also now supports scalars: you can input a value for your
+activity, like
+
+habiter did jog 5.5
+habiter did heartbeat 78
+
+And it will be recorded. There is no representation of this data yet,
+and the representation within habiter will be minimal, only good output to
+formats which are easily visualized.
 
 Install
 -------
@@ -34,3 +50,5 @@ Edit ~/.habiter.yaml
 * How do I reset habiter?
 
 echo > ~/.habiter.yaml
+
+Dedicated to Bryn Bellomy :)

data/bin/habiter

@@ -36,21 +36,26 @@ end
 options = {}
 
 optparse = OptionParser.new do |opts|
-  opts.banner = "Usage: habiter.rb did your_habit"
+  opts.banner = 
+    "Usage:
+    habiter did your_habit
+    habiter log"
   options[:verbose] = false
   opts.on('-v', '--verbose', "Show weekday letters for log") do
     options[:verbose] = true
   end
 end
 
-def did(key)
+def did(args)
+  key = args[1]
+  new_record = (args.length > 2) ? {Time.now => args[2]} : Time.now
   if not @habits.has_key?(key)
     print "#{key} is not a habit yet. create and complete it? (y/n) "
     if STDIN.gets.chomp == 'y'
-      @habits[key] = [Time.now]
+      @habits[key] = [new_record]
     end
   else
-    @habits[key] << Time.now
+    @habits[key] << new_record
   end
   File.open(@habiter_file, 'w') do |f|
     YAML.dump(@habits, f)
@@ -69,13 +74,19 @@ def log(options={})
     end
     puts
   end
+  daily_counts = Array.new(29, 0)
   @habits.each do |habit, times|
     day = Date.today - (options[:days])
     print (sprintf("%#{name_column_width}s ", habit) + "|").colorize(37)
     times.collect! do |time|
+      if time.is_a? Hash
+        # For scalar values, normalize
+        time = time.keys.first
+      end
       if time.is_a? Time
         time.to_date
       elsif time.is_a? Date
+        # For user-inputted values, normalize
         time
       end
     end
@@ -83,6 +94,7 @@ def log(options={})
     (0..options[:days]).each do |i|
       if times.include? day
         print "+".colorize(47)
+        daily_counts[i] += 1
         done_in_last_28 += 1
         pre_week += 1 unless i >= 20
         week += 1 unless i < 20
@@ -100,12 +112,19 @@ def log(options={})
     end
     puts
   end
+  if options[:verbose]
+    print " " * (name_column_width + 2)
+    (0..options[:days]).each do |i|
+        print (daily_counts[i] > 0) ? daily_counts[i] : " "
+    end
+    puts
+  end
 end
 
 optparse.parse!
 
 if ARGV[0] == 'did'
-  did(ARGV[1])
+  did(ARGV)
 elsif ARGV[0] == 'log'
   log(options)
 else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: habiter
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: "0.2"
 platform: ruby
 authors: 
 - Tom MacWright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -05:00
+date: 2009-11-06 00:00:00 -05:00
 default_executable: 
 dependencies: []