Updating the website, adding syntax highlighting

77e78b98 · Erwan Bousse · 4c07a93e · 77e78b98 · 77e78b98 · 77e78b98
Commit 77e78b98 authored Apr 03, 2014 by Erwan Bousse
12 changed files
--- a/site/README
+++ b/site/README
 - Markdown processing was added to the default "Rules" file.

+- Syntax highlighting was added in the default "Rules" file, and using a css found here: https://gist.github.com/clarkdave/5117910. Complete walkthrough: http://clarkdave.net/2013/03/syntax-highlighting-in-nanoc/.
+
 - The pages of the website are in "content", in pure markdown. The sidebar is defined in "layouts/default.html". To compile  in the "output" folder:
    $ nanoc

-
 - rsync push was added to the default "nanoc.yaml" file, in order to be able to push the compiled website right at http://moclodash.gforge.inria.fr/. Simply type:
-    $ nanoc push
+    $ nanoc deploy --target public

 - Note that the push gives an error. This is normal, because rsync wants to write on the folder "htdocs", but has no rights to do so (gforge server limitation). The push *is* made despite the error.
--- a/site/Rules
+++ b/site/Rules
@@ -16,6 +16,7 @@
 compile '*' do
  if item[:extension] == 'md'
    filter :kramdown
+    filter :colorize_syntax, :default_colorizer => :pygmentsrb
    layout 'default'
  elsif item[:extension] == 'css'
    # don’t filter stylesheets

--- a/site/content/doc/benchmarking/index.md
+++ b/site/content/doc/benchmarking/index.md
+---
+title: Benchmarking
+---
+
+
+Running the evaluation
+=======
+
+Coming soon.
--- a/site/content/doc/getting-started/index.md
+++ b/site/content/doc/getting-started/index.md
@@ -6,4 +6,4 @@ title: Getting started
 Getting started
 =======

-blabla
+Coming soon.
--- a/site/content/doc/research/index.md
+++ b/site/content/doc/research/index.md
@@ -6,4 +6,4 @@ title: Research
 Research work
 =======

-blabla
+Coming soon.
--- a/site/content/index.md
+++ b/site/content/index.md
@@ -13,8 +13,8 @@ Moclodash is a set of tools for memory efficient EMF model cloning.

 ## Authors

-This research work was made by the DiverSE research team.
+This research work was made by the [DiverSE research team](http://diverse.irisa.fr/).

- Erwan Bousse (writer and developer)
- Benoit Combemale (supervisor)
- Benoit Baudry (supervisor)
+- [Erwan Bousse](http://people.irisa.fr/Erwan.Bousse/) (writer and developer)
+- [Benoit Combemale](http://people.irisa.fr/Benoit.Combemale/) (supervisor)
+- [Benoit Baudry](http://people.rennes.inria.fr/Benoit.Baudry/) (supervisor)
--- a/site/content/pygments.css
+++ b/site/content/pygments.css
+code  { background: #f8f8f8; }
+code .hll { background-color: #ffffcc }
+code .c { color: #8f5902; font-style: italic } /* Comment */
+code .err { color: #a40000; border: 1px solid #ef2929 } /* Error */
+code .g { color: #000000 } /* Generic */
+code .k { color: #204a87; font-weight: bold } /* Keyword */
+code .l { color: #000000 } /* Literal */
+code .n { color: #000000 } /* Name */
+code .o { color: #ce5c00; font-weight: bold } /* Operator */
+code .x { color: #000000 } /* Other */
+code .p { color: #000000; font-weight: bold } /* Punctuation */
+code .cm { color: #8f5902; font-style: italic } /* Comment.Multiline */
+code .cp { color: #8f5902; font-style: italic } /* Comment.Preproc */
+code .c1 { color: #8f5902; font-style: italic } /* Comment.Single */
+code .cs { color: #8f5902; font-style: italic } /* Comment.Special */
+code .gd { color: #a40000 } /* Generic.Deleted */
+code .ge { color: #000000; font-style: italic } /* Generic.Emph */
+code .gr { color: #ef2929 } /* Generic.Error */
+code .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+code .gi { color: #00A000 } /* Generic.Inserted */
+code .go { color: #000000; font-style: italic } /* Generic.Output */
+code .gp { color: #8f5902 } /* Generic.Prompt */
+code .gs { color: #000000; font-weight: bold } /* Generic.Strong */
+code .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+code .gt { color: #a40000; font-weight: bold } /* Generic.Traceback */
+code .kc { color: #204a87; font-weight: bold } /* Keyword.Constant */
+code .kd { color: #204a87; font-weight: bold } /* Keyword.Declaration */
+code .kn { color: #204a87; font-weight: bold } /* Keyword.Namespace */
+code .kp { color: #204a87; font-weight: bold } /* Keyword.Pseudo */
+code .kr { color: #204a87; font-weight: bold } /* Keyword.Reserved */
+code .kt { color: #204a87; font-weight: bold } /* Keyword.Type */
+code .ld { color: #000000 } /* Literal.Date */
+code .m { color: #0000cf; font-weight: bold } /* Literal.Number */
+code .s { color: #4e9a06 } /* Literal.String */
+code .na { color: #c4a000 } /* Name.Attribute */
+code .nb { color: #204a87 } /* Name.Builtin */
+code .nc { color: #000000 } /* Name.Class */
+code .no { color: #000000 } /* Name.Constant */
+code .nd { color: #5c35cc; font-weight: bold } /* Name.Decorator */
+code .ni { color: #ce5c00 } /* Name.Entity */
+code .ne { color: #cc0000; font-weight: bold } /* Name.Exception */
+code .nf { color: #000000 } /* Name.Function */
+code .nl { color: #f57900 } /* Name.Label */
+code .nn { color: #000000 } /* Name.Namespace */
+code .nx { color: #000000 } /* Name.Other */
+code .py { color: #000000 } /* Name.Property */
+code .nt { color: #204a87; font-weight: bold } /* Name.Tag */
+code .nv { color: #000000 } /* Name.Variable */
+code .ow { color: #204a87; font-weight: bold } /* Operator.Word */
+code .w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
+code .mf { color: #0000cf; font-weight: bold } /* Literal.Number.Float */
+code .mh { color: #0000cf; font-weight: bold } /* Literal.Number.Hex */
+code .mi { color: #0000cf; font-weight: bold } /* Literal.Number.Integer */
+code .mo { color: #0000cf; font-weight: bold } /* Literal.Number.Oct */
+code .sb { color: #4e9a06 } /* Literal.String.Backtick */
+code .sc { color: #4e9a06 } /* Literal.String.Char */
+code .sd { color: #8f5902; font-style: italic } /* Literal.String.Doc */
+code .s2 { color: #4e9a06 } /* Literal.String.Double */
+code .se { color: #4e9a06 } /* Literal.String.Escape */
+code .sh { color: #4e9a06 } /* Literal.String.Heredoc */
+code .si { color: #4e9a06 } /* Literal.String.Interpol */
+code .sx { color: #4e9a06 } /* Literal.String.Other */
+code .sr { color: #4e9a06 } /* Literal.String.Regex */
+code .s1 { color: #4e9a06 } /* Literal.String.Single */
+code .ss { color: #4e9a06 } /* Literal.String.Symbol */
+code .bp { color: #3465a4 } /* Name.Builtin.Pseudo */
+code .vc { color: #000000 } /* Name.Variable.Class */
+code .vg { color: #000000 } /* Name.Variable.Global */
+code .vi { color: #000000 } /* Name.Variable.Instance */
+code .il { color: #0000cf; font-weight: bold } /* Literal.Number.Integer.Long */
\ No newline at end of file
--- a/site/content/source/index.md
+++ b/site/content/source/index.md
@@ -3,7 +3,17 @@ title: Source
 ---


-Source
+Source code
 =======

-blabla
+The source code is available under the Eclipse Public License (EPL) 1.0.
+
+Git repository:
+
+    #!bash
+    $ git clone git://scm.gforge.inria.fr/moclodash/moclodash.git
+    
+via https:
+
+    #!bash
+    $ git clone https://gforge.inria.fr/git/moclodash/moclodash.git
--- a/site/content/tools/benchmark/index.md
+++ b/site/content/tools/benchmark/index.md
@@ -6,4 +6,4 @@ title: Benchmark tool suite
 Benchmark tool suite
 =======

-blabla
+Coming soon.
--- a/site/content/tools/plugin/index.md
+++ b/site/content/tools/plugin/index.md
@@ -6,4 +6,4 @@ title: Eclipse plugin
 Eclipse plugin
 =======

-blabla
+Coming soon.
--- a/site/crash.log
+++ b/site/crash.log
+Crashlog created at 2014-04-03 18:33:39 +0200
+
+===== MESSAGE:
+
+RuntimeError: command exited with a nonzero status code 23 (command: rsync -glpPrtvz --exclude=".hg" --exclude=".svn" --exclude=".git" output/ scm.gforge.inria.fr:/home/groups/moclodash/htdocs)
+
+===== COMPILATION STACK:
+
+  (empty)
+
+===== STACK TRACE:
+
+  0. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/extra/deployers/rsync.rb:60:in `run_shell_cmd'
+  1. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/extra/deployers/rsync.rb:50:in `run'
+  2. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/commands/deploy.rb:89:in `run'
+  3. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/command_runner.rb:14:in `block in call'
+  4. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/error_handler.rb:70:in `handle_while'
+  5. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/error_handler.rb:26:in `handle_while'
+  6. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/command_runner.rb:13:in `call'
+  7. /usr/local/share/gems/gems/cri-2.5.0/lib/cri/command_dsl.rb:185:in `block in runner'
+  8. /usr/local/share/gems/gems/cri-2.5.0/lib/cri/command.rb:298:in `call'
+  9. /usr/local/share/gems/gems/cri-2.5.0/lib/cri/command.rb:298:in `run_this'
+  10. /usr/local/share/gems/gems/cri-2.5.0/lib/cri/command.rb:251:in `run'
+  11. /usr/local/share/gems/gems/cri-2.5.0/lib/cri/command.rb:264:in `run'
+  12. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli.rb:59:in `block in run'
+  13. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/error_handler.rb:70:in `handle_while'
+  14. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli/error_handler.rb:26:in `handle_while'
+  15. /usr/local/share/gems/gems/nanoc-3.6.8/lib/nanoc/cli.rb:57:in `run'
+  16. /usr/local/share/gems/gems/nanoc-3.6.8/bin/nanoc:19:in `<top (required)>'
+  17. /usr/local/bin/nanoc:23:in `load'
+
+===== VERSION INFORMATION:
+
+nanoc 3.6.8 © 2007-2013 Denis Defreyne.
+Running ruby 2.0.0 (2013-11-22) on x86_64-linux with RubyGems 2.1.11.
+
+===== SYSTEM INFORMATION:
+
+Linux rockman-irisa-fr 3.13.7-200.fc20.x86_64 #1 SMP Mon Mar 24 22:01:49 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
+
+===== INSTALLED GEMS:
+
+  adsf 1.2.0
+  bigdecimal 1.2.0
+  blankslate 2.1.2.4
+  classifier 1.3.4
+  colorator 0.1
+  colored 1.2
+  commander 4.1.6
+  cri 2.5.0
+  fast-stemmer 1.0.2
+  ffi 1.9.3
+  highline 1.6.21
+  io-console 0.4.2
+  jekyll 1.5.1
+  json 1.7.7
+  kramdown 1.3.3
+  liquid 2.5.5
+  listen 1.3.1
+  maruku 0.7.0
+  mini_portile 0.5.3
+  nanoc 3.6.8
+  nokogiri 1.6.1
+  parslet 1.5.0
+  posix-spawn 0.3.8
+  psych 2.0.0
+  pygments.rb 0.5.4
+  rack 1.5.2
+  rb-fsevent 0.9.4
+  rb-inotify 0.9.3
+  rb-kqueue 0.2.2
+  rdoc 4.0.1
+  redcarpet 2.3.0
+  safe_yaml 1.0.1
+  systemu 2.6.4
+  toml 0.1.1
+  yajl-ruby 1.1.0
+
+===== ENVIRONMENT:
+
+COLORTERM => "gnome-terminal"
+DBUS_SESSION_BUS_ADDRESS => "unix:abstract=/tmp/dbus-r2XsqNOVee,guid=c73dd0b4dd5cf677318e3f56533d097e"
+DESKTOP_SESSION => "gnome"
+DISPLAY => ":0"
+GDMSESSION => "gnome"
+GDM_LANG => "fr_FR.UTF-8"
+GJS_DEBUG_OUTPUT => "stderr"
+GJS_DEBUG_TOPICS => "JS ERROR;JS LOG"
+GNOME_DESKTOP_SESSION_ID => "this-is-deprecated"
+GNOME_KEYRING_CONTROL => "/run/user/1000/keyring-rKq7ik"
+GNOME_KEYRING_PID => "1550"
+GPG_AGENT_INFO => "/run/user/1000/keyring-rKq7ik/gpg:0:1"
+HISTCONTROL => "ignoredups"
+HISTSIZE => "1000"
+HOME => "/home/ebousse"
+HOSTNAME => "rockman-irisa-fr"
+KDEDIRS => "/usr"
+LANG => "fr_FR.UTF-8"
+LC_MEASUREMENT => "fr_FR.utf8"
+LC_MONETARY => "fr_FR.utf8"
+LC_NUMERIC => "fr_FR.utf8"
+LC_PAPER => "fr_FR.utf8"
+LC_TIME => "fr_FR.utf8"
+LESSOPEN => "||/usr/bin/lesspipe.sh %s"
+LOGNAME => "ebousse"
+LS_COLORS => "rs=0:di=38;5;27:ln=38;5;51:mh=44;38;5;15:pi=40;38;5;11:so=38;5;13:do=38;5;5:bd=48;5;232;38;5;11:cd=48;5;232;38;5;3:or=48;5;232;38;5;9:mi=05;48;5;232;38;5;15:su=48;5;196;38;5;15:sg=48;5;11;38;5;16:ca=48;5;196;38;5;226:tw=48;5;10;38;5;16:ow=48;5;10;38;5;21:st=48;5;21;38;5;15:ex=38;5;34:*.tar=38;5;9:*.tgz=38;5;9:*.arc=38;5;9:*.arj=38;5;9:*.taz=38;5;9:*.lha=38;5;9:*.lzh=38;5;9:*.lzma=38;5;9:*.tlz=38;5;9:*.txz=38;5;9:*.tzo=38;5;9:*.t7z=38;5;9:*.zip=38;5;9:*.z=38;5;9:*.Z=38;5;9:*.dz=38;5;9:*.gz=38;5;9:*.lrz=38;5;9:*.lz=38;5;9:*.lzo=38;5;9:*.xz=38;5;9:*.bz2=38;5;9:*.bz=38;5;9:*.tbz=38;5;9:*.tbz2=38;5;9:*.tz=38;5;9:*.deb=38;5;9:*.rpm=38;5;9:*.jar=38;5;9:*.war=38;5;9:*.ear=38;5;9:*.sar=38;5;9:*.rar=38;5;9:*.alz=38;5;9:*.ace=38;5;9:*.zoo=38;5;9:*.cpio=38;5;9:*.7z=38;5;9:*.rz=38;5;9:*.cab=38;5;9:*.jpg=38;5;13:*.jpeg=38;5;13:*.gif=38;5;13:*.bmp=38;5;13:*.pbm=38;5;13:*.pgm=38;5;13:*.ppm=38;5;13:*.tga=38;5;13:*.xbm=38;5;13:*.xpm=38;5;13:*.tif=38;5;13:*.tiff=38;5;13:*.png=38;5;13:*.svg=38;5;13:*.svgz=38;5;13:*.mng=38;5;13:*.pcx=38;5;13:*.mov=38;5;13:*.mpg=38;5;13:*.mpeg=38;5;13:*.m2v=38;5;13:*.mkv=38;5;13:*.ogm=38;5;13:*.mp4=38;5;13:*.m4v=38;5;13:*.mp4v=38;5;13:*.vob=38;5;13:*.qt=38;5;13:*.nuv=38;5;13:*.wmv=38;5;13:*.asf=38;5;13:*.rm=38;5;13:*.rmvb=38;5;13:*.flc=38;5;13:*.avi=38;5;13:*.fli=38;5;13:*.flv=38;5;13:*.gl=38;5;13:*.dl=38;5;13:*.xcf=38;5;13:*.xwd=38;5;13:*.yuv=38;5;13:*.cgm=38;5;13:*.emf=38;5;13:*.axv=38;5;13:*.anx=38;5;13:*.ogv=38;5;13:*.ogx=38;5;13:*.aac=38;5;45:*.au=38;5;45:*.flac=38;5;45:*.mid=38;5;45:*.midi=38;5;45:*.mka=38;5;45:*.mp3=38;5;45:*.mpc=38;5;45:*.ogg=38;5;45:*.ra=38;5;45:*.wav=38;5;45:*.axa=38;5;45:*.oga=38;5;45:*.spx=38;5;45:*.xspf=38;5;45:"
+MAIL => "/var/spool/mail/ebousse"
+PATH => "/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/home/ebousse/.local/bin:/home/ebousse/bin"
+PWD => "/home/ebousse/Dev/modelCloning/emf/site"
+QT_GRAPHICSSYSTEM_CHECKED => "1"
+QT_IM_MODULE => "ibus"
+QT_PLUGIN_PATH => "/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins"
+SESSION_MANAGER => "local/unix:@/tmp/.ICE-unix/1591,unix/unix:/tmp/.ICE-unix/1591"
+SHELL => "/bin/bash"
+SHLVL => "2"
+SSH_AUTH_SOCK => "/run/user/1000/keyring-rKq7ik/ssh"
+TERM => "xterm-256color"
+USER => "ebousse"
+USERNAME => "ebousse"
+VTE_VERSION => "3409"
+WINDOWID => "52466476"
+WINDOWPATH => "1"
+XAUTHORITY => "/run/gdm/auth-for-ebousse-o6OmGs/database"
+XDG_MENU_PREFIX => "gnome-"
+XDG_RUNTIME_DIR => "/run/user/1000"
+XDG_SEAT => "seat0"
+XDG_SESSION_ID => "1"
+XDG_VTNR => "1"
+XMODIFIERS => "@im=ibus"
+
+===== LOAD PATHS:
+
+  0. /usr/local/share/gems/gems/systemu-2.6.4/lib
+  1. /usr/local/share/gems/gems/nanoc-3.6.8/lib
+  2. /usr/local/share/gems/gems/nanoc-3.6.8/lib
+  3. /usr/local/share/gems/gems/cri-2.5.0/lib
+  4. /usr/local/share/gems/gems/colored-1.2/lib
+  5. /usr/local/share/ruby/site_ruby
+  6. /usr/local/lib64/ruby/site_ruby
+  7. /usr/share/ruby/vendor_ruby
+  8. /usr/lib64/ruby/vendor_ruby
+  9. /usr/share/rubygems
+  10. /usr/share/ruby
+  11. /usr/lib64/ruby/
--- a/site/layouts/default.html
+++ b/site/layouts/default.html
@@ -4,6 +4,7 @@
    <meta charset="utf-8">
    <title>Moclodash - <%= @item[:title] %></title>
    <link rel="stylesheet" href="/stylesheet.css">
+    <link rel="stylesheet" href="/pygments.css">

    <!-- you don't need to keep this, but it's cool for stats! -->
    <meta name="generator" content="nanoc <%= Nanoc::VERSION %>">
@@ -31,6 +32,7 @@
      <h2>Documentation</h2>
      <ul>
        <li><a href="/doc/getting-started">Getting started</a></li>
+        <li><a href="/doc/benchmarking">Running the evaluation</a></li>
        <li><a href="/doc/research">Research</a></li>
      </ul>
    </div>