Update to Nanoc 4

pentandra · Nov 19, 2015 · 2483905 · 2483905
1 parent 8291284
commit 2483905
Show file tree

Hide file tree

Showing 26 changed files with 313 additions and 303 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.1.4
+ruby-2.2
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'compass', '~>0.12' # for advanced CSS
 gem 'haml' # for layouts with clean sources
 gem 'kramdown' # for advanced markdown
 gem 'nanoc' # for compiling the site
-gem 'nokogiri', '1.6.3.1' # for parsing HTML
+gem 'nokogiri' # for parsing HTML
 gem 'rainpress' # for compact CSS
 gem 'uglifier' # for compact javascript
 gem 'html5small'
@@ -25,6 +25,7 @@ gem 'rest-client', '~> 1.6'
 gem 'addressable'
 gem 'rubypants-unicode'
 gem 'linkeddata'
+gem 'jsonlint'
 
 group :development do
   gem 'guard'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -13,7 +13,7 @@ GEM
     bcp47 (0.3.3)
       i18n
     builder (3.2.2)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
     coderay (1.1.0)
     colored (1.2)
     command-builder (0.3.2)
@@ -26,7 +26,7 @@ GEM
       colored (~> 1.2)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    ebnf (0.3.9)
+    ebnf (1.0.0)
       rdf (~> 1.1)
       sxp (~> 0.1, >= 0.1.3)
     em-websocket (0.5.1)
@@ -48,13 +48,16 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-livereload (2.4.0)
+    guard-compat (1.2.1)
+    guard-livereload (2.5.1)
       em-websocket (~> 0.5)
       guard (~> 2.8)
+      guard-compat (~> 1.0)
       multi_json (~> 1.8)
-    guard-nanoc (1.0.3)
+    guard-nanoc (2.0.0)
       guard (~> 2.8)
-      nanoc (~> 3.6)
+      guard-compat (~> 1.0)
+      nanoc (~> 4.0)
     haml (4.0.7)
       tilt
     hash-utils (2.2.0)
@@ -76,55 +79,58 @@ GEM
       ffi (~> 1.0.7)
     i18n (0.7.0)
     json (1.8.1)
-    json-ld (1.1.11)
+    json-ld (1.99.0)
       multi_json (~> 1.11)
-      rdf (~> 1.1, >= 1.1.7)
+      rdf (~> 1.99)
+    jsonlint (0.1.0)
+      oj (~> 2)
     jwt (0.1.13)
       multi_json (>= 1.5)
     kramdown (1.9.0)
     link_header (0.0.8)
-    linkeddata (1.1.11)
-      equivalent-xml (~> 0.5)
-      json-ld (~> 1.1, >= 1.1.8)
+    linkeddata (1.99.0)
+      equivalent-xml (~> 0.6)
+      json-ld (~> 1.99)
       nokogiri (~> 1.6)
-      rdf (~> 1.1, >= 1.1.11)
-      rdf-aggregate-repo (~> 1.1)
-      rdf-isomorphic (~> 1.1)
+      rdf (~> 1.99)
+      rdf-aggregate-repo (~> 1.99)
+      rdf-isomorphic (~> 1.99)
       rdf-json (~> 1.1, >= 1.1.2)
-      rdf-microdata (~> 2.0, >= 2.0.1)
-      rdf-n3 (~> 1.1, >= 1.1.3)
-      rdf-rdfa (~> 1.1, >= 1.1.6)
-      rdf-rdfxml (~> 1.1, >= 1.1.4)
-      rdf-reasoner (~> 0.2, >= 0.2.1)
-      rdf-tabular (~> 0.1, >= 0.1.2)
-      rdf-trig (~> 1.1, >= 1.1.4)
-      rdf-trix (~> 1.1)
-      rdf-turtle (~> 1.1, >= 1.1.6)
-      rdf-vocab (~> 0.8)
-      rdf-xsd (~> 1.1, >= 1.1.3)
-      sparql (~> 1.1, >= 1.1.5)
-      sparql-client (~> 1.1, >= 1.1.3)
-    listen (3.0.3)
+      rdf-microdata (~> 2.0, >= 2.0.2)
+      rdf-n3 (~> 1.99)
+      rdf-rdfa (~> 1.99)
+      rdf-rdfxml (~> 1.1, >= 1.1.5)
+      rdf-reasoner (~> 0.3)
+      rdf-tabular (~> 0.3)
+      rdf-trig (~> 1.99, >= 1.99.0.1)
+      rdf-trix (~> 1.99)
+      rdf-turtle (~> 1.99)
+      rdf-vocab (~> 0.8, >= 0.8.6)
+      rdf-xsd (~> 1.1, >= 1.1.5)
+      sparql (~> 1.99)
+      sparql-client (~> 1.99)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
     mime-types (2.6.2)
-    mini_portile (0.6.0)
-    minitest (5.8.1)
-    msgpack (0.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.3)
+    msgpack (0.7.0)
     multi_json (1.11.2)
     multi_xml (0.5.5)
-    nanoc (3.8.0)
+    nanoc (4.0.0)
       cri (~> 2.3)
     nenv (0.2.0)
     net-http-persistent (2.9.4)
-    netrc (0.10.3)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    netrc (0.11.0)
+    nokogiri (1.6.6.3)
+      mini_portile (~> 0.6.0)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    oj (2.13.1)
     optipng (0.2.1)
       command-builder (>= 0.2.0)
       unix-whereis (>= 0.1.0)
@@ -142,56 +148,57 @@ GEM
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
-    rdf (1.1.17.1)
+    rdf (1.99.0)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (1.1.0)
-      rdf (>= 1.1)
-    rdf-isomorphic (1.1.0.1)
-      rdf (~> 1.1, >= 1.1.16.1)
-    rdf-json (1.1.2)
-      rdf (~> 1.1)
-    rdf-microdata (2.0.1)
+    rdf-aggregate-repo (1.99.0)
+      rdf (~> 1.99)
+    rdf-isomorphic (1.99.0)
+      rdf (~> 1.99)
+    rdf-json (1.99.0)
+      rdf (~> 1.99)
+    rdf-microdata (2.0.2)
       htmlentities (~> 4.3)
       nokogiri (~> 1.6)
       rdf (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-n3 (1.1.3)
-      rdf (~> 1.1, >= 1.1.5)
-    rdf-rdfa (1.1.6)
+    rdf-n3 (1.99.0)
+      rdf (~> 1.99)
+    rdf-rdfa (1.99.0)
       haml (~> 4.0)
       htmlentities (~> 4.3)
-      rdf (~> 1.1, >= 1.1.6)
+      rdf (~> 1.99)
       rdf-aggregate-repo (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.1.4)
+    rdf-rdfxml (1.99.0)
       htmlentities (~> 4.3)
-      rdf (~> 1.1, >= 1.1.6)
-      rdf-rdfa (~> 1.1, >= 1.1.4.1)
-      rdf-xsd (~> 1.1)
-    rdf-reasoner (0.2.2)
+      rdf (~> 1.99)
+      rdf-rdfa (~> 1.99)
+      rdf-xsd (~> 1.99)
+    rdf-reasoner (0.3.0)
       rdf (~> 1.1, >= 1.1.4.2)
       rdf-turtle (~> 1.1)
       rdf-vocab (~> 0.8)
       rdf-xsd (~> 1.1)
-    rdf-tabular (0.2.1)
+    rdf-tabular (0.3.0)
       addressable (~> 2.3)
       bcp47 (~> 0.3, >= 0.3.3)
       json-ld (~> 1.1)
       rdf (~> 1.1, >= 1.1.7)
+      rdf-vocab (~> 0.8)
       rdf-xsd (~> 1.1)
-    rdf-trig (1.1.5)
-      ebnf (~> 0.3, >= 0.3.7)
-      rdf (~> 1.1, >= 1.1.11)
-      rdf-turtle (~> 1.1, >= 1.1.7)
-    rdf-trix (1.1.0)
-      rdf (>= 1.1)
-    rdf-turtle (1.1.8)
-      ebnf (~> 0.3, >= 0.3.6)
-      rdf (~> 1.1, >= 1.1.10)
-    rdf-vocab (0.8.6)
+    rdf-trig (1.99.0.1)
+      ebnf (~> 1.0)
+      rdf (~> 1.99)
+      rdf-turtle (~> 1.99)
+    rdf-trix (1.99.0)
+      rdf (~> 1.1)
+    rdf-turtle (1.99.0)
+      ebnf (~> 1.0)
+      rdf (~> 1.99)
+    rdf-vocab (0.8.7.1)
       rdf (~> 1.1, >= 1.1.10)
-    rdf-xsd (1.1.4)
-      rdf (~> 1.1, >= 1.1.9)
+    rdf-xsd (1.99.0)
+      rdf (~> 1.99)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -206,15 +213,15 @@ GEM
       httparty (= 0.13.0)
       json (= 1.8.1)
     slop (3.6.0)
-    sparql (1.1.9)
+    sparql (1.99.0)
       builder (~> 3.2)
-      ebnf (~> 0.3, >= 0.3.9)
-      rdf (~> 1.1, >= 1.1.13)
-      rdf-aggregate-repo (~> 1.1, >= 1.1.0)
+      ebnf (~> 1.0)
+      rdf (~> 1.99)
+      rdf-aggregate-repo (~> 1.99)
       rdf-xsd (~> 1.1)
       sparql-client (~> 1.1)
       sxp (~> 0.1)
-    sparql-client (1.1.6)
+    sparql-client (1.99.0)
       net-http-persistent (~> 2.9)
       rdf (~> 1.1)
     sxp (0.1.5)
@@ -254,11 +261,12 @@ DEPENDENCIES
   html5small
   html_spellchecker
   json
+  jsonlint
   jwt (~> 0.1)
   kramdown
   linkeddata
   nanoc
-  nokogiri (= 1.6.3.1)
+  nokogiri
   optipng
   rainpress
   rbtrace