timr 0.1.0.pre.dev.5 → 0.1.0

data/lib/timr/window.rb

@@ -10,10 +10,10 @@ module TheFox
 				@cursor = 1
 				@has_cursor = false
 				@content_changed = true
-				@content_refreshes = 1
+				@content_refreshes = 0
 				@page = []
 				@page_changed = true
-				@page_refreshes = 1
+				@page_refreshes = 0
 				
 				setup
 				content_refresh
@@ -24,6 +24,9 @@ module TheFox
 			end
 			
 			def content_length=(content_length)
+				if @content_length != content_length
+					@content_changed = true
+				end
 				@content_length = content_length
 			end
 			
@@ -44,13 +47,11 @@ module TheFox
 					@content = content
 					@content_refreshes += 1
 					@content_changed = false
+					
+					@page_changed = true
 				end
 			end
 			
-			def page_changed
-				@page_changed = true
-			end
-			
 			def page_refreshes
 				@page_refreshes
 			end
@@ -96,7 +97,7 @@ module TheFox
 					add_lines = @content_length
 				end
 				
-				page_changed
+				@page_changed = true
 				@current_line += add_lines if next_page?
 				cursor_set_to_last_if_out_of_range
 			end
@@ -107,7 +108,7 @@ module TheFox
 			
 			def previous_page(length = @content_length)
 				if previous_page?
-					page_changed
+					@page_changed = true
 					@current_line -= length
 					if @current_line < 0
 						@current_line = 0
@@ -116,7 +117,7 @@ module TheFox
 			end
 			
 			def first_page
-				page_changed
+				@page_changed = true
 				@current_line = 0
 				cursor_first_line
 			end
@@ -127,7 +128,7 @@ module TheFox
 			
 			def last_page
 				if !last_page?
-					page_changed
+					@page_changed = true
 					
 					new_current_line = @content.length - @content_length
 					if new_current_line >= 0
@@ -138,12 +139,12 @@ module TheFox
 			end
 			
 			def next_line
-				page_changed
+				@page_changed = true
 				next_page(1)
 			end
 			
 			def previous_line
-				page_changed
+				@page_changed = true
 				previous_page(1)
 			end
 			
@@ -189,7 +190,7 @@ module TheFox
 					else
 						
 					end
-				elsif @cursor <= border
+				elsif @cursor < border
 					if previous_page?
 						@cursor = border
 						previous_line

data/lib/timr/window_help.rb

@@ -29,7 +29,6 @@ module TheFox
 					"    #{TASK_NO_TASK_LOADED_C} .. No task loaded.",
 					'    | .. Task stopped.',
 					'    > .. Task is running.',
-					#'',
 				]
 			end
 			

data/lib/timr/window_test.rb

@@ -4,16 +4,28 @@ 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
-				c = []
-				(1..30).each do |n|
-					c << 'LINE %03d  123456789_123456789_123456789_123456789_123456789_123456789' % [n]
+				if @lines.nil?
+					c = []
+					(1..30).each do |n|
+						c << 'LINE %03d  123456789_123456789_123456789_123456789_123456789_123456789' % [n]
+					end
+					c
+				else
+					@lines
 				end
-				c
 			end
 			
 		end

data/lib/timr/window_timeline.rb

@@ -28,7 +28,7 @@ module TheFox
 						}
 						.flatten
 						.sort{ |task_a, task_b|
-							task_a.begin <=> task_b.begin || task_a.end <=> task_b.end
+							task_a.begin_time <=> task_b.begin_time || task_a.end_time <=> task_b.end_time
 						}
 				end
 			end

data/tests/tc_stack.rb

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+
+require 'minitest/autorun'
+require 'timr'
+
+
+class TestStack < MiniTest::Test
+	def test_class_name
+		stack = TheFox::Timr::Stack.new
+		
+		assert_equal('TheFox::Timr::Stack', stack.class.to_s)
+	end
+	
+	def test_has_task
+		stack = TheFox::Timr::Stack.new
+		assert_equal(false, stack.has_task?)
+	end
+	
+	def test_push_pop
+		task1 = TheFox::Timr::Task.new
+		task1.name = 'task1'
+		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)
+		
+		push_res = stack.push(task1)
+		assert_equal(true, push_res)
+		assert_equal(task1, stack.task)
+		assert_equal(1, stack.length)
+		assert_equal(true, task1.running?)
+		assert_equal(['* task1'], stack.tasks_texts)
+		
+		push_res = stack.push(task2)
+		assert_equal(true, push_res)
+		assert_equal(task2, stack.task)
+		assert_equal(2, stack.length)
+		assert_equal(true, task2.running?)
+		assert_equal(false, task1.running?)
+		assert_equal(['| task1', '* task2'], stack.tasks_texts)
+		
+		# if !@tasks.include?(task)
+		push_res = stack.push(task2)
+		assert_equal(false, push_res)
+		assert_equal(2, stack.length)
+		
+		pop_res = stack.pop
+		assert_equal(true, pop_res)
+		assert_equal(task1, stack.task)
+		assert_equal(1, stack.length)
+		assert_equal(true, task1.running?)
+		assert_equal(false, task2.running?)
+		assert_equal(['* task1'], stack.tasks_texts)
+		
+		pop_res = stack.pop
+		assert_equal(true, pop_res)
+		assert_equal([], stack.tasks_texts)
+		assert_equal(nil, stack.task)
+		assert_equal(0, stack.length)
+		
+		# if !old.nil?
+		pop_res = stack.pop
+		assert_equal(false, pop_res)
+		
+		
+		# Pop All
+		task3 = TheFox::Timr::Task.new
+		task3.name = 'task3'
+		task4 = TheFox::Timr::Task.new
+		task4.name = 'task4'
+		task5 = TheFox::Timr::Task.new
+		task5.name = 'task5'
+		
+		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)
+		
+		pop_all_res = stack.pop_all(task5)
+		assert_equal(false, pop_all_res)
+		assert_equal(1, stack.length)
+		
+		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)
+	end
+end

data/tests/tc_task.rb

@@ -0,0 +1,119 @@
+#!/usr/bin/env ruby
+
+require 'minitest/autorun'
+require 'time'
+require 'fileutils'
+require 'timr'
+
+
+class TestTask < MiniTest::Test
+	def test_class_name
+		task = TheFox::Timr::Task.new
+		
+		assert_equal('TheFox::Timr::Task', task.class.to_s)
+	end
+	
+	def test_save_load
+		task1 = TheFox::Timr::Task.new
+		
+		file_path = task1.save_to_file('tmp')
+		assert_equal(false, File.exist?(file_path))
+		
+		task1.name = 'task1'
+		task1.description = 'description2'
+		file_path = task1.save_to_file('tmp')
+		assert_equal(true, File.exist?(file_path))
+		
+		task2 = TheFox::Timr::Task.new
+		task2.load_from_file(file_path)
+		
+		assert_equal(task1.id, task2.id)
+		assert_equal('task1', task2.name)
+		assert_equal('description2', task2.description)
+		
+		FileUtils.rm_r(file_path)
+	end
+	
+	def test_running
+		task1 = TheFox::Timr::Task.new
+		assert_equal(false, task1.running?)
+		assert_equal(?|, task1.status)
+		
+		task1.start
+		assert_equal(true, task1.running?)
+		assert_equal(?>, task1.status)
+		
+		task1.stop
+		assert_equal(false, task1.running?)
+		assert_equal(?|, task1.status)
+	end
+	
+	def test_track
+		task1 = TheFox::Timr::Task.new
+		assert_equal(false, task1.has_track?)
+		assert_equal(0, task1.timeline.length)
+		
+		task1.start
+		assert_equal(true, task1.has_track?)
+		assert_equal(1, task1.timeline.length)
+		
+		task1.stop
+		assert_equal(false, task1.has_track?)
+		assert_equal(1, task1.timeline.length)
+		
+		task1.start
+		assert_equal(true, task1.has_track?)
+		assert_equal(2, task1.timeline.length)
+		
+		task1.stop
+		assert_equal(false, task1.has_track?)
+		assert_equal(2, task1.timeline.length)
+		
+		task1.toggle
+		assert_equal(true, task1.has_track?)
+		assert_equal(3, task1.timeline.length)
+		
+		task1.toggle
+		assert_equal(false, task1.has_track?)
+		assert_equal(3, task1.timeline.length)
+	end
+	
+	def test_to_s
+		task1 = TheFox::Timr::Task.new
+		assert_equal(nil, task1.to_s)
+		
+		task1.name = 'task1'
+		assert_equal('task1', task1.to_s)
+	end
+	
+	def test_run_time_track
+		task1 = TheFox::Timr::Task.new
+		
+		task1.start
+		task1.track.begin_time = Time.parse('1987-02-21 09:58:59')
+		assert_equal([24, 3, 2], task1.run_time_track(Time.parse('1987-02-22 10:02:01')))
+	end
+	
+	def test_run_time_total
+		task1 = TheFox::Timr::Task.new
+		task1.toggle
+		task1.toggle
+		task1.toggle
+		task1.toggle
+		task1.toggle
+		task1.toggle
+		
+		timeline = task1.timeline
+		timeline[0].begin_time = Time.parse('1986-11-20 01:01:01')
+		timeline[0].end_time   = Time.parse('1986-11-20 02:02:02')
+		timeline[1].begin_time = Time.parse('1991-07-19 03:03:03')
+		timeline[1].end_time   = Time.parse('1991-07-19 04:04:04')
+		timeline[2].begin_time = Time.parse('1991-08-24 05:05:05')
+		timeline[2].end_time   = Time.parse('1991-08-24 06:06:06')
+		assert_equal([3, 3, 3], task1.run_time_total)
+		
+		task1.toggle
+		timeline[3].begin_time = Time.parse('2001-01-01 07:07:07')
+		assert_equal([4, 4, 5], task1.run_time_total(Time.parse('2001-01-01 08:08:09')))
+	end
+end

data/tests/tc_track.rb

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+
+require 'minitest/autorun'
+require 'time'
+require 'fileutils'
+require 'timr'
+
+
+class TestTrack < MiniTest::Test
+	def test_class_name
+		track = TheFox::Timr::Track.new
+		
+		assert_equal('TheFox::Timr::Track', track.class.to_s)
+	end
+	
+	def test_basic
+		track = TheFox::Timr::Track.new
+		assert_equal(Time.now.to_date, track.begin_time.to_date)
+	end
+	
+	def test_diff
+		track = TheFox::Timr::Track.new
+		assert_equal(0, track.diff)
+		
+		track.begin_time = Time.parse('1986-04-08 13:37:02')
+		track.end_time   = Time.parse('1986-04-08 13:38:01')
+		assert_equal(59, track.diff)
+		assert_equal(Fixnum, track.diff.class)
+		
+		track.begin_time = Time.parse('2015-01-16 23:00:00')
+		track.end_time   = Time.parse('2015-06-04 15:30:01')
+		assert_equal(11979001, track.diff)
+		assert_equal(Fixnum, track.diff.class)
+	end
+	
+	def test_to_h
+		track = TheFox::Timr::Track.new(nil, nil, nil)
+		h = track.to_h
+		assert_equal(nil, h['b'])
+		assert_equal(nil, h['e'])
+		
+		track.begin_time = Time.parse('1990-02-21 09:45')
+		h = track.to_h
+		assert_equal('1990-02-21T08:45:00+0000', h['b'])
+		assert_equal(nil, h['e'])
+		
+		track.begin_time = Time.parse('1989-10-19 12:59')
+		track.end_time   = Time.parse('2012-12-14 20:45')
+		h = track.to_h
+		assert_equal('1989-10-19T11:59:00+0000', h['b'])
+		assert_equal('2012-12-14T19:45:00+0000', h['e'])
+		
+		track.begin_time = Time.parse('2013-11-23 23:00')
+		track.end_time   = Time.parse('2013-11-24 09:00')
+		h = track.to_h
+		assert_equal('2013-11-23T22:00:00+0000', h['b'])
+		assert_equal('2013-11-24T08:00:00+0000', h['e'])
+	end
+	
+	def test_to_list_s
+		track = TheFox::Timr::Track.new(nil, Time.parse('1990-08-29 12:34:56'))
+		assert_equal('1990-08-29 12:34 - xx:xx               ', track.to_list_s)
+		
+		task = TheFox::Timr::Task.new
+		task.name = 'task1'
+		track = TheFox::Timr::Track.new(task, Time.parse('1990-08-29 12:34:56'))
+		assert_equal('1990-08-29 12:34 - xx:xx               task1', track.to_list_s)
+		
+		track.begin_time = Time.parse('1987-06-11 12:00:00')
+		track.end_time   = Time.parse('1987-06-12 23:00:00')
+		assert_equal('1987-06-11 12:00 - 23:00 1987-06-12    task1', track.to_list_s)
+	end
+	
+	def test_from_h
+		track = TheFox::Timr::Track.from_h({})
+		assert_equal(nil, track.begin_time)
+		assert_equal(nil, track.end_time)
+		
+		track = TheFox::Timr::Track.from_h({
+			'b' => '1986-06-18 12:34:56+0000',
+			'e' => '2014-11-11 19:05:12+0000',
+		})
+		assert_equal('1986-06-18 14:34:56', track.begin_time.strftime('%Y-%m-%d %H:%M:%S'))
+		assert_equal('2014-11-11 20:05:12',   track.end_time.strftime('%Y-%m-%d %H:%M:%S'))
+	end
+end