to-do 1.2.1 → 1.2.2

data/Gemfile

@@ -6,9 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 gem "shoulda", ">= 0"
-gem "rdoc", "~> 3.12"
-
-gem "bundler", "~> 1.0.0"
+gem "sqlite3", ">=0"
+gem "bundler", ">= 1.0.0"
 gem "jeweler", "~> 1.8.4"
 gem "simplecov", ">= 0"
 gem "colorize", ">= 0"

data/README.md

@@ -1,8 +1,9 @@
-#to-do 1.2.1
+#to-do 1.2.2
 
-A simple command line todo application.
+A simple command line todo application written in Ruby.  
 
-##What's new 1.2.1
+##What's new 1.2.2
+* Switch from yaml to sqlite for data persistence
 * Bug Fixes
 
 ##What's new in 1.2
@@ -16,13 +17,13 @@ A simple command line todo application.
 ##Features
 * Basic todo list functionality
 	* Add items
-	* Delete items
+	* Complete items
+	* Clear list
+	* Display list
 * Multiple lists
-* Clear list
-* Display list
 * Colored display
-* Undo completing
-* Removelists
+* Undo Completing
+* Remove lists
 
 ##How to Use
 
@@ -73,7 +74,7 @@ A simple command line todo application.
 	todo undo write paper
 	todo u -n 2
 
-###Clear completed tasks
+###Clear completed tasks and reset completed count
 
 	todo clear
 
@@ -99,7 +100,7 @@ A simple command line todo application.
 * Tags
 * Due Dates
 * Tab Completion
-* YAML Record
+* SQLite Backend
 * Sorting
 * Priorites
 * Reorganizing

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/to-do.rb

@@ -1,14 +1,46 @@
-require 'rdoc'
+require 'sqlite3'
 require File.join(File.dirname(__FILE__), 'to-do', 'config')
-require File.join(File.dirname(__FILE__), 'to-do', 'list')
 if !File.exists?(File.join(ENV['HOME'], '.to-do'))
 	Dir.mkdir(File.join(ENV['HOME'], '.to-do'))
 	Todo::Config.write
-	Dir.mkdir(Todo::Config[:lists_directory])
-	#Todo::List.new "Default List"
 end
+
+# If the Database doesn't exist, create it
+if !File.exists?(Todo::Config[:task_database])
+	Todo::Config.write
+	database = SQLite3::Database.new(Todo::Config[:task_database])
+	database.execute "CREATE TABLE Tasks(Id INTEGER PRIMARY KEY, Task_number INTEGER, Name TEXT, Completed INTEGER)"
+	database.execute "CREATE TABLE Lists(Id INTEGER PRIMARY KEY, Name TEXT, Total INTEGER)"
+	database.execute "CREATE TABLE Task_list(Task_id INTEGER, List_id INTEGER)"
+
+	# If you have existing lists from earlier versions stored in YAML, stick them 
+	# in the sqlite database
+	if File.exists?(File.join(ENV['HOME'], '.to-do', 'lists'))
+		Dir.chdir(File.join(ENV['HOME'], '.to-do', 'lists')) do 
+			lists = Dir.entries "."
+			lists.each do |file|
+				next if file == "." or file == ".."
+				list_object = YAML.load_file(file)
+				database.execute "INSERT INTO Lists (Name, Total) VALUES('" + list_object.name + "', " + list_object.count.to_s + ")"
+				list_id = database.last_insert_row_id
+				list_object.tasks.each do |num, task|
+					database.execute "INSERT INTO Tasks (Task_number, Name, Completed) VALUES('" + num.to_s + "', '" + task + "', 0)"
+					task_id = database.last_insert_row_id 
+					database.execute "INSERT INTO Task_list VALUES(" + task_id.to_s + ", " + list_id.to_s + ")"
+				end
+				list_object.completed_tasks.each do |num, task|
+					database.execute "INSERT INTO Tasks (Task_number, Name, Completed) VALUES('" + num.to_s + "', '" + task + "', 1)"
+					task_id = database.last_insert_row_id 
+					database.execute "INSERT INTO Task_list VALUES(" + task_id.to_s + ", " + list_id.to_s + ")"
+				end
+			end
+		end
+	end
+end
+require File.join(File.dirname(__FILE__), 'to-do', 'tasks')
 require File.join(File.dirname(__FILE__), 'to-do', 'cli')
 
+
 # Todo is the main namespace that all of the other modules and classes are a 
 # part of
 module Todo

data/lib/to-do/cli.rb

@@ -1,14 +1,16 @@
 require 'optparse'
 require 'yaml'
 require 'colorize'
+require 'sqlite3'
 
 module Todo 
 	# CLI is the module that contains the methods to display the list as well as
 	# the methods to parse command line arguments.
 	module CLI 
 		extend self
-			# The current working list
-			WORKING_LIST=YAML.load_file(File.join(Config[:lists_directory], Config[:working_list_name]+'.yml')) if File.exists?(File.join(Config[:lists_directory], Config[:working_list_name]+'.yml'))
+
+		# The database
+		DATABASE = SQLite3::Database.new(Todo::Config[:task_database])
 
 		# The option flags 
 		OPTIONS = {
@@ -32,21 +34,33 @@ module Todo
 		#        4. Task 4
 		#
 		# @param [List] list the list you want to display.
-		def display list = WORKING_LIST
+		def display list = []
+			tasks = DATABASE.execute "SELECT Task_number, Name, Completed FROM Tasks WHERE Id IN 
+				(SELECT Task_id FROM Task_list WHERE List_id IN 
+				(SELECT Id FROM Lists Where Lists.Name='" + Config[:working_list_name]+"'))"
+			tasks.sort!{|x, y| x[0] <=> y[0]}
+			list = DATABASE.execute("SELECT Total FROM Lists WHERE Name = '" + Config[:working_list_name] + "'")
+			count = list ? list[0][0] : 0
+			completed_count = 0
 			puts "********************************".colorize(:light_red)
-			puts list.name.center(32).colorize(:light_cyan)
+			puts Config[:working_list_name].center(32).colorize(:light_cyan)
 			puts "********************************".colorize(:light_red)
 			puts
 			puts "Todo:".colorize(:light_green)
-			list.tasks.each do |k,v|
-				printf "%4d. ".to_s.colorize(:light_yellow), k
-				puts v
+			tasks.each do |task|
+				if task[2] == 1
+					completed_count +=1
+					next
+				end
+				printf "%4d. ".to_s.colorize(:light_yellow), task[0]
+				puts task[1]
 			end
 			print "\nCompleted:".colorize(:light_green)
-			printf "%36s\n", "#{list.completed_count}/#{list.count}".colorize(:light_cyan)
-			list.completed_tasks.each do |k,v|
-				printf "%4d. ".to_s.colorize(:light_yellow), k
-				puts v
+			printf "%36s\n", "#{completed_count}/#{count}".colorize(:light_cyan)
+			tasks.each do |task|
+				next if task[2] == 0
+				printf "%4d. ".to_s.colorize(:light_yellow), task[0]
+				puts task[1]
 			end
 			puts
 		end
@@ -58,12 +72,12 @@ module Todo
 				opts.version = File.exist?(version_path) ? File.read(version_path) : ""
 				opts.banner = "Usage: todo [COMMAND] [option] [arguments]"
 				opts.separator "Commands:"
+				opts.separator "    create, switch <list name>       creates a new list or switches to an existing one"
 				opts.separator "    <blank>, display, d              displays the current list"
 				opts.separator "    add, a <task>                    adds the task to the current list"
 				opts.separator "    finish, f [option] <task>        marks the task as completed"
-				opts.separator "    clear [option]                   clears completed tasks"
 				opts.separator "    undo, u [option] <task>          undos a completed task"
-				opts.separator "    create, switch <list name>       creates a new list or switches to an existing one"
+				opts.separator "    clear [option]                   clears completed tasks"
 				opts.separator "    remove, rm <list name>           removes the list completely (cannot undo)"
 				opts.separator "Options: "
 				opts.on('-n', 'with finish or undo, references a task by its number') do
@@ -78,7 +92,7 @@ module Todo
 				end
 				opts.on('-w', "displays the name of the current list") do
 					if Config[:working_list_exists]
-						puts "Working list is #{WORKING_LIST.name}"
+						puts "Working list is #{Config[:working_list_name]}"
 					else
 						puts "Working List does not exist yet.  Please create one"
 						puts "todo create <list name>"
@@ -92,63 +106,63 @@ module Todo
 		def commands_parser
 			if ARGV.count > 0
 				case ARGV[0]
-				when "add", "a"
+				when "display", "d"
 					if Config[:working_list_exists]
-						ARGV.count > 1 ? WORKING_LIST.add(ARGV[1..-1].join(' ')) : puts("Usage: todo add <task name>")
 						display 
 					else
 						puts "Working List does not exist yet.  Please create one"
 						puts "todo create <list name>"
 					end
-				when "finish", "f"
+				when "create", "switch"
+					if ARGV.count > 0
+						name = ARGV[1..-1].map{|word| word.capitalize}.join(' ')
+						Config[:working_list_name] =  name
+						Config[:working_list_exists] = true
+						puts "Switch to #{name}"
+						puts
+						display
+					else
+						puts "Usage: todo #{ARGV[0]} <listname>"
+					end		
+				when "add", "a"
 					if Config[:working_list_exists]
-						WORKING_LIST.finish ARGV[1..-1].join(' '), OPTIONS[:is_num]
+						ARGV.count > 1 ? Tasks.add(ARGV[1..-1].join(' ')) : puts("Usage: todo add <task name>")
+						puts
 						display 
 					else
 						puts "Working List does not exist yet.  Please create one"
 						puts "todo create <list name>"
 					end
-				when "clear"
+				when "finish", "f"
 					if Config[:working_list_exists]
-						WORKING_LIST.clear OPTIONS[:clear_all]
+						ARGV.count > 1 ? Tasks.finish(ARGV[1..-1].join(' '), OPTIONS[:is_num]) : puts("Usage: todo finish <task name>")
+						puts
+						display 
 					else
 						puts "Working List does not exist yet.  Please create one"
 						puts "todo create <list name>"
 					end
-				when "display", "d"
+				when "undo", "u"
 					if Config[:working_list_exists]
+						ARGV.count > 1 ? Tasks.undo(ARGV[1..-1].join(' '), OPTIONS[:is_num]) : puts("Usage: todo undo <task name>")
+						puts
 						display 
 					else
 						puts "Working List does not exist yet.  Please create one"
 						puts "todo create <list name>"
 					end
-				when "create", "switch"
-					if File.exists?(File.join(Config[:lists_directory], ARGV[1..-1].join('_').downcase + '.yml'))
-						Config[:working_list_name] = ARGV[1..-1].join('_').downcase
-						Config[:working_list_exists] = true
-						puts "Switch to #{ARGV[1..-1].join(' ')}"
-						new_list = YAML.load_file(File.join(Config[:lists_directory], 
-						Config[:working_list_name]+'.yml')) if File.exists?(File.join(Config[:lists_directory], 
-						Config[:working_list_name]+'.yml'))
-						display new_list
-					else 
-						ARGV.count > 1 ? List.new(ARGV[1..-1].join(' ')) : puts("Usage: todo create <list_name> ")
-						new_list = YAML.load_file(File.join(Config[:lists_directory], 
-						Config[:working_list_name]+'.yml')) if File.exists?(File.join(Config[:lists_directory], 
-						Config[:working_list_name]+'.yml'))
-						display new_list
-					end
-				when "undo", "u"
+				when "clear"
 					if Config[:working_list_exists]
-						WORKING_LIST.undo ARGV[1..-1].join(' '), OPTIONS[:is_num]
-					display 
+						Tasks.clear OPTIONS[:clear_all]
+						puts
+						display
 					else
 						puts "Working List does not exist yet.  Please create one"
 						puts "todo create <list name>"
-					end
+					end	
 				when "remove", "r"
 					if ARGV.count > 1
-						List.remove ARGV[1..-1].join(' ')
+						Tasks.clear true, ARGV[1..-1].map{|word| word.capitalize}.join(' ')
 					end
 				else
 					puts "Invalid command.  See todo -h for help."
@@ -174,5 +188,40 @@ module Todo
 			end
 		end
 
+		# splits string for wrapping
+		def split string, width
+			split = Array.new
+			if string.length > width #if the string needs to be split
+				string_words = string.split(" ")
+				line = ""
+				string_words.each do |x|
+					if x.length > width #if the word needs to be split
+						#add the start of the word onto the first line (even if it has already started)
+						while line.length < width
+							line += x[0]
+							x = x[1..-1]
+						end
+						split << line
+						#split the rest of the word up onto new lines
+						split_word = x.scan(%r[.{1,#{width}}])
+						split_word[0..-2].each do |word|
+							split << word
+						end
+						line = split_word.last+" "
+					elsif (line + x).length > width-1 #if the word would fit alone on its own line
+						split << line.chomp
+						line = x
+					else #if the word can be added to this line
+						line += x + " "
+					end
+				end
+				split << line
+			else #if the string doesn't need to be split
+				split = [string]
+			end
+			#give back the split line
+			return split
+		end
+
 	end
 end

data/lib/to-do/config.rb

@@ -18,10 +18,14 @@ module Todo
 			{
 				# the location of all all your list yaml files
 				:lists_directory => File.join(ENV["HOME"],".to-do","lists"),
+				# a sqlite3 databse that contains all of the tasks 
+				:task_database => File.join(ENV["HOME"], ".to-do", "to-do.sqlite"), 
 				# the current working list
 				:working_list_name => "default_list", 
 				# does the working list actually exist
-				:working_list_exists => false
+				:working_list_exists => false, 
+				# default width for formatting
+				:width => 50
 			}
 		end
 

data/lib/to-do/tasks.rb

@@ -0,0 +1,109 @@
+require File.join(File.dirname(__FILE__), 'config')
+require 'fileutils'
+require 'sqlite3'
+module Todo
+
+	# The module that contains methods for manipulating the database
+	module Tasks
+		extend self
+		DATABASE = SQLite3::Database.new(Todo::Config[:task_database])
+
+		# Adds the tast to the list
+		# 
+		# @param [String] task the task to add to the list
+		def add task
+			list = DATABASE.execute("SELECT Total, Id FROM Lists WHERE Name = '" + Config[:working_list_name] + "'")
+			if !list
+				Database.execute("INSERT INTO Lists (Name, Total) VALUES('" + Config[:working_list_name] +  "', 0)")
+			end
+			count = list ? list[0][0]+1 : 1
+			DATABASE.execute "INSERT INTO Tasks (Task_number, Name, Completed) VALUES('" + count.to_s + "', '" + task + "', 0)"
+			list_id = list[0][1]
+			task_id = DATABASE.last_insert_row_id 
+			DATABASE.execute "INSERT INTO Task_list VALUES(" + task_id.to_s + ", " + list_id.to_s + ")"
+			DATABASE.execute "UPDATE Lists SET Total="+ count.to_s + " WHERE Id = " + list_id.to_s
+		end
+
+		# finish the task. task is either a case insensitive task on the list or
+		# the task number. Prints out either the task is not in the list or that i
+		# succesfully finished the task
+		#
+		# @param task either a task number or task name to finish
+		# @param [Bool] is_num if the task param represents the task number, true. 
+		# false if it is the task name
+		def finish task, is_num
+			finish_undo task, is_num, 0, 1
+		end
+
+		# undos finishing a task. task is either a case insensitive task on the list or
+		# the task number. Prints out either the task is not in the list or that i
+		# succesfully undoed finished the task
+		#
+		# @param task either a task number or task name to finish
+		# @param [Bool] is_num if the task param represents the task number, true. 
+		# false if it is the task name
+		def undo task, is_num
+			finish_undo task, is_num, 1, 0
+		end
+
+		# clears either just the completed or the uncompleted tasks
+		#
+		# @param completed [Integer] 1 if clearing completed tasks, 0 if clearing 
+		# Uncompleted tasks
+		def clear_each completed ,list_name
+			tasks = DATABASE.execute("SELECT Id from Tasks WHERE Id IN 
+				(SELECT Task_ID FROM Task_list WHERE List_Id IN 
+					(SELECT Id FROM Lists WHERE Name='"+list_name+"' AND Tasks.Completed ="+ completed.to_s+ "))")
+			tasks.each do |task|
+				DATABASE.execute("DELETE FROM Task_list WHERE Task_id=" + task[0].to_s)
+				DATABASE.execute("DELETE FROM Tasks WHERE Id=" + task[0].to_s)
+			end
+		end
+
+		# clears all the tasks in the list 
+		# 
+		# @param [Bool] clear_all if true, clears all completed and uncompleted tasks
+		# and resets the count. if false, just clears the completed tasks
+		def clear clear_all, list_name = Config[:working_list_name]
+			clear_each 1, list_name
+			if clear_all
+				clear_each 0, list_name
+				DATABASE.execute("UPDATE Lists SET Total = 0 WHERE Name = '" + list_name +"'")
+				DATABASE.execute("DELETE FROM Lists WHERE Name = '" + list_name +  "'")
+				puts "Cleared all tasks in #{list_name}"
+			else
+				puts "Cleared completed tasks in #{Config[:working_list_name]}"
+			end
+		end
+
+		# Helper method for finishing and undoing a task
+		# 
+		# @param task either a task number or task name to finish
+		# @param [Bool] is_num if the task param represents the task number, true. 
+		# false if it is the task name
+		# @param initial [Integer] 0 if you are finishing a task, 1 if you are undoing a task
+		# @param final [Integer] 1 if you are finishing a task, 0 if you ara undoing a task
+		def finish_undo task , is_num, initial, final
+			list = DATABASE.execute("SELECT Id FROM Lists WHERE Name = '" + Config[:working_list_name] + "'")
+			list_id = list[0][0]
+			names = DATABASE.execute("SELECT * from Tasks WHERE Id IN 
+					(SELECT Task_ID FROM Task_list WHERE List_Id IN 
+						(SELECT Id FROM Lists WHERE Name='"+Config[:working_list_name]+"' AND Tasks.Completed ="+ initial.to_s+"))")
+			if is_num
+				if names.map{|t| t[1]}.include? task.to_i
+					task_array = names.find{|t| t[1] == task.to_i}
+					DATABASE.execute "Update Tasks SET Completed="+final.to_s+ " WHERE Id=" + task_array[0].to_s
+				else
+					puts "Task ##{task} is not in the list."
+				end
+			else
+				if names.map{|t| t[2].downcase}.include? task.downcase
+					task_array = names.find{|t| t[2].downcase == task.downcase}
+					DATABASE.execute "Update Tasks SET Completed="+final.to_s+ " WHERE Id=" + task_array[0].to_s
+				else
+					puts "Task #{task} is not in the list."
+				end
+			end
+		end
+	end	
+end

data/to-do.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "to-do"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristen Mills"]
-  s.date = "2012-07-15"
+  s.date = "2012-07-18"
   s.description = "A simple command line todo application"
   s.email = "kristen@kristen-mills.com"
   s.executables = ["todo"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
     "lib/to-do.rb",
     "lib/to-do/cli.rb",
     "lib/to-do/config.rb",
-    "lib/to-do/list.rb",
+    "lib/to-do/tasks.rb",
     "test/helper.rb",
     "test/test_to-do.rb",
     "to-do.gemspec"
@@ -44,16 +44,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_runtime_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_runtime_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<colorize>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<colorize>, [">= 0"])
@@ -61,8 +61,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<colorize>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to-do
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70161145118480 !ruby/object:Gem::Requirement
+  requirement: &70322464748740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161145118480
+  version_requirements: *70322464748740
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70161145118000 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70322464747940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161145118000
+  version_requirements: *70322464747940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70161145117520 !ruby/object:Gem::Requirement
+  requirement: &70322464747040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70161145117520
+  version_requirements: *70322464747040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70161145117040 !ruby/object:Gem::Requirement
+  requirement: &70322464744360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70161145117040
+  version_requirements: *70322464744360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70161145116500 !ruby/object:Gem::Requirement
+  requirement: &70322464758220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161145116500
+  version_requirements: *70322464758220
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70161145115960 !ruby/object:Gem::Requirement
+  requirement: &70322464755580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161145115960
+  version_requirements: *70322464755580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70161145115400 !ruby/object:Gem::Requirement
+  requirement: &70322464753260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161145115400
+  version_requirements: *70322464753260
 description: A simple command line todo application
 email: kristen@kristen-mills.com
 executables:
@@ -107,7 +107,7 @@ files:
 - lib/to-do.rb
 - lib/to-do/cli.rb
 - lib/to-do/config.rb
-- lib/to-do/list.rb
+- lib/to-do/tasks.rb
 - test/helper.rb
 - test/test_to-do.rb
 - to-do.gemspec
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1554472922961583254
+      hash: -1294389487870074632
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/to-do/list.rb

@@ -1,161 +0,0 @@
-require 'yaml'
-require File.join(File.dirname(__FILE__), 'config')
-require 'fileutils'
-module Todo
-
-	# The Class that represents a list of tasks
-	class List
-		attr_accessor :tasks, :completed_tasks, :count, :completed_count, :name
-
-		# Creates a new list and sets it to be the working list
-		# 
-		# @param [String] name the name of the list
-		def initialize name
-			@tasks = Hash.new
-			@completed_tasks = Hash.new
-			@count = 0
-			@completed_count = 0
-			@name = name
-			if !File.exists? Config[:lists_directory]
-				Dir.mkdir(Config[:lists_directory])
-			end
-			update
-			Config[:working_list_name] = name.downcase.gsub(/ /, '_')
-			Config[:working_list_exists] = true
-			Config.write
-			puts "Created List #{name}."
-		end
-
-		# Updates the yaml file
-		def update
-			path = File.join(Config[:lists_directory], @name.downcase.gsub(/ /, '_') +'.yml')
-			File.open(path, 'w') do |fh|
-				fh.puts(self.to_yaml)
-			end
-		end
-
-		# Adds the tast to the list
-		# 
-		# @param [String] task the task to add to the list
-		def add task
-			@count+=1
-			@tasks[@count] = task
-			puts "Added task #{task}."
-			update
-		end
-
-		# finish the task. task is either a case insensitive task on the list or
-		# the task number. Prints out either the task is not in the list or that i
-		# succesfully finished the task
-		#
-		# @param task either a task number or task name to finish
-		# @param [Bool] is_num if the task param represents the task number, true. 
-		# false if it is the task name
-		def finish task, is_num
-			if is_num
-				if !@tasks[task.to_i].nil?
-					@completed_tasks[task.to_i] = @tasks[task.to_i]
-					@tasks.delete(task.to_i)
-					@completed_count+=1
-					@completed_tasks = Hash[@completed_tasks.sort]
-					puts "Finished #{@completed_tasks[task.to_i]}."
-				else
-					puts "Task \##{task} not in list."
-				end
-			else
-				hash = Hash.new
-				@tasks.each do |k,v|
-					hash[k] = v.downcase
-				end
-				if hash.value?(task.downcase)
-					num = hash.key(task.downcase)
-					@completed_tasks[num] = @tasks[num]
-					@tasks.delete(num)
-					@completed_count+=1
-					@completed_tasks = Hash[@completed_tasks.sort]
-					puts "Finished #{@completed_tasks[num]}."
-				else
-					puts "Task #{task} is not in list."
-				end
-			end
-			update
-		end
-
-		# undos finishing a task. task is either a case insensitive task on the list or
-		# the task number. Prints out either the task is not in the list or that i
-		# succesfully undoed finished the task
-		#
-		# @param task either a task number or task name to finish
-		# @param [Bool] is_num if the task param represents the task number, true. 
-		# false if it is the task name
-		def undo task, is_num
-			if is_num
-				if !@completed_tasks[task.to_i].nil?
-					@tasks[task.to_i] = @completed_tasks[task.to_i]
-					@completed_tasks.delete(task.to_i)
-					@completed_count-=1
-					@tasks = Hash[@tasks.sort]
-					puts "Undo completeing #{@tasks[task.to_i]}."
-				else
-					puts "Task \##{task} not in list."
-				end
-			else
-				hash = Hash.new
-				@completed_tasks.each do |k,v|
-					hash[k] = v.downcase
-				end
-				if hash.value?(task.downcase)
-					num = hash.key(task.downcase)
-					@tasks[num] = @completed_tasks[num]
-					@completed_tasks.delete(num)
-					@completed_count-=1
-					@tasks = Hash[@tasks.sort]
-					puts "Undo completeing #{@tasks[num]}."
-				else
-					puts "Task #{task} is not in list."
-				end
-			end
-			update
-		end
-
-		# clears just the completed tasks
-		def clear_completed
-			@completed_tasks = Hash.new
-			update
-		end
-
-		# clears the task in the list 
-		# 
-		# @param [Bool] clear_all if true, clears all completed and uncompleted tasks
-		# and resets the count. if false, just clears the completed tasks
-		def clear clear_all
-			clear_completed
-			if clear_all
-				@tasks = Hash.new
-				@completed_count = 0
-				@count = 0
-				puts "Cleared list."
-			else
-				puts "Cleared completed tasks."
-			end
-			update
-		end
-
-		# Class method that removes a list from the your lists.
-		# 
-		# @param [string] name name of the list that you are trying to remove
-		def self.remove name
-			underscore_name = name.downcase.gsub(/ /, '_')
-			begin
-				FileUtils.rm File.join(Config[:lists_directory], underscore_name +'.yml')
-				puts "Removed list #{name}"
-			rescue
-				puts "List doesn't exist"
-			end
-			if underscore_name == Config[:working_list_name]
-				Config[:working_list_exists] = false
-			end
-		end
-	end
-end
-