diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
What is gipeda?
---------------
-Gitpeda is a a tool that presents data from your program’s benchmark suite (or
+Gipeda is a a tool that presents data from your program’s benchmark suite (or
any other source), with nice tables and shiny graphs.
@@ -22,17 +22,21 @@
Do you want to see it live? Check out these:
- * [Demo page], visualizing fairly boring stuff about gipedia itself.
+ * [Demo page], visualizing fairly boring stuff about gipeda itself.
* [GHC’s gipeda installation].
-[Demo page]: http://nomeata.github.io/gipeda/
-[GHC’s gipeda installation]: https://perf.haskell.org/
+[Demo page]: http://perf.haskell.org/gipeda
+[GHC’s gipeda installation]: https://perf.haskell.org/ghc
Setting it up
-------------
- * Clone gipedia somewhere, possibly directly into your webspace.
+ * Clone gipeda somewhere, possibly directly into your webspace.
* Install a Haskell compiler, including the `cablal` tool.
+ * Install a few packages
+
+ apt-get install git unzip libfile-slurp-perl libipc-run-perl
+
* Install the dependencies:
cabal install --only-dependencies
@@ -83,7 +87,7 @@
pull` or, if it is a bare clone, `git -C repository fetch origin
"+refs/heads/*:refs/heads/*" --prune`.
-Using gipedia
+Using gipeda
-------------
Finally, you simply point your browser to the `site/index.html`. The page
@@ -92,6 +96,29 @@
the `=`.
To host this on a webserver, just put the `site/` directory in your webspace.
+
+Hacking on gipeda
+-----------------
+
+Gipeda doesn't do much; it mostly assembles the data and creates nice reports.
+The rough pipeline is as follows:
+
+ * Directory `logs/` contains project-specific data per git commit that has
+ been benchmarked. gipeda will run `log2csv` on these files to generate the
+ files in `site/out/results`. `logs` may be a normal directory, or (for disk
+ space efficiency) a bare git repository. This step is optional.
+ * Directory `site/out/results` contains one csv file per git commit. The
+ format is simple, as there are two columns: benchmark name and a numerical
+ value.
+ * From these files, gipeda generates a number of JSON files, some per commit
+ (`report`, `summaries`), some global (`settings`, `latest-summaries`).
+
+ A crucial idea here is that these JSON files are all but fragments of a
+ theoretical global JSON document. In other words: You could combine them
+ (using a naive JSON object merge) and there would be no conflicts, and the
+ result could be used by the client as well.
+ * The client (`site/index.html` and `site/js/gipeda.js`) is a fairly standard
+ HTML+JS application using jquery, bootstrap, handlebars.
Bugs, Code, Contact
-------------------
diff --git a/gipeda.cabal b/gipeda.cabal
--- a/gipeda.cabal
+++ b/gipeda.cabal
@@ -1,9 +1,9 @@
name: gipeda
-version: 0.1.0.2
+version: 0.1.1
category: Development
synopsis: Git Performance Dashboard
description:
- Gitpeda is a a tool that presents data from your program’s benchmark suite
+ Gipeda is a a tool that presents data from your program’s benchmark suite
(or any other source), with nice tables and shiny graphs.
.
So it is up to you whether you have a polling shell script loop, a post-commit
@@ -46,7 +46,6 @@
BenchmarksInCSV,
BenchNames,
GraphReport,
- IndexReport,
JsonSettings,
JsonUtils,
ParentMap,
@@ -56,8 +55,12 @@
RevReport,
Shake,
Summary,
- WithLatestLogs
+ GraphSummaries,
+ WithLatestLogs,
+ Development.Shake.Gitlib,
+ Data.Text.Binary
+
build-depends:
base >= 4.6 && <4.9,
bytestring >= 0.10 && <0.11,
@@ -71,12 +74,20 @@
vector >= 0.10 && <0.11,
cassava >= 0.4 && <0.5,
yaml >= 0.8 && <0.9,
- aeson >= 0.7 && <0.9
+ aeson >= 0.7 && <0.10,
+ scientific >= 0.3 && <0.4,
+ gitlib >= 3.1 && <3.2,
+ gitlib-libgit2,
+ tagged >= 0.7 && <0.9,
+ extra >= 1 && <1.2,
+ -- https://github.com/jwiegley/gitlib/issues/46
+ conduit-combinators < 1
+
hs-source-dirs: src
default-language: Haskell2010
source-repository head
type: git
- location: https://github.com/nomeat/gipeda
+ location: https://github.com/nomeata/gipeda
diff --git a/install-jslibs.sh b/install-jslibs.sh
--- a/install-jslibs.sh
+++ b/install-jslibs.sh
@@ -12,6 +12,12 @@
wget -c http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v2.0.0.js
test -e jquery-1.11.2.min.js ||
wget -c http://code.jquery.com/jquery-1.11.2.min.js
+test -d jquery-ui || {
+ wget -c http://jqueryui.com/resources/download/jquery-ui-1.11.4.zip
+ unzip jquery-ui-1.11.4.zip
+ mv jquery-ui-1.11.4 jquery-ui
+ rm -f jquery-ui-1.11.4.zip
+ }
test -e jquery.timeago.js ||
wget -c http://timeago.yarp.com/jquery.timeago.js
test -d flot || {
@@ -23,7 +29,9 @@
mkdir bootstrap
cd bootstrap
wget -c https://github.com/twbs/bootstrap/releases/download/v3.3.1/bootstrap-3.3.1-dist.zip
- unzip bootstrap-3.3.1-dist.zip
- rm -f bootstrap-3.3.1-dist.zip
+ unzip bootstrap-3.3.1-dist.zip
+ rm -f bootstrap-3.3.1-dist.zip
cd ..
}
+test -e naturalSort.j ||
+ wget -c https://raw.githubusercontent.com/overset/javascript-natural-sort/master/naturalSort.js
diff --git a/site/index.html b/site/index.html
--- a/site/index.html
+++ b/site/index.html
@@ -11,6 +11,9 @@
+
+
+
@@ -57,7 +60,7 @@
border-collapse:collapse;
}
-.summary-row-collapsed + .summary-row td {
+.summary-table .summary-row-collapsed + .summary-row td {
border-top: 4px dotted #DDD;
}
@@ -110,18 +113,24 @@