From 1de0a5b039afe5dea4ebce52aa0a4d0c4166f86a Mon Sep 17 00:00:00 2001 From: "B. van Berkum" Date: Thu, 26 Oct 2017 04:21:38 +0200 Subject: [PATCH 1/5] Badges --- ReadMe.rst | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ReadMe.rst b/ReadMe.rst index 35687315..3eb26656 100644 --- a/ReadMe.rst +++ b/ReadMe.rst @@ -12,6 +12,10 @@ Node Sitefile :target: https://gemnasium.com/dotmpe/node-sitefile :alt: Dependencies + .. image:: https://david-dm.org/dotmpe/node-sitefile.svg?style=flat-square + :target: https://david-dm.org/dotmpe/node-sitefile + :alt: Dependencies + .. image:: https://snyk.io/package/npm/name/badge.svg :target: https://snyk.io/package/npm/name :alt: Vulnerabilities @@ -22,15 +26,19 @@ Node Sitefile :target: https://coveralls.io/r/dotmpe/node-sitefile :alt: Coverage - .. image:: https://secure.travis-ci.org/dotmpe/node-sitefile.png - :target: https://travis-ci.org/dotmpe/node-sitefile - :alt: Build + .. image:: http://img.shields.io/travis/bvberkum/node-sitefile.svg + :target: http://travis-ci.org/bvberkum/node-sitefile + :alt: Build Status .. .. image:: https://img.shields.io/github/issues/dotmpe/node-sitefile.svg :target: http://githubstats.com/dotmpe/node-sitefile/issues :alt: GitHub issues + .. image:: http://img.shields.io/codeclimate/github/bvberkum/node-sitefile.svg + :target: https://codeclimate.com/github/bvberkum/node-sitefile + :alt: Code Climate + :repository: .. image:: https://badge.fury.io/gh/dotmpe%2Fnode-sitefile.png From 12a73a478ee580a473404917c42ed889afc45730 Mon Sep 17 00:00:00 2001 From: "B. van Berkum" Date: Fri, 27 Oct 2017 15:56:46 +0200 Subject: [PATCH 2/5] Docker tooling --- tools/docker/ubuntu/Dockerfile | 40 +++++++++++++--------------------- tools/docker/ubuntu/entry.sh | 1 - 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/tools/docker/ubuntu/Dockerfile b/tools/docker/ubuntu/Dockerfile index 97f8473e..5cef756e 100644 --- a/tools/docker/ubuntu/Dockerfile +++ b/tools/docker/ubuntu/Dockerfile @@ -1,41 +1,29 @@ -ARG DCKR_TAG=latest -FROM bvberkum/ubuntu-treebox:$DCKR_TAG +ARG DCKR_TAG=dev +FROM bvberkum/treebox:$DCKR_TAG MAINTAINER B. van Berkum -# Node version manager -#ENV NVM_DIR=/usr/local/nvm -#RUN curl -o- \ -# https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | \ -# bash && \ -# . $NVM_DIR/nvm.sh && \ -# nvm install stable - - -#RUN sudo npm install npm -g - - ARG sf_checkout=dev # Prepare for Sitefile RUN \ - sudo mkdir -vp /src/github.com && \ - sudo chmod g+rw /usr/local/* /usr/local/lib/node_modules /src/github.com && \ - sudo chgrp staff /usr/local/* /usr/local/lib/node_modules /src/github.com + sudo mkdir -vp /opt /src && \ + sudo chmod g+rw /usr/local/* /usr/local/lib/node_modules /opt /src && \ + sudo chgrp staff /usr/local/* /usr/local/lib/node_modules /opt /src # Checkout Sitefile RUN USER=$(whoami) && \ - ls -la /home/treebox /src/ /src/github.com && \ - mkdir -vp /src/github.com/bvberkum && \ + mkdir -vp /opt/bvberkum /src/github.com/bvberkum && \ git clone https://github.com/bvberkum/node-sitefile.git \ - /src/github.com/bvberkum/node-sitefile && \ - sudo chown -R $USER:$USER /home/$USER /src/github.com/bvberkum && \ - cd /src/github.com/bvberkum/node-sitefile && \ - git checkout $sf_checkout + /opt/bvberkum/node-sitefile && \ + sudo chown -R $USER:$USER /home/$USER /opt/bvberkum && \ + cd /opt/bvberkum/node-sitefile && \ + git checkout $sf_checkout && \ + ln -s /opt/bvberkum/node-sitefile /src/github.com/bvberkum/ # Install Sitefile RUN USER=$(whoami) && \ - cd /src/github.com/bvberkum/node-sitefile && \ + cd /opt/bvberkum/node-sitefile && \ npm install --quiet grunt coffee-script && \ npm install --quiet -g . @@ -46,4 +34,6 @@ ENV site_checkout= RUN mkdir -vp /usr/local/share/sitefile COPY ./entry.sh /usr/local/share/sitefile/entry.sh -ENTRYPOINT /usr/local/share/sitefile/entry.sh +ENTRYPOINT ["/usr/local/share/sitefile/entry.sh"] +EXPOSE 7100-7199 +CMD ["$site_src","$site_checkout","$site_repo"] diff --git a/tools/docker/ubuntu/entry.sh b/tools/docker/ubuntu/entry.sh index fd0c1e76..f12904e1 100755 --- a/tools/docker/ubuntu/entry.sh +++ b/tools/docker/ubuntu/entry.sh @@ -1,6 +1,5 @@ #!/bin/bash - test -n "$1" || set -- "github.com/bvberkum/node-sitefile" "$2" "$3" test -d "/src/$1" || { From e00cabaa2c2b384ab89252d8e69f6f7269b09af7 Mon Sep 17 00:00:00 2001 From: "B. van Berkum" Date: Fri, 27 Oct 2017 16:51:29 +0200 Subject: [PATCH 3/5] Docs, todos --- doc/.defaults.rst | 38 ++++++++++++++++++++++++++------------ doc/dev.rst | 4 +++- doc/dev/0.0.5.rst | 2 +- doc/index.rst | 5 +++++ 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 doc/index.rst diff --git a/doc/.defaults.rst b/doc/.defaults.rst index 84c6a73c..01fd1ae4 100644 --- a/doc/.defaults.rst +++ b/doc/.defaults.rst @@ -5,10 +5,11 @@ expressiveness: all relative path references need to be pre-processed per including document. -.. Global +.. Doc parts .. _changelog: /Changelog.rst .. _examples: /example/main .. _ToDo: /TODO.md +.. _Sitefile Planet: /doc/sitefile-planet.rst .. Local .. _manual: manual.rst @@ -26,24 +27,37 @@ .. _Mocha Router docstrings: /doc/literate/mocha.html .. Releases -.. _r0.0.1: /doc/dev/0.0.6.rst -.. _v0.0.1: Changelog.rst#0.0.1 +.. _r0.0.1: /doc/dev/0.0.1.rst +.. _v0.0.1: /Changelog.rst#0.0.1 .. _r0.0.3: /doc/dev/0.0.3.rst +.. _v0.0.3: /Changelog.rst#0.0.3 + .. _r0.0.4: /doc/dev/0.0.4.rst -.. _v0.0.4: Changelog.rst#0.0.4 +.. _v0.0.4: /Changelog.rst#0.0.4 +.. _v0.0.5: /Changelog.rst#0.0.5 .. _r0.0.5: /doc/dev/0.0.5.rst +.. _v0.0.6: /Changelog.rst#0.0.6 .. _r0.0.6: /doc/dev/0.0.6.rst +.. _v0.0.7: /Changelog.rst#0.0.7 +.. _r0.0.7: /doc/dev/0.0.7.rst +.. _v0.1.0: /Changelog.rst#0.1.0 +.. .. _r0.1.0: /doc/dev/0.1.0.rst -.. External -.. _jsonary: http://jsonary.com/ -.. _elegant apis with json schema: https://brandur.org/elegant-apis -.. _understanding json schema: http://spacetelescope.github.io/understanding-json-schema/index.html -.. _semver: https://github.com/npm/node-semver -.. _JSON API: http://jsonapi.org/format/ -.. _json-editor: https://github.com/jdorn/json-editor -.. _List of Mocha reporters: https://github.com/mochajs/mocha/tree/master/lib/reporters +.. _v1.0.0: /Changelog.rst#1.0.0 +.. External +.. _jsonary: //jsonary.com/ +.. _elegant apis with json schema: //brandur.org/elegant-apis +.. _understanding json schema: //spacetelescope.github.io/understanding-json-schema/index.html +.. _semver: //github.com/npm/node-semver +.. _JSON API: //jsonapi.org/format/ +.. _json-editor: //github.com/jdorn/json-editor +.. _List of Mocha reporters: //github.com/mochajs/mocha/tree/master/lib/reporters +.. _neodoc: //github.com/felixSchl/neodoc +.. _ansigarden.com: //ansigarden.com +.. _Fermata: //github.com/natevw/fermata +.. _PouchDB: //github.com/pouchdb/pouchdb diff --git a/doc/dev.rst b/doc/dev.rst index ff1fc5fa..b8108d82 100644 --- a/doc/dev.rst +++ b/doc/dev.rst @@ -1,3 +1,5 @@ +Main Development Document +========================= .. include:: .defaults.rst @@ -120,6 +122,6 @@ There are many possibly useful directions: Branch docs ------------ .. include:: scm-branches.rst - + :start-line: 4 diff --git a/doc/dev/0.0.5.rst b/doc/dev/0.0.5.rst index 75c0a035..9f70bd8f 100644 --- a/doc/dev/0.0.5.rst +++ b/doc/dev/0.0.5.rst @@ -9,7 +9,7 @@ - Rewrite of all contexts: handler/resolver are merged now. Root context has new structures ``paths`` and ``site``. ``paths.routers`` makes it possible - to load extension routers from custom paths. + to load addon routers from custom paths. Router initialization extends on regular objects until router is initialized, then creates proper subContext. It uses new attributes ``methods`` and diff --git a/doc/index.rst b/doc/index.rst new file mode 100644 index 00000000..ff431b81 --- /dev/null +++ b/doc/index.rst @@ -0,0 +1,5 @@ +Documentation Overview +====================== +.. include:: .defaults.rst + + From 9dcffd4bc9c4cad9a1bb613351d0456d4a7d37ec Mon Sep 17 00:00:00 2001 From: "B. van Berkum" Date: Fri, 27 Oct 2017 18:02:09 +0200 Subject: [PATCH 4/5] docs --- ReadMe.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReadMe.rst b/ReadMe.rst index 3eb26656..339e9e40 100644 --- a/ReadMe.rst +++ b/ReadMe.rst @@ -45,8 +45,7 @@ Node Sitefile :target: http://badge.fury.io/gh/dotmpe%2Fnode-sitefile :alt: GIT -:autobuild: - +:autobuild: `ReadMe `_ .. image:: https://images.microbadger.com/badges/image/bvberkum/node-sitefile.svg :target: https://microbadger.com/images/bvberkum/node-sitefile :alt: Data by microbadger.com From f76b1f210ae2b971a46fe962ec5952b034244b25 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 10:22:31 +0000 Subject: [PATCH 5/5] Bump ajv from 4.11.8 to 6.10.2 Bumps [ajv](https://github.com/epoberezkin/ajv) from 4.11.8 to 6.10.2. - [Release notes](https://github.com/epoberezkin/ajv/releases) - [Commits](https://github.com/epoberezkin/ajv/compare/4.11.8...v6.10.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 532e057b..0ee871d8 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "stylus": "^0.54.5" }, "devDependencies": { - "ajv": "^4.11.2", + "ajv": "^6.10.2", "bootstrap": "^3.3.7", "chai": "^3.5.0", "chai-webdriver": "^1.2.0",