to-do 1.3.0 → 1.3.1

data/README.md

@@ -1,7 +1,12 @@
-#to-do 1.3 [![Build Status](https://secure.travis-ci.org/kristenmills/to-do.png?branch=master)](http://travis-ci.org/kristenmills/to-do)
+#to-do 1.3.1 [![Build Status](https://secure.travis-ci.org/kristenmills/to-do.png?branch=master)](http://travis-ci.org/kristenmills/to-do) [![Dependency Status](https://gemnasium.com/kristenmills/to-do.png)](https://gemnasium.com/kristenmills/to-do) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/kristenmills/to-do)
 
 A simple command line todo application written in Ruby.   
 
+## What's new in 1.3.1
+* Bug Fixes
+* Text color adjustments for dark and light color schemes
+* Add a default list automatically as opposed to the message that tells you to create a default list
+
 ##What's new in 1.3
 * Priorities
 * Sorting
@@ -102,6 +107,10 @@ This is just basic usage. For more information, view
 * Tab Completion
 * Reorganizing
 
+##Similar Projects
+* [timetrap](https://github.com/samg/timetrap) is hip. You should probably check it out. 
+* [tracking](https://github.com/thenickperson/tracking) is also pretty hip. You should probably check it out. 
+
 ##Contributing to to-do
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/Rakefile

@@ -41,12 +41,5 @@ end
 
 task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-	version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-	rdoc.rdoc_dir = 'rdoc'
-	rdoc.title = "to-do #{version}"
-	rdoc.rdoc_files.include('README*')
-	rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/to-do.rb

@@ -14,6 +14,13 @@ Sequel::Migrator.apply(database, File.join(File.dirname(__FILE__),'to-do', 'dbmi
 
 # If a lists file exists from back when we were using YAML populate the database with that information
 if File.exists?(File.join(ENV['HOME'], '.to-do', 'lists')) && database[:Lists].empty?
+	add_tasks = Proc.new { |list_object, list_id, completed| 
+		list_object.completed_tasks.each do |num, task|
+			database[:Tasks].insert(:Task_number => num.to_s, :Name => task, :Completed => completed)
+			task_id = database[:Tasks].count
+			database[:Task_list].insert(:Task_id => task_id, :List_id => list_id)
+		end
+	}
 	Dir.chdir(File.join(ENV['HOME'], '.to-do', 'lists')) do 
 		lists = Dir.entries "."
 		lists.each do |file|
@@ -21,20 +28,13 @@ if File.exists?(File.join(ENV['HOME'], '.to-do', 'lists')) && database[:Lists].e
 			list_object = YAML.load_file(file)
 			database[:Lists].insert(:Name => list_object.name, :Total => list_object.count)
 			list_id = database[:Lists].count
-			list_object.tasks.each do |num, task|
-				database[:Tasks].insert(:Task_number => num.to_s, :Name => task, :Completed => 0)
-				task_id = database[:Tasks].count
-				database[:Task_list].insert(:Task_id => task_id, :List_id => list_id)
-			end
-			list_object.completed_tasks.each do |num, task|
-				database[:Tasks].insert(:Task_number => num.to_s, :Name => task, :Completed => 1)
-				task_id = database[:Tasks].count
-				database[:Task_list].insert(:Task_id => task_id, :List_id => list_id)
-			end
+			add_tasks.call list_object, list_id, 0
+			add_tasks.call list_object, list_id, 1
 		end
 	end
 end
 
+require File.join(File.dirname(__FILE__), 'to-do', 'helpers', 'helpers') 
 require File.join(File.dirname(__FILE__), 'to-do', 'tasks')
 require File.join(File.dirname(__FILE__), 'to-do', 'cli')
 

data/lib/to-do/cli.rb

@@ -8,31 +8,6 @@ module Todo
 	module CLI 
 		extend self
 
-		# The database
-		DATABASE = Sequel.sqlite Todo::Config[:task_database]
-
-		# The option flags 
-		OPTIONS = {
-			:is_num => false, 
-			:clear_all => false,
-			:change_priority => false,
-			:priority => 1, 
-			:sort => "n"
-		}
-
-		# Usage messages for each of the commnands
-		USAGE = {
-			:default => "todo [COMMAND] [option] [arguments]", 
-			:create  => "todo create|switch <LIST NAME>", 
-			:display => "todo [display|d] [-s {p,n}]",
-			:add => "todo add|a [-p {high, medium, low}] <TASK>", 
-			:finish => "todo finish|f [-n <TASK_NUMBER>] [<TASK>]",
-			:undo => "todo undo|u [-n <TASK_NUMBER>] [<TASK>]",
-			:clear => "todo clear [-a]",
-			:remove => "todo remove|rm <LIST NAME>",
-			:set => "todo set|s [-p {high, medium, low}] [-n <TASK_NUMBER>] [<TASK>]"
-		}
-
 		# Displays the list in a human readable form:
 		#
 		# @example 
@@ -48,248 +23,101 @@ module Todo
 		#        3. Task 3
 		#        4. Task 4
 		def display
-			tasks = DATABASE[:Tasks].join(:Task_list, :Tasks__id => :Task_list__Task_id).join(
-				:Lists, :Lists__id => :Task_list__List_id).select(:Tasks__Task_number, :Tasks__Name, 
-				:Tasks__Completed, :Tasks__Priority).filter(:Lists__Name => Config[:working_list_name])
-			tasks = OPTIONS[:sort] == "n" ? tasks.order(:Task_number) : tasks.order(:Priority, :Task_number)
-			list = DATABASE[:Lists][:Name=>Config[:working_list_name]]
+
+			colors = Helpers::CLI.create_color_hash
+			tasks = Helpers.task_names
+			tasks = Helpers::CLI::OPTIONS[:sort] == "n" ? tasks.order(:Task_number) : tasks.order(:Priority, :Task_number)
+			list = Helpers::DATABASE[:Lists][:Name=>Config[:working_list_name]]
 			count = list.nil? ? 0 : list[:Total]
 			completed_count = tasks.filter(:Completed=>1).count
 
-			priority = {
-				0 => "**",
-				1 => "*",
-				2 => ""
-			}
 			#print out the header
-			Config[:width].times do 
-				print "*".colorize(:light_red)
-			end
-			puts
-			split_name = split Config[:working_list_name], Config[:width]
-			split_name.each do |line|
-				puts line.center(Config[:width]).colorize(:light_cyan)
-			end
-			Config[:width].times do 
-				print "*".colorize(:light_red)
-			end
+			Helpers::CLI.print_header colors
+			
 			puts
 			puts
 
 			#prints out incomplete tasks
-			puts "Todo:".colorize(:light_green)
-			tasks.each do |task|
-				next if task[:Completed] == 1
-				printf "%2s".colorize(:light_magenta), priority[task[:Priority]]
-				printf "%3d. ".colorize(:light_yellow), task[:Task_number] 
-				split_v = split task[:Name], Config[:width] - 7
-				puts split_v[0]
-				split_v.shift
-				split_v.each do |line|
-					printf "      %s\n", line
-				end
-			end
+			puts "Todo:".colorize(colors[:green])
+			Helpers::CLI.print_tasks 1, tasks, colors
 
 			#Prints out complete tasks
-			print "\nCompleted:".colorize(:light_green)
-			printf "%#{Config[:width]+4}s\n", "#{completed_count}/#{count}".colorize(:light_cyan)
-			tasks.each do |task|
-				next if task[:Completed] == 0
-				printf "%2s".colorize(:light_magenta), priority[task[:Priority]]
-				printf "%3d. ".to_s.colorize(:light_yellow), task[:Task_number]
-				split_v = split task[:Name], Config[:width]-7
-				puts split_v[0]
-				split_v.shift
-				split_v.each do |line|
-					printf "      %s\n", line
-				end
-			end
+			print "\nCompleted:".colorize(colors[:green])
+			printf "%#{Config[:width]+4}s\n", "#{completed_count}/#{count}".colorize(colors[:cyan])
+			Helpers::CLI.print_tasks 0, tasks, colors
 			puts
 		end
 
 		# Helper method for parsing the options using OptionParser
 		def option_parser
+			colors = Helpers::CLI.create_color_hash
 			OptionParser.new do |opts|
-				version_path = File.expand_path("../../VERSION", File.dirname(__FILE__))
-				opts.version = File.exist?(version_path) ? File.read(version_path) : ""
-				opts.banner = "Todo: A simple command line todo application\n\n".colorize(:light_green) +
-				"    usage:".colorize(:light_cyan) + " todo [COMMAND] [option] [arguments]".colorize(:light_red)
-				opts.separator ""
-				opts.separator "Commands:".colorize(:light_green)
-
-				#todo create, switch
-				opts.separator "  *".colorize(:light_cyan)  + " create, switch".colorize(:light_yellow) +  " creates a new list or switches to an existing one".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:create].colorize(:light_red)
-				
-				# todo display, d
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan)  + " display, d".colorize(:light_yellow) +  " displays the current list".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:display].colorize(:light_red)
-				opts.on('-s TYPE', [:p, :n], "sorts the task by ") do |s|
-					OPTIONS[:sort] = s
-				end
-
-				#todo add, a
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan)  + " add, a".colorize(:light_yellow) +  " adds the task to the current list".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:add].colorize(:light_red)
-				opts.on('-p PRIORITY', ["high", "medium", "low"], 'set the priority of the task to one of the following.\n' + 
-				'                                                    Default is medium') do |p|
-					priorities = {
-						"high" => 0,
-						"medium" => 1,
-						"low" => 2
-					}
-					OPTIONS[:change_priority] = true
-					OPTIONS[:priority] = priorities[p]
-				end
-
-				#todo finish, f
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan)  + " finish , f".colorize(:light_yellow) +  " marks a task as finished".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:finish].colorize(:light_red)
-				opts.on('-n',  'references a task by its number') do |n|
-					OPTIONS[:is_num] = true
-				end
-
-				#todo undo, u
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan)  + " undo, u".colorize(:light_yellow) +  " undos a completed task".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:undo].colorize(:light_red)
-				opts.separator "    -n                               references a task by its number"
+				Helpers::CLI.options_title opts, colors
+				Helpers::CLI.options_create opts, colors
+				Helpers::CLI.options_display opts, colors
+				Helpers::CLI.options_add opts, colors
+				Helpers::CLI.options_finish opts, colors
+				Helpers::CLI.options_undo opts, colors
+				Helpers::CLI.options_clear opts, colors
+				Helpers::CLI.options_remove opts, colors
+				Helpers::CLI.options_set opts, colors
+				Helpers::CLI.options_config  opts, colors
+				Helpers::CLI.options_other opts, colors
+			end
+		end
 
-				#todo clear
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan)  + " clear".colorize(:light_yellow) +  " clears a completed tasks".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:clear].colorize(:light_red)
-				opts.on('-a', 'resets the entire list') do
-					OPTIONS[:clear_all] = true
+		# Helper method for parsing commands.
+		def commands_parser
+			if ARGV.count > 0
+				should_display = command_switch
+				if ARGV[0] == "clear"
+					Tasks.clear Helpers::CLI::OPTIONS[:clear_all]
+					should_display = true
 				end
 
-				#todo remove, rm
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan)  + " remove, rm".colorize(:light_yellow) +  " removes the list completely.".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:remove].colorize(:light_red)
-
-				#todo set, s
-				opts.separator ""
-				opts.separator "  *".colorize(:light_cyan) + " set, s".colorize(:light_yellow) + " adds additional information to a task".colorize(:light_magenta)
-				opts.separator "    usage: ".colorize(:light_cyan) + USAGE[:set].colorize(:light_red)
-				opts.separator "    -p TYPE                          set the priority of the task to one of the following.\n" + 
-				"                                     Default is medium"
-				opts.separator "    -n                               references a task by its number"
-
-				opts.separator ""
-				opts.separator "Other Options: ".colorize(:light_green)
-
-				#todo -h
-				opts.on('-h', '--help', 'displays this screen' ) do
-					puts opts
-					exit
-				end
-				#todo -w
-				opts.on('-w', "displays the name of the current list") do
-					if Config[:working_list_exists]
-						puts "Working list is #{Config[:working_list_name]}"
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "todo create <list name>"
-					end
-					exit
+				if ARGV[0] == "display" || ARGV[0] == "d" || should_display
+					puts
+					display
+				elsif Helpers::CLI::USAGE[ARGV[0].to_sym].nil? && ARGV.count == 1
+					puts "Invalid command.  See todo -h for help."
+				elsif ARGV.count == 1
+					puts "Usage: #{Helpers::CLI::USAGE[ARGV[0].to_sym]}"
 				end
 
+			else
+				display
 			end
 		end
 
-		# Helper method for parsing commands.
-		def commands_parser
-			if ARGV.count > 0
+		# Helper method for parsing commmands. 
+		def command_switch 
+			if ARGV.count > 1 
+				should_display =  true
 				case ARGV[0]
-				when "display", "d"
-					if Config[:working_list_exists]
-						display 
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "Usage: #{USAGE[:create]}"
-					end
 				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: #{USAGE[:create]}"
-					end		
 				when "add", "a"
-					if Config[:working_list_exists]
-						ARGV.count > 1 ? Tasks.add(ARGV[1..-1].join(' '), OPTIONS[:priority]) : puts("Usage: #{USAGE[:add]}")
-						puts
-						display 
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "Usage: #{USAGE[:create]}"
-					end
+					Tasks.add(ARGV[1..-1].join(' '), Helpers::CLI::OPTIONS[:priority]) 
 				when "finish", "f"
-					if Config[:working_list_exists]
-						ARGV.count > 1 ? Tasks.finish(ARGV[1..-1].join(' '), OPTIONS[:is_num]) : puts("Usage: #{USAGE[:finish]}")
-						puts
-						display 
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "Usage: #{USAGE[:create]}"
-					end
+					Tasks.finish(ARGV[1..-1].join(' '), Helpers::CLI::OPTIONS[:is_num])
 				when "undo", "u"
-					if Config[:working_list_exists]
-						ARGV.count > 1 ? Tasks.undo(ARGV[1..-1].join(' '), OPTIONS[:is_num]) : puts("Usage: #{USAGE[:undo]}")
-						puts
-						display 
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "Usage: #{USAGE[:create]}"
-					end
-				when "clear"
-					if Config[:working_list_exists]
-						Tasks.clear OPTIONS[:clear_all]
-						puts
-						display
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "Usage: #{USAGE[:create]}"
-					end	
+					Tasks.undo(ARGV[1..-1].join(' '), Helpers::CLI::OPTIONS[:is_num])
 				when "remove", "r"
-					if ARGV.count > 1
-						Tasks.clear true, ARGV[1..-1].map{|word| word.capitalize}.join(' ')
-					else 
-						puts "Usage: #{USAGE[:remove]}"
-					end
+					Tasks.clear true, ARGV[1..-1].map{|word| word.capitalize}.join(' ')
+					should_display = false
 				when "set", "s"
-					if Config[:working_list_exists]
-						if ARGV.count > 1
-							if OPTIONS[:change_priority]
-								Tasks.set_priority OPTIONS[:priority], ARGV[1..-1].join(' '), OPTIONS[:is_num]
-							end
-							display
-						else 
-							puts "Usage: #{USAGE[:set]}"
-						end
-					else
-						puts "Working List does not exist yet.  Please create one"
-						puts "Usage: #{USAGE[:create]}"
-					end	
+					if Helpers::CLI::OPTIONS[:change_priority]
+						Tasks.set_priority Helpers::CLI::OPTIONS[:priority], ARGV[1..-1].join(' '), OPTIONS[:is_num]
+					end
 				else
 					puts "Invalid command.  See todo -h for help."
-				end
-			else
-				if Config[:working_list_exists]
-					display 
-				else
-					puts "Working List does not exist yet.  Please create one"
-					puts "Usage: #{USAGE[:create]}"
+					should_display = false
 				end
 			end
+			should_display
 		end
 
 		# Parses the commands and options
@@ -298,45 +126,10 @@ module Todo
 			begin
 				optparse.parse!
 				commands_parser
-			rescue OptionParser::InvalidOption, OptionParser::InvalidArgument => e
-				puts "#{e}. See todo -h for help."
+			rescue OptionParser::InvalidOption, OptionParser::InvalidArgument, 
+						 OptionParser::MissingArgument, OptionParser::NeedlessArgument => e
+				puts "#{e.to_s. capitalize}. See todo -h for help."
 			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

@@ -21,11 +21,11 @@ module Todo
 				# 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_name => "My New List", 
 				# default width for formatting
-				:width => 50
+				:width => 50,
+				# default color scheme options
+				:color => "light"
 			}
 		end
 

data/lib/to-do/helpers/helpers.rb

@@ -0,0 +1,22 @@
+module Todo
+
+	#A module that contains helper methods 
+	module Helpers
+		extend self
+
+		# The database
+		DATABASE = Sequel.sqlite Todo::Config[:task_database]
+
+		# Gets a list of the tasks in the working lists
+		#
+		# @return [Dataset] the dataset containing all of the tasks in the working lists
+ 		def task_names 
+			Helpers::DATABASE[:Tasks].join(:Task_list, :Tasks__Id => :Task_list__Task_Id).join(
+			:Lists, :Lists__Id => :Task_list__List_id).select(:Tasks__Id, :Tasks__Task_number, 
+			:Tasks__Name, :Tasks__Completed, :Tasks__Priority).filter(:Lists__Name => Config[:working_list_name])
+		end
+	end
+end
+
+require File.join(File.dirname(__FILE__), 'helpers_CLI') 
+require File.join(File.dirname(__FILE__), 'helpers_tasks') 

data/lib/to-do/helpers/helpers_CLI.rb

@@ -0,0 +1,301 @@
+module Todo
+	module Helpers
+
+		# Helper methods used in the Todo::CLI module
+		module CLI
+			extend self
+
+			# The option flags 
+			OPTIONS = {
+				:is_num => false, 
+				:clear_all => false,
+				:change_priority => false,
+				:priority => 1, 
+				:sort => "n"
+			}
+
+			# Usage messages for each of the commnands
+			USAGE = {
+				:default => "todo [COMMAND] [option] [arguments]", 
+				:create  => "todo create|switch <LIST NAME>", 
+				:display => "todo [display|d] [-s {p,n}]",
+				:add => "todo add|a [-p {high, medium, low}] <TASK>", 
+				:finish => "todo finish|f [-n <TASK_NUMBER>] [<TASK>]",
+				:undo => "todo undo|u [-n <TASK_NUMBER>] [<TASK>]",
+				:clear => "todo clear [-a]",
+				:remove => "todo remove|rm <LIST NAME>",
+				:set => "todo set|s [-p {high, medium, low}] [-n <TASK_NUMBER>] [<TASK>]", 
+				:config => "todo [--color-scheme {light, dark, none}] [--width <WIDTH_NUMBER>]"
+			}
+
+			# splits string for wrapping
+			# 
+			# @param [String] string the string to be split
+			# @param [Width] width the width of the line
+			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
+
+			#create a hash of the colors needed for display based on the config file
+			def create_color_hash
+				colors = [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white, :default]
+				type = Config[:color]
+				color_hash = Hash.new
+				colors.each do |c|
+					case type
+					when "light"
+						color_hash[c] = c
+					when  "dark"
+						color_hash[c] = ("light_" + c.to_s).to_sym
+					else
+						color_hash[c] = :default
+					end
+				end
+				color_hash
+			end
+
+			# Helper method for the options parser that displays the title
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_title opts, colors
+				version_path = File.expand_path("../../VERSION", File.dirname(__FILE__))
+				opts.version = File.exist?(version_path) ? File.read(version_path) : ""
+				opts.banner = "Todo: A simple command line todo application\n\n".colorize(colors[:green]) +
+				"    usage:".colorize(colors[:cyan]) + " todo [COMMAND] [option] [arguments]".colorize(colors[:red])
+				opts.separator ""
+				opts.separator "Commands:".colorize(colors[:green])
+			end
+
+			# Helper method for the options parser for create, switch
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_create opts, colors
+				#todo create, switch
+				opts.separator "  *".colorize(colors[:cyan])  + " create, switch".colorize(colors[:yellow]) +  
+				" creates a new list or switches to an existing one".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:create].colorize(colors[:red])
+			end
+
+			# Helper method for the options parser for display
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_display opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan])  + " display, d".colorize(colors[:yellow]) +  
+				" displays the current list".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:display].colorize(colors[:red])
+				opts.on('-s TYPE', [:p, :n], "sorts the task by Type") do |s|
+					OPTIONS[:sort] = s
+				end
+			end
+
+			# Helper method for the options parser that for add
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_add opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan])  + " add, a".colorize(colors[:yellow]) +  
+				" adds the task to the current list".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:add].colorize(colors[:red])
+				opts.on('-p PRIORITY', ["high", "medium", "low"], 'set the priority of the task to one of the', 'following. Default is medium') do |p|
+					priorities = {
+						"high" => 0,
+						"medium" => 1,
+						"low" => 2
+					}
+					OPTIONS[:change_priority] = true
+					OPTIONS[:priority] = priorities[p]
+				end
+			end
+
+			# Helper method for the options parser that for finish
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_finish opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan])  + " finish , f".colorize(colors[:yellow]) +  
+				" marks a task as finished".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:finish].colorize(colors[:red])
+				opts.on('-n',  'references a task by its number') do |n|
+					OPTIONS[:is_num] = true
+				end
+			end
+
+			# Helper method for the options parser for undo
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_undo opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan])  + " undo, u".colorize(colors[:yellow]) +  
+				" undos a completed task".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:undo].colorize(colors[:red])
+				opts.separator "    -n                               references a task by its number"
+			end
+
+			# Helper method for the options parser for clear
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_clear opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan])  + " clear".colorize(colors[:yellow]) +  
+				" clears a completed tasks".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:clear].colorize(colors[:red])
+				opts.on('-a', 'resets the entire list') do
+					OPTIONS[:clear_all] = true
+				end
+			end
+
+			# Helper method for the options parser for remove
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_remove opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan])  + " remove, rm".colorize(colors[:yellow]) +  
+				" removes the list completely.".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:remove].colorize(colors[:red])
+			end
+
+			# Helper method for the options parser that for set
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_set opts, colors
+				opts.separator ""
+				opts.separator "  *".colorize(colors[:cyan]) + " set, s".colorize(colors[:yellow]) + 
+				" adds additional information to a task".colorize(colors[:magenta])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:set].colorize(colors[:red])
+				opts.separator "    -p TYPE                          set the priority of the task to one of the \n" + 
+				"                                     following. Default is medium"
+				opts.separator "    -n                               references a task by its number"
+			end
+
+			# Helper method for the options parser for help and display working list
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_other opts, colors
+				opts.separator ""
+				opts.separator "Other Options: ".colorize(colors[:green])
+
+				#todo -h
+				opts.on('-h', '--help', 'displays this screen' ) do
+					puts opts
+					exit
+				end
+				#todo -w
+				opts.on('-w', "displays the name of the current list") do
+					puts "Working list is #{Config[:working_list_name]}"
+					exit
+				end
+			end
+
+			# Helper method for the options parser for help and display working list
+			#
+			# @param opts the options switch
+			# @param [Hash] colors the color hash
+			def options_config opts, colors
+				opts.separator ""
+				opts.separator "Configuration Options: ".colorize(colors[:green])
+				opts.separator "    usage: ".colorize(colors[:cyan]) + USAGE[:config].colorize(colors[:red])
+
+				#todo -h
+				opts.on('--color-scheme SCHEME', ["light", "dark", "none"],  "State whether you are using a light" , 
+					"scheme or dark scheme.  This is used","for the text colors.  If none work",  "with your current 
+					color scheme,", "you can turn it off.  Default is light." ) do |scheme|
+					Config[:color] = scheme
+					exit
+				end
+				#todo -w
+				opts.on('--width WIDTH', Integer, "Changes the width for formatting") do |width|
+					Config[:width] = width
+					exit
+				end
+			end
+
+			# Print out the tasks
+			#
+			# @param [Integer] completed whether to print out completed or uncompleted 
+			# 								 items. 0 if completed. 1 if not
+			# @param [Dataset] tasks the dataset of tasks to print out
+			# @param [Hash] colors the color hash
+			def print_tasks completed, tasks, colors
+				priority = {
+					0 => "**",
+					1 => "*",
+					2 => ""
+				}
+				tasks.each do |task|
+					next if task[:Completed] == completed
+					printf "%2s".colorize(colors[:magenta]), priority[task[:Priority]]
+					printf "%3d. ".to_s.colorize(colors[:yellow]), task[:Task_number]
+					split_v = split task[:Name], Config[:width]-7
+					puts split_v[0]
+					split_v.shift
+					split_v.each do |line|
+						printf "      %s\n", " " + line
+					end
+				end
+			end
+
+			# print asterisks
+			# 
+			# @param [Hash] colors the color hash
+			def print_stars colors
+				Config[:width].times do 
+					print "*".colorize(colors[:red])
+				end
+			end
+
+			# print the header out
+			#
+			# @param [Hash] colors the color hash
+			def print_header colors
+				Helpers::CLI::print_stars colors
+				puts
+				split_name = split Config[:working_list_name], Config[:width]
+				split_name.each do |line|
+					puts line.center(Config[:width]).colorize(colors[:cyan])
+				end
+				Helpers::CLI::print_stars colors
+			end
+		end
+	end
+end

data/lib/to-do/helpers/helpers_tasks.rb

@@ -0,0 +1,34 @@
+module Todo
+	module Helpers
+
+		# Helper methods used in the Todo::Tasks module
+		module Tasks
+			extend self
+
+			# Update a task
+			#
+			# @param [Bool] is_num is the task a number
+			# @param [Dataset] names a dataset of all the tasks in the working list
+			# @param task the task name or number that we are updating
+			# @param [Symbol] key the key we are updating
+			# @param [Integer] value the value that we are changing it too. 
+			def update_task is_num, names, task, key, value
+				if is_num
+					found_task = names[:Task_number => task]
+					if found_task
+						Helpers::DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(key => value)
+					else
+						puts "Task ##{task} is not in the list."
+					end
+				else
+					found_task = names.with_sql("SELECT * FROM :table WHERE Name = :task COLLATE NOCASE",:table=>names, :task=>task).first
+					if found_task
+						Helpers::DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(key => value)
+					else
+						puts "Task '#{task}' is not in the list."
+					end
+				end
+			end
+		end
+	end
+end

data/lib/to-do/tasks.rb

@@ -4,25 +4,22 @@ module Todo
 	module Tasks
 		extend self
 
-		# The Database
-		DATABASE = Sequel.sqlite Todo::Config[:task_database]
-
 		# Adds the tast to the list
 		# 
 		# @param [String] task the task to add to the list
 		# @param [Integer] priority the priority of the task
 		def add task, priority=1
-			list = DATABASE[:Lists].select(:Total, :Id)[:Name=>Todo::Config[:working_list_name]]
+			list = Helpers::DATABASE[:Lists].select(:Total, :Id)[:Name=>Todo::Config[:working_list_name]]
 			if !list
-				DATABASE[:Lists] << {:Name => Config[:working_list_name], :Total => 0}
-				list = DATABASE[:Lists].select(:Total, :Id)[:Name=>Todo::Config[:working_list_name]]
+				Helpers::DATABASE[:Lists] << {:Name => Config[:working_list_name], :Total => 0}
+				list = Helpers::DATABASE[:Lists].select(:Total, :Id)[:Name=>Todo::Config[:working_list_name]]
 			end
 			count = list[:Total]+1
-			DATABASE[:Tasks] << {:Task_number => count, :Name => task, :Completed => 0, :Priority => priority}
+			Helpers::DATABASE[:Tasks] << {:Task_number => count, :Name => task, :Completed => 0, :Priority => priority}
 			list_id = list[:Id]
-			task_id = DATABASE[:Tasks].with_sql("SELECT last_insert_rowid() FROM Tasks")
-			DATABASE[:Task_list] << {:Task_id => task_id, :List_id => list_id}
-			DATABASE[:Lists].filter(:Id => list_id).update(:Total => count)
+			task_id = Helpers::DATABASE[:Tasks].with_sql("SELECT last_insert_rowid() FROM Tasks")
+			Helpers::DATABASE[:Task_list] << {:Task_id => task_id, :List_id => list_id}
+			Helpers::DATABASE[:Lists].filter(:Id => list_id).update(:Total => count)
 		end
 
 		# finish the task. task is either a case insensitive task on the list or
@@ -52,12 +49,12 @@ module Todo
 		# @param completed [Integer] 1 if clearing completed tasks, 0 if clearing 
 		# Uncompleted tasks
 		def clear_each completed ,list_name
-			tasks = DATABASE[:Tasks].join(:Task_list, :Tasks__id => :Task_list__Task_id).join(
+			tasks = Helpers::DATABASE[:Tasks].join(:Task_list, :Tasks__id => :Task_list__Task_id).join(
 				:Lists, :Lists__id => :Task_list__List_id).select(:Tasks__Id).filter(
 				:Lists__Name => Config[:working_list_name]).filter(:Tasks__Completed => completed)
 			tasks.each do |task|
-				DATABASE[:Task_list].filter(:Task_id => task[:Id]).delete
-				DATABASE[:Tasks].filter(:Id => task[:Id]).delete
+				Helpers::DATABASE[:Task_list].filter(:Task_id => task[:Id]).delete
+				Helpers::DATABASE[:Tasks].filter(:Id => task[:Id]).delete
 			end
 		end
 
@@ -69,8 +66,8 @@ module Todo
 			clear_each 1, list_name
 			if clear_all
 				clear_each 0, list_name
-				#DATABASE[:Lists].filter(:Name => list_name).update(:Total => 0)
-				DATABASE[:Lists].filter(:Name => list_name).delete
+				#Helpers::DATABASE[:Lists].filter(:Name => list_name).update(:Total => 0)
+				Helpers::DATABASE[:Lists].filter(:Name => list_name).delete
 				puts "Cleared all tasks in #{list_name}"
 			else
 				puts "Cleared completed tasks in #{Config[:working_list_name]}"
@@ -85,54 +82,19 @@ module Todo
 		# @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_id = DATABASE[:Lists][:Name => Config[:working_list_name]][:Id]
-			names =DATABASE[:Tasks].join(:Task_list, :Tasks__Id => :Task_list__Task_Id).join(
-				:Lists, :Lists__Id => :Task_list__List_id).select(:Tasks__Id, :Tasks__Task_number, 
-				:Tasks__Name).filter(:Lists__Name => Config[:working_list_name]).filter(
-				:Tasks__Completed => initial)
-			if is_num
-				found_task = names[:Task_number => task]
-				if found_task
-					DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(:Completed => final)
-				else
-					puts "Task ##{task} is not in the list."
-				end
-			else
-				found_task = names.with_sql("SELECT * FROM :table WHERE Name = :task COLLATE NOCASE",:table=>names, :task=>task).first
-				if found_task
-					DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(:Completed => final)
-				else
-					puts "Task '#{task}' is not in the list."
-				end
-			end
+			names =Helpers::task_names.filter(:Tasks__Completed => initial)
+			Helpers::Tasks::update_task is_num, names, task, :Completed, final
 		end
 
 		# Sets the priority of a task
 		# 
 		# @param priority [Integer] the new priority
-		# @param tasks either a task number or a task name to change the priority of 
+		# @param task either a task number or a task name to change the priority of 
 		# @param [Bool] is_num if the task param represents the task number, true. 
 		# false if it is the task name
 		def set_priority priority, task, is_num
-			list_id = DATABASE[:Lists][:Name => Config[:working_list_name]][:Id]
-			names =DATABASE[:Tasks].join(:Task_list, :Tasks__Id => :Task_list__Task_Id).join(
-				:Lists, :Lists__Id => :Task_list__List_id).select(:Tasks__Id, :Tasks__Task_number, 
-				:Tasks__Name).filter(:Lists__Name => Config[:working_list_name])
-			if is_num
-				found_task = names[:Task_number => task]
-				if found_task
-					DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(:Priority => priority)
-				else
-					puts "Task ##{task} is not in the list."
-				end
-			else
-				found_task = names.with_sql("SELECT * FROM :table WHERE Name = :task COLLATE NOCASE",:table=>names, :task=>task).first
-				if found_task
-					DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(:Priority => priority)
-				else
-					puts "Task '#{task}' is not in the list."
-				end
-			end
+			names =Helpers::Tasks::task_names
+			Helpers::Tasks::update_task is_num, names, task, :Priority, priority
 		end
 	end	
 end

data/to-do.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "to-do"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristen Mills"]
-  s.date = "2012-07-30"
+  s.date = "2012-10-09"
   s.description = "A simple command line todo application"
   s.email = "kristen@kristen-mills.com"
   s.executables = ["todo"]
@@ -32,6 +32,9 @@ Gem::Specification.new do |s|
     "lib/to-do/dbmigrations/001_create_tables.rb",
     "lib/to-do/dbmigrations/002_rename_name_column.rb",
     "lib/to-do/dbmigrations/003_priorities.rb",
+    "lib/to-do/helpers/helpers.rb",
+    "lib/to-do/helpers/helpers_CLI.rb",
+    "lib/to-do/helpers/helpers_tasks.rb",
     "lib/to-do/old/list.rb",
     "lib/to-do/tasks.rb",
     "test/helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to-do
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70152148957820 !ruby/object:Gem::Requirement
+  requirement: &70186149754420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152148957820
+  version_requirements: *70186149754420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70152148957040 !ruby/object:Gem::Requirement
+  requirement: &70186149766420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152148957040
+  version_requirements: *70186149766420
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70152148972400 !ruby/object:Gem::Requirement
+  requirement: &70186149763580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70152148972400
+  version_requirements: *70186149763580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70152148971900 !ruby/object:Gem::Requirement
+  requirement: &70186149560360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152148971900
+  version_requirements: *70186149560360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70152148971240 !ruby/object:Gem::Requirement
+  requirement: &70186149567920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70152148971240
+  version_requirements: *70186149567920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70152148970480 !ruby/object:Gem::Requirement
+  requirement: &70186149562240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152148970480
+  version_requirements: *70186149562240
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70152148969680 !ruby/object:Gem::Requirement
+  requirement: &70186149842620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152148969680
+  version_requirements: *70186149842620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70152148968700 !ruby/object:Gem::Requirement
+  requirement: &70186149854300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152148968700
+  version_requirements: *70186149854300
 description: A simple command line todo application
 email: kristen@kristen-mills.com
 executables:
@@ -122,6 +122,9 @@ files:
 - lib/to-do/dbmigrations/001_create_tables.rb
 - lib/to-do/dbmigrations/002_rename_name_column.rb
 - lib/to-do/dbmigrations/003_priorities.rb
+- lib/to-do/helpers/helpers.rb
+- lib/to-do/helpers/helpers_CLI.rb
+- lib/to-do/helpers/helpers_tasks.rb
 - lib/to-do/old/list.rb
 - lib/to-do/tasks.rb
 - test/helper.rb
@@ -142,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4015950886949104978
+      hash: 1542733467158236008
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: