do_stuff 0.1.2 → 0.2.0

data/lib/do_stuff/runner.rb

@@ -12,10 +12,9 @@ module DoStuff
       FileUtils.mkdir_p(File.dirname(todofile))
       FileUtils.touch(todofile)
 
-
       opts = OptionParser.new do |opts|
         opts.on('-e [TASK NUM]') do |task_num|
-          TodoList.edit(todofile)
+          Tasklist.edit(todofile)
           exit
         end
 
@@ -42,8 +41,8 @@ module DoStuff
       end
 
       begin
-        todolist = TodoList.new(todofile)
-      rescue TodoList::ParseError => e
+        todolist = Tasklist.new(todofile)
+      rescue Tasklist::ParseError => e
         abort "Error parsing #{e.file}: #{e.message}"
       end
 
@@ -53,9 +52,9 @@ module DoStuff
         end
       elsif argv.length == 1 && argv[0] =~ /^\d+$/
         task_num = argv[0].to_i
-        task = todolist.get(task_num)
-        abort "There is no task ##{task_num}." unless task
-        todolist.erase(task_num)
+        abort "There is no task ##{task_num}." unless todolist.tasks.key?(task_num)
+        task = todolist[task_num]
+        todolist.delete(task_num)
         todolist.write!
         puts "Erased ##{task_num}: #{task}"
       else

data/lib/do_stuff/tasklist.rb

@@ -0,0 +1,67 @@
+module DoStuff
+  class Tasklist
+    attr_reader :tasks
+
+    def initialize(file)
+      @file = file
+      @tasks = {}
+      parse
+    end
+
+    def add(task)
+      # Find the first unused task number in the list.
+      task_num = 1
+      task_num += 1 while @tasks.key?(task_num)
+
+      @tasks[task_num] = task
+
+      task_num
+    end
+
+    def [](task_num)
+      @tasks[task_num]
+    end
+
+    def delete(task_num)
+      @tasks.delete(task_num)
+    end
+
+    def write!
+      File.open(@file, 'w') do |f|
+        tasks.each{|num, task| f.puts("#{num}. #{task}") }
+      end
+    end
+
+    def self.edit(file)
+      # TODO: Use task_num to jump to a line
+      system(ENV['EDITOR'], file)
+    end
+
+    class ParseError < ::StandardError
+      attr_accessor :file
+      def initialize(file, msg)
+        @file = file
+        super(msg)
+      end
+    end
+
+    private
+    def parse
+      File.readlines(@file).each do |line|
+        line.chomp!
+        if line =~ /^(\d+)\.\s+(.+)$/
+          task_num, task = $1.to_i, $2
+
+          if @tasks[task_num]
+            raise ParseError.new(@file, "Two definitions for task " +
+              "#{task_num}:\n\t#{task_num}. #{@tasks[task_num]}\n\t#{line}")
+          end
+
+          @tasks[task_num] = task
+        else
+          raise ParseError.new(@file, "Ill-formed line encountered:\n\t#{line}")
+        end
+      end
+    end
+  end
+end

data/lib/do_stuff.rb

@@ -1,3 +1,3 @@
 require 'do_stuff/standalone'
-require 'do_stuff/todolist'
+require 'do_stuff/tasklist'
 require 'do_stuff/runner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: do_stuff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies: []
 description: A minimalistic command-line todo list
 email: scott@scott-olson.org
@@ -20,7 +20,7 @@ extra_rdoc_files: []
 files:
 - lib/do_stuff/standalone.rb
 - lib/do_stuff/runner.rb
-- lib/do_stuff/todolist.rb
+- lib/do_stuff/tasklist.rb
 - lib/do_stuff.rb
 - bin/do_stuff
 - README.md

data/lib/do_stuff/todolist.rb

@@ -1,75 +0,0 @@
-module DoStuff
-  class TodoList
-    def initialize(file)
-      @file = file
-      parse
-    end
-
-    def add(task)
-      # Try to fill a hole in the task list, otherwise append to the end.
-      i = @tasks.find_index(nil)
-      i ||= @tasks.length
-
-      @tasks[i] = task
-
-      # Return the task number
-      i + 1
-    end
-
-    def erase(task_num)
-      raise "No such task ##{task_num}." unless task_num >= 0 && @tasks[task_num - 1]
-      @tasks[task_num - 1] = nil
-    end
-
-    def get(task_num)
-	  return nil if task_num <= 0
-      @tasks[task_num - 1]
-    end
-
-    def tasks
-      # Group each task with its number and remove all nils
-      @tasks.map.with_index{|task, i| [i + 1, task] if task }.compact
-    end
-
-    def write!
-      File.open(@file, 'w') do |f|
-        tasks.each{|num, task| f.puts("#{num}. #{task}") }
-      end
-    end
-
-    def self.edit(file)
-      # TODO: Use task_num to jump to a line
-      system(ENV['EDITOR'], file)
-    end
-
-    class ParseError < StandardError
-      attr_accessor :file
-      def initialize(file, msg)
-        @file = file
-        super(msg)
-      end
-    end
-
-    private
-    def parse
-      @tasks = []
-
-      File.read(@file).each_line do |line|
-        line.chomp!
-        if line =~ /^(\d+)\.\s+(.+)$/
-          task_num, task = $1.to_i, $2
-          i = task_num - 1
-
-          if @tasks[i]
-            raise ParseError.new(@file, "Two definitions for task " +
-              "#{task_num}:\n\t#{task_num}. #{@tasks[i]}\n\t#{line}")
-          end
-
-          @tasks[i] = task
-        else
-          raise ParseError.new(@file, "Ill-formed line encountered:\n\t#{line}")
-        end
-      end
-    end
-  end
-end