Merge branch 'hooks'

3 files changed, 74 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 39c709e..8297585 100644
--- a/Makefile
+++ b/Makefile
@@ -10,24 +10,19 @@ html=$(outdir)/resume.html
 
 .SILENT : help pdf odf
 
-all:
-	make setup
-	make html5
+all: html5
 
-embed:
-	make setup
-	asciidoctor $(safe) -b html5 -a stylesheet=$(style) -o $(html) $(src)
+rst-html5:
+	rst2html5.py --stylesheet=$(style) resume.rst $(html)
 
-clean:
-	rm -rv $(outdir)/*
+embed: setup
+	asciidoc $(safe) -b html5 -a stylesheet=$(shell pwd)/$(style) -o $(html) $(src)
 
-html5:
-	make setup
-	asciidoctor $(safe) -b html5 -a linkcss -a stylesheet=$(style) -o $(html) $(src)
+html5: setup
+	asciidoc $(safe) -b html5 -a stylesheet=$(shell pwd)/$(style) -o $(html) $(src)
 
-xhtml:
-	make setup
-	asciidoctor $(safe) -b xhtml11 -a linkcss -a stylesheet=$(style) -o $(html) $(src)
+xhtml: setup
+	asciidoc $(safe) -b xhtml11 -a stylesheet=$(shell pwd)/$(style) -o $(html) $(src)
 
 odf:
 	echo "ERROR: Not implemented"
@@ -42,6 +37,8 @@ pdf:
 	# wkhtmltopdf -s Letter -B .5in -T .5in -R .5in -L .5in --minimum-font-size 16 $(html) $(pdf)
 	# rm $(html)
 
+clean:
+	rm -rv $(outdir)/*
 
 setup:
 	if [ ! -d $(outdir) ]; then mkdir $(outdir); fi
diff --git a/hooks/post-receive b/hooks/post-receive
new file mode 100644
index 0000000..066a4b1
--- /dev/null
+++ b/hooks/post-receive
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+source ~/git-shell-variables.sh
+source ~/bin/libgithook.sh
+
+export LANG=en_US.utf8
+export LC_ALL=en_US.utf8
+
+load_file_actions
+CACHE=$(use_cache ${NEWREV})
+cd "${CACHE}"
+
+for i in ${FILES_A[@]} ${FILES_M[@]}; do
+  d="$(dirname ${i})"
+  f="$(basename ${i})"
+  if [ "$(basename ${d})" = 'hooks' ]; then
+    printf 'Deploying hook updates\n'
+    cp -v "${i}" "${SRC}/hooks/"
+  elif [ "${f%.*}" = 'resume' ]; then
+    printf 'Generating and deploying resume\n'
+    make embed
+    install -v -D out/resume.html "${WEB}/oper.io.git/master/resume.html"
+  fi
+done
+
+cd "${SRC}"
+if [ "${SRC}" != "${CACHE}" ]; then
+  printf 'Cleaning up cache\n'
+  rm -rf "${CACHE}"
+fi
diff --git a/resume.css b/resume.css
index c226972..e9e32f1 100644
--- a/resume.css
+++ b/resume.css
@@ -37,6 +37,10 @@ body {
 a:link, a:visited { color:#444; }
 a:hover { color:#999; }
 
+strong {
+  color:#444;
+}
+
 h2 {
   text-align:right;
   color:#000;
@@ -106,7 +110,8 @@ div.resume-author-contact {
   display:inline-block;
 }
 
-div.resume-author-contact ul {
+div.resume-author-contact ul,
+div.resume-author-contact div {
   margin:0px;
   padding-left:0px;
   list-style-type:none;
@@ -114,7 +119,9 @@ div.resume-author-contact ul {
 }
 
 div.resume-author-contact ul li,
-div.resume-author-contact ul li a {
+div.resume-author-contact ul li a,
+div.resume-author-contact div.line,
+div.resume-author-contact div.line a {
   text-decoration:none;
   color:#111;
   font-family: mono;
@@ -136,31 +143,44 @@ div.job {
   margin-left:7px;
 }
 
-div.job ul {
+div.job ul,
+ul.job {
   list-style-type: none;
   padding-left:5px;
   margin-top:10px;
 }
 
-div.job ul li {
+div.job ul li,
+ul.job li {
   border-left:2px dotted #888;
   padding-left:7px;
   margin-top:7px;
   margin-bottom:7px;
 }
 
-div.job table {
+div.job table,
+table.job {
   margin-top:30px;
   margin-bottom:0px;
   width:100%;
+  border:none;
+}
+
+div.job table td,
+div.job table th,
+table.job td,
+table.job th {
+  border:none;
 }
 
-div.job table td p {
+div.job table td p,
+table.job td p {
   margin:0px;
 }
 
 /* Top left cell (company and location) */
-div.job table tr:first-child td:first-child {
+div.job table tr:first-child td:first-child,
+table.job tr:first-child td:first-child {
   white-space:nowrap;
   color:#222;
   font-size:1.3em;
@@ -168,20 +188,23 @@ div.job table tr:first-child td:first-child {
 }
 
 /* Top right cell (duration at job) */
-div.job table tr:first-child td:last-child p {
+div.job table tr:first-child td:last-child p,
+table.job tr:first-child td:last-child p {
   text-align:right;
   color:#777;
 }
 
 /* Bottom left cell (job title) */
-div.job table tr:last-child td:first-child p {
+div.job table tr:last-child td:first-child p,
+table.job tr:last-child td:first-child p {
   font-size:1em;
   font-style:italic;
   color:#777;
 }
 
 /* Bottom right cell (contract) */
-div.job table tr:last-child td:last-child p {
+div.job table tr:last-child td:last-child p,
+table.job tr:last-child td:last-child p {
   color:#555;
   font-size:1em;
   font-style:italic;