Commit Graph

213 Commits

Author SHA1 Message Date
Kienan Stewart 56f5aca6c2 Remvoe exec mode from erb templates 2018-12-04 20:13:01 -05:00
David Schmitt 07f81f2da1 Release prep for v2.1.0 2018-06-26 08:29:46 +01:00
David Schmitt 6b5c2dbd45 Update Gemfile and gemspec
This adjusts the Gemfile and gemspec to current packaging
standards.
2018-06-26 08:29:46 +01:00
Eric Putnam adbf887246
(PDOC-212, PDOC-213) add support for @note and @todo 2018-06-08 14:59:59 -07:00
Eric Putnam 03b36bcb9f
(PDOC-255) markdown table of contents update
Markdown output does not currently distinguish between the group headings for the table of contents and group headings in the actual content. This change adds a 'Table of Contents' heading and changes group headings to bold text to make it much more clear that you're looking at the table of contents.
2018-06-03 20:27:05 -07:00
willmeek d4e743dbad
Merge pull request #175 from eputnam/pdoc238
(PDOC-238) add generated message to markdown
2018-04-23 16:33:46 +01:00
willmeek 8ce914ee71
Merge pull request #176 from eputnam/pdoc36
(PDOC-36) fix hack for README urls
2018-04-23 16:33:31 +01:00
Eric Putnam 5d2c4411ca
(PDOC-36) fix hack for README urls
Discovered that this hack was finding broken links and then replacing all instances of the link text in the README. This led to a lot of non-links being affected. This patch works harder to match only actual links and works as far as I can tell.
2018-04-23 16:06:29 +01:00
Eric Putnam 2d59213b34
(PDOC-238) add generated message to markdown
Currently there is no evidence in REFERENCE.md itself that it was generated and should not be edited. This adds a comment in the markdown, so as not to disrupt its rendered appearance but still communicate to the user when editing that the file is generated.
2018-04-20 16:25:40 +01:00
Eric Putnam 9a1a0b4af6
(PDOC-240) add handling for :array node type in rsapi_handler
The 'features' key in the resource api expects an array of feature names. Currently, if you run strings on a resource api type that specifies features, it falls over because it doesn't know what to do with an AST node of type :array. Further, the method that throws the error is looking for an undefined variable called 'parameters'. This removes the odd conditional that calls 'parameters' and adds a method that returns an array of the array contents that may be passed to features. Features are not currently sent to the renderer, but now Strings will be able to handle any array it comes across in an rsapi type.
2018-04-20 15:06:58 +01:00
Eric Putnam e63f1c3142
(PDOC-159) server urls fix
When using `puppet strings server`, resources with names containing '::' end up 404ing from the left bar. This is because strings namespaces these objects but YARD does not when building URLs.
e.g. foo::bar's url should be /doc/foo/puppet_classes/foo/bar.html but
ends up instead being doc/foo/puppet_classes/foo_3A_3A_bar.html because
of YARD's url encoding. This is a monkey patch, courtesy @domcleal, that
decodes the urls back so that they are namespaced correctly.
2018-04-16 12:22:50 +01:00
Eric Putnam d4ca490d1b
(maint) display Plans in markdown table of contents
Currently, Plans are not being included in the table of contents in the
markdown output. This is because Plans were not being passed to the
table of contents renderer. This adds Plans to the renderer and updates
tests accordingly.
2018-04-03 13:37:47 +01:00
John Lyman 6ba0350928 (PDOC-233) Simplify logic for white space formatting of summary
Instead of specifying white space after each conditional, just add a
blank line at the end of the conditional similar to the `function.erb`
template.
2018-03-30 13:02:59 +00:00
John Lyman ca26677cad (PDOC-233) Make markdown white space formatting consistent
Replace arbitrary double blank lines with a single blank lines.
2018-03-30 13:02:59 +00:00
John Lyman d9065e6f2e (PDOC-233) Increase chances of markdown rendering correctly
Some variants of markdown do not convert atx-style headers correctly
unless they are surrounded by blank lines.  This commit adds blank lines
to increase chances of rendering when using those variants while still
maintaining compatibly with variants that do not require the surrounding
blank lines.  Also increases readability when viewing the raw markdown
file.
2018-03-30 13:02:35 +00:00
Hunter Haugen 6eec1544f7
Merge pull request #168 from eputnam/_pdoc228
(PDOC-228) puppet plan support
2018-03-29 10:22:50 -07:00
Eric Putnam baf000b07e
(PDOC-229) fix error with return_type and @return
Currently, if the user is documenting a Puppet 4 type custom function and they try to use the return_type method without also including an @return tag, Strings will throw an error. This is caused by the function handler trying to add a type to a return tag on the function object that doesn't exist. To fix the problem, if you are using return_type, the handler will now add an empty return tag first if one does not exist.
2018-03-29 08:48:52 -07:00
Eric Putnam da5cad7cb1
(PDOC-228) puppet plans support
Currently, Puppet Strings only supports Puppet Tasks. Since Plans are
sort of connected to Tasks, it seemed right that Strings should also
support Plans. That and Plans are a thing that needs to be documented.

First, the Puppet[:tasks] setting needs to be set to add the 'plan' keyword to the Puppet Parser's lexicon, so this sets it in the Strings parser if the setting exists. If it does not exist and Puppet.version is less than 5.0.0, Strings will error out.

Second, processing for the Plans themselves is set up. Plans are very
similar to other Puppet objects like defined types and classes, so this
involved some serious copy-pasta.

Third, all the template/to_hash scaffolding for the different outputs is in place (HTML,
JSON, Markdown).

Yey.
2018-03-27 09:59:20 -07:00
Hunter Haugen e37c8b70ae
Merge pull request #167 from eputnam/pdoc36
(PDOC-36) hack to fix README links in generated HTML
2018-03-26 17:03:39 -07:00
Hunter Haugen 414d124d18
Merge pull request #166 from eputnam/pdoc192
(PDOC-192) remove warning for title/name
2018-03-26 17:02:26 -07:00
Hunter Haugen 5407e4e48d
Merge pull request #155 from eputnam/missing_doc_warn
(maint) add condition for misleading warning
2018-03-26 16:39:03 -07:00
Eric Putnam c56ee788b5
(PDOC-192) remove warning for title/name
Currently, if a user attempts to document the title or name params, Strings will throw a warning saying that these parameters are missing from the class/type. Of course, they aren't, they just may not be explicit. This removes the warning if the param name is 'name' or 'title'.
2018-03-22 16:07:24 -07:00
Eric Putnam 37cfe49f95
(PDOC-36) hack to fix README links in generated HTML 2018-03-22 15:39:38 -07:00
Hunter Haugen 67f249c8ea
Merge pull request #164 from eputnam/update_travis
(PDOC-223) prepare travis for dropping old version support
2018-03-22 13:35:29 -07:00
Eric Putnam be444fa6ad
(PDOC-223) revert rsapi changes and remove markdown test
First, there were some rspec problems we originally connected to directory naming (e.g. 'yard'), but now we think it's a possible bug in rspec (https://github.com/rspec/rspec-core/issues/2184). this removes the markdown_spec.rb test that was both triggering the bug and, as it turns out, is an unnecessary test.

Reverted some of the changes made to the rsapi handler during markdown
output work. Those changes were made because of a typo in the spec
tests, so the typo has been fixed and most of the handler returned to
its original state.
2018-03-22 11:35:37 -07:00
Eric Putnam 738275b9e7
(PDOC-206) support for Puppet Tasks
Currently, puppet-strings does not know how to generate documentation
for Puppet Tasks. This does all the work to add support for Tasks
including a new JSON parser, a task handler, task statement, and task code
object. Basically, Strings reads the JSON using the native ruby json
parser and sends values through in a way it understands. It is only
passing json key/value pairs through, nothing is happening with tags at
this time. You can now document Tasks and generate HTML, Markdown, or
JSON output.
2018-03-19 11:37:00 -07:00
Ewoud Kohl van Wijngaarden 9728d1004a
(PDOC-224) Handle --emit-json(-stdout) again 2018-03-01 18:28:48 +01:00
Eric Putnam dde16375d0
(maint) actually update rake task 2018-02-27 16:32:33 -08:00
Eric Putnam 784c32c979
(maint) update rake tasks 2018-02-26 15:36:28 -08:00
Hunter Haugen 378c01a719
Merge pull request #157 from eputnam/pdoc-184_2
(maint) do not display name if there is nothing to display
2018-02-26 14:13:31 -08:00
Eric Putnam 65bfdaf1de
remove displayed tag business 2018-02-26 13:50:19 -08:00
Eric Putnam 6923d9e18c
(maint) update table of contents
The table_of_contents template was already too bulky and redundant and recognizing public and private components was only going to make it worse. This refactors the toc template and the toc class to use a generic outline for all components.
2018-02-26 13:10:30 -08:00
Eugene Piven 4db84c81e5 Fix return type matching for Puppet functions 2018-02-23 13:56:55 +03:00
Eric Putnam 09a5d3e4ff
(maint) change template logic and add test 2018-02-22 16:07:39 -08:00
Eric Putnam 5a283c2212
(maint) do not display name if there is nothing to display
If there is a class, type, or function with no information documented but is pulled in by some fluke or tag we don't support, do not give it its own section
2018-02-22 11:21:06 -08:00
Eric Putnam 1316975826
(PDOC-184) revised cli
`puppet generate` behavior remains unchanged
`puppet generate --format markdown` now defaults to writing to
REFERENCE.md and will accept an override from --out
`puppet generate --format json` defaults to printing to stdout but will
accept the --out param
2018-02-20 12:26:05 -08:00
Eric Putnam 4ea43e03aa
re-add test for Puppet 3 function 2018-02-16 10:57:12 -08:00
Eric Putnam db88cd9857
(PDOC-184) custom_type back to resource_type 2018-02-16 09:29:50 -08:00
Eric Putnam 176d6d4d8c
(PDOC-184) refactoring because naming is hard 2018-02-12 16:11:52 -08:00
Eric Putnam 8a34dc7ea4
rubocop sucks 2018-02-09 15:22:51 -08:00
Eric Putnam f6cd3ff4a8
(PDOC-184) implemented option and raises tags
This implements the two remaining tags and removes the author tag. Had to do some deeper plumbing because options per function signature were not being passed along from YARD
2018-02-09 15:08:18 -08:00
Eric Putnam 56c24cc362
(PDOC-184) implement author tag
This implements the author tag. We also claim to support the 'raise' and 'option' tags, but I don't know that we need to. This also consolidates some code in base.rb and adds docs
2018-02-08 12:12:56 -08:00
Eric Putnam 3635fe95f0
rubocop sucks 2018-02-07 15:24:48 -08:00
Eric Putnam 7c06ed77c4
(PDOC-184) block pointless output and re-add options
This makes sure the markdown doesn't include section headers that have no content. e.g. '## Classes' does not get put in if there are no classes. Also, we should deprecate --emit-json and --emit-json-stdout instead of just killing them.
2018-02-07 15:18:43 -08:00
Eric Putnam 1374b67da0
(PDOC-184) generate markdown
This change does a few things:
1. Fixes up new api handler to return the stuff we want
2. Adds all the logic to parse YARD registries into markdown
3. Adds templates for markdown
4. Changes Face cli to use a --format option that can be used for either
markdown or json
2018-02-07 14:04:19 -08:00
Eric Putnam 64d7b0e4db
(maint) add condition for misleading warning
There is a warning that displays when there is no text outside of tags for a given component, this text would become the 'Overview' section. The warning says: `[warn]: Missing documentation for Puppet class 'klass' at (stdin):4` The problem is that if the user has instead used the @summary tag, and is then using only tags, strings will report this warning even though there is clearly documentation. This adds a condition for the warning: If there is no text AND there are no tags, THEN output a warning saying there is no documentation.
2018-01-29 15:44:52 -08:00
David Schmitt 5156e8db10 (PDK-437) Add support for Resource API types 2018-01-29 16:17:30 +00:00
Antoine Musso fc2779202c Fix args handling for rake strings::generate
In the rake task strings::generate, the arguments json and yard_args
are not applied properly. The logic uses args.key?, however args is not
a Hash but a  Rake::TaskArguments (and Enumerable). There is now key?
method.

Use Rake::TaskArguments.has_key? instead.
2017-07-14 21:45:42 +02:00
Geoff Williams 203610d67c (PDOC-160) Remove the timestamp from output
Prevent mass-changes to files by removing the date in the footer of each page.
Since the generation date isn't particularly useful and isn't tied to either
a git revision or a released version, this could be an easy way to address this
bug.  The files will of-course be regenerated but if there are no changes then
the content will be identical and git will not notice.
2017-06-05 20:56:13 +10:00
Will Hopper 4990576f61 (PDOC-161) Add `summary` tag for short descriptions
This tag is primarily meant to be applied to Puppet classes,
but it is also supported by every other construct that can be
documented with strings.
2017-03-16 12:51:53 -07:00