quirk 0.0.2 → 0.0.3

data/README.md

@@ -13,6 +13,7 @@ Then configure your habits in a plaintext file:
     % quirk -e
     mile-run: monday, wednesday, thursday
     walk-dog: everyday
+    ; comments start with semi-colons
     ^quit-tv: friday
 
 If a habit is prefixed with `^`, it means you're trying to break that habit.

data/quirk.rb

@@ -2,7 +2,7 @@ require 'date'
 require 'colorize'
 
 module Quirk
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   QUIRKFILE = ENV['QUIRKFILE'] || "#{ENV['HOME']}/.quirk"
   EDITOR = ENV['EDITOR'] || 'vi'
 
@@ -59,6 +59,7 @@ module Quirk
 
     def initialize(id, days, quitting)
       @id, @days, @quitting, @marks = id, days, quitting, []
+      raise "No days found for #{id}" if @days.empty?
     end
 
     def quitting?
@@ -141,6 +142,7 @@ module Quirk
   
   class Calendar
     attr_writer :year
+    attr_reader :habits
 
     def initialize(habits)
       @habits = habits.reduce({}) {|hash,habit| hash[habit.id] = habit; hash}
@@ -227,7 +229,7 @@ module Quirk
       text.strip.each_line do |line|
         if line =~ /^\d\d\d\d\/\d\d?\/\d\d?\s+/
           marks << line
-        elsif line !~ /^\s*$/
+        elsif line !~ /^\s*$/ && line !~ /^\s*;.*$/
           habits << Habit.parse(line)
         end
       end

data/quirk_test.rb

@@ -33,9 +33,9 @@ class QuirkHabitTest < MiniTest::Unit::TestCase
     habit.mark!(Date.new(2012, 1, 2))
     habit.mark!(Date.new(2012, 1, 3))
     assert_equal(:white, habit.color_on(Date.new(2012, 1, 1)))
-    assert_equal(:green, habit.color_on(Date.new(2012, 1, 2)))
+    assert_equal(:light_green, habit.color_on(Date.new(2012, 1, 2)))
     assert_equal(:white, habit.color_on(Date.new(2012, 1, 3)))
-    assert_equal(:red, habit.color_on(Date.new(2012, 1, 4)))
+    assert_equal(:light_red, habit.color_on(Date.new(2012, 1, 4)))
     assert_equal(:white, habit.color_on(Date.new(2012, 1, 5)))
   end
 
@@ -43,13 +43,13 @@ class QuirkHabitTest < MiniTest::Unit::TestCase
     quit = Quirk::Habit.parse('^quit-tv: sunday, monday, wednesday, thursday')
     quit.mark!(Date.new(2012, 1, 2))
     assert_equal(:white, quit.color_on(Date.new(2012, 1, 1)))
-    assert_equal(:red, quit.color_on(Date.new(2012, 1, 2)))
+    assert_equal(:light_red, quit.color_on(Date.new(2012, 1, 2)))
     assert_equal(:white, quit.color_on(Date.new(2012, 1, 3)))
-    assert_equal(:green, quit.color_on(Date.new(2012, 1, 4)))
-    assert_equal(:green, quit.color_on(Date.new(2012, 1, 5)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 4)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 5)))
 
     quit.mark_first!(Date.new(2012, 1, 1))
-    assert_equal(:green, quit.color_on(Date.new(2012, 1, 1)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 1)))
   end
 
   def test_streak
@@ -94,6 +94,25 @@ class QuirkCalendarTest < MiniTest::Unit::TestCase
     @cal.mark!('2012/01/02 running, walk-dog')
   end
 
+  def test_parse
+    calendar = Quirk::Calendar.parse(
+      "; ignore comment line\n" +
+      "running: everyday\n" +
+      "^smoking: everyday\n\n" +
+      "; ignore comment line\n" +
+      "2012/01/01 ^smoking\n" +
+      "2012/01/01 running\n\n")
+
+    assert(calendar.has_habit?('running'))
+    assert(calendar.has_habit?('smoking'))
+    assert_equal(Date.new(2012, 1, 1), calendar.habits['running'].first_date)
+    assert_equal(Date.new(2012, 1, 1), calendar.habits['smoking'].first_date)
+  end
+
+  def test_parse_day_error
+    assert_raises(RuntimeError) { Quirk::Calendar.parse('running: invalid') }
+  end
+
   def test_mark
     assert_equal([Date.new(2012,1,1), Date.new(2012,1,2)], @running.marks)
     assert_equal([Date.new(2012,1,1), Date.new(2012,1,2)], @walking.marks)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quirk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest