gwtf 0.5.0 → 0.6.0

data/lib/gwtf.rb

@@ -22,7 +22,7 @@ module Gwtf
   def self.projects(root_dir)
     Dir.entries(root_dir).map do |entry|
       next if entry =~ /^\./
-        next unless File.directory?(File.join(root_dir, entry))
+      next unless File.directory?(File.join(root_dir, entry))
 
       entry
     end.compact.sort

data/lib/gwtf/commands/list_command.rb

@@ -22,6 +22,8 @@ command [:list, :ls, :l] do |c|
       longest_name = projects.map{|p| p.length}.max
 
       projects.each_with_index do |project, idx|
+        next if project == "reminders"
+
         puts "Items in all projects:\n\n" if idx == 0
 
         items = Gwtf::Items.new(File.join(global_options[:data], project), project)
@@ -43,6 +45,8 @@ command [:list, :ls, :l] do |c|
 
     elsif options[:due]
       Gwtf.projects(global_options[:data]).each do |project|
+        next if project == "reminders"
+
         items = Gwtf::Items.new(File.join(global_options[:data], project), project)
 
         items.each_item do |item|
@@ -52,6 +56,8 @@ command [:list, :ls, :l] do |c|
 
     elsif options[:overview]
       Gwtf.projects(global_options[:data]).each do |project|
+        next if project == "reminders"
+
         items = Gwtf::Items.new(File.join(global_options[:data], project), project)
 
         if items.item_ids.size > 0

data/lib/gwtf/commands/remind_command.rb

@@ -1,13 +1,12 @@
-desc 'Send a reminder about an item via email'
-arg_name 'id [at time specification]'
+desc 'Manage or send reminders about an item'
 long_desc <<EOF
-When run without the --send option this comand will
-add an at() job using the supplied at time specification.
+Schedule a reminder for an existing task: gwtf remind 10 now +5 minutes
 
-The at job will call the same command again this time
-with the --send option that will send an email to you
-or the address specified in --recipient using your system
-mail command
+Send a reminder for an existing task immediately: gwtf remind 10 --send
+
+Add a new item to the reminders project and schedule a reminder: gwtf remind --at="noon tomorrow" have lunch
+
+Time specifications are in at(1) format.
 EOF
 
 command [:remind, :rem] do |c|
@@ -27,17 +26,44 @@ command [:remind, :rem] do |c|
   c.default_value false
   c.switch [:ifopen]
 
+  c.desc "at(1) time specification for the reminder to be sent"
+  c.default_value nil
+  c.flag [:at]
+
   c.action do |global_options,options,args|
     raise "Please supply an item ID to remind about" if args.empty?
 
+    STDOUT.sync
+
     unless options[:send]
-      raise "Please specify a valid at() time specification" unless args.size > 2
+      if args.first =~ /^\d+$/ # got an item id, schedule a reminder
+        unless options[:at]
+          raise "Please specify a valid at(1) time specification with --at after the item id" unless args.size > 2
+          options[:at] = args[1..-1].join(" ")
+        end
+
+        print "Creating reminder at job for item #{args.first}: "
 
-      STDOUT.sync
+        @items.load_item(args.first).schedule_reminer(options[:at], options[:recipient], options[:done], options[:ifopen])
 
-      print "Creating reminder at job for item #{args.first}: "
+      else # new reminder in the 'reminders' project
+        raise "Please specify an at(1) time specification" unless options[:at]
+        raise "Please specify a subject for the reminder item" if args.empty?
 
-      @items.load_item(args.first).schedule_reminer(args[1..-1].join(" "), options[:recipient], options[:done], options[:ifopen])
+        project_dir = File.join(global_options[:data], "reminders")
+        Gwtf::Items.setup(project_dir) unless File.directory?(project_dir)
+
+        items = Gwtf::Items.new(project_dir, "reminders")
+        reminder = items.new_item
+        reminder.subject = args.join(" ")
+
+        print "Creating reminder at job for item #{reminder.item_id}: "
+        reminder.schedule_reminer(options[:at], options[:recipient], true, true)
+
+        reminder.save
+
+        puts reminder.to_s
+      end
     else
       item = @items.load_item(args.first)
 

data/lib/gwtf/version.rb

@@ -1,3 +1,3 @@
 module Gwtf
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gwtf
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-08 00:00:00 +01:00
+date: 2012-04-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency