@@ -3,11 +3,16 @@ require 'main' require 'highline/import' require 'ftools' -def read_file(environment) +def read_list(environment) file = environment.nil? ? Todo::Store.read('.todo/list.yml') : Todo::Store.read(environment) + if file + yield(file) + else + say "Todo list file is invalid or do not exist." + end end -def write_file(list, environment) +def write_list(list, environment) file = environment.nil? ? Todo::Store.write(list, '.todo/list.yml') : Todo::Store.write(list, environment) end @@ -53,14 +58,9 @@ Main { str.split(/,\s*/) }) end - #read the YAML file - if list=read_file(params['FILE'].value) - #add the task + read_list(params['FILE'].value) do |list| list.add(params['item'].value, tags) - #write the changes - say "Successfully added your task." if write_file(list, params['FILE'].value) - else - say "Todo list file is invalid or do not exist." + say "Successfully added your task." if write_list(list, params['FILE'].value) end end end @@ -84,14 +84,12 @@ Main { } def run - if list=read_file(params['FILE'].value) + read_list(params['FILE'].value) do |list| if list.remove(params['item'].value || params['index'].value) - say "Removed item from the list." if write_file(list, params['FILE'].value) + say "Removed item from the list." if write_list(list, params['FILE'].value) else say "Could not find item to remove." end - else - say "Todo list file is invalid or do not exist." end end end @@ -114,7 +112,7 @@ Main { } def run - if list=read_file(params['FILE'].value) + read_list(params['FILE'].value) do |list| if params['tag'].given? title = "Listing todos tagged '#{params['tag'].value}'" @@ -129,8 +127,7 @@ Main { tag_string = ("(#{tags.join(", ")})") unless tags.include?(nil) say " - #{task} #{tag_string} \n" end - else - say "Todo list file is invalid or do not exist." + end end end lib/todo/cli.rb @@ -2,7 +2,7 @@ module Todo module VERSION #:nodoc: MAJOR = 0 MINOR = 0 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end lib/todo/version.rb @@ -1,11 +1,11 @@ (in /home/lakshan/projects/ruby-samples/todo) Gem::Specification.new do |s| s.name = %q{todo} - s.version = "0.0.3" + s.version = "0.0.4" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Lakshan Perera"] - s.date = %q{2008-08-28} + s.date = %q{2008-08-29} s.default_executable = %q{todo} s.description = %q{simple command line todo list manager} s.email = ["lakshan@web2media.net"] todo.gemspec 4bdafadc5f5b34ce7ec7850c2cc0a9e66f172a95 Lakshan Perera lakshan@web2media.net http://github.com/laktek/todo/commit/6a6f17da0f826331e938f5c711c71281200887f3 6a6f17da0f826331e938f5c711c71281200887f3 2008-08-28T19:14:32-07:00 2008-08-28T19:14:32-07:00 Refactored list read/write methods b65a8daa4822b6e05c1a73ec0cfbcfd04ae2b4bb Lakshan Perera lakshan@web2media.net