timr 0.1.0 → 0.2.0

data/lib/timr/track.rb

@@ -1,5 +1,6 @@
 
 require 'time'
+require 'uuid'
 require 'thefox-ext'
 
 module TheFox
@@ -7,10 +8,42 @@ module TheFox
 		
 		class Track
 			
-			def initialize(task = nil, begin_time = Time.now, end_time = nil)
+			def initialize
+				@id = UUID.new.generate
+				@parent = nil
+				@parent_id = nil
+				@task = nil
+				@begin_time = nil
+				@end_time = nil
+				@description = nil
+			end
+			
+			def id=(id)
+				@id = id
+			end
+			
+			def id
+				@id
+			end
+			
+			def parent=(parent)
+				@parent = parent
+			end
+			
+			def parent
+				@parent
+			end
+			
+			def parent_id=(parent_id)
+				@parent_id = parent_id
+			end
+			
+			def parent_id
+				@parent_id
+			end
+			
+			def task=(task)
 				@task = task
-				@begin_time = begin_time
-				@end_time = end_time
 			end
 			
 			def task
@@ -43,6 +76,14 @@ module TheFox
 				end
 			end
 			
+			def description
+				@description
+			end
+			
+			def description=(descr_s)
+				@description = descr_s == '' ? nil : descr_s
+			end
+			
 			def diff
 				if !@begin_time.nil? && !@end_time.nil?
 					(@end_time - @begin_time).abs.to_i
@@ -53,16 +94,27 @@ module TheFox
 			
 			def to_h
 				h = {
-					'b' => nil,
-					'e' => nil,
+					'id' => @id,
+					#'p' => nil, # parent_id
+					#'b' => nil, # begin time
+					#'e' => nil, # end time
+					#'d' => nil, # description
 				}
-				h['b'] = @begin_time.utc.strftime(TIME_FORMAT) if !@begin_time.nil?
-				h['e'] = @end_time.utc.strftime(TIME_FORMAT) if !@end_time.nil?
+				h['p'] = @parent.id if !@parent.nil?
+				h['p'] = @parent_id if !@parent_id.nil?
+				
+				h['b'] = @begin_time.utc.strftime(TIME_FORMAT_FILE) if !@begin_time.nil?
+				h['e'] = @end_time.utc.strftime(TIME_FORMAT_FILE) if !@end_time.nil?
+				
+				#h['d'] = @description if !@description.nil?
+				d = description
+				h['d'] = d if !d.nil?
+				
 				h
 			end
 			
 			def to_s
-				'track'
+				@id
 			end
 			
 			def to_list_s
@@ -85,14 +137,27 @@ module TheFox
 				if !@task.nil?
 					task_name = @task.to_list_s
 				end
+				#task_name = @id[0..4]
 				
-				'%10s %5s - %5s %10s    %s' % [begin_date_s, @begin_time.localtime.strftime('%R'), end_time_s, end_date_s, task_name]
+				descr_s = ''
+				if !@description.nil? && @description.length > 0
+					descr_s = ": #{@description}"
+				end
+				
+				'%10s %5s - %5s %10s    %s%s' % [
+					begin_date_s, @begin_time.localtime.strftime('%R'), end_time_s, end_date_s,
+					task_name, descr_s]
 			end
 			
 			def self.from_h(task = nil, h)
-				t = Track.new(task, nil)
+				t = Track.new
+				t.task = task
+				t.id = h['id'] if h.has_key?('id')
+				t.parent_id = h['p'] if h.has_key?('p')
 				t.begin_time = Time.parse(h['b']) if h.has_key?('b')
 				t.end_time   = Time.parse(h['e']) if h.has_key?('e')
+				t.description = h['d'] if h.has_key?('d')
+				
 				t
 			end
 			

data/lib/timr/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Timr
 		NAME = 'Timr'
-		VERSION = '0.1.0'
-		DATE = '2016-05-15'
+		VERSION = '0.2.0'
+		DATE = '2016-05-22'
 		HOMEPAGE = 'https://github.com/TheFox/timr'
 		
 		COL = 1
@@ -16,8 +16,8 @@ module TheFox
 		# - Status Text Line
 		RESERVED_LINES = 3
 		
-		TIME_FORMAT = '%FT%T%z'
+		TIME_FORMAT_FILE = '%FT%T%z'
 		
-		TASK_NO_TASK_LOADED_C = ?-
+		TASK_NO_TASK_LOADED_CHAR = ?-
 	end
 end

data/lib/timr/window.rb

@@ -218,6 +218,35 @@ module TheFox
 				end
 			end
 			
+			def cursor_border_top
+				previous_page? ? 3 : 1
+			end
+			
+			def cursor_border_bottom
+				#next_page? ? @content_length - 2 : -1
+				next_page? ? @content_length - 2 : @content_length
+			end
+			
+			def cursor_on_inner_range?
+				if previous_page?
+					if next_page?
+						# Middle
+						@cursor > cursor_border_top && @cursor < cursor_border_bottom
+					else
+						# Bottom
+						@cursor >= cursor_border_top
+					end
+				else
+					if next_page?
+						# First page.
+						@cursor <= cursor_border_bottom
+					else
+						# Only one page, so middle.
+						true
+					end
+				end
+			end
+			
 		end
 		
 	end

data/lib/timr/window_help.rb

@@ -8,27 +8,29 @@ module TheFox
 				[
 					'#### Help ####',
 					'',
-					'           n .. Create a New Task',
-					'           c .. Current Task: Start/Continue',
-					'           x .. Current Task: Stop',
-					'           v .. Current Task: Stop and Pop from Stack',
-					'           f .. Stop and deselect all Tasks on the Stack',
-					'        p, b .. Push and start selected Task.',
-					'           r .. Refresh Window',
-					'           w .. Write all changes.',
-					'           q .. Exit',
-					'           h .. Help',
-					'           1 .. Timeline Window',
-					'           2 .. Tasks Window',
-					'      RETURN .. Start selected task.',
-					'      KEY UP .. Move Cursor up.',
-					'    KEY DOWN .. Move Cursor down.',
+					'         n .. Create a new Task and start',
+					'         t .. Create a new Task',
+					'         c .. Current Task: Start/Continue',
+					'         x .. Current Task: Stop',
+					'         v .. Current Task: Stop and Pop from Stack',
+					'         f .. Stop and deselect all Tasks on the Stack',
+					'      p, b .. Push and start selected Task.',
+					'         r .. Refresh Window',
+					'         w .. Write all changes.',
+					'         q .. Exit',
+					'         h .. Help',
+					'         1 .. Timeline Window',
+					'         2 .. Tasks Window',
+					'    RETURN .. Start selected Task.',
+					'         # .. Start selected Task, edit Track Description.',
+					'    KEY UP .. Move Cursor up.',
+					'  KEY DOWN .. Move Cursor down.',
 					'',
 					'Current Task Status',
 					'',
-					"    #{TASK_NO_TASK_LOADED_C} .. No task loaded.",
-					'    | .. Task stopped.',
-					'    > .. Task is running.',
+					"         #{TASK_NO_TASK_LOADED_CHAR} .. No Task loaded.",
+					'         | .. Task stopped.',
+					'         > .. Task is running.',
 				]
 			end
 			

data/lib/timr/window_tasks.rb

@@ -8,6 +8,10 @@ module TheFox
 			
 			@tasks = nil
 			
+			def setup
+				@tasks = nil
+			end
+			
 			def tasks=(tasks)
 				content_changed
 				@tasks = tasks
@@ -18,9 +22,10 @@ module TheFox
 					@has_cursor = false
 					[
 						'',
-						'#### NO TASKS YET ####',
+						'#### NO  TASKS YET ####',
 						'',
 						"Press 'n' to create a new task.",
+						"   Or 'h' to jump to the help page.",
 					]
 				else
 					@has_cursor = true

data/lib/timr/window_timeline.rb

@@ -6,6 +6,10 @@ module TheFox
 			
 			@tasks = nil
 			
+			def setup
+				@tasks = nil
+			end
+			
 			def tasks=(tasks)
 				content_changed
 				@tasks = tasks
@@ -16,9 +20,10 @@ module TheFox
 					@has_cursor = false
 					[
 						'',
-						'#### NO TASKS YET ####',
+						'#### NO TRACKS YET ####',
 						'',
 						"Press 'n' to create a new task.",
+						"   Or 'h' to jump to the help page.",
 					]
 				else
 					@has_cursor = true

data/tests/tc_stack.rb

@@ -6,14 +6,14 @@ require 'timr'
 
 class TestStack < MiniTest::Test
 	def test_class_name
-		stack = TheFox::Timr::Stack.new
+		stack1 = TheFox::Timr::Stack.new
 		
-		assert_equal('TheFox::Timr::Stack', stack.class.to_s)
+		assert_equal('TheFox::Timr::Stack', stack1.class.to_s)
 	end
 	
 	def test_has_task
-		stack = TheFox::Timr::Stack.new
-		assert_equal(false, stack.has_task?)
+		stack1 = TheFox::Timr::Stack.new
+		assert_equal(false, stack1.has_task?)
 	end
 	
 	def test_push_pop
@@ -22,75 +22,97 @@ class TestStack < MiniTest::Test
 		task2 = TheFox::Timr::Task.new
 		task2.name = 'task2'
 		
-		stack = TheFox::Timr::Stack.new
-		assert_equal([], stack.tasks_texts)
-		assert_equal(nil, stack.task)
-		assert_equal(0, stack.length)
+		stack1 = TheFox::Timr::Stack.new
+		assert_equal([], stack1.tasks_texts)
+		assert_equal(nil, stack1.task)
+		assert_equal(0, stack1.size)
 		
-		push_res = stack.push(task1)
+		push_res = stack1.push(task1)
 		assert_equal(true, push_res)
-		assert_equal(task1, stack.task)
-		assert_equal(1, stack.length)
+		assert_equal(task1, stack1.task)
+		assert_equal(1, stack1.size)
 		assert_equal(true, task1.running?)
-		assert_equal(['* task1'], stack.tasks_texts)
+		assert_equal(['* task1'], stack1.tasks_texts)
 		
-		push_res = stack.push(task2)
+		push_res = stack1.push(task2)
 		assert_equal(true, push_res)
-		assert_equal(task2, stack.task)
-		assert_equal(2, stack.length)
+		assert_equal(task2, stack1.task)
+		assert_equal(2, stack1.size)
 		assert_equal(true, task2.running?)
 		assert_equal(false, task1.running?)
-		assert_equal(['| task1', '* task2'], stack.tasks_texts)
+		assert_equal(['# task1', '* task2'], stack1.tasks_texts)
 		
 		# if !@tasks.include?(task)
-		push_res = stack.push(task2)
+		push_res = stack1.push(task2)
 		assert_equal(false, push_res)
-		assert_equal(2, stack.length)
+		assert_equal(2, stack1.size)
 		
-		pop_res = stack.pop
+		pop_res = stack1.pop
 		assert_equal(true, pop_res)
-		assert_equal(task1, stack.task)
-		assert_equal(1, stack.length)
+		assert_equal(task1, stack1.task)
+		assert_equal(1, stack1.size)
 		assert_equal(true, task1.running?)
 		assert_equal(false, task2.running?)
-		assert_equal(['* task1'], stack.tasks_texts)
+		assert_equal(['* task1'], stack1.tasks_texts)
 		
-		pop_res = stack.pop
+		pop_res = stack1.pop
 		assert_equal(true, pop_res)
-		assert_equal([], stack.tasks_texts)
-		assert_equal(nil, stack.task)
-		assert_equal(0, stack.length)
+		assert_equal([], stack1.tasks_texts)
+		assert_equal(nil, stack1.task)
+		assert_equal(0, stack1.size)
 		
 		# if !old.nil?
-		pop_res = stack.pop
+		pop_res = stack1.pop
 		assert_equal(false, pop_res)
-		
-		
-		# Pop All
+	end
+	
+	def test_pop_all
 		task3 = TheFox::Timr::Task.new
-		task3.name = 'task3'
+		#task3.name = 'task3'
 		task4 = TheFox::Timr::Task.new
-		task4.name = 'task4'
+		#task4.name = 'task4'
 		task5 = TheFox::Timr::Task.new
-		task5.name = 'task5'
+		#task5.name = 'task5'
+		
+		stack1 = TheFox::Timr::Stack.new
+		
+		stack1.push(task3)
+		assert_equal(true, task3.running?)
+		assert_equal(false, task4.running?)
+		assert_equal(false, task5.running?)
+		
+		stack1.push(task4)
+		assert_equal(2, stack1.size)
+		assert_equal(false, task3.running?)
+		assert_equal(true, task4.running?)
+		assert_equal(false, task5.running?)
+		
+		assert_equal(true, stack1.pop_all(task5))
+		assert_equal(1, stack1.size)
 		
-		stack.push(task3)
-		stack.push(task4)
-		assert_equal(2, stack.length)
-		pop_all_res = stack.pop_all(task5)
-		assert_equal(true, pop_all_res)
-		assert_equal(1, stack.length)
+		assert_equal(false, stack1.pop_all(task5))
+		assert_equal(1, stack1.size)
+		assert_equal(false, task3.running?)
+		assert_equal(false, task4.running?)
+		assert_equal(true, task5.running?)
 		
-		pop_all_res = stack.pop_all(task5)
-		assert_equal(false, pop_all_res)
-		assert_equal(1, stack.length)
+		task5_track = task5.track
+		assert_equal(false, task5_track.nil?)
 		
+		assert_equal(false, stack1.pop_all(task5))
 		assert_equal(false, task3.running?)
 		assert_equal(false, task4.running?)
 		assert_equal(true, task5.running?)
 		
-		pop_all_res = stack.pop_all
-		assert_equal(true, pop_all_res)
-		assert_equal(0, stack.length)
+		task5_track = task5.track
+		assert_equal(false, task5_track.nil?)
+		assert_equal(false, stack1.pop_all(task5, task5_track))
+		
+		# Pop All with no new Task.
+		assert_equal(true, stack1.pop_all)
+		assert_equal(0, stack1.size)
+		assert_equal(false, task3.running?)
+		assert_equal(false, task4.running?)
+		assert_equal(false, task5.running?)
 	end
 end

data/tests/tc_task.rb

@@ -8,9 +8,9 @@ require 'timr'
 
 class TestTask < MiniTest::Test
 	def test_class_name
-		task = TheFox::Timr::Task.new
+		task1 = TheFox::Timr::Task.new
 		
-		assert_equal('TheFox::Timr::Task', task.class.to_s)
+		assert_equal('TheFox::Timr::Task', task1.class.to_s)
 	end
 	
 	def test_save_load
@@ -20,7 +20,7 @@ class TestTask < MiniTest::Test
 		assert_equal(false, File.exist?(file_path))
 		
 		task1.name = 'task1'
-		task1.description = 'description2'
+		task1.description = 'hello world1'
 		file_path = task1.save_to_file('tmp')
 		assert_equal(true, File.exist?(file_path))
 		
@@ -29,12 +29,12 @@ class TestTask < MiniTest::Test
 		
 		assert_equal(task1.id, task2.id)
 		assert_equal('task1', task2.name)
-		assert_equal('description2', task2.description)
+		assert_equal('hello world1', task2.description)
 		
 		FileUtils.rm_r(file_path)
 	end
 	
-	def test_running
+	def test_status
 		task1 = TheFox::Timr::Task.new
 		assert_equal(false, task1.running?)
 		assert_equal(?|, task1.status)
@@ -46,44 +46,90 @@ class TestTask < MiniTest::Test
 		task1.stop
 		assert_equal(false, task1.running?)
 		assert_equal(?|, task1.status)
+		
+		task1.start
+		assert_equal(true, task1.running?)
+		assert_equal(?>, task1.status)
+		
+		task1.pause
+		assert_equal(false, task1.running?)
+		assert_equal(true, task1.paused?)
+		assert_equal(?#, task1.status)
+		
+		task1.stop
+		assert_equal(false, task1.running?)
+		assert_equal(?|, task1.status)
 	end
 	
-	def test_track
+	def test_start_stop
 		task1 = TheFox::Timr::Task.new
+		assert_equal(false, task1.running?)
 		assert_equal(false, task1.has_track?)
 		assert_equal(0, task1.timeline.length)
 		
-		task1.start
+		assert_equal(true, task1.start)
+		assert_equal(true, task1.running?)
 		assert_equal(true, task1.has_track?)
 		assert_equal(1, task1.timeline.length)
 		
 		task1.stop
+		assert_equal(false, task1.running?)
 		assert_equal(false, task1.has_track?)
 		assert_equal(1, task1.timeline.length)
 		
-		task1.start
+		assert_equal(true, task1.start)
+		assert_equal(true, task1.running?)
+		assert_equal(true, task1.has_track?)
+		assert_equal(2, task1.timeline.length)
+		
+		assert_equal(false, task1.start)
+		assert_equal(true, task1.running?)
 		assert_equal(true, task1.has_track?)
 		assert_equal(2, task1.timeline.length)
 		
 		task1.stop
+		assert_equal(false, task1.running?)
 		assert_equal(false, task1.has_track?)
 		assert_equal(2, task1.timeline.length)
 		
 		task1.toggle
+		assert_equal(true, task1.running?)
 		assert_equal(true, task1.has_track?)
 		assert_equal(3, task1.timeline.length)
 		
 		task1.toggle
+		assert_equal(false, task1.running?)
 		assert_equal(false, task1.has_track?)
 		assert_equal(3, task1.timeline.length)
+		
+		# Track
+		assert_equal(true, task1.start)
+		
+		track1 = TheFox::Timr::Track.new
+		track1.description = 'hello world1'
+		track2 = TheFox::Timr::Track.new
+		track2.description = 'hello world2'
+		
+		assert_equal(true, task1.start(track1))
+		assert_equal(false, task1.start(track1))
+		assert_equal(true, task1.start(track2))
 	end
 	
 	def test_to_s
 		task1 = TheFox::Timr::Task.new
-		assert_equal(nil, task1.to_s)
+		assert_equal('', task1.to_s)
 		
 		task1.name = 'task1'
 		assert_equal('task1', task1.to_s)
+		
+		track1 = TheFox::Timr::Track.new
+		track1.description = 'hello world1'
+		
+		task1.start(track1)
+		assert_equal('task1: hello world1', task1.to_s)
+		
+		task1.stop
+		assert_equal('task1', task1.to_s)
 	end
 	
 	def test_run_time_track