From 9ab889a1473404cbee60a2b67ee463fb26dfb2a2 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 6 Sep 2016 03:38:38 +0100 Subject: [PATCH 01/55] Remove errant .DS_Store file --- .DS_Store | Bin 21508 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 31f2b2add5c8029802d08595fb30301841887c8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21508 zcmeI2TWnNC7{}-P+S0Rjp{KQ!MOnMhq!cXB0#b@7+Y5KFg|=+VrDb=|u|45*PqSy+ z0;QoMK@%@g)C40jG0_JF^+CCq_+WT2L=zu$gFuXzXkvJgczMvo2fsOIx0J0*3`T|e zO)~S%nVE0SnP2BW-I;TQ5YRB7)d*27git6-t9mIpB1AyiaY5G0I3eUv2~hM_m0-1;Cu#yeavLM^U^xLq<%qh8nDa*u?I* zgb6SKCcp%k02BBN1myo-3QB=%Ib{M&fC-Edkn2N$qO`%39d)g@Kq%PA9J0uu@3QBjVtL|pVlhV1@`X+@~yWTf9TZnXQ>>>aJW)=;aV>5*`Jmy=I~ z69aZbIPTQ6gcH3~BGZI>Z$^@BUORn+NH~?0{1Pe9U1W` z9*_E>GJVd%mFwEV`}PkX7;zsOQogq1_hP&0`K|>#E?oSw2%-*KQZL-~Jp-sbFAGKmFab4DjqLw+(7qh$7 zqG;HR4w&JDUT>PM#(tg33hijzGR+ptHe@%Q9SMDJLe@>F>ey~u@kFE3S+}YV*!otT z`Z5OfChF1dFzA-jQ3cN%(`J-aEL`^Bn$7LWLba&aTjDJZ4H~u)G4=K#39~b7NA;Ly z#Co>VA0(DA9yav2rwFP%ZLx5lo-FpwyzA~+es5;$bT2zKy60v~lYW|dO7SF%1GDFp z&+_}TdF+rLjd7h)O;M7?b1Ub~zc>30+H5(Lu-mH((wuer5RNF%>YnRup zxZj)g5!%ggL^oBo=5SZ`={J`uYf>E!#fS+_GhB zb_`t-!=|vEXztfzgzh}C*cR$2_RsR~NW;xUs3@J%t6tLxU3q#kmj^4|>{yAXJSb1) zWKe{k4#%3rCb64@IxLgBZQy>Iw1nR5QqJ65FUX;@F+Y9N8vcU3a`TnI0@FV<&q#De{Je-Clcn?Lc$QT861+m1dVh&)cGR_$qwueP2>8!@ zq{FZLlehaT|NqNfC)?j0)GHG3B@)5 From 6be45404e495f60bd1a84411cdb947f888a555fc Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 6 Sep 2016 04:53:57 +0100 Subject: [PATCH 02/55] Ignore .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0c3e5abb..2d2eb810 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ _site/ .sass-cache/ +.DS_Store From c050a4631b66fd0ef8703b458898fb89dd3767b4 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 16:56:44 +0100 Subject: [PATCH 03/55] Create a list of organisations --- orgs.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 orgs.md diff --git a/orgs.md b/orgs.md new file mode 100644 index 00000000..2a5a6ec9 --- /dev/null +++ b/orgs.md @@ -0,0 +1,6 @@ +--- +layout: page +title: Organisation List +permalink: /orgs/ +--- +{%include orgtable.html %} From 895ba0d09854bb16f8228f06d5bceb251bc9caad Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 17:05:02 +0100 Subject: [PATCH 04/55] Add an org list --- _includes/orgtable.html | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 _includes/orgtable.html diff --git a/_includes/orgtable.html b/_includes/orgtable.html new file mode 100644 index 00000000..86b1b9cc --- /dev/null +++ b/_includes/orgtable.html @@ -0,0 +1,11 @@ +{% include data.html %} + + + + + {% for org in orgs %} + + + + {% endfor %} +
Organisation
{{org.title}}
From 89965231e2d6ba450fe5a66c5b2de323ecfa6f45 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 19:56:01 +0100 Subject: [PATCH 05/55] Show number of PIDs per org --- _includes/orgtable.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 86b1b9cc..0d2b31e9 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -1,11 +1,12 @@ {% include data.html %} - + {% for org in orgs %} + {{ pids | where:"owner",org.title | size }} {% endfor %}
Organisation
OrganisationNumber of PIDs
{{org.title}}
From f9793e92509d84d888fd9168a443f330a42baf91 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 20:02:15 +0100 Subject: [PATCH 06/55] Fix HTML issue, sort orgs by title --- _includes/orgtable.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 0d2b31e9..2841d128 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,10 +3,10 @@ OrganisationNumber of PIDs - {% for org in orgs %} + {% for org in {{orgs|sort:"title"}} %} {{org.title}} - {{ pids | where:"owner",org.title | size }} + {{ pids | where:"owner",org.title | size }} {% endfor %} From 2c76f60b14937c6fc09c37ed2e7d4cee2654cce1 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 20:16:17 +0100 Subject: [PATCH 07/55] Try and fix the PID count --- _includes/orgtable.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 2841d128..976c5305 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,10 +3,11 @@ OrganisationNumber of PIDs - {% for org in {{orgs|sort:"title"}} %} + {% for org in {orgs|sort:"title"} %} + {% assign urlparts = org.url|split:"/" %} {{org.title}} - {{ pids | where:"owner",org.title | size }} + {{ pids | where:"owner",urlparts[1] | size }} {% endfor %} From 1a88388309d586308c7a37be0d568442ee841e21 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 20:19:27 +0100 Subject: [PATCH 08/55] Try and fix issues --- _includes/orgtable.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 976c5305..c4ed2037 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,11 +3,11 @@ OrganisationNumber of PIDs - {% for org in {orgs|sort:"title"} %} + {% for org in orgs|sort:"title" %} {% assign urlparts = org.url|split:"/" %} {{org.title}} - {{ pids | where:"owner",urlparts[1] | size }} + {{ pids | where:"owner",urlparts[1] | size }} - urlparts[1] {% endfor %} From 29eba864bc5d0f5b46bc6966a20a3d89ad7a6b27 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 20:23:22 +0100 Subject: [PATCH 09/55] Try again to fix issues --- _includes/orgtable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index c4ed2037..12f39014 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -7,7 +7,7 @@ {% assign urlparts = org.url|split:"/" %} {{org.title}} - {{ pids | where:"owner",urlparts[1] | size }} - urlparts[1] + {{ pids | where:"owner",{{urlparts[1]}} | size }} - {{urlparts[1]}} {% endfor %} From c1b8af92620de76d792228eac02ab6115bdb134c Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 20:30:14 +0100 Subject: [PATCH 10/55] Try yet again to fix issues --- _includes/orgtable.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 12f39014..63bef307 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -5,9 +5,10 @@ {% for org in orgs|sort:"title" %} {% assign urlparts = org.url|split:"/" %} + {% assign owner = urlparts[1] %} {{org.title}} - {{ pids | where:"owner",{{urlparts[1]}} | size }} - {{urlparts[1]}} + {{ pids | where:"owner",owner | size }} - {{owner}} {% endfor %} From 937ee8d15c7ee03e83b2176ff553dfd6308228c0 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 20:35:15 +0100 Subject: [PATCH 11/55] Correct the urlpart --- _includes/orgtable.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 63bef307..adfa390a 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,9 +3,10 @@ OrganisationNumber of PIDs - {% for org in orgs|sort:"title" %} + {% assign sortedorgs = {{orgs|sort:"title"}} %} + {% for org in sortedorgs %} {% assign urlparts = org.url|split:"/" %} - {% assign owner = urlparts[1] %} + {% assign owner = urlparts[2] %} {{org.title}} {{ pids | where:"owner",owner | size }} - {{owner}} From 52fc9de00d9b0940f9e24f3cc073203ea0a6035b Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 9 Sep 2016 23:42:12 +0100 Subject: [PATCH 12/55] Change to sort_natural, minor code tidy --- _includes/orgtable.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index adfa390a..3dd040da 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,10 +3,10 @@ OrganisationNumber of PIDs - {% assign sortedorgs = {{orgs|sort:"title"}} %} + {% assign sortedorgs = {{orgs|sort_natural:"title"}} %} {% for org in sortedorgs %} - {% assign urlparts = org.url|split:"/" %} - {% assign owner = urlparts[2] %} + {% assign urlparts = org.url|split:"/" %} + {% assign owner = urlparts[2] %} {{org.title}} {{ pids | where:"owner",owner | size }} - {{owner}} From c5ac7d8849bee8741e38c7d55f519cd170a21cee Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 11 Sep 2016 01:10:46 +0100 Subject: [PATCH 13/55] Try and fix the sorting --- _includes/orgtable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 3dd040da..2d365ddf 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,7 +3,7 @@ OrganisationNumber of PIDs - {% assign sortedorgs = {{orgs|sort_natural:"title"}} %} + {% assign sortedorgs = {{site.pages|where:"layout","org"|sort_natural:"title"}} %} {% for org in sortedorgs %} {% assign urlparts = org.url|split:"/" %} {% assign owner = urlparts[2] %} From 96d71253ed57b2992ead8ab48bd921fb7a35c552 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 11 Sep 2016 01:16:59 +0100 Subject: [PATCH 14/55] Try again to fix the sorting --- _includes/orgtable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 2d365ddf..639d9690 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -3,7 +3,7 @@ OrganisationNumber of PIDs - {% assign sortedorgs = {{site.pages|where:"layout","org"|sort_natural:"title"}} %} + {% assign sortedorgs = {{site.pages|where:"layout","org"|sort:"title"}} %} {% for org in sortedorgs %} {% assign urlparts = org.url|split:"/" %} {% assign owner = urlparts[2] %} From 4e3f9ace2fe5f4d4ededb19adf1404fe3052a979 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 11 Sep 2016 01:33:17 +0100 Subject: [PATCH 15/55] Remove debugging --- _includes/orgtable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/orgtable.html b/_includes/orgtable.html index 639d9690..19c8e839 100644 --- a/_includes/orgtable.html +++ b/_includes/orgtable.html @@ -9,7 +9,7 @@ {% assign owner = urlparts[2] %} {{org.title}} - {{ pids | where:"owner",owner | size }} - {{owner}} + {{ pids | where:"owner",owner | size }} {% endfor %} From 4814955a85434e0edfe510c51fa410ea0c7ad82e Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 11 Sep 2016 01:34:22 +0100 Subject: [PATCH 16/55] Add a link to orgs page --- _includes/navigation.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/navigation.html b/_includes/navigation.html index 14c23538..8e34770e 100755 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,4 +1,5 @@ About All PIDs +All Orgs Get a PID FAQ From dfcdea905dde95fc8bed9b2967eeb6e6335786c3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 13:41:38 +0100 Subject: [PATCH 17/55] Install dependencies for Travis --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..75feaf52 --- /dev/null +++ b/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "jekyll" +gem "html-proofer" From ee66817f8bbdc93884f444a7008643907877f7cf Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 13:46:29 +0100 Subject: [PATCH 18/55] Create .travis.yml --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..1d4f3a52 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: ruby +rvm: +- 2.1 + +# Assume bundler is being used, therefore +# the `install` step will run `bundle install` by default. +script: "bash -ex .travis-ci.sh" + +env: + global: + - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer + +sudo: false # route your build to the container-based infrastructure for a faster build From 2b64ddcf61bfacb8609357c4b3960406c9d86569 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 13:48:00 +0100 Subject: [PATCH 19/55] Add the Travis script --- .travis-ci.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis-ci.sh diff --git a/.travis-ci.sh b/.travis-ci.sh new file mode 100644 index 00000000..4a1c2b06 --- /dev/null +++ b/.travis-ci.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e # halt script on error + +bundle exec jekyll build +bundle exec htmlproofer ./_site From e9c3e2c0aaf2eae367087cfcf15fc6e6a3af1c69 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 13:51:14 +0100 Subject: [PATCH 20/55] Update the Ruby version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d4f3a52..10cc1e3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.1 +- 2.2 # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. From a3ca6149b6b651bfcd47bc7cfc9c1da808c7e0c4 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 13:53:40 +0100 Subject: [PATCH 21/55] Bump the Ruby version some more --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 10cc1e3d..9b57d82a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.2 +- 2.3 # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. From f056bf3aebef971c50ffe61b6c182dd9e5e3a3d7 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 13:57:24 +0100 Subject: [PATCH 22/55] Switch back to the documented version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b57d82a..1d4f3a52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.3 +- 2.1 # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. From 9bdc4987cef1f4eb8a2b5c7270b83d056ee97da8 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:01:58 +0100 Subject: [PATCH 23/55] Add the exclude --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index 5c327b0f..e315e12c 100644 --- a/_config.yml +++ b/_config.yml @@ -44,6 +44,7 @@ share_reddit: false share_stumbleupon: false # Build settings +exclude: [vendor] markdown: redcarpet redcarpet: extensions: ['smart', 'tables', 'with_toc_data'] From fb98a7d3b6b03330ab57cb763182bbcb7f0b8bca Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:04:46 +0100 Subject: [PATCH 24/55] Update based on https://github.com/jekyll/jekyll/pull/5413 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d4f3a52..cbcc5ac5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.1 +- 2.2.5 # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. From 7b05103948a8f0eb430e3c04722afb77ec60b18d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:19:06 +0100 Subject: [PATCH 25/55] Add github-pages Gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 75feaf52..bbe0e0a9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source "https://rubygems.org" gem "jekyll" +gem "github-pages" gem "html-proofer" From 51f60cbf3f1f08f3de6d976d3d97f2341307211b Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:23:42 +0100 Subject: [PATCH 26/55] Add missing gems --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index e315e12c..b8b640bd 100644 --- a/_config.yml +++ b/_config.yml @@ -45,6 +45,7 @@ share_stumbleupon: false # Build settings exclude: [vendor] +gems: [jekyll-paginate, redcarpet] markdown: redcarpet redcarpet: extensions: ['smart', 'tables', 'with_toc_data'] From c0b9104d0856607f30962908d5ae3d8c9bb230d9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:28:13 +0100 Subject: [PATCH 27/55] Add redcarpet --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index bbe0e0a9..35ba31fb 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,5 @@ source "https://rubygems.org" gem "jekyll" gem "github-pages" +gem "redcarpet" gem "html-proofer" From db9e2a956698a35011a06a2238ddd49e62e13354 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:48:46 +0100 Subject: [PATCH 28/55] Switch to tasks so we can run multiple CI tasks --- .travis-ci.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 4a1c2b06..eca885db 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -1,5 +1,10 @@ #!/bin/bash set -e # halt script on error -bundle exec jekyll build -bundle exec htmlproofer ./_site +if [[ $TASK = 'htmlproofer' ]]; then + bundle exec jekyll build + bundle exec htmlproofer ./_site --disable-external +elif [[ $TASK = 'htmlproofer-external' ]]; then + bundle exec jekyll build + bundle exec htmlproofer ./_site +fi From 212f80a828bdf87e8e82fef788cd87d35ec7d893 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:52:15 +0100 Subject: [PATCH 29/55] Switch to tasks --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index cbcc5ac5..2449a789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,11 @@ env: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer sudo: false # route your build to the container-based infrastructure for a faster build + +matrix: + fast_finish: true + include: + - env: TASK='htmlproofer' + - env: TASK='htmlproofer-external' + allow_failures: + - env: TASK='htmlproofer' From b09fc9f6c954ef86b22aa45d2bd99fbdffbc838d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:53:48 +0100 Subject: [PATCH 30/55] Fix the matrix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2449a789..3fe8c289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ matrix: - env: TASK='htmlproofer' - env: TASK='htmlproofer-external' allow_failures: - - env: TASK='htmlproofer' + - env: TASK='htmlproofer-external' From 158861ab1f15bcbf18ffa90d7c3f0ca002582397 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 14:56:00 +0100 Subject: [PATCH 31/55] More matrix fixing --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fe8c289..8dbdab86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ +sudo: false # route your build to the container-based infrastructure for a faster build + language: ruby -rvm: -- 2.2.5 # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. @@ -10,12 +10,13 @@ env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer -sudo: false # route your build to the container-based infrastructure for a faster build - matrix: fast_finish: true include: - - env: TASK='htmlproofer' - - env: TASK='htmlproofer-external' + - rvm: 2.2.5 + env: TASK='htmlproofer' + - rvm: 2.2.5 + env: TASK='htmlproofer-external' allow_failures: - - env: TASK='htmlproofer-external' + - rvm: 2.2.5 + env: TASK='htmlproofer-external' From 9b32ba0864a67bb4ea01656c962021fe6106b03e Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:15:33 +0100 Subject: [PATCH 32/55] Turn on more htmlproofer options --- .travis-ci.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index eca885db..499ba704 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -1,10 +1,12 @@ #!/bin/bash set -e # halt script on error +HTMLPROOFER_OPTIONS="./_site --check-favicon --check-html --report-invalid-tags --report-missing-names --log-level=:debug" + if [[ $TASK = 'htmlproofer' ]]; then bundle exec jekyll build - bundle exec htmlproofer ./_site --disable-external + bundle exec htmlproofer $HTMLPROOFER_OPTIONS --disable-external elif [[ $TASK = 'htmlproofer-external' ]]; then bundle exec jekyll build - bundle exec htmlproofer ./_site + bundle exec htmlproofer $HTMLPROOFER_OPTIONS fi From 5f5875fe3bd65d4d302c00e05ec797b2accd86b9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:25:59 +0100 Subject: [PATCH 33/55] Make the check less strict --- .travis-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 499ba704..ace3aca9 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # halt script on error -HTMLPROOFER_OPTIONS="./_site --check-favicon --check-html --report-invalid-tags --report-missing-names --log-level=:debug" +HTMLPROOFER_OPTIONS="./_site --check-html --report-invalid-tags --report-missing-names --log-level=:debug" if [[ $TASK = 'htmlproofer' ]]; then bundle exec jekyll build From a161ad559c282ade003c49cead2bc0718c611a76 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:29:48 +0100 Subject: [PATCH 34/55] Don't bother complaining about extra jekyll tags --- .travis-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index ace3aca9..5533846e 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # halt script on error -HTMLPROOFER_OPTIONS="./_site --check-html --report-invalid-tags --report-missing-names --log-level=:debug" +HTMLPROOFER_OPTIONS="./_site --check-html --report-missing-names --log-level=:debug" if [[ $TASK = 'htmlproofer' ]]; then bundle exec jekyll build From 0360d486ba132f1fdf2523df4c785efc03c6adb9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:41:42 +0100 Subject: [PATCH 35/55] Escape HTML entities --- _includes/head.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 676fac84..13bc629d 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,11 +1,11 @@ - {% if include.title %}{{ include.title }} – {% elsif page.title %}{{ page.title }} – {% endif %}{{ site.title }} + {% if include.title %}{{ include.title | xml_escape }} – {% elsif page.title %}{{ page.title | xml_escape }} – {% endif %}{{ site.title | xml_escape }} - - - {% if page.categories %}{% endif %} + + + {% if page.categories %}{% endif %} @@ -23,9 +23,9 @@ - - + + - + From d6e9ff86f3053d7324f69271f294665d94c14de2 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:45:42 +0100 Subject: [PATCH 36/55] Fix the email link --- about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.md b/about.md index 4f87eeaa..dc3b58e7 100644 --- a/about.md +++ b/about.md @@ -12,6 +12,6 @@ pid.codes seeks to solve this issue for anyone producing open-source hardware. W pid.codes will assign PIDs on any VID we own to any open-source hardware project needing one. To learn how to get a PID or PIDs for your project, see the [how to get a PID](/howto/) page. -pid.codes will also gladly accept donations of Vendor IDs from other organisations that no longer require them, and take responsibility for administering them. If you have a VID code that is no longer in use, please contact us at [admin@pid.codes](admin@pid.codes). +pid.codes will also gladly accept donations of Vendor IDs from other organisations that no longer require them, and take responsibility for administering them. If you have a VID code that is no longer in use, please contact us at [admin@pid.codes](mailto:admin@pid.codes). This site is in no way supported or endorsed by [USB-IF](http://www.usb.org/). From 0f40d138bb9d7b322e5bd0eb0c16c08829a7577e Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:47:04 +0100 Subject: [PATCH 37/55] Fix the link within the 404 page! --- 404.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/404.md b/404.md index ab7c9f6b..4f2e8a6b 100755 --- a/404.md +++ b/404.md @@ -9,5 +9,5 @@ Sorry, we can't seem to find this page's pixylls.
Home - Contact + About
From 757c1fcfe559595c387186c31663d5e8e62e24d7 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:52:09 +0100 Subject: [PATCH 38/55] Escape more HTML entities --- _layouts/pid.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_layouts/pid.html b/_layouts/pid.html index f71bb49a..326b443d 100644 --- a/_layouts/pid.html +++ b/_layouts/pid.html @@ -17,22 +17,22 @@

- {{vid}} / + {{vid|upcase}} / {{pid|upcase}} - - {{page.title}} + {{page.title|xml_escape}}

- + - - + + {% if page.site %} - + {% endif %} {% if page.source %} - + {% endif %}
VID0x{{vid}}
VID0x{{vid|upcase}}
PID0x{{pid|upcase}}
Owner{{org.title}}
License{{page.license}}
Owner{{org.title|xml_escape}}
License{{page.license|xml_escape}}
Site{{page.site}}
Site{{page.site|xml_escape}}
Source{{page.source}}
Source{{page.source|xml_escape}}
{{ content }} From 57ee312134cbfdf1ae082c3848865309ff697012 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:53:42 +0100 Subject: [PATCH 39/55] Remove an invalid site URL --- 1209/E500/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/1209/E500/index.md b/1209/E500/index.md index 688416db..5e2553a9 100644 --- a/1209/E500/index.md +++ b/1209/E500/index.md @@ -3,7 +3,6 @@ layout: pid title: Helios Laser DAC owner: GitleMikkelsen license: Creative Commons Attribution-NonCommercial 4.0 International -site: TBD source: https://github.com/Grix/helios_dac --- -Open source, low cost USB DAC for the ISP-DB25 laser projector protocol. \ No newline at end of file +Open source, low cost USB DAC for the ISP-DB25 laser projector protocol. From 331bec4ad2ea1fc688f838d2d6f9f29dd7feceb6 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 15:58:22 +0100 Subject: [PATCH 40/55] Cache ruby bundles --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8dbdab86..cfefee4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ sudo: false # route your build to the container-based infrastructure for a faste language: ruby +# Cache Ruby bundles +cache: bundler + # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. script: "bash -ex .travis-ci.sh" From 48c71773806428a6d2dce6e4a2d6a8f5ae5ac46d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:00:48 +0100 Subject: [PATCH 41/55] Escape even more HTML entities --- _layouts/org.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/org.html b/_layouts/org.html index fc88afd2..015fa153 100644 --- a/_layouts/org.html +++ b/_layouts/org.html @@ -13,7 +13,7 @@
-

{{page.title}}

+

{{page.title|xml_escape}}

{{ content }} @@ -28,7 +28,7 @@

Allocated PIDs

{{pidurlparts[1]}} {{pidurlparts[2]}} - {{page.title}} {{pid.title}} + {{page.title|xml_escape}} {{pid.title|xml_escape}} {% endfor %} From 73d6600c228e8c777cc70a6434cb3b57475fd40f Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:02:20 +0100 Subject: [PATCH 42/55] Escape yet more HTML entities --- _includes/pidtable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/pidtable.html b/_includes/pidtable.html index dce11c70..2f23385b 100644 --- a/_includes/pidtable.html +++ b/_includes/pidtable.html @@ -10,7 +10,7 @@ {% assign org = orgs|where:"url",orgpath|first %} {{urlparts[2]|upcase}} - {{org.title}} {{pid.title}} + {{org.title|xml_escape}} {{pid.title|xml_escape}} {% endif %} {% endfor %} From 68c0db9defbf0a7a2a4d8fec0622e044e6f6ad16 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:05:47 +0100 Subject: [PATCH 43/55] Escape more HTML entities and switch to a div --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 369852bf..7ba1f1c6 100644 --- a/index.html +++ b/index.html @@ -16,15 +16,15 @@

{{ post.date | date: "%b %-d, %Y" }}

-

{{ post.title }}

+

{{ post.title | xml_escape }}

 -

+

{% if post.summary %} {{ post.summary }} {% else %} {{ post.excerpt }} {% endif %} -

+
{% endfor %}
From 94da335e0e176e6264779b54220ab3a446f55ac5 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:23:40 +0100 Subject: [PATCH 44/55] Try and fix the errant paragraph item --- pids.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pids.md b/pids.md index d81b1767..a7af7501 100644 --- a/pids.md +++ b/pids.md @@ -7,6 +7,6 @@ permalink: /pids/ {% for vid in vids %} {% assign urlparts = vid.url|split:"/" %} {% assign vidno = urlparts[1] %} -

0x{{urlparts[1]}}

+

0x{{vidno}}

{%include pidtable.html vid=vidno %} {% endfor %} From e88e8c11d75536bd175e91817ee6a61fee75d782 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:28:54 +0100 Subject: [PATCH 45/55] Add a Travis badge to the readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 54f07a07..a81cbc1c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - # pid.codes -Website for pid.codes +[![Build Status](https://travis-ci.org/pidcodes/pidcodes.github.com.svg?branch=master)](https://travis-ci.org/pidcodes/pidcodes.github.com) +Website for [pid.codes](http://pid.codes) From fcbb0021541cad7adee99b68411e0eccfff161be Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:44:36 +0100 Subject: [PATCH 46/55] Update Gemfile Adapted from https://github.com/lunaryorn/lunaryorn.github.io --- Gemfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 35ba31fb..5cf9072e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,13 @@ -source "https://rubygems.org" +require 'json' +require 'open-uri' + +source 'https://rubygems.org' + +versions = open('https://pages.github.com/versions.json') do |source| + JSON.parse(source.read) +end + +# Github Pages environment +gem 'github-pages', versions['github-pages'] -gem "jekyll" -gem "github-pages" -gem "redcarpet" gem "html-proofer" From 32f8d660645895be9cfa6a9aa463538c858ac352 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:45:46 +0100 Subject: [PATCH 47/55] Update _config.yml --- _config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index b8b640bd..388ec024 100644 --- a/_config.yml +++ b/_config.yml @@ -45,7 +45,9 @@ share_stumbleupon: false # Build settings exclude: [vendor] -gems: [jekyll-paginate, redcarpet] +gems: + - jekyll-paginate + - redcarpet markdown: redcarpet redcarpet: extensions: ['smart', 'tables', 'with_toc_data'] From 06e3eb99cb3ca64bb88c81691a1974a751d1d18d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:50:56 +0100 Subject: [PATCH 48/55] Add some more checks to Travis --- .travis-ci.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 5533846e..b46f488d 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -3,10 +3,14 @@ set -e # halt script on error HTMLPROOFER_OPTIONS="./_site --check-html --report-missing-names --log-level=:debug" +bundle exec jekyll doctor +bundle exec jekyll build + if [[ $TASK = 'htmlproofer' ]]; then - bundle exec jekyll build bundle exec htmlproofer $HTMLPROOFER_OPTIONS --disable-external elif [[ $TASK = 'htmlproofer-external' ]]; then - bundle exec jekyll build bundle exec htmlproofer $HTMLPROOFER_OPTIONS fi + +# Validate GH Pages DNS setup +bundle exec github-pages health-check From 1aeaaeefcce7e7d9696afae3c26a94bd89a59e71 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:51:39 +0100 Subject: [PATCH 49/55] Report GH Pages versions --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index cfefee4c..0584cfda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ language: ruby # Cache Ruby bundles cache: bundler +before_script: + - bundle exec github-pages versions + # Assume bundler is being used, therefore # the `install` step will run `bundle install` by default. script: "bash -ex .travis-ci.sh" From 70a1b630e9b60a78ef4bc357b9768526180f2c3b Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 28 Sep 2016 16:55:35 +0100 Subject: [PATCH 50/55] Tidy up, add redcarpet back in --- Gemfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5cf9072e..88c9b37c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,14 @@ -require 'json' -require 'open-uri' +require "json" +require "open-uri" -source 'https://rubygems.org' +source "https://rubygems.org" -versions = open('https://pages.github.com/versions.json') do |source| +versions = open("https://pages.github.com/versions.json") do |source| JSON.parse(source.read) end # Github Pages environment -gem 'github-pages', versions['github-pages'] +gem "github-pages", versions['github-pages'] +gem "redcarpet" gem "html-proofer" From f028925d052a1ededf5163c2332c1adbda341751 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 2 Oct 2016 01:21:56 +0100 Subject: [PATCH 51/55] Try and stop the spurious paragraph tags --- pids.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pids.md b/pids.md index a7af7501..74097ad5 100644 --- a/pids.md +++ b/pids.md @@ -7,6 +7,6 @@ permalink: /pids/ {% for vid in vids %} {% assign urlparts = vid.url|split:"/" %} {% assign vidno = urlparts[1] %} -

0x{{vidno}}

+

0x{{vidno}}

{%include pidtable.html vid=vidno %} {% endfor %} From b9247e857fa7b7299c16ffde9b486434047d6bea Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 7 Oct 2016 23:58:32 +0100 Subject: [PATCH 52/55] Check Open Graph --- .travis-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index b46f488d..9e94b594 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # halt script on error -HTMLPROOFER_OPTIONS="./_site --check-html --report-missing-names --log-level=:debug" +HTMLPROOFER_OPTIONS="./_site --check-html --check-opengraph --report-missing-names --log-level=:debug" bundle exec jekyll doctor bundle exec jekyll build From 4839ed375f73e96724d7c2abe08e0ec069311e8c Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 19 Oct 2016 03:29:47 +0100 Subject: [PATCH 53/55] Make pid.codes an internal domain --- .travis-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 9e94b594..88b97df6 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # halt script on error -HTMLPROOFER_OPTIONS="./_site --check-html --check-opengraph --report-missing-names --log-level=:debug" +HTMLPROOFER_OPTIONS="./_site --internal-domains=pid.codes --check-html --check-opengraph --report-missing-names --log-level=:debug" bundle exec jekyll doctor bundle exec jekyll build From 61325889de563a7e9be9624b6ec5101cccf1646d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 20 Oct 2016 22:06:22 +0100 Subject: [PATCH 54/55] Ensure we've got the fixed html-proofer --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 88c9b37c..db6cec36 100644 --- a/Gemfile +++ b/Gemfile @@ -11,4 +11,4 @@ end gem "github-pages", versions['github-pages'] gem "redcarpet" -gem "html-proofer" +gem "html-proofer", '>=3.3.1' From 12c9803695a09eada1cc1131910fc0680c930872 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 1 Dec 2016 03:10:53 +0000 Subject: [PATCH 55/55] Use the original orgpath URL --- _layouts/pid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/pid.html b/_layouts/pid.html index 326b443d..16bbcdfb 100644 --- a/_layouts/pid.html +++ b/_layouts/pid.html @@ -26,7 +26,7 @@

- + {% if page.site %}
VID0x{{vid|upcase}}
PID0x{{pid|upcase}}
Owner{{org.title|xml_escape}}
Owner{{org.title|xml_escape}}
License{{page.license|xml_escape}}
Site{{page.site|xml_escape}}