timr 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2d97ef6133107ff6c5f10ec8d7469ceab22317
-  data.tar.gz: 0eb7ce0ac1b3946fe7c4022c243cdfdd790eb360
+  metadata.gz: 3b190f08b68a3b332d9e275c9773cd75187d88fa
+  data.tar.gz: c6c3941e0d5afd7352e4c4187161e14d5909a3d7
 SHA512:
-  metadata.gz: e431719fdaa4d85555c6578e61f80fb81c12e21d49b2ffbe74db47e2d21f727da133766b4eb645fbc04d77881586a35fe26febfc6d3a6ad03c95123f06b96421
-  data.tar.gz: f5fd40d36d15e55298686229bfd61e6dda2571bd8c0d4f306f89c7625ffcc53af52751f6ca6fb4ecfef7d241661c94a28af9d0de72ca7af024ed22327f8284e0
+  metadata.gz: f19bb6ba4f42fd18390ecd08030f58a4ac5158cf3067703b02cf8b023e5b5d5ad47fe4f1c076e0641db3485e7753a4273346e39a9103df8364af692d83de1761
+  data.tar.gz: 9d8557cb636b962b1062f8f4619a8a86cc7f44eb7cc91ea16e74ec1d877f7c4c1f626121f7f88a287971cb3af68cd74ed5eedce73eb856cdf3aa8147e52fe02a

data/bin/timr

@@ -44,6 +44,7 @@ timr = TheFox::Timr::Timr.new(@options[:dir], @options[:config_path])
 begin
 	timr.run
 rescue Exception => e
-	timr.close
 	raise e
+ensure
+	timr.close
 end

data/lib/timr/stack.rb

@@ -25,7 +25,11 @@ module TheFox
 				@tasks.map{ |task|
 					status = task.status
 					status = '*' if task == @task
-					"#{status} #{task}"
+					
+					task_name = task.to_s
+					task_name = task.track.name if task.has_track?
+					
+					"#{status} #{task_name}"
 				}
 			end
 			
@@ -43,13 +47,8 @@ module TheFox
 			
 			def pop_all(new_task = nil, parent_track = nil)
 				if @task == new_task
-					#puts 'tasks =='
-					x = @task.start(parent_track)
-					#puts "return #{x}"
-					#puts
-					x
+					@task.start(parent_track)
 				else
-					#puts 'stop all tasks'
 					@tasks.each do |task|
 						task.stop
 					end

data/lib/timr/task.rb

@@ -76,9 +76,9 @@ module TheFox
 				when :running
 					?>
 				when :paused
-					?#
-				when :stop
 					?|
+				when :stop
+					?.
 				end
 			end
 			
@@ -92,7 +92,7 @@ module TheFox
 			end
 			
 			def name
-				@meta['name']
+				@meta['name'].to_s
 			end
 			
 			def name=(name)
@@ -132,13 +132,15 @@ module TheFox
 						end
 					end
 				elsif paused?
-					parent_track = @track
+					parent_track = @track if parent_track.nil?
 					create_new_track = true
 				else
 					create_new_track = true
 				end
 				
 				if create_new_track
+					@changed = true
+					
 					@track = Track.new
 					if !parent_track.nil?
 						@track.parent = parent_track
@@ -148,8 +150,6 @@ module TheFox
 					@track.task = self
 					@track.begin_time = Time.now
 					@timeline << @track
-					
-					@changed = true
 				end
 				
 				@status = :running
@@ -158,10 +158,11 @@ module TheFox
 			end
 			
 			def pause
-				if !@track.nil?
+				if running? && !@track.nil?
 					@status = :paused
 					@changed = true
 					@track.end_time = Time.now
+					@timeline_diff_total = nil
 				end
 			end
 			
@@ -181,21 +182,18 @@ module TheFox
 			
 			def toggle
 				if running?
-					stop
+					pause
 				else
 					start
 				end
 			end
 			
-			def to_s
-				track_description = ''
-				if has_track? && !@track.description.nil? && @track.description.to_s.length > 0
-					track_description = ": #{@track.description}"
-				end
-				'%s%s' % [name, track_description]
+			def remove_track(track)
+				@changed = true
+				@timeline.delete(track)
 			end
 			
-			def to_list_s
+			def to_s
 				name
 			end
 			
@@ -204,7 +202,7 @@ module TheFox
 				minutes = 0
 				seconds = 0
 				
-				if !@track.nil?
+				if running? && has_track?
 					diff = (end_time - @track.begin_time).to_i.abs
 					hours = diff / 3600
 					
@@ -222,7 +220,13 @@ module TheFox
 				# Cache all other tracks.
 				if @timeline_diff_total.nil?
 					@timeline_diff_total = @timeline
-						.select{ |track| track != @track }
+						.select{ |track|
+							if running?
+								track != @track
+							else
+								true
+							end
+						}
 						.map{ |track| track.diff }
 						.inject(:+)
 				end
@@ -232,8 +236,8 @@ module TheFox
 				seconds = 0
 				
 				track_diff = 0
-				if !@track.nil?
-					track_diff = (end_time - @track.begin_time).to_i.abs
+				if running?
+					track_diff = @track.diff(end_time)
 				end
 				
 				diff = @timeline_diff_total.to_i + track_diff

data/lib/timr/timr.rb

@@ -44,11 +44,8 @@ module TheFox
 				@window_help = HelpWindow.new
 				@window_test = TestWindow.new
 				
-				@window_tasks = TasksWindow.new
-				@window_tasks.tasks = @tasks
-				
-				@window_timeline = TimelineWindow.new
-				@window_timeline.tasks = @tasks
+				@window_tasks = TasksWindow.new(@tasks)
+				@window_timeline = TimelineWindow.new(@tasks)
 			end
 			
 			def config_read(path = @config_path)
@@ -216,7 +213,7 @@ module TheFox
 					status_s = @stack.task.status
 					
 					track_begin_time_s = '--:--'
-					if @stack.task.has_track?
+					if @stack.task.running? && @stack.task.has_track?
 						track_begin_time_s = @stack.task.track.begin_time.strftime('%R')
 					end
 					
@@ -298,34 +295,13 @@ module TheFox
 				end
 			end
 			
-			def ui_window_refresh(lines)
-				ui_window_refresh_all
-				
-				# if !@window.nil?
-				# 	simple_refresh = @window.cursor_on_inner_range?
-					
-				# 	if !simple_refresh || simple_refresh != @ui_window_refresh_last
-				# 		ui_window_refresh_all
-				# 	else
-				# 		ui_window_refresh_simple(lines)
-				# 	end
-					
-				# 	@ui_window_refresh_last = simple_refresh
-				# end
-			end
-			
 			def ui_window_refresh_all
 				if !@window.nil?
 					content_line_nr = 1
 					@window.content_refresh
 					max_line_len = Curses.cols - 2
 					@window.page.each do |line_object|
-						line_text = ''
-						if line_object.is_a?(Task) || line_object.is_a?(Track)
-							line_text = line_object.to_list_s
-						else
-							line_text = line_object.to_s
-						end
+						line_text = line_object.to_s
 						
 						if line_text.length > max_line_len
 							range = 0..-(line_text.length - max_line_len + 4)
@@ -361,46 +337,6 @@ module TheFox
 				Curses.refresh
 			end
 			
-			def ui_window_refresh_simple(lines)
-				max_line_len = Curses.cols - 2
-				
-				
-				old_cursor = @window.cursor + (lines * -1)
-				old_line_object = @window.page[old_cursor - 1]
-				
-				old_line_text = ''
-				if old_line_object.is_a?(Task) || old_line_object.is_a?(Track)
-					old_line_text = old_line_object.to_list_s
-				else
-					old_line_text = old_line_object.to_s
-				end
-				
-				if old_line_text.length > max_line_len
-					range = 0..-(line_text.length - max_line_len + 4)
-					old_line_text = "#{old_line_text[range]}..."
-				end
-				
-				
-				new_cursor = @window.cursor
-				new_line_object = @window.page[new_cursor - 1]
-				
-				new_line_text = ''
-				if new_line_object.is_a?(Task) || new_line_object.is_a?(Track)
-					new_line_text = new_line_object.to_list_s
-				else
-					new_line_text = new_line_object.to_s
-				end
-				
-				if new_line_text.length > max_line_len
-					range = 0..-(line_text.length - max_line_len + 4)
-					new_line_text = "#{new_line_text[range]}..."
-				end
-				
-				ui_content_line(old_cursor, old_line_text)
-				ui_content_line(@window.cursor, new_line_text)
-				Curses.refresh
-			end
-			
 			def ui_content_length
 				Curses.lines - RESERVED_LINES - @stack.size
 			end
@@ -559,7 +495,7 @@ module TheFox
 							# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d %02d %02d %s %s' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes, @window.cursor_border_top, @window.cursor_border_bottom, simple_refresh_b ? 'SIMPLE' : 'FULL', simple_refresh_a ? 'SIMPLE' : 'FULL'])
 							#end
 							
-							ui_window_refresh(1)
+							ui_window_refresh_all
 						end
 					when Curses::Key::UP
 						if !@window.nil? && @window.has_cursor?
@@ -573,7 +509,7 @@ module TheFox
 							# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d %02d %02d %s %s' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes, @window.cursor_border_top, @window.cursor_border_bottom, simple_refresh_b ? 'SIMPLE' : 'FULL', simple_refresh_a ? 'SIMPLE' : 'FULL'])
 							# end
 							
-							ui_window_refresh(-1)
+							ui_window_refresh_all
 						end
 					when Curses::Key::HOME
 						@window.first_page if !@window.nil?
@@ -591,6 +527,17 @@ module TheFox
 						# end
 						
 						ui_window_refresh_all
+					when Curses::Key::DC
+						task, track = window_page_object
+						
+						if track.nil?
+							# Remove Task
+						else
+							# Remove Track
+						end
+						task.remove_track(track)
+						
+						ui_status_text("Del '#{task.class}' '#{track.class}'")
 					when Curses::Key::RESIZE
 						update_content_length
 						ui_status_text("Window size: #{Curses.cols}x#{Curses.lines}")
@@ -601,19 +548,24 @@ module TheFox
 						ui_refresh_all
 					when 10
 						task, track = window_page_object
+						
+						# if track.nil?
+						# 	track = Track.new
+						# 	track.task = task
+						# end
+						
 						task_apply_replace_stack(task, track)
 					when '#'
 						task, * = window_page_object
 						
 						track_description = ui_status_input('Track Description: ')
-						ui_status_text("Description: '#{track_description}'")
 						
 						track = Track.new
 						track.task = task
 						track.description = track_description
 						
 						task_apply_replace_stack(task, track)
-						#ui_status_text('OK')
+						ui_status_text('OK')
 					when 'b', 'p'
 						task, track = window_page_object
 						
@@ -657,7 +609,7 @@ module TheFox
 							ui_status_text("Task '#{task_name}' created.")
 						end
 					when 'x'
-						@stack.task.stop if @stack.has_task?
+						@stack.task.pause if @stack.has_task?
 						window_content_changed
 						ui_refresh_simple
 					when 'c'
@@ -674,7 +626,7 @@ module TheFox
 						ui_window_show(@window_timeline)
 					when '2'
 						ui_window_show(@window_tasks)
-					when '3' # Test Windows
+					when 'z' # Test Windows
 						ui_window_show(@window_test)
 					when 'w'
 						tasks_save(true)

data/lib/timr/track.rb

@@ -76,22 +76,38 @@ module TheFox
 				end
 			end
 			
-			def description
-				@description
+			def description=(description)
+				@description = description == '' ? nil : description
 			end
 			
-			def description=(descr_s)
-				@description = descr_s == '' ? nil : descr_s
+			def description
+				@description
 			end
 			
-			def diff
-				if !@begin_time.nil? && !@end_time.nil?
-					(@end_time - @begin_time).abs.to_i
+			def diff(end_time = nil)
+				end_time = @end_time if !@end_time.nil?
+				
+				if !@begin_time.nil? && !end_time.nil?
+					(end_time - @begin_time).abs.to_i
 				else
 					0
 				end
 			end
 			
+			def name
+				name_s = ''
+				if !@task.nil?
+					name_s += @task.to_s
+				end
+				if !@description.nil? && @description.length > 0
+					if name_s.length > 0
+						name_s += ': '
+					end
+					name_s += @description
+				end
+				name_s
+			end
+			
 			def to_h
 				h = {
 					'id' => @id,
@@ -114,10 +130,6 @@ module TheFox
 			end
 			
 			def to_s
-				@id
-			end
-			
-			def to_list_s
 				end_date = nil
 				end_time_s = 'xx:xx'
 				if !@end_time.nil?
@@ -133,20 +145,8 @@ module TheFox
 					end_date_s = @end_time.localtime.strftime('%F') if !@end_time.nil?
 				end
 				
-				task_name = ''
-				if !@task.nil?
-					task_name = @task.to_list_s
-				end
-				#task_name = @id[0..4]
-				
-				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]
+				'%10s %5s - %5s %10s    %s' % [
+					begin_date_s, @begin_time.localtime.strftime('%R'), end_time_s, end_date_s, name]
 			end
 			
 			def self.from_h(task = nil, h)

data/lib/timr/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Timr
 		NAME = 'Timr'
-		VERSION = '0.2.0'
-		DATE = '2016-05-22'
+		VERSION = '0.3.0'
+		DATE = '2016-06-01'
 		HOMEPAGE = 'https://github.com/TheFox/timr'
 		
 		COL = 1

data/lib/timr/window.rb

@@ -4,7 +4,8 @@ module TheFox
 		
 		class Window
 			
-			def initialize
+			def initialize(data = [])
+				@data = data
 				@content_length = 0
 				@current_line = 0
 				@cursor = 1
@@ -30,8 +31,13 @@ module TheFox
 				@content_length = content_length
 			end
 			
+			def content=(data)
+				@content_changed = true
+				@data = data
+			end
+			
 			def content
-				[]
+				@data
 			end
 			
 			def content_changed

data/lib/timr/window_help.rb

@@ -4,14 +4,14 @@ module TheFox
 		
 		class HelpWindow < Window
 			
-			def content
-				[
+			def setup
+				@data = [
 					'#### Help ####',
 					'',
 					'         n .. Create a new Task and start',
 					'         t .. Create a new Task',
-					'         c .. Current Task: Start/Continue',
-					'         x .. Current Task: Stop',
+					'         c .. Current Task: Toggle Start/Continue',
+					'         x .. Current Task: Pause',
 					'         v .. Current Task: Stop and Pop from Stack',
 					'         f .. Stop and deselect all Tasks on the Stack',
 					'      p, b .. Push and start selected Task.',
@@ -29,7 +29,8 @@ module TheFox
 					'Current Task Status',
 					'',
 					"         #{TASK_NO_TASK_LOADED_CHAR} .. No Task loaded.",
-					'         | .. Task stopped.',
+					'         . .. Task is stopped.',
+					'         | .. Task is paused.',
 					'         > .. Task is running.',
 				]
 			end

data/lib/timr/window_tasks.rb

@@ -1,24 +1,11 @@
 
-require 'pp'
-
 module TheFox
 	module Timr
 		
 		class TasksWindow < Window
 			
-			@tasks = nil
-			
-			def setup
-				@tasks = nil
-			end
-			
-			def tasks=(tasks)
-				content_changed
-				@tasks = tasks
-			end
-			
 			def content
-				if @tasks.nil? || @tasks.length == 0
+				if @data.nil? || @data.length == 0
 					@has_cursor = false
 					[
 						'',
@@ -29,7 +16,7 @@ module TheFox
 					]
 				else
 					@has_cursor = true
-					@tasks
+					@data
 						.sort_by{ |k, v|
 							v.name.downcase
 						}

data/lib/timr/window_test.rb

@@ -4,28 +4,14 @@ module TheFox
 		
 		class TestWindow < Window
 			
-			@lines = nil
-			
 			def setup
 				@has_cursor = true
-				@lines = nil
-			end
-			
-			def content=(lines)
-				content_changed
-				@lines = lines
-			end
-			
-			def content
-				if @lines.nil?
-					c = []
-					(1..30).each do |n|
-						c << 'LINE %03d  123456789_123456789_123456789_123456789_123456789_123456789' % [n]
-					end
-					c
-				else
-					@lines
+				
+				@data = []
+				(1..30).each do |n|
+					@data << 'LINE %03d  123456789_123456789_123456789_123456789_123456789_123456789' % [n]
 				end
+				@data
 			end
 			
 		end

data/lib/timr/window_timeline.rb

@@ -4,19 +4,8 @@ module TheFox
 		
 		class TimelineWindow < Window
 			
-			@tasks = nil
-			
-			def setup
-				@tasks = nil
-			end
-			
-			def tasks=(tasks)
-				content_changed
-				@tasks = tasks
-			end
-			
 			def content
-				if @tasks.nil? || @tasks.length == 0
+				if @data.nil? || @data.length == 0
 					@has_cursor = false
 					[
 						'',
@@ -27,7 +16,7 @@ module TheFox
 					]
 				else
 					@has_cursor = true
-					@tasks
+					@data
 						.map{ |task_id, task|
 							task.timeline
 						}

data/tests/tc_stack.rb

@@ -5,24 +5,27 @@ require 'timr'
 
 
 class TestStack < MiniTest::Test
+	
+	include TheFox::Timr
+	
 	def test_class_name
-		stack1 = TheFox::Timr::Stack.new
+		stack1 = Stack.new
 		
 		assert_equal('TheFox::Timr::Stack', stack1.class.to_s)
 	end
 	
 	def test_has_task
-		stack1 = TheFox::Timr::Stack.new
+		stack1 = Stack.new
 		assert_equal(false, stack1.has_task?)
 	end
 	
 	def test_push_pop
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		task1.name = 'task1'
-		task2 = TheFox::Timr::Task.new
+		task2 = Task.new
 		task2.name = 'task2'
 		
-		stack1 = TheFox::Timr::Stack.new
+		stack1 = Stack.new
 		assert_equal([], stack1.tasks_texts)
 		assert_equal(nil, stack1.task)
 		assert_equal(0, stack1.size)
@@ -40,7 +43,7 @@ class TestStack < MiniTest::Test
 		assert_equal(2, stack1.size)
 		assert_equal(true, task2.running?)
 		assert_equal(false, task1.running?)
-		assert_equal(['# task1', '* task2'], stack1.tasks_texts)
+		assert_equal(['| task1', '* task2'], stack1.tasks_texts)
 		
 		# if !@tasks.include?(task)
 		push_res = stack1.push(task2)
@@ -67,14 +70,14 @@ class TestStack < MiniTest::Test
 	end
 	
 	def test_pop_all
-		task3 = TheFox::Timr::Task.new
+		task3 = Task.new
 		#task3.name = 'task3'
-		task4 = TheFox::Timr::Task.new
+		task4 = Task.new
 		#task4.name = 'task4'
-		task5 = TheFox::Timr::Task.new
+		task5 = Task.new
 		#task5.name = 'task5'
 		
-		stack1 = TheFox::Timr::Stack.new
+		stack1 = Stack.new
 		
 		stack1.push(task3)
 		assert_equal(true, task3.running?)

data/tests/tc_task.rb

@@ -7,14 +7,17 @@ require 'timr'
 
 
 class TestTask < MiniTest::Test
+	
+	include TheFox::Timr
+	
 	def test_class_name
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		
 		assert_equal('TheFox::Timr::Task', task1.class.to_s)
 	end
 	
 	def test_save_load
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		
 		file_path = task1.save_to_file('tmp')
 		assert_equal(false, File.exist?(file_path))
@@ -24,7 +27,7 @@ class TestTask < MiniTest::Test
 		file_path = task1.save_to_file('tmp')
 		assert_equal(true, File.exist?(file_path))
 		
-		task2 = TheFox::Timr::Task.new
+		task2 = Task.new
 		task2.load_from_file(file_path)
 		
 		assert_equal(task1.id, task2.id)
@@ -35,9 +38,9 @@ class TestTask < MiniTest::Test
 	end
 	
 	def test_status
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		assert_equal(false, task1.running?)
-		assert_equal(?|, task1.status)
+		assert_equal(?., task1.status)
 		
 		task1.start
 		assert_equal(true, task1.running?)
@@ -45,7 +48,7 @@ class TestTask < MiniTest::Test
 		
 		task1.stop
 		assert_equal(false, task1.running?)
-		assert_equal(?|, task1.status)
+		assert_equal(?., task1.status)
 		
 		task1.start
 		assert_equal(true, task1.running?)
@@ -54,15 +57,15 @@ class TestTask < MiniTest::Test
 		task1.pause
 		assert_equal(false, task1.running?)
 		assert_equal(true, task1.paused?)
-		assert_equal(?#, task1.status)
+		assert_equal(?|, task1.status)
 		
 		task1.stop
 		assert_equal(false, task1.running?)
-		assert_equal(?|, task1.status)
+		assert_equal(?., task1.status)
 	end
 	
 	def test_start_stop
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		assert_equal(false, task1.running?)
 		assert_equal(false, task1.has_track?)
 		assert_equal(0, task1.timeline.length)
@@ -99,15 +102,15 @@ class TestTask < MiniTest::Test
 		
 		task1.toggle
 		assert_equal(false, task1.running?)
-		assert_equal(false, task1.has_track?)
+		assert_equal(true, task1.has_track?)
 		assert_equal(3, task1.timeline.length)
 		
 		# Track
 		assert_equal(true, task1.start)
 		
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		track1.description = 'hello world1'
-		track2 = TheFox::Timr::Track.new
+		track2 = Track.new
 		track2.description = 'hello world2'
 		
 		assert_equal(true, task1.start(track1))
@@ -115,25 +118,47 @@ class TestTask < MiniTest::Test
 		assert_equal(true, task1.start(track2))
 	end
 	
+	def test_remove_track
+		task1 = Task.new
+		
+		task1.start
+		#track1 = task1.track
+		task1.stop
+		assert_equal(1, task1.timeline.length)
+		
+		task1.start
+		track2 = task1.track
+		task1.stop
+		assert_equal(2, task1.timeline.length)
+		
+		task1.start
+		#track3 = task1.track
+		task1.stop
+		assert_equal(3, task1.timeline.length)
+		
+		task1.remove_track(track2)
+		assert_equal(2, task1.timeline.length)
+	end
+	
 	def test_to_s
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		assert_equal('', task1.to_s)
 		
 		task1.name = 'task1'
 		assert_equal('task1', task1.to_s)
 		
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		track1.description = 'hello world1'
 		
 		task1.start(track1)
-		assert_equal('task1: hello world1', task1.to_s)
+		assert_equal('task1', task1.to_s)
 		
 		task1.stop
 		assert_equal('task1', task1.to_s)
 	end
 	
 	def test_run_time_track
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		
 		task1.start
 		task1.track.begin_time = Time.parse('1987-02-21 09:58:59')
@@ -141,13 +166,13 @@ class TestTask < MiniTest::Test
 	end
 	
 	def test_run_time_total
-		task1 = TheFox::Timr::Task.new
-		task1.toggle
-		task1.toggle
-		task1.toggle
-		task1.toggle
-		task1.toggle
-		task1.toggle
+		task1 = Task.new
+		task1.toggle # running
+		task1.toggle # paused
+		task1.toggle # running
+		task1.toggle # paused
+		task1.toggle # running
+		task1.toggle # paused
 		
 		timeline = task1.timeline
 		timeline[0].begin_time = Time.parse('1986-11-20 01:01:01')

data/tests/tc_track.rb

@@ -7,25 +7,28 @@ require 'timr'
 
 
 class TestTrack < MiniTest::Test
+	
+	include TheFox::Timr
+	
 	def test_class_name
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		
 		assert_equal('TheFox::Timr::Track', track1.class.to_s)
 	end
 	
 	def test_basic
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		assert_equal(nil, track1.begin_time)
 		assert_equal(nil, track1.end_time)
 	end
 	
 	def test_description
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		assert_equal(nil, track1.description)
 		
 		track1.description = 'hello world1'
 		
-		track2 = TheFox::Timr::Track.new
+		track2 = Track.new
 		assert_equal(nil, track2.description)
 		
 		track2.parent = track1
@@ -36,7 +39,7 @@ class TestTrack < MiniTest::Test
 	end
 	
 	def test_diff
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		assert_equal(0, track1.diff)
 		
 		track1.begin_time = Time.parse('1986-04-08 13:37:02')
@@ -50,8 +53,25 @@ class TestTrack < MiniTest::Test
 		assert_equal(Fixnum, track1.diff.class)
 	end
 	
+	def test_name
+		task1 = Task.new
+		task1.name = 'task1'
+		
+		track1 = Track.new
+		track1.description = 'hello world1'
+		
+		task1.start(track1)
+		assert_equal('hello world1', track1.name)
+		
+		track1.task = task1
+		assert_equal('task1: hello world1', track1.name)
+		
+		task1.stop
+		assert_equal('task1: hello world1', track1.name)
+	end
+	
 	def test_to_h
-		track1 = TheFox::Timr::Track.new
+		track1 = Track.new
 		
 		h = track1.to_h
 		assert_equal(false, h['id'].nil?)
@@ -81,32 +101,33 @@ class TestTrack < MiniTest::Test
 		assert_equal('hello world2', h['d'])
 	end
 	
-	def test_to_list_s
-		track1 = TheFox::Timr::Track.new
+	def test_to_s
+		track1 = Track.new
 		track1.begin_time = Time.parse('1990-08-29 12:34:56')
-		assert_equal('1990-08-29 12:34 - xx:xx               ', track1.to_list_s)
+		assert_equal('1990-08-29 12:34 - xx:xx               ', track1.to_s)
 		
-		task1 = TheFox::Timr::Task.new
+		task1 = Task.new
 		task1.name = 'task1'
-		track1 = TheFox::Timr::Track.new
+		
+		track1 = Track.new
 		track1.begin_time = Time.parse('1990-08-29 12:34:56')
 		track1.task = task1
-		assert_equal('1990-08-29 12:34 - xx:xx               task1', track1.to_list_s)
+		assert_equal('1990-08-29 12:34 - xx:xx               task1', track1.to_s)
 		
 		track1.begin_time = Time.parse('1987-06-11 12:00:00')
 		track1.end_time   = Time.parse('1987-06-12 23:00:00')
-		assert_equal('1987-06-11 12:00 - 23:00 1987-06-12    task1', track1.to_list_s)
+		assert_equal('1987-06-11 12:00 - 23:00 1987-06-12    task1', track1.to_s)
 		
 		track1.description = 'hello world'
-		assert_equal('1987-06-11 12:00 - 23:00 1987-06-12    task1: hello world', track1.to_list_s)
+		assert_equal('1987-06-11 12:00 - 23:00 1987-06-12    task1: hello world', track1.to_s)
 	end
 	
 	def test_from_h
-		track1 = TheFox::Timr::Track.from_h(nil, {})
+		track1 = Track.from_h(nil, {})
 		assert_equal(nil, track1.begin_time)
 		assert_equal(nil, track1.end_time)
 		
-		track1 = TheFox::Timr::Track.from_h(nil, {
+		track1 = Track.from_h(nil, {
 			'id' => 'abc',
 			'b' => '1986-06-18 12:34:56+0000',
 			'e' => '2014-11-11 19:05:12+0000',

data/tests/tc_window.rb

@@ -7,14 +7,17 @@ require 'timr'
 
 
 class TestWindow < MiniTest::Test
+	
+	include TheFox::Timr
+	
 	def test_class_name
-		window1 = TheFox::Timr::Window.new
+		window1 = Window.new
 		
 		assert_equal('TheFox::Timr::Window', window1.class.to_s)
 	end
 	
 	def test_content_refresh
-		window1 = TheFox::Timr::Window.new
+		window1 = Window.new
 		assert_equal(1, window1.content_refreshes)
 		
 		window1.content_length = 10
@@ -35,7 +38,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_page_refreshes
-		window1 = TheFox::Timr::Window.new
+		window1 = Window.new
 		assert_equal(0, window1.page_refreshes)
 		
 		window1.content_changed
@@ -45,7 +48,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_page
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 3
 		window1.content_refresh
 		page = window1.page.map{ |page_item| page_item[0..7] }
@@ -60,7 +63,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_page_object
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		assert_equal(1, window1.cursor)
 		
 		window1.content_length = 3
@@ -72,7 +75,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_has_next_page
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 3
 		window1.content_refresh
 		assert_equal(true, window1.next_page?)
@@ -89,7 +92,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_has_previous_page
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 3
 		window1.content_refresh
 		assert_equal(false, window1.previous_page?)
@@ -100,7 +103,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_jmp_next_previous_page
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 3
 		window1.content_refresh
 		
@@ -303,7 +306,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_cursor_border_top_bottom
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 7
 		window1.content_refresh
 		assert_equal(1, window1.cursor_border_top)
@@ -343,7 +346,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_cursor_on_inner_range_multiple_pages
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 7
 		window1.content_refresh
 		assert_equal(true, window1.cursor_on_inner_range?)
@@ -412,7 +415,7 @@ class TestWindow < MiniTest::Test
 	end
 	
 	def test_cursor_on_inner_range_one_page
-		window1 = TheFox::Timr::TestWindow.new
+		window1 = TestWindow.new
 		window1.content_length = 35
 		window1.content_refresh
 		assert_equal(true, window1.cursor_on_inner_range?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest