Commit graph

425 commits

Author SHA1 Message Date
Imran Iqbal
a98b77723a
refactor(tofs): make files_switch macro fully portable
* Introduce `v1_path_prefix` parameter
2019-03-24 03:44:07 +00:00
semantic-release-bot
709d6a2294 chore(release): 2.0.0 [skip ci]
# [2.0.0](https://github.com/saltstack-formulas/template-formula/compare/v1.2.6...v2.0.0) (2019-03-24)

### Code Refactoring

* **tofs:** move “files_switch” macro to “libtofs.jinja” ([da7e692](https://github.com/saltstack-formulas/template-formula/commit/da7e692))

### BREAKING CHANGES

* **tofs:** every formula writer will need to change the import
to use this new version.

* template/libtofs.jinja: provides the “files_switch” macro.

* docs/TOFS_pattern.rst: update documentation to use the new path.

* template/config/clean.sls: change import from “macros.jinja” to “libtofs.jinja”.

* template/config/file.sls: ditoo.
2019-03-24 03:42:47 +00:00
Imran Iqbal
54c3cc5717
Merge pull request #79 from eole/feature/move-files_switch-to-libtofs.jinja
refactor(tofs): move “files_switch” macro to “libtofs.jinja”
2019-03-24 03:30:56 +00:00
semantic-release-bot
483ce48ae4 chore(release): 1.2.6 [skip ci]
## [1.2.6](https://github.com/saltstack-formulas/template-formula/compare/v1.2.5...v1.2.6) (2019-03-24)

### Reverts

* **kitchen+travis:** use `debian:jessie-backports` as `debian-8` ([dcd141a](https://github.com/saltstack-formulas/template-formula/commit/dcd141a)), closes [/github.com/saltstack/salt-pack/issues/657#issuecomment-474954298](https://github.com//github.com/saltstack/salt-pack/issues/657/issues/issuecomment-474954298)
2019-03-24 01:58:57 +00:00
Imran Iqbal
fd4ce6a34e
Merge pull request #82 from myii/chore/use-standard-debian-8
revert(kitchen+travis): use `debian:jessie-backports` as `debian-8`
2019-03-24 01:37:47 +00:00
Imran Iqbal
dcd141af74
revert(kitchen+travis): use debian:jessie-backports as debian-8
This reverts commit 1b9d2493c9.

* https://github.com/saltstack/salt-pack/issues/657#issuecomment-474954298
  - `python-systemd` is now available in the SaltStack repo
* Amended the commit to add: `image: debian:8`
2019-03-24 01:27:31 +00:00
semantic-release-bot
66ece768dd chore(release): 1.2.5 [skip ci]
## [1.2.5](https://github.com/saltstack-formulas/template-formula/compare/v1.2.4...v1.2.5) (2019-03-23)

### Bug Fixes

* **travis:** use version numbers in Gemfile to prevent failed builds ([35f7111](https://github.com/saltstack-formulas/template-formula/commit/35f7111))
2019-03-23 16:01:43 +00:00
Imran Iqbal
ae7af65302
Merge pull request #81 from myii/bug/fix-kitchen-failures
fix(travis): use version numbers in Gemfile to prevent failed builds
2019-03-23 15:45:22 +00:00
Imran Iqbal
35f71113cf
fix(travis): use version numbers in Gemfile to prevent failed builds
* `kitchen-salt 0.0.21` being installed instead of current latest `0.5.0`
  - Failing builds since `pillars_from_files` is not recognised
  - Deprecated `pillars-from-files` is working but not the right solution
* Reason: `test-kitchen 2.0.0` was released 3 days ago on March 20, 2019
  - `kitchen-salt 0.5.0` depends on `test-kitchen ~> 1.4`
  - `kitchen-salt 0.0.21` depends on `test-kitchen >= 0`, so gets pulled
* Remove `test-kitchen` since it is pulled automatically by the other gems
  - Allow the correct version to be installed via. dependency resolution
2019-03-23 15:42:27 +00:00
semantic-release-bot
6ceb238248 chore(release): 1.2.4 [skip ci]
## [1.2.4](https://github.com/saltstack-formulas/template-formula/compare/v1.2.3...v1.2.4) (2019-03-22)

### Code Refactoring

* **tofs:** avoid using “salt['config.get']” for formula writers ([60d43e7](https://github.com/saltstack-formulas/template-formula/commit/60d43e7))
2019-03-22 21:15:12 +00:00
Daniel Dehennin
da7e69283f refactor(tofs): move “files_switch” macro to “libtofs.jinja”
BREAKING CHANGE: every formula writer will need to change the import
to use this new version.

* template/libtofs.jinja: provides the “files_switch” macro.

* docs/TOFS_pattern.rst: update documentation to use the new path.

* template/config/clean.sls: change import from “macros.jinja” to “libtofs.jinja”.

* template/config/file.sls: ditoo.
2019-03-21 11:42:14 +01:00
Imran Iqbal
6d2140f1da
Merge pull request #77 from eole/feature/simplify-files_switch-call
refactor(tofs): avoid using “salt['config.get']” for formula writers
2019-03-21 04:16:29 +00:00
Daniel Dehennin
60d43e7fee refactor(tofs): avoid using “salt['config.get']” for formula writers
We can hide the call to “salt['config.get']” in the macro by only
asking for a “lookup key” where to lookup the list of “source_files”.

* docs/TOFS_pattern.rst (Example): document the use of the new
  optional “lookup” parameter.

* template/macros.jinja: add a new optional “lookup” parameter.
  Lookup “files override” under the
  “<tplroot>:tofs:sources_files:<lookup key>” and fallback to
  “source_files” parameter.

* template/config/file.sls (template-config-file-file-managed): use
  the new “lookup” parameter.
2019-03-14 10:14:29 +01:00
semantic-release-bot
193bba805f chore(release): 1.2.3 [skip ci]
## [1.2.3](https://github.com/saltstack-formulas/template-formula/compare/v1.2.2...v1.2.3) (2019-03-13)

### Documentation

* **tofs:** incorrect path for “source_files” lookup key ([a76f659](https://github.com/saltstack-formulas/template-formula/commit/a76f659))
2019-03-13 17:43:50 +00:00
Imran Iqbal
a01baa0516
Merge pull request #78 from eole/bugfix/tofs-doc-typo
docs(tofs): incorrect path for “source_files” lookup key
2019-03-13 17:25:28 +00:00
Daniel Dehennin
a76f659e9d docs(tofs): incorrect path for “source_files” lookup key
* docs/TOFS_pattern.rst: rename “nfs” to “ntp”.
2019-03-13 14:57:36 +01:00
semantic-release-bot
18e5a3dac1 chore(release): 1.2.2 [skip ci]
## [1.2.2](https://github.com/saltstack-formulas/template-formula/compare/v1.2.1...v1.2.2) (2019-03-09)

### Bug Fixes

* **tofs:** update use of state ID in `config` and `pillar` ([3d9a24c](https://github.com/saltstack-formulas/template-formula/commit/3d9a24c))
* **tofs:** use `source_files` instead of `files` ([5110716](https://github.com/saltstack-formulas/template-formula/commit/5110716)), closes [/freenode.logbot.info/saltstack-formulas/20190308#c2046753](https://github.com//freenode.logbot.info/saltstack-formulas/20190308/issues/c2046753)
2019-03-09 22:24:09 +00:00
Niels Abspoel
f72c621a2e
Merge pull request #76 from myii/bug/remove-dupe-files-in-tofs
fix(tofs): use `source_files` instead of `files`
2019-03-09 23:11:24 +01:00
Imran Iqbal
51107165f0
fix(tofs): use source_files instead of files
* As discussed in the Slack/IRC/Matrix room from this point forward:
  - https://freenode.logbot.info/saltstack-formulas/20190308#c2046753
2019-03-09 06:36:11 +00:00
Imran Iqbal
3d9a24c71d
fix(tofs): update use of state ID in config and pillar 2019-03-09 01:58:30 +00:00
semantic-release-bot
eab481cd4f chore(release): 1.2.1 [skip ci]
## [1.2.1](https://github.com/saltstack-formulas/template-formula/compare/v1.2.0...v1.2.1) (2019-03-07)

### Code Refactoring

* **kitchen:** `pillars-from-files` => `pillars_from_files` ([7c954a7](https://github.com/saltstack-formulas/template-formula/commit/7c954a7)), closes [/github.com/saltstack-formulas/packages-formula/pull/50#discussion_r262769817](https://github.com//github.com/saltstack-formulas/packages-formula/pull/50/issues/discussion_r262769817)

### Styles

* **map:** use `-` for each Jinja block ([64e3834](https://github.com/saltstack-formulas/template-formula/commit/64e3834))
2019-03-07 19:07:06 +00:00
Niels Abspoel
2e89b15f6e
Merge pull request #74 from saltstack-formulas/myii-patch-1
refactor(kitchen): `pillars-from-files` => `pillars_from_files`
2019-03-07 19:53:57 +01:00
Imran Iqbal
4f1fe2d253
Merge pull request #75 from myii/refactor/map-jinja-consistency
style(map): use `-` for each Jinja block
2019-03-07 15:12:44 +00:00
Imran Iqbal
64e383474f
style(map): use - for each Jinja block 2019-03-07 15:11:23 +00:00
Imran Iqbal
7c954a7e47
refactor(kitchen): pillars-from-files => pillars_from_files
* https://github.com/saltstack-formulas/packages-formula/pull/50#discussion_r262769817
  - `pillars-from-files` is deprecated in favor of `pillars_from_files`
2019-03-06 17:52:02 +00:00
Imran Iqbal
b9bc8dc0f6
Merge pull request #73 from myii/feature/prepare-docs-for-RTD
chore(semantic-release): move pre-commit script back to root dir
2019-03-06 00:45:19 +00:00
Imran Iqbal
4601d38289
chore(semantic-release): move pre-commit script back to root dir
* https://freenode.logbot.info/saltstack-formulas/20190305#c2040419
2019-03-06 00:36:41 +00:00
semantic-release-bot
a52523b9f4 chore(release): 1.2.0 [skip ci]
# [1.2.0](https://github.com/saltstack-formulas/template-formula/compare/v1.1.2...v1.2.0) (2019-03-03)

### Features

* **m2r:** use `m2r` to convert automatic `.md` files to `.rst` ([b86ddf4](https://github.com/saltstack-formulas/template-formula/commit/b86ddf4))
2019-03-03 05:22:26 +00:00
Imran Iqbal
ab3bb0e575
Merge pull request #72 from myii/feature/prepare-docs-for-RTD
feat(m2r): use `m2r` to convert automatic `.md` files to `.rst`
2019-03-03 05:09:58 +00:00
Imran Iqbal
f341bdb8ef
chore(semantic-release): move pre-commit script to bin/ subdir 2019-03-03 05:05:13 +00:00
Imran Iqbal
b86ddf4ce7
feat(m2r): use m2r to convert automatic .md files to .rst
* https://github.com/miyakogi/m2r
  - Markdown to reStructuredText converter
2019-03-03 05:04:23 +00:00
semantic-release-bot
1a26fdda06 chore(release): 1.1.2 [skip ci]
## [1.1.2](https://github.com/saltstack-formulas/template-formula/compare/v1.1.1...v1.1.2) (2019-03-03)

### Documentation

* **contributing:** add documentation contribution guidelines ([dff0ee8](https://github.com/saltstack-formulas/template-formula/commit/dff0ee8))
* **rtd:** add comment to CSS file for overriding in-use Sphinx theme ([f237364](https://github.com/saltstack-formulas/template-formula/commit/f237364))
* **rtd:** clean up numerous issues and inconsistencies ([ad5a8b8](https://github.com/saltstack-formulas/template-formula/commit/ad5a8b8))
* **tofs:** use `literalinclude` of `macros.jinja` instead of code dupe ([3f0071b](https://github.com/saltstack-formulas/template-formula/commit/3f0071b))
2019-03-03 00:30:55 +00:00
Imran Iqbal
3a2974585f
Merge pull request #71 from myii/feature/prepare-docs-for-RTD
docs(contributing): add documentation contribution guidelines
2019-03-03 00:15:44 +00:00
Imran Iqbal
ad5a8b84bf
docs(rtd): clean up numerous issues and inconsistencies
* Include:
  - Fix link texts
  - Apply text formatting
  - Split some of the long lines (improved diffs)
  - Remove extra `\ ` appearing after conversion from Markdown
  - Improve ordered (numbered) nested lists
  - Use 3-character indents under RST directives
  - Use Jinja commenting in Jinja examples (not just `#`)
2019-03-03 00:11:35 +00:00
Imran Iqbal
3f0071b72b
docs(tofs): use literalinclude of macros.jinja instead of code dupe 2019-03-02 23:56:21 +00:00
Imran Iqbal
dff0ee8ef8
docs(contributing): add documentation contribution guidelines 2019-03-02 23:56:21 +00:00
Imran Iqbal
f2373641b4
docs(rtd): add comment to CSS file for overriding in-use Sphinx theme 2019-03-02 23:54:44 +00:00
semantic-release-bot
ea1841c08d chore(release): 1.1.1 [skip ci]
## [1.1.1](https://github.com/saltstack-formulas/template-formula/compare/v1.1.0...v1.1.1) (2019-03-01)

### Continuous Integration

* **travis:** remove obsolete `markdown-toc` process ([97fbb60](https://github.com/saltstack-formulas/template-formula/commit/97fbb60))

### Documentation

* **contributing:** add TOC to match all other pages ([7b1a2a9](https://github.com/saltstack-formulas/template-formula/commit/7b1a2a9))
* **readme:** add Read the Docs build status badge ([f47797d](https://github.com/saltstack-formulas/template-formula/commit/f47797d))
* **tofs:** replace existing `.md` with `.rst` and add to RTD ([fd68168](https://github.com/saltstack-formulas/template-formula/commit/fd68168))
* **tofs:** use table to list authorship ([2f0e20f](https://github.com/saltstack-formulas/template-formula/commit/2f0e20f))
2019-03-01 16:53:13 +00:00
Imran Iqbal
97fbb601e9
ci(travis): remove obsolete markdown-toc process 2019-03-01 16:40:02 +00:00
Imran Iqbal
f47797d1fc
docs(readme): add Read the Docs build status badge 2019-03-01 16:32:17 +00:00
Imran Iqbal
9294a97b50
Merge pull request #69 from myii/feature/prepare-docs-for-RTD
docs(tofs): replace existing `.md` with `.rst` and add to RTD
2019-03-01 16:21:24 +00:00
Imran Iqbal
7b1a2a9a14
docs(contributing): add TOC to match all other pages 2019-03-01 16:20:49 +00:00
Imran Iqbal
2f0e20f449
docs(tofs): use table to list authorship 2019-03-01 16:07:27 +00:00
Imran Iqbal
fd68168cce
docs(tofs): replace existing .md with .rst and add to RTD 2019-03-01 16:06:28 +00:00
semantic-release-bot
7abef94232 chore(release): 1.1.0 [skip ci]
# [1.1.0](https://github.com/saltstack-formulas/template-formula/compare/v1.0.1...v1.1.0) (2019-03-01)

### Documentation

* **rtd:** add basic `docs/conf.py` to allow additional customisation ([18d3924](https://github.com/saltstack-formulas/template-formula/commit/18d3924))

### Features

* **rtd:** provide custom CSS file for overriding in-use Sphinx theme ([24bd338](https://github.com/saltstack-formulas/template-formula/commit/24bd338))
2019-03-01 15:30:16 +00:00
Imran Iqbal
64c9e70d6e
Merge pull request #68 from myii/feature/prepare-docs-for-RTD
feat(rtd): provide custom CSS file for overriding in-use Sphinx theme
2019-03-01 15:14:31 +00:00
Imran Iqbal
24bd338334
feat(rtd): provide custom CSS file for overriding in-use Sphinx theme
* `sphinx_rtd_theme` known issue: long lines in tables do not wrap by default
  - https://github.com/rtfd/sphinx_rtd_theme/issues/117
2019-03-01 15:08:58 +00:00
Imran Iqbal
18d3924dcb
docs(rtd): add basic docs/conf.py to allow additional customisation
* Incorporate settings from default `docs/conf.py` used by RTD
2019-03-01 14:57:40 +00:00
semantic-release-bot
eb246a284c chore(release): 1.0.1 [skip ci]
## [1.0.1](https://github.com/saltstack-formulas/template-formula/compare/v1.0.0...v1.0.1) (2019-03-01)

### Continuous Integration

* **travis:** remove unavailable files from `markdown-toc` process ([3148f0d](https://github.com/saltstack-formulas/template-formula/commit/3148f0d))

### Documentation

* **contributing:** convert to `.rst` and move to `docs` subdir ([474f318](https://github.com/saltstack-formulas/template-formula/commit/474f318))
* **index:** add `CONTRIBUTING` to the `toctree` ([0c98e67](https://github.com/saltstack-formulas/template-formula/commit/0c98e67))
* **readme:** move under `docs` subdir to access in both GitHub and RTD ([c92f674](https://github.com/saltstack-formulas/template-formula/commit/c92f674))
* **readme:** update heading markers for consistency ([5a2bea8](https://github.com/saltstack-formulas/template-formula/commit/5a2bea8))
* **rtd:** add basic `index.rst` to allow RTD to produce docs ([f02139f](https://github.com/saltstack-formulas/template-formula/commit/f02139f))
* **rtd:** use internal link targets at the top of each `.rst` file ([da09528](https://github.com/saltstack-formulas/template-formula/commit/da09528))
2019-03-01 05:35:09 +00:00
Imran Iqbal
0e4051187d
Merge pull request #67 from myii/feature/prepare-docs-for-RTD
docs(rtd): use internal link targets at the top of each `.rst` file
2019-03-01 05:22:22 +00:00