habits 0.1.1 → 0.1.2

data/lib/habits/command_line.rb

@@ -26,7 +26,8 @@ sub.register('delete', ['TITLE'], 'Delete habit.') do |title|
   puts "#{h.title} deleted."
 end
   
-sub.register('create', ['TITLE','DAYS'], 'Create a new habit.') do |title, days|
+sub.register('create', ['TITLE','DAYS'], 
+             'Create a new habit. DAYS is comma separated list of Mon,Tue,Wed..') do |title, days|
   Habits::Habit.new(title, days.split(',')).save
   puts "Habit \"#{title}\" created."
 end
@@ -45,7 +46,10 @@ sub.register('list', [], 'List habits.') do
   on_hold = Habits::Habit.all_on_hold
   
   if on_hold.size > 0
-    puts "\nOn Hold: #{on_hold.map{|h| h.title}.join(', ')}.\n"
+    puts "\nOn Hold:\n--------" 
+    on_hold.each do |habit|
+      puts "* #{habit.title}"
+    end
   end
   
   puts "\nWeek #{Date.today.cweek} | Total #{Habits::Habit.all.size} habits "+
@@ -124,7 +128,12 @@ sub.register('unhold', ['TITLE'], 'Unhold a habit.') do |title|
   puts "Habit \"#{title}\" is not on hold anymore."
 end
 
+sub.register('help', [], 'See the list of commands.') do
+  sub.help
+end
 
-sub.default = 'list'
+sub.default do
+  puts "Use 'habits help' to see the list of commands. "
+end
 
 sub.parse

data/lib/habits/subcommand.rb

@@ -38,9 +38,12 @@ class Subcommand
     end
   end
 
+  attr_accessor :auto_help
+
   def initialize
     @default = nil
     @subs = {}
+    @auto_help = false
   end
   
   # Register a command with name, arguments, description, and block (blk).
@@ -71,14 +74,18 @@ class Subcommand
     
     sub = @subs[args.shift]
     
-    help and return if sub.nil?
+    if sub.nil?
+      puts "Unknown command."
+      help if auto_help
+      return
+    end
     
     begin
       sub.parse(args)
       sub.call
     rescue Exception => e
       puts e.message
-      help
+      help if auto_help
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: habits
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Antti Hakala
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +02:00
+date: 2011-04-14 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A habit tracker.