puppet-strings 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 841114139c5e61cbe619f7d6282f08555a8cd890
-  data.tar.gz: 3acc7ea95bb3bdb7cf3890e3fb58d95f2d4f7e61
+SHA256:
+  metadata.gz: b656b5430c108d15ea909e2381ca758884b51c910505ab36880f76be538b5eff
+  data.tar.gz: 6951a084211bbdc7d0d760865acae0e839ceadadd8df337d33938097083b4bc1
 SHA512:
-  metadata.gz: 7729f413ef4d94ecb2ada117ae4d93eabf096da95ad99804280121c33460466b76032f8c964abeafdf97d5ca38aed7ee551aac1dc77d3b07fcaf00bc46f1bb73
-  data.tar.gz: a4c6a1960fce2917d318acb4c6cd0f353779499acaf416dab177d3f2da7706f1475e0a7c694e4b58813faac7ebe48882937c89e3651ec67831a79bb43aac6cb5
+  metadata.gz: 0c359ad4b8a62e978e16f01cf17a50e86d9c011fc13ce3bde9757f2f57074d92c8df7b78119b88bd8551510adb3cf2cbe5adb5644e99e2415ed830d6744eccfe
+  data.tar.gz: ed4d414529d500e4dfa696271e757c4daecd3df98c89ab83b2c7f956ac16a1392779c3fcf0d601d1c91c70a75a0e8745ce36bfef6679dac9f36a7cc3428aca76

data/CHANGELOG.md

@@ -1,6 +1,22 @@
-# Change log
+# Changelog
 
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+All significant changes to this repo will be summarized in this file.
+
+
+## [v2.1.0](https://github.com/puppetlabs/puppet-strings/tree/v2.1.0) (2018-06-25)
+
+[Full Changelog](https://github.com/puppetlabs/puppet-strings/compare/2.0.0...v2.1.0)
+
+**Implemented enhancements:**
+
+- \(PDOC-212, PDOC-213\) add support for @note and @todo [\#182](https://github.com/puppetlabs/puppet-strings/pull/182) ([eputnam](https://github.com/eputnam))
+- \(PDOC-255\) markdown table of contents update [\#181](https://github.com/puppetlabs/puppet-strings/pull/181) ([eputnam](https://github.com/eputnam))
+
+**Merged pull requests:**
+
+- \(PDOC-259\) relax ruby requirement to 2.1.0 from 2.1.9 [\#184](https://github.com/puppetlabs/puppet-strings/pull/184) ([DavidS](https://github.com/DavidS))
+
+# Previous Changes
 
 ## [2.0.0](https://github.com/puppetlabs/puppet-strings/tree/2.0.0) (2018-05-11)
 

data/CONTRIBUTING.md

@@ -51,7 +51,7 @@ that we can have a chance of keeping on top of things.
 For changes of a trivial nature to comments and documentation, it is not
 always necessary to create a new ticket in Jira. In this case, it is
 appropriate to start the first line of a commit with '(doc)' instead of
-a ticket number. 
+a ticket number.
 
 ````
     (doc) Add documentation commit example to CONTRIBUTING
@@ -76,6 +76,25 @@ a ticket number.
 * After feedback has been given we expect responses within two weeks. After two
   weeks will may close the pull request if it isn't showing any activity.
 
+## Cutting a release
+
+To cut a new release, from a current `master` checkout:
+
+* Start the release branch with `git checkout -b release-prep`
+* Update `lib/puppet-strings/version.rb` to the new version
+* Update the CHANGELOG
+  * Have a [CHANGELOG_GITHUB_TOKEN](https://github.com/skywinder/github-changelog-generator#github-token) set in your environment
+  * run `rake changelog`
+  * double check the PRs to make sure they're all tagged correctly (using the new CHANGELOG for cross-checking)
+* Check README and other materials for up-to-date-ness
+* Commit changes with title "Release prep for v\<VERSION>"
+* Upload and PR the release-prep branch to the puppetlabs GitHub repo
+* Check that CI is green and merge the PR
+* Run `rake release[upstream]` to release from your checkout
+  * make sure to use the name of your git remote pointing to the puppetlabs GitHub repo
+* Remove the release-prep branch
+* Send the release announcements using the template in [misc/ANNOUNCEMENT_TEMPLATE.md](misc/ANNOUNCEMENT_TEMPLATE.md)
+
 # Additional Resources
 
 * [More information on contributing](http://links.puppet.com/contribute-to-puppet)

data/Gemfile

@@ -29,14 +29,9 @@ group :acceptance do
 end
 
 group :development do
+  gem 'github_changelog_generator', git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
   gem 'pry'
-  if RUBY_VERSION[0..2] == '1.9'
-    gem 'pry-debugger'
-  elsif RUBY_VERSION[0] == '2'
-    gem 'pry-byebug'
-  end
+  gem 'pry-byebug'
 end
 
-gem 'json',      '<= 1.8'    if RUBY_VERSION < '2.0.0'
-gem 'json_pure', '<= 2.0.1'  if RUBY_VERSION < '2.0.0'
-gem 'rubocop',   '<= 0.47.0' if RUBY_VERSION >= '2.0.0'
+gem 'rubocop', '<= 0.47.0'

data/HISTORY.md

@@ -0,0 +1,218 @@
+# Previous Changes
+
+## [2.0.0](https://github.com/puppetlabs/puppet-strings/tree/2.0.0) (2018-05-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppet-strings/compare/1.2.1...2.0.0)
+
+### Changed
+
+- bump required ruby and puppet versions [\#178](https://github.com/puppetlabs/puppet-strings/pull/178) ([eputnam](https://github.com/eputnam))
+
+### Added
+
+- \(PDOC-238\) add generated message to markdown [\#175](https://github.com/puppetlabs/puppet-strings/pull/175) ([eputnam](https://github.com/eputnam))
+- \(PDOC-228\) puppet plan support [\#168](https://github.com/puppetlabs/puppet-strings/pull/168) ([eputnam](https://github.com/eputnam))
+- \(PDOC-206\) support for tasks [\#161](https://github.com/puppetlabs/puppet-strings/pull/161) ([eputnam](https://github.com/eputnam))
+
+### Fixed
+
+- \(PDOC-36\) fix hack for README urls [\#176](https://github.com/puppetlabs/puppet-strings/pull/176) ([eputnam](https://github.com/eputnam))
+- \(PDOC-240\) add handling for :array node type in rsapi\_handler [\#174](https://github.com/puppetlabs/puppet-strings/pull/174) ([eputnam](https://github.com/eputnam))
+- \(PDOC-159\) server urls fix [\#173](https://github.com/puppetlabs/puppet-strings/pull/173) ([eputnam](https://github.com/eputnam))
+- \(maint\) display Plans in markdown table of contents [\#171](https://github.com/puppetlabs/puppet-strings/pull/171) ([eputnam](https://github.com/eputnam))
+- \(PDOC-233\) markdown whitespace fixes [\#170](https://github.com/puppetlabs/puppet-strings/pull/170) ([JohnLyman](https://github.com/JohnLyman))
+- \(PDOC-229\) fix error with return\_type and @return [\#169](https://github.com/puppetlabs/puppet-strings/pull/169) ([eputnam](https://github.com/eputnam))
+- \(PDOC-36\) hack to fix README links in generated HTML [\#167](https://github.com/puppetlabs/puppet-strings/pull/167) ([eputnam](https://github.com/eputnam))
+- \(PDOC-192\) remove warning for title/name [\#166](https://github.com/puppetlabs/puppet-strings/pull/166) ([eputnam](https://github.com/eputnam))
+- \(maint\) add condition for misleading warning [\#155](https://github.com/puppetlabs/puppet-strings/pull/155) ([eputnam](https://github.com/eputnam))
+
+## [1.2.1](https://github.com/puppetlabs/puppet-strings/tree/1.2.1) (2018-03-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppet-strings/compare/1.2.0...1.2.1)
+
+### Fixed
+
+- (PDOC-224) Handle --emit-json(-stdout) again [\#162](https://github.com/puppetlabs/puppet-strings/pull/162) ([ekohl](https://github.com/ekohl))
+
+## [1.2.0](https://github.com/puppetlabs/puppet-strings/tree/1.2.0) (2018-02-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppet-strings/compare/1.1.1...1.2.0)
+
+### Added
+
+- \(PDOC-184\) generate markdown [\#156](https://github.com/puppetlabs/puppet-strings/pull/156) ([eputnam](https://github.com/eputnam))
+- \(PDK-437\) Add support for Resource API types [\#153](https://github.com/puppetlabs/puppet-strings/pull/153) ([DavidS](https://github.com/DavidS))
+
+### Fixed
+
+- Fix return type matching for Puppet functions [\#159](https://github.com/puppetlabs/puppet-strings/pull/159) ([pegasd](https://github.com/pegasd))
+- Add rgen as a runtime dependency [\#149](https://github.com/puppetlabs/puppet-strings/pull/149) ([rnelson0](https://github.com/rnelson0))
+
+## 2017-10-20 - Release 1.1.1
+
+### BugFixes
+- Remove timestamps from footer of generated HTML pages ([GeoffWilliams](https://github.com/GeoffWilliams))
+- Fix argument handling for `rake strings::generate` ([hashar](https://github.com/hashar))
+
+### Other
+- Fixed Markdown formatting issues in CHANGELOG ([maju6406](https://github.com/maju6406))
+- Fixed typo in README ([hfm](https://github.com/hfm))
+- Fixed Markdown formatting issues in README ([gguillotte](https://github.com/gguillotte))
+- Update Travis CI configurations for Ruby and Puppet versions ([ghoneycutt](https://github.com/ghoneycutt))
+
+## 2017-03-20 - Release 1.1.0
+
+### Summary
+
+This release adds a new `summary` tag which can be used to add a short description to classes, functions, types, and providers. In addition, `@param` tags can now include type information in Puppet 4 code without warnings being issued.
+
+All related tickets can be found under the [PDOC](https://tickets.puppetlabs.com/browse/PDOC) JIRA project with the fix version of [1.1.0](https://tickets.puppetlabs.com/issues/?filter=25603).
+
+### Features
+- The `summary` tag can be added to any code that puppet-strings supports. The recommended length limit for a summary is 140 characters. Warnings will be issued for strings longer than this limit.
+- Puppet 4 parameter types can now be explicitly documented. Previously, this was not allowed because Puppet 4 parameter types can be automatically determined without extra documentation. However, users may desire to do so anyway for consistency. Strings will emit a warning if the documented type does not match the actual type. In such an event, the incorrect documented type will be ignored in favor of the real one.
+
+## 2016-11-28 - Release 1.0.0
+
+### Summary
+
+This release fixes up minor bugs from the 0.99.0 release and modifies the JSON schema for Puppet functions.
+
+All related tickets can be found under the [PDOC](https://tickets.puppetlabs.com/browse/PDOC) JIRA project with the fix version of [1.0.0](https://tickets.puppetlabs.com/issues/?filter=23607).
+
+### Features
+- The JSON schema for Puppet functions has been altered to include a new 'signatures' top-level key **(PDOC-125)**
+  - Includes information about all function signatures (overloads). Existing overload key format has been preserved.
+- Reworked README for enhanced clarity **(PDOC-133)**
+
+### BugFixes
+- Fixed an issue where the search box in the code navigator overlapped list items below it **(PDOC-93)**
+- Strings can now handle multiple `defaultfor` calls in Puppet providers **(PDOC-95)**
+- Fixed an issue preventing the generated \_index.html file from being uploaded to GitHub pages via the gh_pages task **(PDOC-120)**
+- Fixed several issues with String's handling of Puppet 3.x and 4.x function return types **(PDOC-135)**, **(PDOC-136)**
+- Fixed an issue where String's didn't properly parse overloads if no summary description was provided **(PDOC-129)**
+- Strings now correctly handles Puppet 3.x functions when the `newfunction` call is on a newline **(PDOC-122)**
+- Fixed an issue where certain Ruby string constructs were incompletely stripped from some docstrings **(PDOC-126)**
+- Hanging indents from type feature descriptions are now properly stripped **(PDOC-127)**
+
+## 2016-10-10 - Release 0.99.0
+
+### Summary
+
+This release includes a complete rewrite of strings, fixing many bugs from previous versions and generally improving the user experience. This release is intended to be the last stop before the strings major version 1.0 is released, and nearly all of the functionality of the major release is included.
+
+All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with the fix version of [0.99.0](https://tickets.puppetlabs.com/issues/?filter=22705).
+
+### Features
+- Complete overhaul, including code cleanup, bug fixes and new functionality **(PDOC-63)**
+  - Documentation has been split into sections based on type: puppet 3x API functions, puppet 4x API functions, ruby classes, puppet language functions, types, and providers
+  - New JSON schema organized to reflect the separation of types
+  - Support for custom functions written in the puppet language
+  - Support for puppet function overloads via the create_function 4.x API
+  - YARD bumped to latest version, 0.9.5
+- Markdown is now the default format for parsing docstring text **(PDOC-86)**
+  - Note: this means Markdown text in YARD comments and tags, not a change in the output of strings
+- New commandline options: --emit-json and --emit-json-stdout to generate JSON documentation **(PDOC-84)**
+- Runtime dependency on Puppet has been removed, allowing strings to function in Puppet Enterprise 3.8 **(PDOC-80)**
+  - Note that the gem still requires puppet. We recommend that the strings gem be installed with puppet, as suggested in the  [README](https://github.com/puppetlabs/puppet-strings/blob/master/README.md#installing-puppet-strings)
+- New gemspec requirement on Ruby version 1.9.3, the oldest supported Ruby version
+
+### BugFixes
+
+- Prevents a blizzard of errors when documenting Puppet Core source and some puppet modules **(PDOC-63)**
+  - As this is a complete rewrite, many known and unknown bugs from the original code were fixed along the way
+- Allow strings to be installed in PE 3.8 without overwriting existing puppet and facter installations with newer gems
+
+## 2016-03-30 - Release 0.4.0
+
+### Summary
+
+This release adds JSON output support for strings, fixes a major bug that prevented strings from working with the 4.4.0 release of puppet, and is the last version of strings that will be released as a module.
+
+All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with the fix version of [0.4.0](https://tickets.puppetlabs.com/issues/?filter=18810).
+
+### Features
+- Support for JSON output **(PDOC-23)**
+  - Strings now has the ability to produce a JSON representation of a given puppet module
+  - The details of the JSON schema can be found [here](https://github.com/puppetlabs/puppet-strings/blob/master/json_dom.md)
+  - For details on how to generate JSON, see the [README](https://github.com/puppetlabs/puppet-strings/blob/master/README.md#running-puppet-strings)
+- Migrate to ruby gems as a distribution method **(PDOC-28)**
+  - This is the last release of strings that will be available as a puppet module
+  - The 0.4.0 release will be released concurrently as a ruby gem
+  - After this release, all updates will only be available via the gem
+
+### Bugfixes
+
+- Fix issue that prevented strings from running with Puppet 4.4.0 **(PDOC-75)**
+
+## 2015-09-22 - Release 0.3.1
+
+### Summary
+
+This is a minor bug fix release.
+
+All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with the fix version of [0.3.1](https://tickets.puppetlabs.com/issues/?filter=15530).
+
+### Bugfixes
+
+- Prevent strings from printing unnecessary quotes in error messages **(PDOC-57)**
+- Issue correct type check warnings for defined types **(PDOC-56)**
+- Allow providers, types, and defines to have the same name **(PDOC-54)**
+
+## 2015-09-21 - Release 0.3.0
+
+### Summary
+
+This release includes support for Puppet Types and Providers, as well as
+type checking Puppet 4x functions and defined types.
+
+All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with
+the fix version of [0.3.0](https://tickets.puppetlabs.com/issues/?filter=15529).
+
+#### Features
+
+- Support for Puppet Types and Providers **(PDOC-35)**
+- Type check Puppet 4x functions and defined types where possible and warn the user when types don't match.
+  - Type check defined types **(PDOC-21)**
+  - Type check Puppet 4x functions **(PDOC-38)** **(PDOC-19)** **(PDOC-37)**
+  - Output type info in generated HTML **(PDOC-19)**
+- Improved warnings and logging.
+  - Create a consistent style for warnings. **(PDOC-49)**
+  - All warnings get printed on stderr.
+  - Yard warnings are redirected to a log file **(PDOC-38)**
+  - Prevent duplicate warnings **(PDOC-38)**
+- Improved README installation and usage instructions.
+  - Installation instructions using Puppet **(PDOC-33)**
+
+
+#### Bugfixes
+
+- Fix markdown list processing **(PDOC-30)**
+- Fix namespacing for nested classes and defined types **(PDOC-20)**
+
+
+## 2015-03-17 - Release 0.2.0
+
+### Summary
+
+This release includes improvements to the HTML output generated by strings and a few bug fixes.
+All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with the fix version of [0.2.0](https://tickets.puppetlabs.com/issues/?filter=13760).
+
+[PDOC JIRA]: https://tickets.puppetlabs.com/browse/PDOC
+
+#### Features
+- Custom YARD templates for classes and defined types **(PDOC-17)**
+    - Improved HMTL output that is more appropriate for Puppet code (especially for parameters)
+    - Support for the explicit list of YARD tags we will be supporting initially (@param, @return, @since, @example)
+    - Our own custom YARD templates which can be easily extended and tweaked
+
+- Custom YARD templates for 3.x and 4.x functions **(PDOC-24)**
+    - Improved HMTL output that is more appropriate for listing several functions on one webpage in addition to being more consistent with the HTML produced for classes and defined types.
+    - Support for the explicit list of YARD tags we will be supporting initially (@param, @return, @since, @example)
+    - Our own custom YARD templates which can be easily extended and tweaked
+- Addition of RubCop Travis CI job to ensure code quality and consistency **(PDOC-8)**
+
+#### Bugfixes
+- Puppet namespaces are no longer mangled for nested classes and defined types **(PDOC-25)**
+- Strings is now compatible with the renaming of the Puppetx/puppetx namespace to PuppetX/puppet_x **(PDOC-26)**
+- Strings will no longer crash when documenting 3x functions with less than two arguments passed into newfunction **(PDOC-27)**

data/Rakefile

@@ -1,5 +1,5 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'bundler/gem_tasks'
+#require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
 # Add our own tasks
@@ -58,3 +58,36 @@ task(:rubocop) do
   cli = RuboCop::CLI.new
   cli.run(%w(-D -f s))
 end
+
+#### CHANGELOG ####
+begin
+  require 'github_changelog_generator/task'
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    require 'puppet-strings/version'
+    config.future_release = "v#{PuppetStrings::VERSION}"
+    config.header = "# Changelog\n\n" \
+      "All significant changes to this repo will be summarized in this file.\n"
+    config.configure_sections = {
+          added: {
+            prefix: "Added",
+            labels: ["enhancement"]
+          },
+          fixed: {
+            prefix: "Fixed",
+            labels: ["bugfix"]
+          },
+          breaking: {
+            prefix: "Changed",
+            labels: ["backwards-incompatible"]
+          }
+        }
+    config.exclude_labels = ['maintenance']
+    config.user = 'puppetlabs'
+    config.project = 'puppet-strings'
+  end
+rescue LoadError
+  desc 'Install github_changelog_generator to get access to automatic changelog generation'
+  task :changelog do
+    raise 'Install github_changelog_generator to get access to automatic changelog generation'
+  end
+end

data/lib/puppet-strings/markdown/base.rb

@@ -57,7 +57,9 @@ module PuppetStrings::Markdown
     # e.g. {:tag_name=>"author", :text=>"eputnam"}
     { :return_val => 'return',
       :since => 'since',
-      :summary => 'summary' }.each do |method_name, tag_name|
+      :summary => 'summary',
+      :note => 'note',
+      :todo => 'todo' }.each do |method_name, tag_name|
       # @return [String] unless the tag is nil or the string.length == 0
       define_method method_name do
         @tags.select { |tag| tag[:tag_name] == "#{tag_name}" }[0][:text] unless @tags.select { |tag| tag[:tag_name] == "#{tag_name}" }[0].nil? || @tags.select { |tag| tag[:tag_name] == "#{tag_name}" }[0][:text].length.zero?

data/lib/puppet-strings/markdown/table_of_contents.rb

@@ -1,7 +1,7 @@
 module PuppetStrings::Markdown
   module TableOfContents
     def self.render
-      final = ""
+      final = "## Table of Contents\n\n"
 
       [PuppetStrings::Markdown::PuppetClasses,
       PuppetStrings::Markdown::DefinedTypes,

data/lib/puppet-strings/markdown/templates/classes_and_defines.erb

@@ -8,6 +8,14 @@
 <%= "The #{name} class." %>
 <% end -%>
 
+<% if todo -%>
+* **TODO** <%= todo %>
+
+<% end -%>
+<% if note -%>
+* **Note** <%= note %>
+
+<% end -%>
 <% if since -%>
 * **Since** <%= since %>
 

data/lib/puppet-strings/markdown/templates/function.erb

@@ -7,7 +7,15 @@ Type: <%= type %>
 <% elsif summary -%>
 <%= summary %>
 <% else -%>
-<%= "The #{name} class." %>
+<%= "The #{name} function." %>
+<% end -%>
+<% if todo -%>
+* **TODO** <%= todo %>
+
+<% end -%>
+<% if note -%>
+* **Note** <%= note %>
+
 <% end -%>
 
 <% signatures.each do |sig| -%>
@@ -16,6 +24,16 @@ Type: <%= type %>
 <% if sig.text -%>
 <%= sig.text %>
 
+<% elsif sig.summary -%>
+<%= sig.summary %>
+
+<% else -%>
+<%= "The #{name} function." %>
+
+<% end -%>
+<% if sig.note -%>
+* **Note** <%= sig.note %>
+
 <% end -%>
 <% if sig.return_type -%>
 Returns: `<%= sig.return_type %>`<% if sig.return_val %> <%= sig.return_val %><% end %>

data/lib/puppet-strings/markdown/templates/resource_type.erb

@@ -8,6 +8,14 @@
 <%= "The #{name} type." %>
 <% end -%>
 
+<% if todo -%>
+* **TODO** <%= todo %>
+
+<% end -%>
+<% if note -%>
+* **Note** <%= note %>
+
+<% end -%>
 <% if since -%>
 * **Since** <%= since %>
 

data/lib/puppet-strings/markdown/templates/table_of_contents.erb

@@ -1,8 +1,8 @@
 <% if group.length > 0 -%>
-## <%= group_name %>
+**<%= group_name %>**
 
 <% if priv -%>
-### Public <%= group_name %>
+_Public <%= group_name %>_
 
 <% group.each do |item| -%>
 <% unless item[:private] -%>
@@ -10,7 +10,7 @@
 <% end -%>
 <% end -%>
 
-### Private <%= group_name %>
+_Private <%= group_name %>_
 
 <% group.each do |item| -%>
 <% if item[:private] -%>

data/lib/puppet-strings/version.rb

@@ -0,0 +1,3 @@
+module PuppetStrings
+  VERSION = '2.1.0'.freeze
+end

data/lib/puppet-strings/yard/templates/default/puppet_class/html/note.erb

@@ -0,0 +1,6 @@
+<% object.tags(:note).each do |tag| %>
+  <div class="note notetag">
+    <strong>Note:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_class/html/setup.rb

@@ -1,7 +1,7 @@
 # Initializes the template.
 # @return [void]
 def init
-  sections :header, :box_info, :summary, :overview, T('tags'), :source
+  sections :header, :box_info, :summary, :overview, :note, :todo, T('tags'), :source
 end
 
 # Renders the box_info section.

data/lib/puppet-strings/yard/templates/default/puppet_class/html/todo.erb

@@ -0,0 +1,6 @@
+<% object.tags(:todo).each do |tag| %>
+  <div class="note todo">
+    <strong>TODO:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_defined_type/html/note.erb

@@ -0,0 +1,6 @@
+<% object.tags(:note).each do |tag| %>
+  <div class="note notetag">
+    <strong>Note:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_defined_type/html/setup.rb

@@ -1,5 +1,5 @@
 # Initializes the template.
 # @return [void]
 def init
-  sections :header, :box_info, :summary, :overview, T('tags'), :source
+  sections :header, :box_info, :summary, :overview, :note, :todo, T('tags'), :source
 end

data/lib/puppet-strings/yard/templates/default/puppet_defined_type/html/todo.erb

@@ -0,0 +1,6 @@
+<% object.tags(:todo).each do |tag| %>
+  <div class="note todo">
+    <strong>TODO:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_function/html/note.erb

@@ -0,0 +1,6 @@
+<% object.tags(:note).each do |tag| %>
+  <div class="note notetag">
+    <strong>Note:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_function/html/setup.rb

@@ -1,5 +1,5 @@
 # Initializes the template.
 # @return [void]
 def init
-  sections :header, :box_info, :summary, :overview, [T('tags'), :source]
+  sections :header, :box_info, :summary, :overview, :note, :todo, [T('tags'), :source]
 end

data/lib/puppet-strings/yard/templates/default/puppet_function/html/todo.erb

@@ -0,0 +1,6 @@
+<% object.tags(:todo).each do |tag| %>
+  <div class="note todo">
+    <strong>TODO:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_plan/html/note.erb

@@ -0,0 +1,6 @@
+<% object.tags(:note).each do |tag| %>
+  <div class="note notetag">
+    <strong>Note:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_plan/html/setup.rb

@@ -1,7 +1,7 @@
 # Initializes the template.
 # @return [void]
 def init
-  sections :header, :box_info, :summary, :overview, T('tags'), :source
+  sections :header, :box_info, :summary, :overview, :note, :todo, T('tags'), :source
 end
 
 # Renders the box_info section.

data/lib/puppet-strings/yard/templates/default/puppet_plan/html/todo.erb

@@ -0,0 +1,6 @@
+<% object.tags(:todo).each do |tag| %>
+  <div class="note todo">
+    <strong>TODO:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_type/html/note.erb

@@ -0,0 +1,6 @@
+<% object.tags(:note).each do |tag| %>
+  <div class="note notetag">
+    <strong>Note:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/lib/puppet-strings/yard/templates/default/puppet_type/html/setup.rb

@@ -1,7 +1,7 @@
 # Initializes the template.
 # @return [void]
 def init
-  sections :header, :box_info, :summary, :overview, T('tags'), :properties, :parameters, :features
+  sections :header, :box_info, :summary, :overview, :note, :todo, T('tags'), :properties, :parameters, :features
 end
 
 # Renders the box_info section.

data/lib/puppet-strings/yard/templates/default/puppet_type/html/todo.erb

@@ -0,0 +1,6 @@
+<% object.tags(:todo).each do |tag| %>
+  <div class="note todo">
+    <strong>TODO:</strong>
+    <%= htmlify_line tag.text %>
+  </div>
+<% end %>

data/misc/ANNOUNCEMENT_TEMPLATE.md

@@ -0,0 +1,40 @@
+Send out announcements for major new feature releases, and high-impact bugfixes to <puppet-announce@googlegroups.com>, <puppet-dev@googlegroups.com>, <puppet-users@googlegroups.com>, <voxpupuli@groups.io>, and the puppet internal mailing lists <dev@puppet.com> and <tech-discuss@puppet.com>.
+
+Before sending, do check that all links are still valid. Feel free to adjust the text to match better with the circumstances of the release, or add other news that are relevant at the time. If you make changes, consider committing them here, for the benefit of future-you.
+
+The github rendering of the markdown seems to copy&paste acceptably into Google Inbox.
+
+The [CHANGELOG](https://github.com/puppetlabs/puppet-strings/blob/master/CHANGELOG.md) is a good starting point for finding enhancements and bug-fixes.
+
+---
+
+Subject: [ANN] Puppet Strings vX.Y.Z Release
+
+Hi all,
+
+We're pleased to announce that version X.Y.Z of the Puppet Strings is being released today.
+
+Puppet Strings provides a simple way to extract source documentation into useful docs. It is provided as a Ruby gem to be referenced within modules. See the [README](https://github.com/puppetlabs/puppet-strings#installing-puppet-strings) for documentation on how to install and use it.
+
+
+The new release of Puppet Strings provides the following enhancements:
+
+* A
+* B
+* C
+
+The new release also contains the following notable bugfixes:
+
+* D
+* E
+* F
+
+See the [CHANGELOG](https://github.com/puppetlabs/puppet-strings/blob/master/CHANGELOG.md) for a full list of changes
+
+We encourage all module developers to review puppet-strings and use it when creating modules.
+
+Please let us know of your experiences with Puppet Strings, either here, on [Slack](https://slack.puppet.com/) (#forge-modules), or on the [github repo](https://github.com/puppetlabs/puppet-strings).
+
+
+Thanks,
+YOUR NAME

data/spec/fixtures/unit/json/output.json

@@ -3,11 +3,19 @@
     {
       "name": "klass",
       "file": "(stdin)",
-      "line": 5,
+      "line": 7,
       "inherits": "foo::bar",
       "docstring": {
         "text": "A simple class.",
         "tags": [
+          {
+            "tag_name": "todo",
+            "text": "Do a thing"
+          },
+          {
+            "tag_name": "note",
+            "text": "Some note"
+          },
           {
             "tag_name": "param",
             "text": "First param.",
@@ -44,7 +52,7 @@
     {
       "name": "dt",
       "file": "(stdin)",
-      "line": 12,
+      "line": 14,
       "docstring": {
         "text": "A simple defined type.",
         "tags": [

data/spec/fixtures/unit/json/output_with_plan.json

@@ -3,11 +3,19 @@
     {
       "name": "klass",
       "file": "(stdin)",
-      "line": 5,
+      "line": 7,
       "inherits": "foo::bar",
       "docstring": {
         "text": "A simple class.",
         "tags": [
+          {
+            "tag_name": "todo",
+            "text": "Do a thing"
+          },
+          {
+            "tag_name": "note",
+            "text": "Some note"
+          },
           {
             "tag_name": "param",
             "text": "First param.",
@@ -44,7 +52,7 @@
     {
       "name": "dt",
       "file": "(stdin)",
-      "line": 12,
+      "line": 14,
       "docstring": {
         "text": "A simple defined type.",
         "tags": [

data/spec/fixtures/unit/json/output_without_puppet_function.json

@@ -8,6 +8,14 @@
       "docstring": {
         "text": "A simple class.",
         "tags": [
+          {
+            "tag_name": "todo",
+            "text": "Do a thing"
+          },
+          {
+            "tag_name": "note",
+            "text": "Some note"
+          },
           {
             "tag_name": "param",
             "text": "First param.",

data/spec/fixtures/unit/markdown/output.md

@@ -1,33 +1,35 @@
 # Reference
 <!-- DO NOT EDIT: This document was generated by Puppet Strings -->
 
-## Classes
+## Table of Contents
+
+**Classes**
 
-### Public Classes
+_Public Classes_
 
 * [`klass`](#klass): A simple class.
 
-### Private Classes
+_Private Classes_
 
 * `noparams`: Overview for class noparams
 
-## Defined types
+**Defined types**
 
 * [`klass::dt`](#klassdt): A simple defined type.
 
-## Resource types
+**Resource types**
 
 * [`apt_key`](#apt_key): Example resource type using the new API.
 * [`database`](#database): An example database server type.
 
-## Functions
+**Functions**
 
 * [`func`](#func): A simple Puppet function.
 * [`func3x`](#func3x): Documentation for an example 3.x function.
 * [`func4x`](#func4x): An example 4.x function.
 * [`func4x_1`](#func4x_1): An example 4.x function with only one signature.
 
-## Tasks
+**Tasks**
 
 * [`(stdin)`](#(stdin)): Allows you to backup your database to local file.
 
@@ -37,6 +39,10 @@
 
 An overview for a simple class.
 
+* **TODO** Do a thing
+
+* **Note** some note
+
 * **Since** 1.0.0
 
 * **See also**

data/spec/fixtures/unit/markdown/output_with_plan.md

@@ -1,37 +1,39 @@
 # Reference
 <!-- DO NOT EDIT: This document was generated by Puppet Strings -->
 
-## Classes
+## Table of Contents
+
+**Classes**
 
-### Public Classes
+_Public Classes_
 
 * [`klass`](#klass): A simple class.
 
-### Private Classes
+_Private Classes_
 
 * `noparams`: Overview for class noparams
 
-## Defined types
+**Defined types**
 
 * [`klass::dt`](#klassdt): A simple defined type.
 
-## Resource types
+**Resource types**
 
 * [`apt_key`](#apt_key): Example resource type using the new API.
 * [`database`](#database): An example database server type.
 
-## Functions
+**Functions**
 
 * [`func`](#func): A simple Puppet function.
 * [`func3x`](#func3x): Documentation for an example 3.x function.
 * [`func4x`](#func4x): An example 4.x function.
 * [`func4x_1`](#func4x_1): An example 4.x function with only one signature.
 
-## Tasks
+**Tasks**
 
 * [`(stdin)`](#(stdin)): Allows you to backup your database to local file.
 
-## Plans
+**Plans**
 
 * [`plann`](#plann): A simple plan.
 
@@ -41,6 +43,10 @@
 
 An overview for a simple class.
 
+* **TODO** Do a thing
+
+* **Note** some note
+
 * **Since** 1.0.0
 
 * **See also**

data/spec/unit/puppet-strings/json_spec.rb

@@ -7,6 +7,8 @@ describe PuppetStrings::Json do
     # Populate the YARD registry with both Puppet and Ruby source
     YARD::Parser::SourceParser.parse_string(<<-SOURCE, :puppet)
 # A simple class.
+# @todo Do a thing
+# @note Some note
 # @param param1 First param.
 # @param param2 Second param.
 # @param param3 Third param.

data/spec/unit/puppet-strings/markdown_spec.rb

@@ -9,6 +9,8 @@ describe PuppetStrings::Markdown do
     YARD::Parser::SourceParser.parse_string(<<-SOURCE, :puppet)
 # An overview for a simple class.
 # @summary A simple class.
+# @todo Do a thing
+# @note some note
 # @since 1.0.0
 # @see www.puppet.com
 # @example This is an example

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-strings
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Puppet Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -53,6 +53,7 @@ files:
 - COMMITTERS.md
 - CONTRIBUTING.md
 - Gemfile
+- HISTORY.md
 - JSON.md
 - LICENSE
 - README.md
@@ -84,6 +85,7 @@ files:
 - lib/puppet-strings/tasks.rb
 - lib/puppet-strings/tasks/generate.rb
 - lib/puppet-strings/tasks/gh_pages.rb
+- lib/puppet-strings/version.rb
 - lib/puppet-strings/yard.rb
 - lib/puppet-strings/yard/code_objects.rb
 - lib/puppet-strings/yard/code_objects/base.rb
@@ -133,28 +135,36 @@ files:
 - lib/puppet-strings/yard/templates/default/layout/html/setup.rb
 - lib/puppet-strings/yard/templates/default/puppet_class/html/box_info.erb
 - lib/puppet-strings/yard/templates/default/puppet_class/html/header.erb
+- lib/puppet-strings/yard/templates/default/puppet_class/html/note.erb
 - lib/puppet-strings/yard/templates/default/puppet_class/html/overview.erb
 - lib/puppet-strings/yard/templates/default/puppet_class/html/setup.rb
 - lib/puppet-strings/yard/templates/default/puppet_class/html/source.erb
 - lib/puppet-strings/yard/templates/default/puppet_class/html/summary.erb
+- lib/puppet-strings/yard/templates/default/puppet_class/html/todo.erb
 - lib/puppet-strings/yard/templates/default/puppet_defined_type/html/box_info.erb
 - lib/puppet-strings/yard/templates/default/puppet_defined_type/html/header.erb
+- lib/puppet-strings/yard/templates/default/puppet_defined_type/html/note.erb
 - lib/puppet-strings/yard/templates/default/puppet_defined_type/html/overview.erb
 - lib/puppet-strings/yard/templates/default/puppet_defined_type/html/setup.rb
 - lib/puppet-strings/yard/templates/default/puppet_defined_type/html/source.erb
 - lib/puppet-strings/yard/templates/default/puppet_defined_type/html/summary.erb
+- lib/puppet-strings/yard/templates/default/puppet_defined_type/html/todo.erb
 - lib/puppet-strings/yard/templates/default/puppet_function/html/box_info.erb
 - lib/puppet-strings/yard/templates/default/puppet_function/html/header.erb
+- lib/puppet-strings/yard/templates/default/puppet_function/html/note.erb
 - lib/puppet-strings/yard/templates/default/puppet_function/html/overview.erb
 - lib/puppet-strings/yard/templates/default/puppet_function/html/setup.rb
 - lib/puppet-strings/yard/templates/default/puppet_function/html/source.erb
 - lib/puppet-strings/yard/templates/default/puppet_function/html/summary.erb
+- lib/puppet-strings/yard/templates/default/puppet_function/html/todo.erb
 - lib/puppet-strings/yard/templates/default/puppet_plan/html/box_info.erb
 - lib/puppet-strings/yard/templates/default/puppet_plan/html/header.erb
+- lib/puppet-strings/yard/templates/default/puppet_plan/html/note.erb
 - lib/puppet-strings/yard/templates/default/puppet_plan/html/overview.erb
 - lib/puppet-strings/yard/templates/default/puppet_plan/html/setup.rb
 - lib/puppet-strings/yard/templates/default/puppet_plan/html/source.erb
 - lib/puppet-strings/yard/templates/default/puppet_plan/html/summary.erb
+- lib/puppet-strings/yard/templates/default/puppet_plan/html/todo.erb
 - lib/puppet-strings/yard/templates/default/puppet_provider/html/box_info.erb
 - lib/puppet-strings/yard/templates/default/puppet_provider/html/collection.erb
 - lib/puppet-strings/yard/templates/default/puppet_provider/html/features.erb
@@ -172,10 +182,12 @@ files:
 - lib/puppet-strings/yard/templates/default/puppet_type/html/box_info.erb
 - lib/puppet-strings/yard/templates/default/puppet_type/html/features.erb
 - lib/puppet-strings/yard/templates/default/puppet_type/html/header.erb
+- lib/puppet-strings/yard/templates/default/puppet_type/html/note.erb
 - lib/puppet-strings/yard/templates/default/puppet_type/html/overview.erb
 - lib/puppet-strings/yard/templates/default/puppet_type/html/parameters.erb
 - lib/puppet-strings/yard/templates/default/puppet_type/html/setup.rb
 - lib/puppet-strings/yard/templates/default/puppet_type/html/summary.erb
+- lib/puppet-strings/yard/templates/default/puppet_type/html/todo.erb
 - lib/puppet-strings/yard/templates/default/tags/html/puppet_overload.erb
 - lib/puppet-strings/yard/templates/default/tags/setup.rb
 - lib/puppet-strings/yard/util.rb
@@ -183,6 +195,7 @@ files:
 - lib/puppet/face/strings.rb
 - lib/puppet/feature/rgen.rb
 - lib/puppet/feature/yard.rb
+- misc/ANNOUNCEMENT_TEMPLATE.md
 - spec/acceptance/emit_json_options.rb
 - spec/acceptance/generate_markdown_spec.rb
 - spec/acceptance/lib/util.rb
@@ -230,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -239,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - puppet, >= 4.0.0
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Puppet documentation via YARD