more cleanup; refactored timepie->tagtime everwhere

tagtime · Mar 8, 2011 · 2b1ff4a · 2b1ff4a
1 parent 8cceebd
commit 2b1ff4a
Show file tree

Hide file tree

Showing 26 changed files with 193 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,6 @@
-timepie.lock
+tagtime.lock
 launch.lock
 settings.pl
-timepie.cron
 tasks.vim
 tmp
-
-dreeves.tsk
 .*.swp
-rtm
-hm
-dst.nb
-pie-dreeves.html
-pie-dreeves.png
-focals.txt
-focals2008.txt
-focals2009.txt
-timetrack
-timetrack/tmp
diff --git a/README b/README
@@ -1,6 +1,6 @@
 Core Perl implementation of TagTime itself is in the following files:
 
-* timepied.pl -- the TagTime daemon
+* tagtimed.pl -- the TagTime daemon
 * launch.pl -- launches the pinger by popping up an xterm
 * ping.pl -- prompts for the tags
 * util.pl -- utility functions
@@ -16,8 +16,11 @@ In addtion are the following files:
 * tskproc.pl -- helper script used by tskedit.pl
 * tasks.vim.template -- vim macros needed for the task editor
 
-* timepie.cron.template -- cron entries (alternative to timepied.pl)
-* fixlog.pl -- just a stub, for fixing/merging tagtime logs
+* merge.pl -- just a stub, for fixing/merging tagtime logs
+
+The aux directory contains various scripts we've used, like for various games
+and contests and commitment contracts and whatnot. Basically, incentive schemes
+for getting ourselves to procrastinate less.
 
 For install instructions and other info about this project, see 
 http://padm.us/timepie
diff --git a/aux/contest.pl b/aux/contest.pl
@@ -12,7 +12,7 @@
 # and (2) do not contain the smk tag) for our frask contests.
 
 use Getopt::Long; # command line options module.
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 my $tmp = $path;  # quelling warning about only using $path once.
 
@@ -38,7 +38,7 @@
 
 # WARNING: this code to compute $start and $end copied from showpie.pl:
 # TODO: make a function in util.pl:  drange(ago, weeks)
-# that gives start and end for a date range where 'ago' is how many timepie
+# that gives start and end for a date range where 'ago' is how many tagtime
 # weeks ago to start (always starts on saturday night midnight) and weeks is
 # how many weeks to include.
 # Compute start and end to be last saturday night to right now (if $ago==0).

diff --git a/aux/frask.pl b/aux/frask.pl
@@ -3,7 +3,7 @@
 # and (2) do not contain the smk tag) for our frask contests.
 
 use Getopt::Long; # command line options module.
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 
 my $target = 1/2;  # target frask.
@@ -13,7 +13,7 @@
 
 # WARNING: this code to compute $start and $end copied from showpie.pl:
 # TODO: make a function in util.pl:  drange(ago, weeks)
-# that gives start and end for a date range where 'ago' is how many timepie
+# that gives start and end for a date range where 'ago' is how many tagtime
 # weeks ago to start (always starts on saturday night midnight) and weeks is 
 # how many weeks to include.
 # Compute start and end to be last saturday night to right now (if $ago==0).

diff --git a/aux/osatest.sh b/aux/osatest.sh
@@ -4,7 +4,7 @@ xyz="testxyz"
 return=`/usr/bin/osascript << EOT
 tell app "System Events"
   Activate
-  display dialog "" buttons {"OK"} default button 1 default answer "" with title "TimePie Test Title $xyz" 
+  display dialog "" buttons {"OK"} default button 1 default answer "" with title "TagTime Test Title $xyz" 
   set pingans to text returned of the result
 end tell
 EOT`

diff --git a/aux/showpie.pl b/aux/showpie.pl
@@ -9,7 +9,7 @@
 # TODO: with --keep foo it should strip out foo so you can see subtags
 # TODO: for --ago, specify number of weeks to include, like frask.pl does.
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 use Getopt::Long; # command line options module.
 
@@ -125,7 +125,7 @@
   open(HTML, ">$html");
   print HTML "<html>
   <header>
-  <title>${username}'s timepie</title>
+  <title>${username}'s time pie</title>
   <style type='text/css'>
     body {font-family: 'Times New Roman', Times, Palatino, serif;
           background:#229; text-align:center;}
@@ -135,7 +135,7 @@
   </header>
   <body>
     <div id='container'>
-    <h1>${username}'s timepie</h1>
+    <h1>${username}'s time pie</h1>
     <pre>$globalStats</pre>
     <img src='pie-$username.png';
     <pre>$toprint</pre>

diff --git a/aux/showvenn.pl b/aux/showvenn.pl
@@ -24,7 +24,7 @@
 #   includes only pings matching given regexp.
 #   example: --keep='job'  (excludes all pings unless they include job tag)
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 use Getopt::Long; # command line options module.
 use Algorithm::Combinatorics qw(combinations);
@@ -140,7 +140,7 @@
   open(HTML, ">$html");
   print HTML "<html>
   <header>
-  <title>${username}'s timepie</title>
+  <title>${username}'s time pie</title>
   <style type='text/css'>
     body {font-family: 'Times New Roman', Times, Palatino, serif;
           background:#229; text-align:center;}
@@ -150,7 +150,7 @@
   </header>
   <body>
     <div id='container'>
-    <h1>${username}'s timepie</h1>
+    <h1>${username}'s time pie</h1>
     <pre>$globalStats</pre>
     <img src='pie-$username.png';
     <pre>$toprint</pre>
@@ -203,7 +203,7 @@
   open(HTML, ">$html");
   print HTML "<html>
   <header>
-  <title>${username}'s timepie</title>
+  <title>${username}'s time pie</title>
   <style type='text/css'>
     body {font-family: 'Times New Roman', Times, Palatino, serif;
           background:#229; text-align:center;}
@@ -213,7 +213,7 @@
   </header>
   <body>
     <div id='container'>
-    <h1>${username}'s timepie</h1>
+    <h1>${username}'s time pie</h1>
     <pre>$globalStats</pre>
     <img src='pie-$username.png';
     <pre>$toprint</pre>

diff --git a/aux/taskspy.pl b/aux/taskspy.pl
@@ -3,7 +3,7 @@
 # (Also shares your own -- uploads it to yootles.com whenever it changes.)
 # Specify their tagtime username on the command line.
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 
 if(scalar(@ARGV)==0) { 

diff --git a/aux/term.sh b/aux/term.sh
@@ -6,7 +6,7 @@ tell application \"Terminal\"
     do script \"sleep 5\"
     set background color to \"red\"
     set cursor color to \"blue\"
-    set custom title to \"TimePie\"
+    set custom title to \"TagTime\"
     repeat while busy
       delay 1
     end repeat
@@ -19,7 +19,7 @@ end tell"
 #    do script \"$*; exit\"
 #    set background color to \"red\"
 #    set cursor color to \"blue\"
-#    set custom title to \"TimePie\"
+#    set custom title to \"TagTime\"
 #    set win_id to id
 #  end tell
 #

diff --git a/aux/tot.pl b/aux/tot.pl
@@ -2,7 +2,7 @@
 # Compute amount of time spent on the tag passed as an argument.
 # Second argument must be the name of a log file.
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 
 # Hours per day, as computed for vacation time.

diff --git a/aux/unixtm.pl b/aux/unixtm.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Convert time strings to unix time and vice versa.
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 
 print "Enter date/times in YMDHMS order, or unix timestamps, one per line.\n";

diff --git a/cntpings.pl b/cntpings.pl
@@ -1,14 +1,14 @@
 #!/usr/bin/env perl
 # Count the number of a pings with given tags in the given time period.
 # Related scripts:
-#  contest.pl -- for chrock contests
-#  frask.pl -- a different kind of chrock contest
-#  tot.pl -- customized for keeping track of yahoo job pings
-#  showpie.pl -- this one is just wrong given how we currently use tagtime 
-#  showvenn.pl -- not sure about this one
+#  aux/contest.pl -- for chrock contests
+#  aux/frask.pl -- a different kind of chrock contest
+#  aux/tot.pl -- customized for keeping track of yahoo job pings
+#  aux/showpie.pl -- this one is just wrong given how we currently use tagtime 
+#  aux/showvenn.pl -- not sure about this one
 #  ../kibo/timepiekib.pl -- converts tagtime log to kib file 
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 use Getopt::Long qw(:config bundling);
 

diff --git a/dreeves.log b/dreeves.log
@@ -11568,7 +11568,6 @@
 1214954960 afk bab off RETRO      [2008.07.01 19:29:20 TUE]
 1214960393 kib home                                   [2008.07.01 20:59:53 TUE]
 1214961412 smk cht ku home                            [2008.07.01 21:16:52 TUE]
-1214966750 test test2 UNSCHED (a b)(c d)              [2008.07.01 22:45:50 TUE]
 1214967462 afk home b eat                             [2008.07.01 22:57:42 TUE]
 1214971728 smk web home                               [2008.07.02 00:08:48 WED]
 1214971778 smk web home                               [2008.07.02 00:09:38 WED]
@@ -40136,7 +40135,6 @@
 1293211116 fac eml non24                              [2010.12.24 11:18:36 FRI]
 1293211411 fac eml non24                              [2010.12.24 11:23:31 FRI]
 1293212180 kib non24 (checking graphs)                [2010.12.24 11:36:20 FRI]
-1293212964 test non24 UNSCHED                         [2010.12.24 11:49:24 FRI]
 1293215714 afk bab b                                  [2010.12.24 12:35:14 FRI]
 1293219399 kib dev non24 (in charge of bab in other room)  [12.24 13:36:39 FRI]
 1293221077 kib non24                                  [2010.12.24 14:04:37 FRI]
@@ -42438,3 +42436,120 @@
 1299284404 afk bab off RETRO      [2011.03.04 18:20:04 FRI]
 1299285325 afk bab off RETRO      [2011.03.04 18:35:25 FRI]
 1299286236 afk bab f c soc                            [2011.03.04 18:50:36 FRI]
+1299288584 kib spt non04 bab b                        [2011.03.04 19:29:44 FRI]
+1299289442 afk bab                                    [2011.03.04 19:44:02 FRI]
+1299291141 tsk 5 kib uvi dev sys mma  [2011.03.04 20:12:21 FRI]
+1299291942 twt kib non04                              [2011.03.04 20:25:42 FRI]
+1299292626 afk fam soc off RETRO   [2011.03.04 20:37:06 FRI]
+1299296195 smk web ent non04                          [2011.03.04 21:36:35 FRI]
+1299296968 smk web non04                              [2011.03.04 21:49:28 FRI]
+1299303554 smk sup non04 hn web                       [2011.03.04 23:39:14 FRI]
+1299308805 git dev non05 kib                          [2011.03.05 01:06:45 SAT]
+1299309393 ths non05 kib adm (tagtime cleanup)        [2011.03.05 01:16:33 SAT]
+1299309473 ths non05 kib adm (tagtime cleanup)        [2011.03.05 01:17:53 SAT]
+1299311016 git non05 ths kib adm (github)             [2011.03.05 01:43:36 SAT]
+1299316445 smk web tls non05                          [2011.03.05 03:14:05 SAT]
+1299319861 slp afk   [2011.03.05 04:11:01 SAT]
+1299320139 slp afk   [2011.03.05 04:15:39 SAT]
+1299322860 slp afk   [2011.03.05 05:01:00 SAT]
+1299326356 slp afk   [2011.03.05 05:59:16 SAT]
+1299326500 slp afk   [2011.03.05 06:01:40 SAT]
+1299328516 slp afk   [2011.03.05 06:35:16 SAT]
+1299329910 slp afk   [2011.03.05 06:58:30 SAT]
+1299336192 afk RETRO                                  [2011.03.05 08:43:12 SAT]
+1299336916 afk bab f c b RETRO   [2011.03.05 08:55:16 SAT]
+1299345647 slp afk  [2011.03.05 11:20:47 SAT]
+1299348932 afk rea bed ftw RETRO    [2011.03.05 12:15:32 SAT]
+1299353046 afk bab b RETRO    [2011.03.05 13:24:06 SAT]
+1299364543 slp afk   [2011.03.05 16:35:43 SAT]
+1299365045 slp afk   [2011.03.05 16:44:05 SAT]
+1299367924 non05 par                                  [2011.03.05 17:32:04 SAT]
+1299367944 non05 par                                  [2011.03.05 17:32:24 SAT]
+1299368770 wrk non05 (iprocrastinate)                 [2011.03.05 17:46:10 SAT]
+1299372217 afk bab b f                                [2011.03.05 18:43:37 SAT]
+1299374760 afk bab c f                                [2011.03.05 19:26:00 SAT]
+1299378365 cht b non05 css kib                        [2011.03.05 20:26:05 SAT]
+1299379661 tsk 1 kib ths dev                          [2011.03.05 20:47:41 SAT]
+1299379844 ths non05 cht b kib                        [2011.03.05 20:50:44 SAT]
+1299380238 kib spt non05                              [2011.03.05 20:57:18 SAT]
+1299383023 kib spt non05 (kib .25)                    [2011.03.05 21:43:43 SAT]
+1299384840 kib mma dev non05 so                       [2011.03.05 22:14:00 SAT]
+1299385526 kib mma dev non05   [2011.03.05 22:25:26 SAT]
+1299388034 kib spt non05                              [2011.03.05 23:07:14 SAT]
+1299388387 smk web non05 (family email related)       [2011.03.05 23:13:07 SAT]
+1299388763 smk web non05 (family email related)       [2011.03.05 23:19:23 SAT]
+1299391336 tsk 5 ths kib git                          [2011.03.06 00:02:16 SUN]
+1299396012 tsk 1 mma kib dev so                       [2011.03.06 01:20:12 SUN]
+1299396037 non06 kib dev so                       [2011.03.06 01:20:37 SUN]
+1299399212 kib non06 dev api                          [2011.03.06 02:13:32 SUN]
+1299399461 kib non06 adm (renewing domains)           [2011.03.06 02:17:41 SUN]
+1299401057 web non06 evg (almost kib)                 [2011.03.06 02:44:17 SUN]
+1299403779 tsk 1 mma dev kib                          [2011.03.06 03:29:39 SUN]
+1299404203 tsk 1 mma kib dev so                       [2011.03.06 03:36:43 SUN]
+1299405463 tsk 5 kib dev mma                          [2011.03.06 03:57:43 SUN]
+1299411225 afk bed rea ftw  [2011.03.06 05:33:45 SUN]
+1299414585 slp afk RETRO       [2011.03.06 06:29:45 SUN]
+1299417854 slp afk RETRO       [2011.03.06 07:24:14 SUN]
+1299425648 slp afk RETRO       [2011.03.06 09:34:08 SUN]
+1299429984 afk nec RETRO    [2011.03.06 10:46:24 SUN]
+1299442640 afk soc fam                                [2011.03.06 14:17:20 SUN]
+1299443245 afk soc fam                                [2011.03.06 14:27:25 SUN]
+1299445524 cht ths non06 evg kib                      [2011.03.06 15:05:24 SUN]
+1299449212 smk web non06 wrk (yootles-related)        [2011.03.06 16:06:52 SUN]
+1299449386 day non06                                  [2011.03.06 16:09:46 SUN]
+1299451022 kib eml afk (twilio)                       [2011.03.06 16:37:02 SUN]
+1299455056 mus non06                                  [2011.03.06 17:44:16 SUN]
+1299456477 mus non06 smk                              [2011.03.06 18:07:57 SUN]
+1299456659 smk web non06                              [2011.03.06 18:10:59 SUN]
+1299459170 smk web non06 fb                           [2011.03.06 18:52:50 SUN]
+1299464912 afk bab f bed  [2011.03.06 20:28:32 SUN]
+1299464939 afk bab f bed  [2011.03.06 20:28:59 SUN]
+1299469424 web non06 b (css-ish)                      [2011.03.06 21:43:44 SUN]
+1299470067 eml non06 fam                              [2011.03.06 21:54:27 SUN]
+1299472042 b mtg non06 kib                            [2011.03.06 22:27:22 SUN]
+1299480072 mes kib ths wri non07                      [2011.03.07 00:41:12 MON]
+1299480399 ths kib eml non07 evg (domains)    [2011.03.07 00:46:39 MON]
+1299480773 ths kib dev non07                          [2011.03.07 00:52:53 MON]
+1299481002 tsk 7 ths kib evg                          [2011.03.07 00:56:42 MON]
+1299482671 git non07 ths kib                          [2011.03.07 01:24:31 MON]
+1299484127 smk web non07                              [2011.03.07 01:48:47 MON]
+1299490910 tsk 5 kib                                  [2011.03.07 03:41:50 MON]
+1299491828 twt non07 (kib .5)                         [2011.03.07 03:57:08 MON]
+1299495260 ths twt evg kib non07                      [2011.03.07 04:54:20 MON]
+1299495445 ths twt evg kib non07                      [2011.03.07 04:57:25 MON]
+1299502141 slp afk  [2011.03.07 06:49:01 MON]
+1299503927 slp afk  [2011.03.07 07:18:47 MON]
+1299506298 slp afk  [2011.03.07 07:58:18 MON]
+1299517533 slp afk  [2011.03.07 11:05:33 MON]
+1299517579 slp afk  [2011.03.07 11:06:19 MON]
+1299518187 slp afk  [2011.03.07 11:16:27 MON]
+1299521362 slp afk  [2011.03.07 12:09:22 MON]
+1299521666 slp afk  [2011.03.07 12:14:26 MON]
+1299522717 slp afk  [2011.03.07 12:31:57 MON]
+1299523237 afk bed RETRO    [2011.03.07 12:40:37 MON]
+1299525744 prd non07 web                              [2011.03.07 13:22:24 MON]
+1299527985 tsk 1 dev pl kib ths                       [2011.03.07 13:59:45 MON]
+1299528078 tsk 1 dev pl kib ths                       [2011.03.07 14:01:18 MON]
+1299528872 ths kib non07                              [2011.03.07 14:14:32 MON]
+1299529798 tsk 4 spt kib (debugging)                  [2011.03.07 14:29:58 MON]
+1299531990 non07 spt kib eml                          [2011.03.07 15:06:30 MON]
+1299540434 ent web non07 smk                          [2011.03.07 17:27:14 MON]
+1299541299 kib evg day non07                          [2011.03.07 17:41:39 MON]
+1299544905 afk bab b   [2011.03.07 18:41:45 MON]
+1299549104 afk bab f   [2011.03.07 19:51:44 MON]
+1299552496 afk bab c read  [2011.03.07 20:48:16 MON]
+1299557127 eml non07                                  [2011.03.07 22:05:27 MON]
+1299558390 smk edu web non07                          [2011.03.07 22:26:30 MON]
+1299558588 smk edu web non07                          [2011.03.07 22:29:48 MON]
+1299561514 smk non07 twt web                          [2011.03.07 23:18:34 MON]
+1299561933 kib non07 api dev                          [2011.03.07 23:25:33 MON]
+1299562183 afk b                                      [2011.03.07 23:29:43 MON]
+1299565820 tsk 5 kib                                  [2011.03.08 00:30:20 TUE]
+1299566975 kib spt non08 wth                          [2011.03.08 00:49:35 TUE]
+1299567838 cht mel non08                              [2011.03.08 01:03:58 TUE]
+1299568713 cht prj non08                              [2011.03.08 01:18:33 TUE]
+1299572808 afk txt mel                                [2011.03.08 02:26:48 TUE]
+1299573760 smk web non08                              [2011.03.08 02:42:40 TUE]
+1299574240 hn non08 yc web (kib .66)                  [2011.03.08 02:50:40 TUE]
+1299576526 kib spt afk txt stv                        [2011.03.08 03:28:46 TUE]
+1299577978 tsk 4 kib ths dev                          [2011.03.08 03:52:58 TUE]
diff --git a/grppings.pl b/grppings.pl
@@ -2,7 +2,7 @@
 # COPIED FROM cntpings.pl
 # Grep for pings matching an expression (or disjunction of expressions).
 
-require "$ENV{HOME}/.timepierc";
+require "$ENV{HOME}/.tagtimerc";
 require "${path}util.pl";
 use Getopt::Long qw(:config bundling);
 

diff --git a/install.py b/install.py
@@ -36,7 +36,7 @@ def findcmd(cmd) :
 
 infile = open("settings.pl.template",'r')
 outfile = open("settings.pl",'w')
-symlink = os.path.join(HOME,".timepierc")
+symlink = os.path.join(HOME,".tagtimerc")
 target = os.path.join(PATH,"settings.pl")