From: Alexandre Terrasa Date: Thu, 16 Jan 2014 23:53:31 +0000 (-0500) Subject: nitdoc: add support for Piwik tracker X-Git-Tag: v0.6.4~60^2~1 X-Git-Url: http://nitlanguage.org nitdoc: add support for Piwik tracker Signed-off-by: Alexandre Terrasa --- diff --git a/Makefile b/Makefile index 1b37b14..dd9824e 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,9 @@ doc/stdlib/index.html: bin/nitdoc --github-upstream "privat:nit:master" \ --github-base-sha1 "$$(git rev-parse HEAD)" \ --github-gitdir "." \ - --source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" + --source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \ + --piwik-tracker "pratchett.info.uqam.ca/~terrasa/piwik/" \ + --piwik-site-id "2" doc/nitc/index.html: bin/nitdoc bin/nitdoc src/nit.nit src/nitmetrics.nit src/nitg.nit src/nitx.nit src/nitunit.nit src/nitlight.nit src/dbgcli.nit src/netdbg.nit -d doc/nitc \ @@ -51,7 +53,9 @@ doc/nitc/index.html: bin/nitdoc --github-upstream "privat:nit:master" \ --github-base-sha1 "$$(git rev-parse HEAD)" \ --github-gitdir "." \ - --source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" + --source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \ + --piwik-tracker "pratchett.info.uqam.ca/~terrasa/piwik/" \ + --piwik-site-id "3" clean: rm -rf -- .nit_compile 2> /dev/null || true diff --git a/src/nitdoc.nit b/src/nitdoc.nit index 716c6b8..f8bb81c 100644 --- a/src/nitdoc.nit +++ b/src/nitdoc.nit @@ -54,6 +54,9 @@ class NitdocContext private var opt_github_base_sha1: OptionString = new OptionString("The sha1 of the base commit used to create pull request", "--github-base-sha1") private var opt_github_gitdir: OptionString = new OptionString("The git working directory used to resolve path name (ex: /home/me/myproject/)", "--github-gitdir") + private var opt_piwik_tracker: OptionString = new OptionString("The URL of the Piwik tracker (ex: nitlanguage.org/piwik/)", "--piwik-tracker") + private var opt_piwik_site_id: OptionString = new OptionString("The site ID in Piwik tracker", "--piwik-site-id") + init do toolcontext.option_context.add_option(opt_dir) toolcontext.option_context.add_option(opt_source) @@ -67,6 +70,8 @@ class NitdocContext toolcontext.option_context.add_option(opt_github_upstream) toolcontext.option_context.add_option(opt_github_base_sha1) toolcontext.option_context.add_option(opt_github_gitdir) + toolcontext.option_context.add_option(opt_piwik_tracker) + toolcontext.option_context.add_option(opt_piwik_site_id) toolcontext.process_options self.arguments = toolcontext.option_context.rest @@ -323,6 +328,26 @@ abstract class NitdocPage if ctx.opt_custom_footer_text.value != null then footed = "footed" append("
") content + + # piwik tracking + var tracker_url = ctx.opt_piwik_tracker.value + var site_id = ctx.opt_piwik_site_id.value + if tracker_url != null and site_id != null then + append("") + append("") + append("") + end append("
") footer append("") diff --git a/tests/sav/nitdoc.res b/tests/sav/nitdoc.res index ee72676..243fc46 100644 --- a/tests/sav/nitdoc.res +++ b/tests/sav/nitdoc.res @@ -23,3 +23,5 @@ usage: nitdoc [options] file... --github-upstream The branch where edited commits will be pulled into (ex: user:repo:branch) --github-base-sha1 The sha1 of the base commit used to create pull request --github-gitdir The git working directory used to resolve path name (ex: /home/me/myproject/) + --piwik-tracker The URL of the Piwik tracker (ex: nitlanguage.org/piwik/) + --piwik-site-id The site ID in Piwik tracker