timr 0.1.0.pre.dev.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4157f4d824d2cadedc511f421b488656ac6a9640
-  data.tar.gz: f859883d4ee1a270a61653e4e6c063bacd5f9969
+  metadata.gz: 169f2bc1266172e38449b616494751f1675e3cf7
+  data.tar.gz: b33d71090571dbcd6aa1e21a62a39f2b6fd8c484
 SHA512:
-  metadata.gz: 461b4bccfd4fd85530a1d570eb8feac64c4f21e47cb2846e18688bbfe8a053e75934f7444f9fa30bb1cc5983b8f089615e316cecfc2f3cf0114717eda371c5cd
-  data.tar.gz: ab112bd2d0e900913dac25283681c2eddf21ae381e78b2299b7d42836baab4e8cd7f4ab6ab2a94685ff22eb9878d4c73116f4c3297622e4a970981ee99cad133
+  metadata.gz: 9425deec3cc7505b9672cbef8eb5a977521ef5374e28c22ba54f7accaa98aae794152e3495486c28dc0df3e04de4da61222a3a70771a4e614be2308586ffc4b8
+  data.tar.gz: 72769b4c7417eecfac58f7a00c0e1e7f19d5b3eb024cf818431a24306bf6d0fc772667fdb544da2633c91651eff95e380980d65ff8a12e38e6f1d6cc3e9a6088

data/.editorconfig

@@ -8,3 +8,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 4

data/.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+rvm:
+    - 2.1
+    - 2.2
+sudo: required
+before_install:
+    - gem update --system
+    - gem --version
+    - gem install bundler -v '~>1.12'
+    - bundler --version
+install:
+    - make
+    - gem build timr.gemspec
+    - gem install timr-*.gem
+    - gem list -l timr
+script:
+    - make test
+    - cd
+    - which -a timr
+    - timr --version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    timr (0.1.0.pre.dev.5)
+    timr (0.1.0)
       curses (~> 1.0)
       thefox-ext (~> 1.4)
       uuid (~> 2.3)
@@ -26,4 +26,4 @@ DEPENDENCIES
   timr!
 
 BUNDLED WITH
-   1.11.2
+   1.12.3

data/Makefile

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

data/README.md

@@ -1,6 +1,11 @@
 # Timr
 
-A Time Tracking Tool for the Command-line.
+Time Tracking for Hackers.
+
+## Project Links
+
+- [Timr Gem](https://rubygems.org/gems/timr)
+- [Travis CI Repository](https://travis-ci.org/TheFox/timr)
 
 ## License
 

data/bin/timr

@@ -12,10 +12,14 @@ opts = OptionParser.new do |o|
 	o.banner = 'Usage: timr [options]'
 	o.separator('')
 	
-	o.on_tail('-d', '--dir <path>', 'Path to a timr directory.') do |path|
+	o.on('-d', '--dir <path>', 'Path to a timr directory.') do |path|
 		@options[:dir] = path
 	end
 	
+	o.on('-p', '--project <name>', 'Project Name: use ~/.timr/NAME as path.') do |name|
+		@options[:dir] = File.expand_path(name, "#{Dir.home}/.timr/projects")
+	end
+	
 	o.on_tail('-v', '--version', 'Show version.') do
 		puts "#{TheFox::Timr::NAME} #{TheFox::Timr::VERSION} (#{TheFox::Timr::DATE})"
 		puts "#{TheFox::Timr::HOMEPAGE}"

data/lib/timr/stack.rb

@@ -17,20 +17,11 @@ module TheFox
 				!@task.nil?
 			end
 			
-			def create(name, description)
-				@task = Task.new
-				@task.name = name
-				@task.description = description
-				
-				@task
-			end
-			
 			def length
 				@tasks.length
 			end
 			
 			def tasks_texts
-				show_star = length > 1
 				@tasks.map{ |task|
 					status = task.status
 					status = '*' if task == @task
@@ -51,14 +42,19 @@ module TheFox
 			end
 			
 			def pop_all(new_task = nil)
-				@tasks.each do |task|
-					task.stop
-				end
-				@tasks = []
-				@task = nil
-				
-				if !new_task.nil?
-					push(new_task)
+				if @task != new_task
+					@tasks.each do |task|
+						task.stop
+					end
+					@tasks = []
+					@task = nil
+					
+					if !new_task.nil?
+						push(new_task)
+					end
+					true
+				else
+					false
 				end
 			end
 			
@@ -69,6 +65,9 @@ module TheFox
 					@task = task
 					@task.start
 					@tasks << @task
+					true
+				else
+					false
 				end
 			end
 			

data/lib/timr/task.rb

@@ -19,8 +19,8 @@ module TheFox
 					'id' => UUID.new.generate,
 					'name' => nil,
 					'description' => nil,
-					'created' => Time.now.strftime(TIME_FORMAT),
-					'modified' => Time.now.strftime(TIME_FORMAT),
+					'created' => Time.now.utc.strftime(TIME_FORMAT),
+					'modified' => Time.now.utc.strftime(TIME_FORMAT),
 				}
 				@track = nil
 				@timeline = []
@@ -42,12 +42,14 @@ module TheFox
 			end
 			
 			def save_to_file(basepath)
-				if @changed
-					path = File.expand_path("task_#{@meta['id']}.yml", basepath)
-					
+				path = File.expand_path("task_#{@meta['id']}.yml", basepath)
+				
+				if @changed || !@track.nil?
 					timeline_c = @timeline
 						.map{ |track|
-							track.to_h
+							h = track.to_h
+							h['e'] = Time.now.utc.strftime(TIME_FORMAT) if !h.has_key?('e') || h['e'].nil?
+							h
 						}
 					
 					store = YAML::Store.new(path)
@@ -57,6 +59,8 @@ module TheFox
 					end
 					@changed = false
 				end
+				
+				path
 			end
 			
 			def running?
@@ -66,15 +70,15 @@ module TheFox
 			def status
 				case @status
 				when :running
-					'>'
+					?>
 				when :stop
-					'|'
+					?|
 				end
 			end
 			
 			def changed
 				@changed = true
-				@meta['modified'] = Time.now.strftime(TIME_FORMAT)
+				@meta['modified'] = Time.now.utc.strftime(TIME_FORMAT)
 			end
 			
 			def id
@@ -86,22 +90,34 @@ module TheFox
 			end
 			
 			def name=(name)
-				changed
+				@changed = true
 				@meta['name'] = name
 			end
 			
+			def description
+				@meta['description']
+			end
+			
 			def description=(description)
-				changed
+				@changed = true
 				@meta['description'] = description == '' ? nil : description
 			end
 			
+			def track
+				@track
+			end
+			
+			def has_track?
+				!@track.nil?
+			end
+			
 			def timeline
 				@timeline
 			end
 			
 			def start
 				if !running?
-					changed
+					@changed = true
 					@track = Track.new(self)
 					@timeline << @track
 				end
@@ -110,8 +126,8 @@ module TheFox
 			
 			def stop
 				if running? && !@track.nil?
-					changed
-					@track.end = Time.now
+					@changed = true
+					@track.end_time = Time.now
 					@track = nil
 					@timeline_diff_total = nil
 				end
@@ -134,13 +150,13 @@ module TheFox
 				name
 			end
 			
-			def run_time_track
+			def run_time_track(end_time = Time.now)
 				hours = 0
 				minutes = 0
 				seconds = 0
 				
 				if !@track.nil?
-					diff = (Time.now - @track.begin).to_i.abs
+					diff = (end_time - @track.begin_time).to_i.abs
 					hours = diff / 3600
 					
 					diff -= hours * 3600
@@ -153,7 +169,7 @@ module TheFox
 				[hours, minutes, seconds]
 			end
 			
-			def run_time_total
+			def run_time_total(end_time = Time.now)
 				# Cache all other tracks.
 				if @timeline_diff_total.nil?
 					@timeline_diff_total = @timeline
@@ -168,7 +184,7 @@ module TheFox
 				
 				track_diff = 0
 				if !@track.nil?
-					track_diff = (Time.now - @track.begin).to_i.abs
+					track_diff = (end_time - @track.begin_time).to_i.abs
 				end
 				
 				diff = @timeline_diff_total.to_i + track_diff

data/lib/timr/timr.rb

@@ -21,6 +21,7 @@ module TheFox
 				
 				@stack = Stack.new
 				@tasks = {}
+				@last_write = nil
 				
 				init_dirs
 				tasks_load
@@ -61,12 +62,19 @@ module TheFox
 				end
 			end
 			
-			def tasks_save
+			def tasks_save(print_status = false)
+				@last_write = Time.now
+				if print_status
+					ui_status_text("Store files ... #{Time.now.strftime('%T')}")
+				end
 				Dir.chdir(@data_dir_path) do
 					@tasks.each do |task_id, task|
 						task.save_to_file('.')
 					end
 				end
+				if print_status
+					ui_status_text("Files stored. #{Time.now.strftime('%T')}")
+				end
 			end
 			
 			def ui_init_curses
@@ -81,7 +89,7 @@ module TheFox
 				
 				Curses.init_pair(Curses::COLOR_BLUE, Curses::COLOR_WHITE, Curses::COLOR_BLUE)
 				Curses.init_pair(Curses::COLOR_RED, Curses::COLOR_WHITE, Curses::COLOR_RED)
-				Curses.init_pair(Curses::COLOR_YELLOW, Curses::COLOR_BLACK, Curses::COLOR_YELLOW)
+				Curses.init_pair(Curses::COLOR_GREEN, Curses::COLOR_BLACK, Curses::COLOR_GREEN)
 			end
 			
 			def ui_title_line
@@ -154,7 +162,7 @@ module TheFox
 			def ui_status_line(init = false)
 				line_nr = Curses.lines - 2
 				
-				Curses.attron(Curses.color_pair(Curses::COLOR_YELLOW) | Curses::A_NORMAL) do
+				Curses.attron(Curses.color_pair(Curses::COLOR_GREEN) | Curses::A_NORMAL) do
 					if init
 						Curses.setpos(line_nr, 0)
 						Curses.clrtoeol
@@ -164,16 +172,20 @@ module TheFox
 					Curses.setpos(line_nr, COL)
 					if @stack.has_task?
 						status = @stack.task.status
+						track_begin_time_s = '--:--'
+						if @stack.task.has_track?
+							track_begin_time_s = @stack.task.track.begin_time.strftime('%R')
+						end
 						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}")
+						Curses.addstr("#{status} #{track_begin_time_s} #{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
-						time_format = '%F %R %Z'
+						time_format = '%F %R'
 						if Curses.cols <= 30
 							time_format = '%R'
 						elsif Curses.cols <= 40
@@ -183,7 +195,7 @@ module TheFox
 						elsif Curses.cols <= 60
 							time_format = '%F %R'
 						elsif Curses.cols > 80
-							time_format = '%F %T %Z'
+							time_format = '%F %T'
 						end
 						time_str = Time.now.strftime(time_format)
 						Curses.setpos(line_nr, Curses.cols - time_str.length - 1)
@@ -209,11 +221,8 @@ module TheFox
 				if !@window.nil?
 					line_nr = 1
 					@window.content_refresh
-					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 = ''
 						if line_object.is_a?(Task) || line_object.is_a?(Track)
 							line_text = line_object.to_list_s
@@ -229,7 +238,7 @@ module TheFox
 						rest = Curses.cols - line_text.length - COL
 						
 						if @window.has_cursor?
-							if is_cursor
+							if line_nr == @window.cursor
 								Curses.setpos(line_nr, 0)
 								Curses.attron(Curses.color_pair(Curses::COLOR_BLUE) | Curses::A_BOLD) do
 									Curses.addstr(' ' * COL + line_text + ' ' * rest)
@@ -243,7 +252,6 @@ module TheFox
 							Curses.addstr(line_text)
 						end
 						
-						
 						line_nr += 1
 					end
 				end
@@ -306,9 +314,10 @@ module TheFox
 					end
 				end
 				
+				update_content_length
 				window_content_changed
 				ui_stack_lines_refresh
-				ui_window_refresh if !push
+				ui_window_refresh
 			end
 			
 			def task_apply_replace_stack(task)
@@ -323,11 +332,34 @@ module TheFox
 				task_apply(task, true)
 			end
 			
+			def task_apply_pop
+				if @stack.pop
+					update_content_length
+					#window_content_changed
+					ui_refresh
+				end
+			end
+			
+			# Update only Windows which shows the data. For example,
+			# if a task is created all Windows needs to know this,
+			# and only Windows which are using the tasks.
+			# Not only the length of the rows can change, but also
+			# the actual an change.
 			def window_content_changed
 				@window_tasks.content_changed
 				@window_timeline.content_changed
 			end
 			
+			def write_all_data
+				if @last_write.nil?
+					@last_write = Time.now
+				else
+					if Time.now - @last_write >= 300
+						tasks_save(true)
+					end
+				end
+			end
+			
 			def run
 				ui_init_curses
 				update_content_length
@@ -369,7 +401,7 @@ module TheFox
 						ui_window_refresh
 					when Curses::Key::RESIZE
 						update_content_length
-						ui_status_text("Resizing: #{Curses.lines}x#{Curses.cols}")
+						ui_status_text("Window size: #{Curses.cols}x#{Curses.lines}")
 						
 						# Refreshing the complete screen while resizing
 						# can make everything slower. So for fast resizing
@@ -385,9 +417,7 @@ module TheFox
 							task = object.task
 						end
 						
-						if task.nil?
-							ui_status_text("Unrecognized object: #{object.class}")
-						else
+						if !task.nil? # && @stack.task != task
 							task_apply_replace_stack(task)
 						end
 					when 'b', 'p'
@@ -413,22 +443,22 @@ module TheFox
 						if task_name.nil?
 							ui_status_text('Aborted.')
 						else
-							task_description = ui_status_input('Description: ')
-							
-							task = @stack.create(task_name, task_description)
+							task = Task.new
+							task.name = task_name
 							task_apply_replace_stack(task)
 							
-							ui_status_text("Task '#{task_name}' created: #{task.id}")
+							ui_status_text("Task '#{task_name}' created.")
 						end
 					when 'x'
 						@stack.task.stop if @stack.has_task?
+						window_content_changed
+						ui_refresh
 					when 'c'
 						@stack.task.toggle if @stack.has_task?
+						window_content_changed
+						ui_refresh
 					when 'v'
-						if @stack.pop
-							window_content_changed
-							ui_refresh
-						end
+						task_apply_pop
 					when 'f'
 						task_apply_stack_pop_all
 					when 'h', '?'
@@ -440,12 +470,13 @@ module TheFox
 					when '2'
 						ui_window_show(@window_tasks)
 					when 'w'
-						tasks_save
+						tasks_save(true)
 					when 'q'
 						break
 					when nil
 						# Do some work.
 						ui_status_line
+						write_all_data
 					else
 						ui_status_text_error("Invalid key '#{key_pressed}' (#{Curses.keyname(key_pressed)})")
 					end

data/lib/timr/track.rb

@@ -7,44 +7,57 @@ module TheFox
 		
 		class Track
 			
-			def initialize(task, tbegin = Time.now, tend = nil)
+			def initialize(task = nil, begin_time = Time.now, end_time = nil)
 				@task = task
-				@tbegin = tbegin
-				@tend = tend
+				@begin_time = begin_time
+				@end_time = end_time
 			end
 			
-			def begin=(tb)
-				@tbegin = tb
+			def task
+				@task
 			end
 			
-			def begin
-				@tbegin
+			def begin_time=(begin_time)
+				@begin_time = nil
+				@begin_time = begin_time.utc if !begin_time.nil?
 			end
 			
-			def end=(te)
-				@tend = te
+			def begin_time
+				if !@begin_time.nil?
+					@begin_time.localtime
+				else
+					nil
+				end
 			end
 			
-			def end
-				@tend
+			def end_time=(end_time)
+				@end_time = nil
+				@end_time = end_time.utc if !end_time.nil?
 			end
 			
-			def diff
-				if !@tbegin.nil? && !@tend.nil?
-					(@tend - @tbegin).abs
+			def end_time
+				if !@end_time.nil?
+					@end_time.localtime
 				else
-					0
+					nil
 				end
 			end
 			
-			def task
-				@task
+			def diff
+				if !@begin_time.nil? && !@end_time.nil?
+					(@end_time - @begin_time).abs.to_i
+				else
+					0
+				end
 			end
 			
 			def to_h
-				h = {}
-				h['b'] = @tbegin.strftime(TIME_FORMAT) if !@tbegin.nil?
-				h['e'] = @tend.strftime(TIME_FORMAT) if !@tend.nil?
+				h = {
+					'b' => nil,
+					'e' => nil,
+				}
+				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
 			end
 			
@@ -53,28 +66,33 @@ module TheFox
 			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_date = nil
+				end_time_s = 'xx:xx'
+				if !@end_time.nil?
+					end_date = @end_time.localtime.to_date
+					end_time_s = @end_time.localtime.strftime('%R')
+				end
+				
+				begin_date_s = ''
+				begin_date = @begin_time.localtime.to_date
+				end_date_s = ''
+				if (begin_date != end_date && !end_date.nil?) || !begin_date.today?
+					begin_date_s = @begin_time.localtime.strftime('%F')
+					end_date_s = @end_time.localtime.strftime('%F') if !@end_time.nil?
 				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?
+				task_name = ''
+				if !@task.nil?
+					task_name = @task.to_list_s
 				end
 				
-				'%10s %5s - %5s %10s    %s' % [tbegin_date_s, @tbegin.strftime('%R'), tend_time_s, tend_date_s, @task.to_list_s]
+				'%10s %5s - %5s %10s    %s' % [begin_date_s, @begin_time.localtime.strftime('%R'), end_time_s, end_date_s, task_name]
 			end
 			
-			def self.from_h(task, h)
-				t = Track.new(task)
-				t.begin = Time.parse(h['b'])
-				t.end = Time.parse(h['e'])
+			def self.from_h(task = nil, h)
+				t = Track.new(task, nil)
+				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
 			end
 			

data/lib/timr/version.rb

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