WIP: Commence develop branch starting with tojson & tplroot changes

AUTHORS.md

@@ -4,15 +4,15 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|158
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|163
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|22
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|17
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|8
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|7
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|6
-<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|6
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|5
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|5
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/4542588?v=4' width='36' height='36' alt='@evvers'>|[@evvers](https://github.com/evvers)|4
-<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|4
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|3
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|2
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/29522418?v=4' width='36' height='36' alt='@k-hamza'>|[@k-hamza](https://github.com/k-hamza)|2
@@ -29,4 +29,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-06-25.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-08.

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [3.0.8](https://github.com/saltstack-formulas/template-formula/compare/v3.0.7...v3.0.8) (2019-07-08)
+
+
+### Documentation
+
+* **contributing:** add template-formula to `semantic-release` formulas ([87e4ebc](https://github.com/saltstack-formulas/template-formula/commit/87e4ebc))
+
+## [3.0.7](https://github.com/saltstack-formulas/template-formula/compare/v3.0.6...v3.0.7) (2019-07-04)
+
+
+### Documentation
+
+* **contributing:** add recent `semantic-release` formula ([c679cb5](https://github.com/saltstack-formulas/template-formula/commit/c679cb5))
+
+## [3.0.6](https://github.com/saltstack-formulas/template-formula/compare/v3.0.5...v3.0.6) (2019-06-28)
+
+
+### Code Refactoring
+
+* **string:** remove capitalisation from 'template' string ([7062210](https://github.com/saltstack-formulas/template-formula/commit/7062210))
+
+## [3.0.5](https://github.com/saltstack-formulas/template-formula/compare/v3.0.4...v3.0.5) (2019-06-28)
+
+
+### Documentation
+
+* **contributing:** add recent `semantic-release` formula ([fc50a9e](https://github.com/saltstack-formulas/template-formula/commit/fc50a9e))
+
+## [3.0.4](https://github.com/saltstack-formulas/template-formula/compare/v3.0.3...v3.0.4) (2019-06-27)
+
+
+### Documentation
+
+* **contributing:** add recent `semantic-release` formulas ([22052fc](https://github.com/saltstack-formulas/template-formula/commit/22052fc))
+
 ## [3.0.3](https://github.com/saltstack-formulas/template-formula/compare/v3.0.2...v3.0.3) (2019-06-25)
 
 

FORMULA

@@ -1,9 +1,9 @@
 name: template
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 3.0.3
+version: 3.0.8
 release: 1
 minimum_version: 2016.11
-summary: Template formula
+summary: template formula
 description: Formula to use as a template for other formulas
 top_level_dir: template

docs/AUTHORS.rst

@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - Contributions
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 158
+     - 163
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
      - `@aboe76 <https://github.com/aboe76>`_
      - 22
@@ -25,20 +25,20 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
      - `@n-rodriguez <https://github.com/n-rodriguez>`_
      - 8
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
-     - `@gravyboat <https://github.com/gravyboat>`_
-     - 6
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
      - `@daks <https://github.com/daks>`_
+     - 7
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
+     - `@gravyboat <https://github.com/gravyboat>`_
      - 6
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
      - `@alxwr <https://github.com/alxwr>`_
      - 5
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/4542588?v=4' width='36' height='36' alt='@evvers'>`
-     - `@evvers <https://github.com/evvers>`_
-     - 4
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
      - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
+     - 5
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/4542588?v=4' width='36' height='36' alt='@evvers'>`
+     - `@evvers <https://github.com/evvers>`_
      - 4
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
      - `@nmadhok <https://github.com/nmadhok>`_
@@ -83,4 +83,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-06-25.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-07-08.

docs/CHANGELOG.rst

@@ -2,6 +2,51 @@
 Changelog
 =========
 
+`3.0.8 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.7...v3.0.8>`_ (2019-07-08)
+----------------------------------------------------------------------------------------------------------
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **contributing:** add template-formula to ``semantic-release`` formulas (\ `87e4ebc <https://github.com/saltstack-formulas/template-formula/commit/87e4ebc>`_\ )
+
+`3.0.7 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.6...v3.0.7>`_ (2019-07-04)
+----------------------------------------------------------------------------------------------------------
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **contributing:** add recent ``semantic-release`` formula (\ `c679cb5 <https://github.com/saltstack-formulas/template-formula/commit/c679cb5>`_\ )
+
+`3.0.6 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.5...v3.0.6>`_ (2019-06-28)
+----------------------------------------------------------------------------------------------------------
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **string:** remove capitalisation from 'template' string (\ `7062210 <https://github.com/saltstack-formulas/template-formula/commit/7062210>`_\ )
+
+`3.0.5 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.4...v3.0.5>`_ (2019-06-28)
+----------------------------------------------------------------------------------------------------------
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **contributing:** add recent ``semantic-release`` formula (\ `fc50a9e <https://github.com/saltstack-formulas/template-formula/commit/fc50a9e>`_\ )
+
+`3.0.4 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.3...v3.0.4>`_ (2019-06-27)
+----------------------------------------------------------------------------------------------------------
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **contributing:** add recent ``semantic-release`` formulas (\ `22052fc <https://github.com/saltstack-formulas/template-formula/commit/22052fc>`_\ )
+
 `3.0.3 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.2...v3.0.3>`_ (2019-06-25)
 ----------------------------------------------------------------------------------------------------------
 

docs/CONTRIBUTING.rst

@@ -163,14 +163,21 @@ Semantic release formulas
 
 These formulas are already compatible with semantic-release:
 
+* `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
 * `bind-formula <https://github.com/saltstack-formulas/bind-formula>`_
 * `cert-formula <https://github.com/saltstack-formulas/cert-formula>`_
 * `chrony-formula <https://github.com/saltstack-formulas/chrony-formula>`_
 * `collectd-formula <https://github.com/saltstack-formulas/collectd-formula>`_
+* `deepsea-formula <https://github.com/saltstack-formulas/deepsea-formula>`_
 * `fail2ban-formula <https://github.com/saltstack-formulas/fail2ban-formula>`_
+* `golang-formula <https://github.com/saltstack-formulas/golang-formula>`_
+* `grafana-formula <https://github.com/saltstack-formulas/grafana-formula>`_
+* `iptables-formula <https://github.com/saltstack-formulas/iptables-formula>`_
 * `keepalived-formula <https://github.com/saltstack-formulas/keepalived-formula>`_
+* `locale-formula <https://github.com/saltstack-formulas/locale-formula>`_
 * `logrotate-formula <https://github.com/saltstack-formulas/logrotate-formula>`_
 * `nginx-formula <https://github.com/saltstack-formulas/nginx-formula>`_
+* `php-formula <https://github.com/saltstack-formulas/php-formula>`_
 * `postfix-formula <https://github.com/saltstack-formulas/postfix-formula>`_
 * `postgres-formula <https://github.com/saltstack-formulas/postgres-formula>`_
 * `prometheus-formula <https://github.com/saltstack-formulas/prometheus-formula>`_
@@ -179,6 +186,7 @@ These formulas are already compatible with semantic-release:
 * `sudoers-formula <https://github.com/saltstack-formulas/sudoers-formula>`_
 * `syslog-ng-formula <https://github.com/saltstack-formulas/syslog-ng-formula>`_
 * `systemd-formula <https://github.com/saltstack-formulas/systemd-formula>`_
+* `template-formula <https://github.com/saltstack-formulas/template-formula>`_
 * `ufw-formula <https://github.com/saltstack-formulas/ufw-formula>`_
 * `vault-formula <https://github.com/saltstack-formulas/vault-formula>`_
 

test/integration/default/controls/config_spec.rb

@@ -1,4 +1,4 @@
-control 'Template configuration' do
+control 'template configuration' do
   title 'should match desired lines'
 
   describe file('/etc/template-formula.conf') do

test/integration/default/controls/packages_spec.rb

@@ -4,7 +4,7 @@
   package_name = 'cronie'
 end
 
-control 'Template package' do
+control 'template package' do
   title 'should be installed'
 
   describe package(package_name) do

test/integration/default/controls/services_spec.rb

@@ -4,7 +4,7 @@
   service_name = 'crond'
 end
 
-control 'Template service' do
+control 'template service' do
   impact 0.5
   title 'should be running and enabled'
 

test/integration/default/inspec.yml

@@ -1,5 +1,5 @@
 name: template
-title: Template Formula
+title: template formula
 maintainer: Your Name
 license: Apache-2.0
 summary: Verify that the template formula is setup and configured correctly