to-do 1.0.3 → 1.1.0

data/README.md

@@ -1,34 +1,45 @@
-#to-do 1.0.3
+#to-do 1.1.0
 
-A simple command line todo application. The app is still in development and this readme reflects the state it will be in at first release.
+A simple command line todo application. 
+
+##What's New in 1.1.0
+* Command shortcuts
+* Undo completing an item
+* Colored Display
+* Display list more often
+* Bug fixes
 
 ##Install
 	gem install to-do
 
 ##Features
-* Basic to-do list functionality
+* Basic todo list functionality
+	* Add items
+	* Delete items
 * Multiple lists
-* Add items
-* Delete items
-* Clear entire list
+* Clear list
 * Display list
+* Colored display
+* Undo completing
 
 ##How to Use
-Creates a new todo list or switch to an already existing list
+
+###Create a new todo list or switch to an existing list
 
 	todo create My New Todo List
 	todo switch My Existing List
 
-Add some tasks to the working list
+###Add some tasks to the current list
 
 	todo add Cook dinner
 	todo add Write Paper
-	todo add Do Laundy
-	todo add Clean Things
+	todo a Do Laundy
+	todo a Clean Things
 	
-Display the list
+###Display the current list
 	
 	todo display
+	todo d
 	
 	********************************
 	*       My New Todo List       *
@@ -41,14 +52,9 @@ Display the list
 	
 	Completed:					0/4
 	
-Finish a task
-
+###Finish a task
 	todo finish -n 2
-	todo finish Clean Things
-	
-Display the list again 
-
-	todo display
+	todo f Clean Things
 	
 	********************************
 	*       My New Todo List       *
@@ -60,26 +66,33 @@ Display the list again
 	Completed:					2/4
 	    2. Write Paper
 	    4. Clean Things
+	    
+###Undo completing a task
+	todo undo write paper
+	todo u -n 2
 		
-To clear the completed items 
+###Clear completed tasks 
 	
 	todo clear
 
-To clear the entire list and reset the count
+###Clear the entire list and reset the count
 
 	todo clear -a
 	
-You can see the usage details with
+###View usage details
 	
 	todo -h
-	
-or
-
 	todo --help
+	
+###View verison
+	todo -v
+	todo --version
 
 ##Future Plans
 * Delete list
-* Undo finishing an item
+* Tags
+* Due Dates
+* Tab Completion
 
 ##Contributing to to-do
  
@@ -94,4 +107,4 @@ or
 ##Copyright
 
 Copyright (c) 2012 Kristen Mills. See LICENSE.txt for
-further details.
+further details.

data/Rakefile

@@ -3,50 +3,50 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+	Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+	$stderr.puts e.message
+	$stderr.puts "Run `bundle install` to install missing gems"
+	exit e.status_code
 end
 require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "to-do"
-  gem.homepage = "http://github.com/kristenmills/to-do"
-  gem.license = "MIT"
-  gem.summary = "A simple command line todo application"
-  gem.description = "A simple command line todo application"
-  gem.email = "kristen@kristen-mills.com"
-  gem.authors = ["Kristen Mills"]
-  gem.executables = ['todo']
-  # dependencies defined in Gemfile
+	# gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+	gem.name = "to-do"
+	gem.homepage = "http://github.com/kristenmills/to-do"
+	gem.license = "MIT"
+	gem.summary = "A simple command line todo application"
+	gem.description = "A simple command line todo application"
+	gem.email = "kristen@kristen-mills.com"
+	gem.authors = ["Kristen Mills"]
+	gem.executables = ['todo']
+	# dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+	test.libs << 'lib' << 'test'
+	test.pattern = 'test/**/test_*.rb'
+	test.verbose = true
 end
 
-  desc "Code coverage detail"
-  task :simplecov do
-    ENV['COVERAGE'] = "true"
-    Rake::Task['spec'].execute
-  end
+	desc "Code coverage detail"
+	task :simplecov do
+		ENV['COVERAGE'] = "true"
+		Rake::Task['spec'].execute
+	end
 
 task :default => :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+	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')
+	rdoc.rdoc_dir = 'rdoc'
+	rdoc.title = "to-do #{version}"
+	rdoc.rdoc_files.include('README*')
+	rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/to-do/cli.rb

@@ -8,9 +8,9 @@ module Todo
 	module CLI
 		extend self
 		# Displays the given todo 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'))
+		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'))
 
 		def display name
 			puts "********************************".colorize(:light_red)
@@ -38,49 +38,60 @@ module Todo
 					:clear_all => false
 				}
 			optparse = OptionParser.new do |opts|
-				opts.version = "1.0.3"
+				opts.version = "1.1.0"
 				opts.banner = "Usage: todo [COMMAND] [option] [arguments]"
 				opts.separator "Commands:"
-				opts.separator "    add				adds the task to the working list"
-				opts.separator "    finish			marks the task as completed"
+				opts.separator "    add, a			adds the task to the working list"
+				opts.separator "    finish, f			marks the task as completed"
 				opts.separator "    clear 			clears completed tasks"
+				opts.separator "    undo, u			undos a completed task"
 				opts.separator "    create			creates a new list or switches to existing"
 				opts.separator "    switch 			creates a new list or switches to existing"
-				opts.separator "    display 			displays the list"
+				opts.separator "    display, d 			displays the list"
 				opts.separator "Options: "
-				opts.on('-n', 'for finish, the task given is a number') do 
+				opts.on('-n', 'finish or undo, the task given is a number') do 
 					options[:is_num] = true
 				end
 				opts.on('-a', 'for clear, will reset the entire list') do 
 					options[:clear_all] = true
 				end
 				opts.on('-h', '--help', 'Display this screen' ) do
-    			puts opts
-    			return 
-    		end
-    	end
-    	optparse.parse!
-    	if ARGV.count > 0
-    		case ARGV[0]
-    		when "add"
-    			ARGV.count > 1 ? WORKING_LIST.add(ARGV[1..-1].join(' '))  : puts("Invalid Command")
-    		when "finish"
-    			WORKING_LIST.finish ARGV[1..-1].join(' '), options[:is_num]
-    		when "clear"
-    			WORKING_LIST.clear options[:clear_all]
-    		when "display"
-    			self.display WORKING_LIST.name
-    		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
+					puts opts
+					return 
+				end
+				opts.on('-w', "display the current working list") do
+					puts "Working list is #{WORKING_LIST.name}"
+					return
+				end
+			end
+			optparse.parse!
+			if ARGV.count > 0
+				case ARGV[0]
+				when "add", "a"
+					ARGV.count > 1 ? WORKING_LIST.add(ARGV[1..-1].join(' ')) : puts("Invalid Command")
+					self.display WORKING_LIST.name
+				when "finish", "f"
+					WORKING_LIST.finish ARGV[1..-1].join(' '), options[:is_num]
+					self.display WORKING_LIST.name
+				when "clear"
+					WORKING_LIST.clear options[:clear_all]
+				when "display", "d"
+					self.display WORKING_LIST.name
+				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
 						puts "Switch to #{ARGV[1..-1].join(' ')}"
+						self.display WORKING_LIST.name
 					else 
 						ARGV.count > 1 ? List.new(ARGV[1..-1].join(' ')) : puts("Invalid Command")
 					end
+				when "undo", "u"
+					WORKING_LIST.undo ARGV[1..-1].join(' '), options[:is_num]
+					self.display WORKING_LIST.name
 				else
 					puts "Invalid Command"
-    		end
-    	end
-  	end
+				end
+			end
+		end
 	end
-end
+end

data/lib/to-do/config.rb

@@ -11,9 +11,9 @@ module Todo
 		def defaults
 			{
 				# the location of all all your list yaml files
-				'lists_directory' => File.join(ENV["HOME"],".to-do","lists"), 
+				:lists_directory => File.join(ENV["HOME"],".to-do","lists"), 
 				# the current working list
-				'working_list_name' => "default_list"
+				:working_list_name => "default_list"
 			}
 		end
 
@@ -29,20 +29,20 @@ module Todo
 			configs = defaults.merge(fileval)
 			configs[key] = value
 			File.open(PATH, 'w') do |fh|
-        fh.puts(configs.to_yaml)
-      end
+				fh.puts(configs.to_yaml)
+			end
 		end
 
 		#writes the config file path
 		def write
 			configs = if File.exist? PATH
-        defaults.merge(YAML.load_file PATH)
-      else 
-      	defaults
-      end
-      File.open(PATH, 'w') do |fh|
-        fh.puts(configs.to_yaml)
-      end
+				defaults.merge(YAML.load_file PATH)
+			else 
+				defaults
+			end
+			File.open(PATH, 'w') do |fh|
+				fh.puts(configs.to_yaml)
+			end
 		end
 	end
-end
+end

data/lib/to-do/list.rb

@@ -12,24 +12,24 @@ module Todo
 			@count = 0
 			@completed_count = 0
 			@name = name
-			if !File.exists? Config['lists_directory']
-				Dir.mkdir(Config['lists_directory'])
+			if !File.exists? Config[:lists_directory]
+				Dir.mkdir(Config[:lists_directory])
 			end
 			update
-      Config['working_list_name'] = name.downcase.gsub(/ /, '_')
-      Config.write
-      puts "Created List #{name}."
+			Config[:working_list_name] = name.downcase.gsub(/ /, '_')
+			Config.write
+			puts "Created List #{name}."
 		end
 
 		# updates the yaml
 		def update 
-			path = File.join(Config['lists_directory'], @name.downcase.gsub(/ /, '_') +'.yml')
+			path = File.join(Config[:lists_directory], @name.downcase.gsub(/ /, '_') +'.yml')
 			File.open(path, 'w') do |fh|
-        fh.puts(self.to_yaml)
-      end
-    end
+				fh.puts(self.to_yaml)
+			end
+		end
 
-    # adds the tast to the list
+		# adds the tast to the list
 		def add task
 			@count+=1
 			@tasks[@count] = task
@@ -45,6 +45,7 @@ module Todo
 					@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."
@@ -59,6 +60,7 @@ module Todo
 					@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."
@@ -67,6 +69,36 @@ module Todo
 			update
 		end
 
+		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 the completed tasks
 		def clear_completed
 			@completed_tasks = Hash.new

data/lib/to-do.rb

@@ -3,7 +3,7 @@ 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'])
+	Dir.mkdir(Todo::Config[:lists_directory])
 	Todo::List.new "Default List"
 end
 require File.join(File.dirname(__FILE__), 'to-do', 'cli')

data/test/helper.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+	Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+	$stderr.puts e.message
+	$stderr.puts "Run `bundle install` to install missing gems"
+	exit e.status_code
 end
 require 'test/unit'
 require 'shoulda'
@@ -15,4 +15,17 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'to-do'
 
 class Test::Unit::TestCase
+	def add_tasks
+		@list.add "Cook dinner"
+		@list.add "Write Paper"
+		@list.add "Do Laundry"
+		@list.add "Clean things"
+		@list.add "Jump up and down"
+	end
+
+	def finish_tasks
+		@list.finish 2, true
+		@list.finish "Clean Things", false
+		@list.finish "jUmP up AND down", false
+	end
 end

data/test/test_to-do.rb

@@ -1,7 +1,72 @@
-require 'helper'
+require File.join(File.dirname(__FILE__), 'helper')
+require '../lib/to-do.rb'
 
 class TestToDo < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
+	context "Test list" do 
+		setup do 
+			@list_name = Todo::Config[:working_list_name]
+			@list = Todo::List.new "Test List"
+		end
+
+		should "list is empty" do 
+			assert_equal 0, @list.count
+			assert_equal 0, @list.completed_count
+			assert_equal 0, @list.tasks.count
+			assert_equal 0, @list.completed_tasks.count
+			assert_equal "test_list" , Todo::Config[:working_list_name]
+		end
+
+		should "add some tasks"  do
+			add_tasks
+			assert_equal 5, @list.count
+			assert_equal 0, @list.completed_count
+			assert_equal 5, @list.tasks.count
+			assert_equal 0, @list.completed_tasks.count
+		end
+
+		should "finish some tasks" do 
+			add_tasks 
+			finish_tasks
+			@list.finish "This task doesn't exist", false
+			@list.finish 40, true
+			assert_equal 5, @list.count
+			assert_equal 3, @list.completed_count
+			assert_equal 2, @list.tasks.count 
+			assert_equal 3, @list.completed_tasks.count
+		end
+
+		should "undo some tasks" do 
+			add_tasks
+			finish_tasks
+			@list.undo 2, true
+			@list.undo "Clean Things", false
+			@list.undo "This task doesn't exist", false
+			@list.undo 40, true
+			assert_equal 5, @list.count
+			assert_equal 1, @list.completed_count
+			assert_equal 4, @list.tasks.count 
+			assert_equal 1, @list.completed_tasks.count
+		end
+
+		should "clear list" do
+			add_tasks
+			finish_tasks
+			@list.clear false
+			assert_equal 5, @list.count
+			assert_equal 3, @list.completed_count
+			assert_equal 2, @list.tasks.count 
+			assert_equal 0, @list.completed_tasks.count
+			@list.finish 3, true
+			@list.clear true
+			assert_equal 0, @list.count
+			assert_equal 0, @list.completed_count
+			assert_equal 0, @list.tasks.count
+			assert_equal 0, @list.completed_tasks.count
+		end
+
+		teardown do
+			#remove list when I create that functionality
+			Todo::Config[:working_list_name] = @list_name
+		end
+	end
 end

data/to-do.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "to-do"
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristen Mills"]
-  s.date = "2012-07-07"
+  s.date = "2012-07-10"
   s.description = "A simple command line todo application"
   s.email = "kristen@kristen-mills.com"
   s.executables = ["todo"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to-do
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70115380548900 !ruby/object:Gem::Requirement
+  requirement: &70207567186320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115380548900
+  version_requirements: *70207567186320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70115380548380 !ruby/object:Gem::Requirement
+  requirement: &70207567185800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70115380548380
+  version_requirements: *70207567185800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70115380547860 !ruby/object:Gem::Requirement
+  requirement: &70207567185280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115380547860
+  version_requirements: *70207567185280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70115380547360 !ruby/object:Gem::Requirement
+  requirement: &70207567184780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70115380547360
+  version_requirements: *70207567184780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70115380546840 !ruby/object:Gem::Requirement
+  requirement: &70207567184220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115380546840
+  version_requirements: *70207567184220
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70115380546320 !ruby/object:Gem::Requirement
+  requirement: &70207567183300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115380546320
+  version_requirements: *70207567183300
 description: A simple command line todo application
 email: kristen@kristen-mills.com
 executables:
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4306662136394665420
+      hash: -1801318960934950244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: