habits 0.1 → 0.1.1

data/lib/habits/command_line.rb

@@ -48,7 +48,8 @@ sub.register('list', [], 'List habits.') do
     puts "\nOn Hold: #{on_hold.map{|h| h.title}.join(', ')}.\n"
   end
   
-  puts "\nWeek #{Date.today.cweek} | Total #{Habits::Habit.all.size} habits.\n\n"
+  puts "\nWeek #{Date.today.cweek} | Total #{Habits::Habit.all.size} habits "+
+       "| #{Habits::Habit.missed_count} missed\n\n"
 end
 
 sub.register('zones', ['TITLE','YELLOW_ZONE','RED_ZONE'], 

data/lib/habits/habit.rb

@@ -11,6 +11,7 @@ module Habits
     HABITS_DIR  = File.join(ENV['HOME'], '.habits')
     YELLOW_ZONE = 16*60*60 # 16 hours before deadline,
     RED_ZONE    = 6*60*60  #  6 -"-
+    DAYS        = Time::RFC2822_DAY_NAME
     
     def self.all
       @@all ||= begin
@@ -30,6 +31,10 @@ module Habits
       all.select{|habit| habit.status == Status.on_hold}
     end
     
+    def self.missed_count
+      all.select{|habit| habit.status == Status.missed}.size
+    end
+    
     def self.find(title)
       h = Habit.all.detect {|h| h.title == title.strip}
       raise "No such habit found." unless h
@@ -112,8 +117,8 @@ module Habits
     end
     
     def set_days(days)
-      if days.detect{|d| Time::RFC2822_DAY_NAME.index(d).nil?}
-        raise "Valid days are #{Time::RFC2822_DAY_NAME.join(',')}"
+      if days.detect{|d| DAYS.index(d).nil?}
+        raise "Valid days are #{DAYS.join(',')}"
       else
         @days = days
       end
@@ -137,7 +142,7 @@ module Habits
       @events += habit.events
       @days += habit.days
       @days.uniq!
-      @days.sort!{|a,b| Time::RFC2822_DAY_NAME.index(a) <=> Time::RFC2822_DAY_NAME.index(b)}
+      @days.sort!{|a,b| DAYS.index(a) <=> DAYS.index(b)}
     end
     
     def join!(habit)

data/lib/habits/status.rb

@@ -31,9 +31,10 @@ module Habits
       
       habit.days.each do |day|
         activities = habit.activities_on_week(date.cweek, day)
-        day_diff = Time::RFC2822_DAY_NAME.index(day) - date.wday
+        day_diff = Habit::DAYS.index(day) - date.wday
+        day_diff -= 7 if day_diff > 0
         
-        if !activities.empty? or (day_diff > 0)
+        if !activities.empty?
           statuses << Status.green
         else
           dl_date = date + day_diff

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: habits
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Antti Hakala
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +02:00
+date: 2010-12-13 00:00:00 +02:00
 default_executable: 
 dependencies: []