timr 0.1.0.pre.dev.1 → 0.1.0.pre.dev.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b78ed2b17c8e1324c1e8ce4ea8d331955c861227
-  data.tar.gz: cc2b02d5c1d05dd690ad117e76b5b0cc3e17df1f
+  metadata.gz: 4157f4d824d2cadedc511f421b488656ac6a9640
+  data.tar.gz: f859883d4ee1a270a61653e4e6c063bacd5f9969
 SHA512:
-  metadata.gz: 984d1c45cf0e32ef972ff0f94c427fa792071c5f6520235b97acc35952b151ee2619ca00025ad5da692793e8d6a1eb890d3874e0f21941ac5d5b2f6cc9ae87c0
-  data.tar.gz: 5bcbacb70f1b9412213d3b7b7214e38c7b081ef2357de42be7594f70e25d7571a36b4e982c80df9d0b18cc7760d1c57a8a7b416eb77d5ad0cda249330ae53ddc
+  metadata.gz: 461b4bccfd4fd85530a1d570eb8feac64c4f21e47cb2846e18688bbfe8a053e75934f7444f9fa30bb1cc5983b8f089615e316cecfc2f3cf0114717eda371c5cd
+  data.tar.gz: ab112bd2d0e900913dac25283681c2eddf21ae381e78b2299b7d42836baab4e8cd7f4ab6ab2a94685ff22eb9878d4c73116f4c3297622e4a970981ee99cad133

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 .setup
+/bin/dev
 /releases/
 README.html
 /tmp/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    timr (0.1.0.pre.dev.1)
+    timr (0.1.0.pre.dev.5)
       curses (~> 1.0)
       thefox-ext (~> 1.4)
       uuid (~> 2.3)

data/Makefile

@@ -6,7 +6,3 @@ include Makefile.common
 
 dev:
 	RUBYOPT=-rbundler/setup ruby ./bin/timr
-
-.PHONY: test
-test:
-	RUBYOPT=-w $(BUNDLER) exec ./tests/ts_all.rb

data/bin/timr

@@ -31,8 +31,6 @@ end
 ARGV << '-h' if ARGV.count == 0
 opts.parse(ARGV)
 
-puts 'currently under heavy development'
-
-# timr = TheFox::Timr::Timr.new(@options[:dir])
-# timr.run
-# timr.close
+timr = TheFox::Timr::Timr.new(@options[:dir])
+timr.run
+timr.close

data/lib/timr.rb

@@ -3,6 +3,7 @@ require 'timr/version'
 require 'timr/timr'
 require 'timr/stack'
 require 'timr/task'
+require 'timr/track'
 require 'timr/window'
 require 'timr/window_help'
 require 'timr/window_tasks'

data/lib/timr/stack.rb

@@ -34,7 +34,7 @@ module TheFox
 				@tasks.map{ |task|
 					status = task.status
 					status = '*' if task == @task
-					"#{status} #{task.name}"
+					"#{status} #{task}"
 				}
 			end
 			
@@ -63,11 +63,13 @@ module TheFox
 			end
 			
 			def push(task)
-				@task.stop if has_task?
-				
-				@task = task
-				@task.start
-				@tasks << @task
+				if !@tasks.include?(task)
+					@task.stop if has_task?
+					
+					@task = task
+					@task.start
+					@tasks << @task
+				end
 			end
 			
 		end

data/lib/timr/task.rb

@@ -1,6 +1,5 @@
 
 require 'time'
-#require 'yaml'
 require 'yaml/store'
 require 'uuid'
 
@@ -23,8 +22,9 @@ module TheFox
 					'created' => Time.now.strftime(TIME_FORMAT),
 					'modified' => Time.now.strftime(TIME_FORMAT),
 				}
-				@time = nil
+				@track = nil
 				@timeline = []
+				@timeline_diff_total = nil
 				
 				@path = path
 				if !@path.nil?
@@ -36,11 +36,8 @@ module TheFox
 				content = YAML::load_file(path)
 				@meta = content['meta']
 				@timeline = content['timeline']
-					.map{ |time_raw|
-						time = {
-							'b' => Time.parse(time_raw['b']),
-							'e' => Time.parse(time_raw['e']),
-						}
+					.map{ |track_raw|
+						Track.from_h(self, track_raw)
 					}
 			end
 			
@@ -49,16 +46,8 @@ module TheFox
 					path = File.expand_path("task_#{@meta['id']}.yml", basepath)
 					
 					timeline_c = @timeline
-						.clone
-						.map{ |time|
-							time = time.clone
-							if !time['b'].nil?
-								time['b'] = time['b'].strftime(TIME_FORMAT)
-							end
-							if !time['e'].nil?
-								time['e'] = time['e'].strftime(TIME_FORMAT)
-							end
-							time
+						.map{ |track|
+							track.to_h
 						}
 					
 					store = YAML::Store.new(path)
@@ -106,22 +95,25 @@ module TheFox
 				@meta['description'] = description == '' ? nil : description
 			end
 			
+			def timeline
+				@timeline
+			end
+			
 			def start
 				if !running?
 					changed
-					@time = {
-						'b' => Time.now, # begin
-						'e' => nil, # end
-					}
-					@timeline << @time
+					@track = Track.new(self)
+					@timeline << @track
 				end
 				@status = :running
 			end
 			
 			def stop
-				if running? && !@time.nil?
+				if running? && !@track.nil?
 					changed
-					@time['e'] = Time.now
+					@track.end = Time.now
+					@track = nil
+					@timeline_diff_total = nil
 				end
 				@status = :stop
 			end
@@ -138,6 +130,59 @@ module TheFox
 				name
 			end
 			
+			def to_list_s
+				name
+			end
+			
+			def run_time_track
+				hours = 0
+				minutes = 0
+				seconds = 0
+				
+				if !@track.nil?
+					diff = (Time.now - @track.begin).to_i.abs
+					hours = diff / 3600
+					
+					diff -= hours * 3600
+					minutes = diff / 60
+					
+					diff -= minutes * 60
+					seconds = diff
+				end
+				
+				[hours, minutes, seconds]
+			end
+			
+			def run_time_total
+				# Cache all other tracks.
+				if @timeline_diff_total.nil?
+					@timeline_diff_total = @timeline
+						.select{ |track| track != @track }
+						.map{ |track| track.diff }
+						.inject(:+)
+				end
+				
+				hours = 0
+				minutes = 0
+				seconds = 0
+				
+				track_diff = 0
+				if !@track.nil?
+					track_diff = (Time.now - @track.begin).to_i.abs
+				end
+				
+				diff = @timeline_diff_total.to_i + track_diff
+				hours = diff / 3600
+				
+				diff -= hours * 3600
+				minutes = diff / 60
+				
+				diff -= minutes * 60
+				seconds = diff
+				
+				[hours, minutes, seconds]
+			end
+			
 		end
 		
 	end

data/lib/timr/timr.rb

@@ -1,6 +1,7 @@
 
 require 'curses'
 require 'time'
+require 'fileutils'
 
 module TheFox
 	module Timr
@@ -25,27 +26,29 @@ module TheFox
 				tasks_load
 				
 				@window = nil
-				@window_timeline = TimelineWindow.new
 				@window_help = HelpWindow.new
 				@window_test = TestWindow.new
 				
 				@window_tasks = TasksWindow.new
 				@window_tasks.tasks = @tasks
+				
+				@window_timeline = TimelineWindow.new
+				@window_timeline.tasks = @tasks
 			end
 			
 			def init_dirs
 				if !Dir.exist?(@base_dir_path)
-					Dir.mkdir(@base_dir_path)
+					FileUtils.mkdir_p(@base_dir_path)
 				end
 				if !Dir.exist?(@data_dir_path)
-					Dir.mkdir(@data_dir_path)
+					FileUtils.mkdir_p(@data_dir_path)
 				end
 			end
 			
 			def tasks_load
 				Dir.chdir(@data_dir_path) do
 					Dir['task_*.yml'].each do |file_name|
-						puts "file: '#{file_name}'"
+						#puts "file: '#{file_name}'"
 						task = Task.new(file_name)
 						@tasks[task.id] = task
 					end
@@ -66,7 +69,7 @@ module TheFox
 				end
 			end
 			
-			def init_curses
+			def ui_init_curses
 				Curses.noecho
 				Curses.timeout = TIMEOUT
 				Curses.curs_set(0)
@@ -81,7 +84,7 @@ module TheFox
 				Curses.init_pair(Curses::COLOR_YELLOW, Curses::COLOR_BLACK, Curses::COLOR_YELLOW)
 			end
 			
-			def title_line
+			def ui_title_line
 				title = "#{NAME} #{VERSION} -- #{@base_dir_name}"
 				if Curses.cols <= title.length + 1
 					title = "#{NAME} #{VERSION}"
@@ -97,7 +100,7 @@ module TheFox
 				end
 			end
 			
-			def status_text(text, attrn = Curses::A_NORMAL)
+			def ui_status_text(text, attrn = Curses::A_NORMAL)
 				line_nr = Curses.lines - 1
 				
 				Curses.setpos(line_nr, 0)
@@ -109,12 +112,16 @@ module TheFox
 				Curses.refresh
 			end
 			
-			def status_input(text)
+			def ui_status_text_error(text)
+				ui_status_text(text, Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD)
+			end
+			
+			def ui_status_input(text)
 				Curses.echo
 				Curses.timeout = -1
 				Curses.curs_set(1)
 				
-				status_text(text)
+				ui_status_text(text)
 				
 				input = ''
 				abort = false
@@ -144,7 +151,7 @@ module TheFox
 				input
 			end
 			
-			def status_line(init = false)
+			def ui_status_line(init = false)
 				line_nr = Curses.lines - 2
 				
 				Curses.attron(Curses.color_pair(Curses::COLOR_YELLOW) | Curses::A_NORMAL) do
@@ -156,9 +163,13 @@ module TheFox
 					
 					Curses.setpos(line_nr, COL)
 					if @stack.has_task?
-						Curses.addstr(@stack.task.status)
+						status = @stack.task.status
+						run_time_track = '%4d:%02d:%02d' % @stack.task.run_time_track
+						run_time_total = '%4d:%02d:%02d' % @stack.task.run_time_total
+						
+						Curses.addstr("#{status} #{run_time_track} #{run_time_total}")
 					else
-						Curses.addstr(TASK_NO_TASK_LOADED_C)
+						Curses.addstr("#{TASK_NO_TASK_LOADED_C} ----:--:-- ----:--:--")
 					end
 					
 					if Curses.cols > MIN_COLS
@@ -183,13 +194,13 @@ module TheFox
 				Curses.refresh
 			end
 			
-			def window_show(window)
+			def ui_window_show(window)
 				@window = window
-				window_refresh
+				ui_window_refresh
 			end
 			
-			def window_refresh
-				max_lines = content_length
+			def ui_window_refresh
+				max_lines = ui_content_length
 				(1..max_lines).each do |line_nr|
 					Curses.setpos(line_nr, 0)
 					Curses.clrtoeol
@@ -198,14 +209,18 @@ module TheFox
 				if !@window.nil?
 					line_nr = 1
 					@window.content_refresh
-					page_length = @window.page_length
 					current_line = @window.current_line
 					max_line_len = Curses.cols - 2
 					@window.page.each do |line_object|
 						is_cursor = line_nr == @window.cursor
 						
-						line_text = line_object.to_s
-						#line_text = "#{line_text} #{is_cursor ? 'X' : ''}"
+						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
+						
 						if line_text.length > max_line_len
 							cut = line_text.length - max_line_len + 4
 							line_text = "#{line_text[0..-cut]}..."
@@ -213,16 +228,22 @@ module TheFox
 						
 						rest = Curses.cols - line_text.length - COL
 						
-						if is_cursor
-							Curses.setpos(line_nr, 0)
-							Curses.attron(Curses.color_pair(Curses::COLOR_BLUE) | Curses::A_BOLD) do
-								Curses.addstr(' ' * COL + line_text + ' ' * rest)
+						if @window.has_cursor?
+							if is_cursor
+								Curses.setpos(line_nr, 0)
+								Curses.attron(Curses.color_pair(Curses::COLOR_BLUE) | Curses::A_BOLD) do
+									Curses.addstr(' ' * COL + line_text + ' ' * rest)
+								end
+							else
+								Curses.setpos(line_nr, COL)
+								Curses.addstr(line_text)
 							end
 						else
 							Curses.setpos(line_nr, COL)
 							Curses.addstr(line_text)
 						end
 						
+						
 						line_nr += 1
 					end
 				end
@@ -230,28 +251,32 @@ module TheFox
 				Curses.refresh
 			end
 			
-			def content_length
+			def ui_content_length
 				Curses.lines - RESERVED_LINES - @stack.length
 			end
 			
 			def update_content_length
-				cl = content_length
+				cl = ui_content_length
 				
-				@window_timeline.content_length = cl
 				@window_help.content_length = cl
 				@window_test.content_length = cl
 				@window_tasks.content_length = cl
+				@window_timeline.content_length = cl
+			end
+			
+			def ui_refresh
+				ui_stack_lines_refresh
+				ui_window_refresh
 			end
 			
-			def refresh
+			def ui_refresh_all
 				update_content_length
-				title_line
-				status_line(true)
-				stack_lines
-				window_refresh
+				ui_title_line
+				ui_status_line(true)
+				ui_refresh
 			end
 			
-			def stack_lines
+			def ui_stack_lines_refresh
 				line_nr = Curses.lines - (3 + (@stack.length - 1))
 				
 				Curses.attron(Curses.color_pair(Curses::COLOR_BLUE)) do
@@ -269,11 +294,46 @@ module TheFox
 				Curses.refresh
 			end
 			
+			def task_apply(task = nil, push = false)
+				if task.nil?
+					@stack.pop_all
+				else
+					@tasks[task.id] = task
+					if push
+						@stack.push(task)
+					else
+						@stack.pop_all(task)
+					end
+				end
+				
+				window_content_changed
+				ui_stack_lines_refresh
+				ui_window_refresh if !push
+			end
+			
+			def task_apply_replace_stack(task)
+				task_apply(task, false)
+			end
+			
+			def task_apply_stack_pop_all
+				task_apply(nil, false)
+			end
+			
+			def task_apply_push(task)
+				task_apply(task, true)
+			end
+			
+			def window_content_changed
+				@window_tasks.content_changed
+				@window_timeline.content_changed
+			end
+			
 			def run
-				init_curses
+				ui_init_curses
 				update_content_length
-				title_line
-				status_line(true)
+				ui_title_line
+				ui_status_line(true)
+				ui_window_show(@window_timeline)
 				
 				loop do
 					key_pressed = Curses.getch
@@ -281,96 +341,113 @@ module TheFox
 					case key_pressed
 					when Curses::Key::NPAGE
 						@window.next_page if !@window.nil?
-						window_refresh
+						ui_window_refresh
 					when Curses::Key::PPAGE
 						@window.previous_page if !@window.nil?
-						window_refresh
+						ui_window_refresh
 					when Curses::Key::DOWN
-						#@window.next_line if !@window.nil?
-						@window.cursor_next_line if !@window.nil?
-						#status_text("Cursor: #{@window.cursor} c=#{content_length}  l=#{@window.current_line}  pr=#{@window.page_refreshes}  cr=#{@window.content_refreshes}") if !@window.nil?
-						window_refresh
+						if !@window.nil? && @window.has_cursor?
+							@window.cursor_next_line 
+							
+							#ui_status_text("Cursor: #{@window.cursor} c=#{ui_content_length}  l=#{@window.current_line}  pr=#{@window.page_refreshes}  cr=#{@window.content_refreshes}")
+							
+							ui_window_refresh
+						end
 					when Curses::Key::UP
-						#@window.previous_line if !@window.nil?
-						@window.cursor_previous_line if !@window.nil?
-						#status_text("Cursor: #{@window.cursor} c=#{content_length}  l=#{@window.current_line}  pr=#{@window.page_refreshes}  cr=#{@window.content_refreshes}") if !@window.nil?
-						window_refresh
+						if !@window.nil? && @window.has_cursor?
+							@window.cursor_previous_line
+							
+							#ui_status_text("Cursor: #{@window.cursor} c=#{ui_content_length}  l=#{@window.current_line}  pr=#{@window.page_refreshes}  cr=#{@window.content_refreshes}")
+							
+							ui_window_refresh
+						end
 					when Curses::Key::HOME
 						@window.first_page if !@window.nil?
-						window_refresh
+						ui_window_refresh
 					when Curses::Key::END
 						@window.last_page if !@window.nil?
-						window_refresh
+						ui_window_refresh
 					when Curses::Key::RESIZE
 						update_content_length
-						status_text("Resizing: #{Curses.lines}x#{Curses.cols}")
+						ui_status_text("Resizing: #{Curses.lines}x#{Curses.cols}")
 						
 						# Refreshing the complete screen while resizing
 						# can make everything slower. So for fast resizing
 						# comment this line.
-						refresh
+						ui_refresh_all
 					when 10
 						object = @window.page_object if !@window.nil?
+						
+						task = nil
+						if object.is_a?(Task)
+							task = object
+						elsif object.is_a?(Track)
+							task = object.task
+						end
+						
+						if task.nil?
+							ui_status_text("Unrecognized object: #{object.class}")
+						else
+							task_apply_replace_stack(task)
+						end
+					when 'b', 'p'
+						object = @window.page_object if !@window.nil?
+						
+						task = nil
 						if object.is_a?(Task)
-							status_text("Object: #{object.class} #{object}")
+							task = object
+						elsif object.is_a?(Track)
+							task = object.task
+						end
+						
+						if task.nil?
+							ui_status_text("Unrecognized object: #{object.class}")
+						else
+							task_apply_push(task)
 						end
 					when 'r'
-						refresh
-						status_text('')
+						ui_refresh_all
+						ui_status_text('')
 					when 'n'
-						task_name = status_input('New task: ')
+						task_name = ui_status_input('New task: ')
 						if task_name.nil?
-							status_text('Aborted.')
+							ui_status_text('Aborted.')
 						else
-							task_description = status_input('Description: ')
+							task_description = ui_status_input('Description: ')
 							
 							task = @stack.create(task_name, task_description)
-							@tasks[task.id] = task
-							@stack.pop_all(task)
-							@window_tasks.content_changed
+							task_apply_replace_stack(task)
 							
-							status_text("Task '#{task_name}' created: #{task.id}")
-							
-							stack_lines
-							window_refresh
+							ui_status_text("Task '#{task_name}' created: #{task.id}")
 						end
-					when 'p'
-						task = Task.new
-						task.name = "task #{Time.now.strftime(TIME_FORMAT)}"
-						task.description = 'description1'
-						
-						@tasks[task.id] = task
-						@stack.push(task)
-						
-						status_text("Task '#{task_name}' created: #{task.id}")
-						
-						stack_lines
 					when 'x'
 						@stack.task.stop if @stack.has_task?
 					when 'c'
 						@stack.task.toggle if @stack.has_task?
 					when 'v'
 						if @stack.pop
-							stack_lines
-							window_refresh
+							window_content_changed
+							ui_refresh
 						end
+					when 'f'
+						task_apply_stack_pop_all
 					when 'h', '?'
-						window_show(@window_help)
+						ui_window_show(@window_help)
 					when 't' # Test Windows
-						window_show(@window_test)
+						ui_window_show(@window_test)
 					when '1'
-						window_show(@window_timeline)
+						ui_window_show(@window_timeline)
 					when '2'
-						window_show(@window_tasks)
+						ui_window_show(@window_tasks)
 					when 'w'
 						tasks_save
 					when 'q'
 						break
 					when nil
 						# Do some work.
-						status_line
+						ui_status_line
 					else
-						status_text("Invalid key '#{key_pressed}' (#{Curses.keyname(key_pressed)})", Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD)
+						ui_status_text_error("Invalid key '#{key_pressed}' (#{Curses.keyname(key_pressed)})")
 					end
 				end
 			end

data/lib/timr/track.rb

@@ -0,0 +1,84 @@
+
+require 'time'
+require 'thefox-ext'
+
+module TheFox
+	module Timr
+		
+		class Track
+			
+			def initialize(task, tbegin = Time.now, tend = nil)
+				@task = task
+				@tbegin = tbegin
+				@tend = tend
+			end
+			
+			def begin=(tb)
+				@tbegin = tb
+			end
+			
+			def begin
+				@tbegin
+			end
+			
+			def end=(te)
+				@tend = te
+			end
+			
+			def end
+				@tend
+			end
+			
+			def diff
+				if !@tbegin.nil? && !@tend.nil?
+					(@tend - @tbegin).abs
+				else
+					0
+				end
+			end
+			
+			def task
+				@task
+			end
+			
+			def to_h
+				h = {}
+				h['b'] = @tbegin.strftime(TIME_FORMAT) if !@tbegin.nil?
+				h['e'] = @tend.strftime(TIME_FORMAT) if !@tend.nil?
+				h
+			end
+			
+			def to_s
+				'track'
+			end
+			
+			def to_list_s
+				tend_date = nil
+				tend_time_s = ''
+				if !@tend.nil?
+					tend_time_s = !@tend.nil? ? @tend.strftime('%R') : 'xx:xx'
+					tend_date = @tend.to_date
+				end
+				
+				tbegin_date_s = ''
+				tbegin_date = @tbegin.to_date
+				tend_date_s = ''
+				if (tbegin_date != tend_date && !tend_date.nil?) || !tbegin_date.today?
+					tbegin_date_s = @tbegin.strftime('%F')
+					tend_date_s = @tend.strftime('%F') if !@tend.nil?
+				end
+				
+				'%10s %5s - %5s %10s    %s' % [tbegin_date_s, @tbegin.strftime('%R'), tend_time_s, tend_date_s, @task.to_list_s]
+			end
+			
+			def self.from_h(task, h)
+				t = Track.new(task)
+				t.begin = Time.parse(h['b'])
+				t.end = Time.parse(h['e'])
+				t
+			end
+			
+		end
+		
+	end
+end

data/lib/timr/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Timr
 		NAME = 'Timr'
-		VERSION = '0.1.0-dev.1'
-		DATE = '2016-05-08'
+		VERSION = '0.1.0-dev.5'
+		DATE = '2016-05-10'
 		HOMEPAGE = 'https://github.com/TheFox/timr'
 		
 		COL = 1

data/lib/timr/window.rb

@@ -8,15 +8,21 @@ module TheFox
 				@content_length = 0
 				@current_line = 0
 				@cursor = 1
+				@has_cursor = false
 				@content_changed = true
 				@content_refreshes = 1
-				@page = nil
+				@page = []
 				@page_changed = true
 				@page_refreshes = 1
 				
+				setup
 				content_refresh
 			end
 			
+			def setup
+				
+			end
+			
 			def content_length=(content_length)
 				@content_length = content_length
 			end
@@ -50,16 +56,13 @@ module TheFox
 			end
 			
 			def page
-				if @content.nil?
-					[]
-				else
-					if @page.nil? || @page_changed
-						@page = @content[@current_line, @content_length]
-						@page_refreshes += 1
-						@page_changed = false
-					end
-					@page
+				if @page_changed
+					@page = @content[@current_line, @content_length]
+					@page_refreshes += 1
+					@page_changed = false
 				end
+				
+				@page
 			end
 			
 			def page_object
@@ -67,7 +70,12 @@ module TheFox
 			end
 			
 			def page_length
-				page.length
+				cpage = page
+				if cpage.nil?
+					0
+				else
+					cpage.length
+				end
 			end
 			
 			def next_page?
@@ -97,10 +105,10 @@ module TheFox
 				@current_line > 0
 			end
 			
-			def previous_page
+			def previous_page(length = @content_length)
 				if previous_page?
 					page_changed
-					@current_line -= @content_length
+					@current_line -= length
 					if @current_line < 0
 						@current_line = 0
 					end
@@ -118,8 +126,14 @@ module TheFox
 			end
 			
 			def last_page
-				page_changed
-				@current_line = @content.length - @content_length
+				if !last_page?
+					page_changed
+					
+					new_current_line = @content.length - @content_length
+					if new_current_line >= 0
+						@current_line = @content.length - @content_length
+					end
+				end
 				cursor_last_line
 			end
 			
@@ -141,6 +155,10 @@ module TheFox
 				@cursor
 			end
 			
+			def has_cursor?
+				@has_cursor
+			end
+			
 			def cursor_next_line
 				@cursor += 1
 				border = @content_length - 2
@@ -183,6 +201,9 @@ module TheFox
 			
 			def cursor_last_line
 				@cursor = @content_length
+				if page_length < @content_length
+					@cursor = page_length
+				end
 			end
 			
 			def cursor_first_line

data/lib/timr/window_help.rb

@@ -12,12 +12,15 @@ module TheFox
 					'           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.',
 					'',

data/lib/timr/window_tasks.rb

@@ -15,6 +15,7 @@ module TheFox
 			
 			def content
 				if @tasks.nil? || @tasks.length == 0
+					@has_cursor = false
 					[
 						'',
 						'#### NO TASKS YET ####',
@@ -22,9 +23,10 @@ module TheFox
 						"Press 'n' to create a new task.",
 					]
 				else
+					@has_cursor = true
 					@tasks
 						.sort_by{ |k, v|
-							v.name
+							v.name.downcase
 						}
 						.map{ |a| a[1] }
 				end

data/lib/timr/window_test.rb

@@ -4,6 +4,10 @@ module TheFox
 		
 		class TestWindow < Window
 			
+			def setup
+				@has_cursor = true
+			end
+			
 			def content
 				c = []
 				(1..30).each do |n|

data/lib/timr/window_timeline.rb

@@ -4,8 +4,33 @@ module TheFox
 		
 		class TimelineWindow < Window
 			
+			@tasks = nil
+			
+			def tasks=(tasks)
+				content_changed
+				@tasks = tasks
+			end
+			
 			def content
-				
+				if @tasks.nil? || @tasks.length == 0
+					@has_cursor = false
+					[
+						'',
+						'#### NO TASKS YET ####',
+						'',
+						"Press 'n' to create a new task.",
+					]
+				else
+					@has_cursor = true
+					@tasks
+						.map{ |task_id, task|
+							task.timeline
+						}
+						.flatten
+						.sort{ |task_a, task_b|
+							task_a.begin <=> task_b.begin || task_a.end <=> task_b.end
+						}
+				end
 			end
 			
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timr
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.dev.1
+  version: 0.1.0.pre.dev.5
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -80,12 +80,12 @@ files:
 - Makefile
 - Makefile.common
 - README.md
-- bin/dev
 - bin/timr
 - lib/timr.rb
 - lib/timr/stack.rb
 - lib/timr/task.rb
 - lib/timr/timr.rb
+- lib/timr/track.rb
 - lib/timr/version.rb
 - lib/timr/window.rb
 - lib/timr/window_help.rb

data/bin/dev

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# coding: UTF-8
-
-require 'pp'
-require 'timr'
-
-
-h = {
-	#'x' => 10,
-	#'y' => 5,
-}
-
-pp h.length