summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorfelix <felix@seconddrawer.com.au>2011-05-16 08:45:39 +0000
committerfelix <felix@seconddrawer.com.au>2011-05-16 08:45:39 +0000
commit70b3632fd9e6ea2522ef86ff4eefecc49e449b84 (patch)
tree18438d50ad9c6847ba5ce8d32970288c4130586e /bin
parent19f74bb93f68f8e42dd4d7e02d78c214ff9fcdf7 (diff)
downloadtimetrackr-70b3632fd9e6ea2522ef86ff4eefecc49e449b84.tar.gz
timetrackr-70b3632fd9e6ea2522ef86ff4eefecc49e449b84.tar.bz2
start some tests
Diffstat (limited to 'bin')
-rwxr-xr-xbin/timetrackr16
1 files changed, 8 insertions, 8 deletions
diff --git a/bin/timetrackr b/bin/timetrackr
index 919e714..6d42dac 100755
--- a/bin/timetrackr
+++ b/bin/timetrackr
@@ -8,6 +8,7 @@ DEFAULTS = {
:backend => 'yaml',
:verbose => false,
:single_task => false,
+ :path => File.join(ENV['HOME'],'.timetrackr.db'),
:time_format => "% -30<task>s %2<hours>dh %2<minutes>dm %2<seconds>ds"
}
@@ -62,15 +63,16 @@ end
config = DEFAULTS.merge(config || {})
$verbose = config[:verbose]
-trackr = TimeTracker.create(config[:backend])
+trackr = TimeTrackr.create(config[:backend], config)
#
# commands
#
case cmd
-when 'start','s'
+when 'start','in','s'
task = ARGV.shift
details = {:action => 'start', :notes => ARGV.join(' ')}
+ # switch tasks if config says so
if config[:single_task] && trackr.current != task
trackr.current.each do |t|
trackr.event(t,Time.now,details.merge(:action => 'stop')) unless t == task
@@ -82,7 +84,7 @@ when 'start','s'
puts "Started task '#{task}'" if $verbose
end
-when 'stop','k'
+when 'stop','out','kill','k'
task = ARGV.shift
tasks = []
details = {:action => 'stop', :notes => ARGV.join(' ')}
@@ -102,7 +104,7 @@ when 'switch','sw'
trackr.event(task, Time.now, details.merge(:action => 'start'))
puts "Switched to task '#{task}'" if $verbose
-when 'time', nil
+when 'time','status',nil
task = ARGV.shift
if task && trackr.tasks.include?(task)
tasks = [*task]
@@ -114,10 +116,8 @@ when 'time', nil
puts format_time(name, trackr.time(task),config[:time_format])
end
-when 'clear'
- task = ARGV.shift
- tasks = []
- tasks = [*task] if trackr.current.include?(task)
+when 'clear','delete','del'
+ tasks = ARGV
tasks = trackr.tasks if task == 'all'
tasks.each do |task|
trackr.clear(task)