to-do 1.1.0 → 1.1.1

data/README.md

@@ -1,8 +1,11 @@
-#to-do 1.1.0
+#to-do 1.1.1
 
-A simple command line todo application. 
+A simple command line todo application.
 
-##What's New in 1.1.0
+##What's new in 1.1.1
+* Bug fixes
+
+##What's new in 1.1
 * Command shortcuts
 * Undo completing an item
 * Colored Display
@@ -35,27 +38,27 @@ A simple command line todo application.
 	todo add Write Paper
 	todo a Do Laundy
 	todo a Clean Things
-	
+
 ###Display the current list
-	
+
 	todo display
 	todo d
-	
+
 	********************************
 	*       My New Todo List       *
 	********************************
-	
+
 	1. Cook Dinner
 	2. Write Paper
 	3. Do Laundry
 	4. Clean Things
-	
+
 	Completed:					0/4
-	
+
 ###Finish a task
 	todo finish -n 2
 	todo f Clean Things
-	
+
 	********************************
 	*       My New Todo List       *
 	********************************
@@ -66,24 +69,24 @@ A simple command line todo application.
 	Completed:					2/4
 	    2. Write Paper
 	    4. Clean Things
-	    
+
 ###Undo completing a task
 	todo undo write paper
 	todo u -n 2
-		
-###Clear completed tasks 
-	
+
+###Clear completed tasks
+
 	todo clear
 
 ###Clear the entire list and reset the count
 
 	todo clear -a
-	
+
 ###View usage details
-	
+
 	todo -h
 	todo --help
-	
+
 ###View verison
 	todo -v
 	todo --version
@@ -95,7 +98,7 @@ A simple command line todo application.
 * Tab Completion
 
 ##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.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/bin/todo

@@ -6,4 +6,4 @@ else
 	require File.join(File.dirname(__FILE__),'..','lib','to-do')
 end
 
-Todo::CLI.parse
+Todo::CLI.parse

data/lib/to-do/cli.rb

@@ -7,59 +7,59 @@ $settings = ENV["HOME"]+"/.todo/config.yml"
 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], 
+		# 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'))
 
-		def display name
+		def display list = WORKING_LIST
 			puts "********************************".colorize(:light_red)
-			puts name.center(32).colorize(:light_cyan)
+			puts list.name.center(32).colorize(:light_cyan)
 			puts "********************************".colorize(:light_red)
 			puts
 			puts "Todo:".colorize(:light_green)
-			WORKING_LIST.tasks.each do |k,v|
+			list.tasks.each do |k,v|
 				printf "%4d. ".to_s.colorize(:light_yellow), k
 				puts v
 			end
 			print "\nCompleted:".colorize(:light_green)
-			printf "%36s\n", "#{WORKING_LIST.completed_count}/#{WORKING_LIST.count}".colorize(:light_cyan)
-			WORKING_LIST.completed_tasks.each do |k,v|
+			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
 			end
 			puts
 		end
 
-		#use Option parser to parse command line arguements
+		#use option parser to parse command line arguments
 		def parse
 			options = {
 					:is_num => false,
 					:clear_all => false
 				}
 			optparse = OptionParser.new do |opts|
-				opts.version = "1.1.0"
+				version_path = File.expand_path("../../VERSION", File.dirname(__FILE__))
+				opts.version = File.exist?(version_path) ? File.read(version_path) : ""
 				opts.banner = "Usage: todo [COMMAND] [option] [arguments]"
 				opts.separator "Commands:"
-				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, d 			displays the list"
+				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 "Options: "
-				opts.on('-n', 'finish or undo, the task given is a number') do 
+				opts.on('-n', 'with finish or undo, references a task by its number') do
 					options[:is_num] = true
 				end
-				opts.on('-a', 'for clear, will reset the entire list') do 
+				opts.on('-a', 'with clear, resets the entire list') do
 					options[:clear_all] = true
 				end
-				opts.on('-h', '--help', 'Display this screen' ) do
+				opts.on('-h', '--help', 'displays this screen' ) do
 					puts opts
-					return 
+					return
 				end
-				opts.on('-w', "display the current working list") do
+				opts.on('-w', "displays the name of the current list") do
 					puts "Working list is #{WORKING_LIST.name}"
 					return
 				end
@@ -69,28 +69,38 @@ module Todo
 				case ARGV[0]
 				when "add", "a"
 					ARGV.count > 1 ? WORKING_LIST.add(ARGV[1..-1].join(' ')) : puts("Invalid Command")
-					self.display WORKING_LIST.name
+					self.display 
 				when "finish", "f"
 					WORKING_LIST.finish ARGV[1..-1].join(' '), options[:is_num]
-					self.display WORKING_LIST.name
+					self.display 
 				when "clear"
 					WORKING_LIST.clear options[:clear_all]
 				when "display", "d"
-					self.display WORKING_LIST.name
+					self.display 
 				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
+						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'))
+						self.display new_list
 					else 
 						ARGV.count > 1 ? List.new(ARGV[1..-1].join(' ')) : puts("Invalid Command")
+						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'))
+						self.display new_list
 					end
 				when "undo", "u"
 					WORKING_LIST.undo ARGV[1..-1].join(' '), options[:is_num]
-					self.display WORKING_LIST.name
+					self.display 
 				else
 					puts "Invalid Command"
 				end
+			else
+				#if no ARGs are given, do what "display" would do
+				self.display WORKING_LIST.name
 			end
 		end
 	end

data/lib/to-do/config.rb

@@ -6,12 +6,12 @@ module Todo
 	module Config
 		extend self
 		PATH = File.join(ENV['HOME'], '.to-do', 'config.yml')
-		
+
 		#default values
 		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"
 			}
@@ -37,7 +37,7 @@ module Todo
 		def write
 			configs = if File.exist? PATH
 				defaults.merge(YAML.load_file PATH)
-			else 
+			else
 				defaults
 			end
 			File.open(PATH, 'w') do |fh|

data/lib/to-do/list.rb

@@ -7,7 +7,7 @@ module Todo
 
 		#Create a new list
 		def initialize name
-			@tasks = Hash.new 
+			@tasks = Hash.new
 			@completed_tasks = Hash.new
 			@count = 0
 			@completed_count = 0
@@ -22,7 +22,7 @@ module Todo
 		end
 
 		# updates the yaml
-		def update 
+		def update
 			path = File.join(Config[:lists_directory], @name.downcase.gsub(/ /, '_') +'.yml')
 			File.open(path, 'w') do |fh|
 				fh.puts(self.to_yaml)
@@ -37,7 +37,7 @@ module Todo
 			update
 		end
 
-		# finish the task. task is either a case insensitive task on the list or 
+		# finish the task. task is either a case insensitive task on the list or
 		# the task number
 		def finish task, is_num
 			if is_num
@@ -64,7 +64,7 @@ module Todo
 					puts "Finished #{@completed_tasks[num]}."
 				else
 					puts "Task #{task} is not in list."
-				end 
+				end
 			end
 			update
 		end
@@ -94,7 +94,7 @@ module Todo
 					puts "Undo completeing #{@tasks[num]}."
 				else
 					puts "Task #{task} is not in list."
-				end 
+				end
 			end
 			update
 		end
@@ -108,7 +108,7 @@ module Todo
 		#clears all of the tasks and resets the count to 0
 		def clear clear_all
 			clear_completed
-			if clear_all 
+			if clear_all
 				@tasks = Hash.new
 				@completed_count = 0
 				@count = 0

data/test/test_to-do.rb

@@ -2,13 +2,13 @@ require File.join(File.dirname(__FILE__), 'helper')
 require '../lib/to-do.rb'
 
 class TestToDo < Test::Unit::TestCase
-	context "Test list" do 
-		setup do 
+	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 
+		should "list is empty" do
 			assert_equal 0, @list.count
 			assert_equal 0, @list.completed_count
 			assert_equal 0, @list.tasks.count
@@ -24,18 +24,18 @@ class TestToDo < Test::Unit::TestCase
 			assert_equal 0, @list.completed_tasks.count
 		end
 
-		should "finish some tasks" do 
-			add_tasks 
+		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 2, @list.tasks.count
 			assert_equal 3, @list.completed_tasks.count
 		end
 
-		should "undo some tasks" do 
+		should "undo some tasks" do
 			add_tasks
 			finish_tasks
 			@list.undo 2, true
@@ -44,7 +44,7 @@ class TestToDo < Test::Unit::TestCase
 			@list.undo 40, true
 			assert_equal 5, @list.count
 			assert_equal 1, @list.completed_count
-			assert_equal 4, @list.tasks.count 
+			assert_equal 4, @list.tasks.count
 			assert_equal 1, @list.completed_tasks.count
 		end
 
@@ -54,7 +54,7 @@ class TestToDo < Test::Unit::TestCase
 			@list.clear false
 			assert_equal 5, @list.count
 			assert_equal 3, @list.completed_count
-			assert_equal 2, @list.tasks.count 
+			assert_equal 2, @list.tasks.count
 			assert_equal 0, @list.completed_tasks.count
 			@list.finish 3, true
 			@list.clear true

data/to-do.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "to-do"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristen Mills"]
-  s.date = "2012-07-10"
+  s.date = "2012-07-14"
   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.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70207567186320 !ruby/object:Gem::Requirement
+  requirement: &70243001200440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207567186320
+  version_requirements: *70243001200440
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70207567185800 !ruby/object:Gem::Requirement
+  requirement: &70243001199920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70207567185800
+  version_requirements: *70243001199920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70207567185280 !ruby/object:Gem::Requirement
+  requirement: &70243001199420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70207567185280
+  version_requirements: *70243001199420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70207567184780 !ruby/object:Gem::Requirement
+  requirement: &70243001198900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70207567184780
+  version_requirements: *70243001198900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70207567184220 !ruby/object:Gem::Requirement
+  requirement: &70243001198380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207567184220
+  version_requirements: *70243001198380
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70207567183300 !ruby/object:Gem::Requirement
+  requirement: &70243001197880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207567183300
+  version_requirements: *70243001197880
 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: -1801318960934950244
+      hash: -982776220175623031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: