forgetful 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/bin/forgetful

@@ -6,34 +6,64 @@ require 'optparse'
 
 #-------------------------------------------------
 
+class FormatException < RuntimeError; end
+
+#-------------------------------------------------
+
+def parse_range(value)
+  case value
+  when /\A(\d+)\Z/
+    min = 0
+    max = Integer($1)
+  when /\A(\d+)\.\.(\d+)\Z/
+    min = Integer($1)
+    max = Integer($2)
+  else
+    raise FormatException.new("unrecognized format: '#{value}'")
+  end
+
+  raise FormatException.new("min cannot be larger than max: '#{value}'") if min > max
+
+  min..max
+end
+
 def parse(args)
   options = { :filenames => [],
               :verbose   => false,
-              :action    => :quiz }
+              :action    => :quiz,
+              :delay     => 0..0 }
 
   args.options do |arg|
     arg.banner = "Usage: forgetful [OPTION]... [FILE]..."
     arg.separator ""
     arg.separator "Specific options:"
 
-    arg.on(     '-t', '--touch',   "Validate filename(s) and write back in full CSV format") do
+    arg.on(     '-t', '--touch',       "Validate filename(s) and write back in full CSV format") do
       options[:action] = :touch
     end
 
+    arg.on(     '-d', '--delay VALUE', "Delay range (in days) to add to unscheduled items (used with --touch)") do |value|
+      begin
+        options[:delay] = parse_range(value)
+      rescue FormatException => e
+        arg.abort(e.message)
+      end
+    end
+
     arg.separator ""
     arg.separator "Common options:"
 
-    arg.on(     '-v', '--verbose', "Show more information") do
+    arg.on(     '-v', '--verbose',     "Show more information") do
       options[:verbose] = true
     end
 
-    arg.on(           '--version', "Show version") do
+    arg.on(           '--version',     "Show version") do
       puts File.read(File.join(File.dirname(__FILE__), "..", "VERSION"))
       exit
     end
 
-    arg.on_tail('-h', '--help',    "Show this message") do
-      puts arg
+    arg.on_tail('-h', '--help',        "Show this message") do
+      warn(arg)
       exit
     end
 
@@ -52,7 +82,7 @@ options = parse(ARGV)
 
 begin
   options[:filenames].each do |filename|
-    ReminderFile.new(filename, options[:verbose]).send(options[:action])
+    ReminderFile.new(filename, options[:verbose], options[:delay]).send(options[:action])
   end
 rescue Interrupt
   puts

data/lib/forgetful/cli.rb

@@ -1,25 +1,25 @@
 
 class ReminderFile
-  attr_reader :filename, :verbose
+  attr_reader :filename, :verbose, :delay
 
-  def initialize(filename, verbose=false)
+  def initialize(filename, verbose=false, delay=0..0)
     @filename = filename
     @verbose  = verbose
+    @delay    = delay
   end
 
   def reminders
-    @reminders ||= Reminder.read_csv(filename)
+    @reminders ||= Reminder.read_csv(filename, delay)
   end
 
   def write(reminders)
     raise "Writing back a different number of reminders than read from file (#{reminders.size} != #{@reminders.size})" if reminders.size != @reminders.size
-    Reminder.write_csv(filename, reminders.sort)
+    Reminder.write_csv(filename, reminders)
   end
 
   # subtle -- reading and writing back a file will:
   # 1. validate the file
   # 2. add the date column
-  # 3. sort the rows
   def touch
     puts "### TOUCH: #{filename}"
     write(reminders)

data/lib/forgetful/csv_ext/reminder.rb

@@ -16,13 +16,13 @@ class Reminder
     end
   end
 
-  def self.read_csv(filename)
+  def self.read_csv(filename, delay=0..0)
     File.open(filename) do |file|
-      self.parse_csv(file)
+      self.parse_csv(file, delay)
     end
   end
 
-  def self.parse_csv(io)
+  def self.parse_csv(io, delay=0..0)
     converters = [lambda { |question| question },
                   lambda { |answer|   answer },
                   lambda { |due_on|   Date.parse(due_on) },
@@ -30,6 +30,7 @@ class Reminder
 
     CSV.parse(io, :skip_blanks => true).map do |list|
       list = list.zip(converters).map { |col, converter| converter[col] }
+      list << Date.today + Random.new.rand(delay) if list.length == 2 # missing date
       new(*list)
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jonathan Palardy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: forgetful
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -65,8 +64,8 @@ homepage: http://github.com/jpalardy/forgetful
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,2 +0,0 @@
-Manifest
-pkg