forgetful 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/forgetful

@@ -1,76 +1,58 @@
-#!/usr/bin/env ruby
-
-############################################################
 
 require "forgetful"
-
-############################################################
-
-def ask(prompt, validate_re=//)
-  while true
-    print prompt
-    answer = readline.chomp
-
-    return answer.to_i if answer =~ validate_re
-  end
-end
+require "forgetful/cli"
+require 'getoptlong'
 
 #-------------------------------------------------
 
-def ask_grade(prompt)
-  ask(prompt, /\A[0-5]\Z/)
-end
+def usage(status=0)
+  $stderr.puts <<-END
+Usage: #{File.basename($0)} [options] filename(s)
 
-#-------------------------------------------------
+    --help,               -h   Show this message
+    --touch,              -t   Validate filename(s) and write back in full CSV format
+    --version                  Show version information
+  END
 
-def ask_about(reminder, i, n)
-  width = "#{n}/#{n}. ".size
-  padding = " " * width
-  ask "#{i}/#{n}. ".rjust(width) + "Q: #{reminder.question}"
-  puts                   padding + "A: #{reminder.answer}"
-  q = ask_grade          padding + "? "
-  puts
-  return q
+  exit status
 end
 
-#-------------------------------------------------
-
-def quiz(reminders)
-  i = 0
-  reminders.collect do |reminder|
-    i += 1
-    reminder.next(ask_about(reminder, i, reminders.size))
+def parse_argv
+  result = { :filenames => [],
+             :action    => :quiz }
+
+  opts = GetoptLong.new(['--help',    '-h', GetoptLong::NO_ARGUMENT],
+                        ['--touch',   '-t', GetoptLong::NO_ARGUMENT],
+                        ['--version',       GetoptLong::NO_ARGUMENT])
+
+  opts.each do |opt, arg|
+    case opt
+    when '--help'
+      usage
+    when '--touch'
+      result[:action] = :touch
+    when '--version'
+      puts File.read(File.join(File.dirname(__FILE__), "..", "VERSION"))
+      exit 0
+    end
   end
-end
-
-############################################################
-
-def process_file(filename)
-  #--------------------- quiz ----------------------
-  reminders = Reminder.read_csv(filename)
-
-  dues, not_dues = reminders.partition {|reminder| reminder.due_on <= Date.today}
 
-  puts "### QUIZ: #{filename}"
-  gradeds = quiz(dues.sort_by { rand })
+  result[:filenames] = ARGV.dup
+  ARGV.clear
 
-  Reminder.write_csv(filename, (gradeds + not_dues).sort)
-
-  #-------------------- review ---------------------
-  faileds = gradeds.select {|reminder| reminder.review? }
-  until faileds.empty?
-    puts "# REVIEW: #{filename}"
-    gradeds = quiz(faileds.sort_by { rand }) # review
-    faileds = gradeds.select {|reminder| reminder.review? }
-  end
+  result
 end
 
-############################################################
+#-------------------------------------------------
 
-filenames = ARGV.dup
-ARGV.clear
+options = parse_argv
 
-filenames.each do |filename|
-  process_file filename
+begin
+  options[:filenames].each do |filename|
+    ReminderFile.new(filename).send(options[:action])
+  end
+rescue Interrupt
+  puts
+  # aborting ... won't save file
 end
 

data/lib/forgetful/cli.rb

@@ -0,0 +1,68 @@
+
+class ReminderFile
+  attr_reader :filename
+
+  def initialize(filename)
+    @filename = filename
+  end
+
+  def reminders
+    @reminders ||= Reminder.read_csv(filename)
+  end
+
+  def reminders=(reminders)
+    Reminder.write_csv(filename, reminders.sort)
+  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}"
+    self.reminders = reminders
+  end
+
+  def quiz
+    puts "### QUIZ: #{filename}"
+    dues, not_dues = reminders.partition { |reminder| reminder.due_on <= Date.today }
+    gradeds = quiz_map(dues.sort_by { rand })
+
+    self.reminders = gradeds + not_dues
+
+    faileds = gradeds.select { |reminder| reminder.review? }
+    until faileds.empty?
+      puts "### REVIEW: #{filename}"
+      gradeds = quiz_map(faileds.sort_by { rand })
+      faileds = gradeds.select { |reminder| reminder.review? }
+    end
+  end
+
+  private
+    def quiz_map(reminders)
+      reminders.zip(1..reminders.length).map do |reminder, i|
+        q = ask(reminder, i, reminders.size)
+        reminder.next(q)
+      end
+    end
+
+    def ask(reminder, i, n)
+      width = "#{n}/#{n}. ".size
+      padding = " " * width
+
+      print "#{i}/#{n}. ".rjust(width) + "Q: #{reminder.question}"
+      readline
+
+      puts padding + "A: #{reminder.answer}"
+
+      while true
+        print padding + "? "
+        answer = readline.chomp
+
+        if answer =~ /\A[0-5]\Z/
+          puts
+          return answer.to_i
+        end
+      end
+    end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jonathan Palardy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -04:00
+date: 2010-06-22 00:00:00 -04:00
 default_executable: forgetful
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,10 @@ files:
 - Rakefile
 - VERSION
 - bin/forgetful
-- examples/katakana_romanji.csv
-- examples/romanji_katakana.csv
+- examples/katakana_romaji.csv
+- examples/romaji_katakana.csv
 - lib/forgetful.rb
+- lib/forgetful/cli.rb
 - lib/forgetful/csv_ext/reminder.rb
 - lib/forgetful/reminder.rb
 - lib/forgetful/supermemo.rb