Commit Graph

317 Commits

Author SHA1 Message Date
Ian Kronquist c4b1d0d10d (PDOC-19) Output type info in generated html 2015-07-15 16:34:08 -07:00
Ian Kronquist c027084f1a (PDOC-21) Typecheck documented parameters
The documented parameter types should be compared with the actual types when
possible.
2015-07-15 16:34:08 -07:00
Hailee Kenney 2ceead0822 Merge pull request #35 from iankronquist/type-checking/PDOC-19
Type checking/pdoc 21
2015-07-15 16:29:18 -07:00
Ian Kronquist 4653a5f9f0 (PDOC-21) Typecheck documented parameters
The documented parameter types should be compared with the actual types when
possible.
2015-07-15 11:58:36 -07:00
Henrik Lindberg 2e3821c2af Merge pull request #33 from iankronquist/dispatch-params/PDOC-37
Dispatch params/pdoc 37
2015-07-13 15:52:01 -07:00
Ian Kronquist 081bbfe790 (PDOC-37) Parse 4x function ast type and params
The previous iteration eagerly grabbed all parameters when any puppet function
was created. We did not retrieve type information and would grab parameters
from any helper functions!
* Parse the Ruby AST for dispatch blocks which specify type information. Parse
  the commands and arguments in those blocks.
* If there are no dispatch blocks, parse the AST for a ruby function with the
  same name as the puppet function being created.
2015-07-13 15:42:26 -07:00
Ian Kronquist 8b3cdd3a51 (PDOC-37) Add additional tests for parameter names
* Test positive cases (warnings AREN'T printed when they shouldn't be)
* Test puppet functions which use dispatches
2015-07-08 16:09:36 -07:00
Hailee Kenney c8fbe3c20f Merge pull request #31 from iankronquist/warn-when-not-matching/PDOC-21
(PDOC-37) Warn when documented name does not match declared name
2015-07-06 20:06:08 -07:00
Ian Kronquist 168c1c4b53 (PDOC-37) Override Yard logger on a per test basis
Override Yard logger on a per test basis, not globally.
Replace one hack with another slightly less disgusting one.
2015-07-06 16:40:30 -07:00
Hailee Kenney 3edf7347df (maint) Remove rspec-html-matchers from acceptance
Prior to this commit, the acceptance tests were using the
rspec-html-matchers gem which we had removed because it does not
work with rspec 3.

In order to make the acceptance tests compatible with this change,
use string matching to check the HTML output instead and remove
the dependency on that gem.
2015-07-06 11:55:59 -07:00
Ian Kronquist d37e071ab7 (PDOC-37) Test errors are output properly
Also comment out a statement which we frequently use for debugging which
snuck in by accident.
2015-07-06 10:18:48 -07:00
Ian Kronquist 463d4e0a1f (PDOC-37) Attach params to Puppet 4.x code object
Traverse the ruby AST to get method arguments and attach them to the code
object.
* Fixes spurious warnings issued by yard.
* Obviates the need for ugly regex code in the templates to retrieve
  parameters from the source code.
2015-07-06 10:18:48 -07:00
Ian Kronquist 49171c92b9 (PDOC-37) Warn if parameter names don't match docs
Print the name of the parameter, the file, and the line number to stderr if the
parameter name does not match the name specified in the docs.
In order for this to be useful we need to present the user with the file name
and line number of the relevant parameters. This information needs to be
extracted from the code object and passed to the extract_param_details method.
2015-07-06 10:18:48 -07:00
Ian Kronquist 584b87e6c7 Merge pull request #32 from hkenney/maint/master/stop_using_html_matchers
(maint) Remove html-matchers dependency
2015-07-06 10:17:04 -07:00
Hailee Kenney 917d9b6536 (maint) Remove html-matchers dependency
Prior to this commit, some of the unit tests for strings relied on
the rspec-html-matchers gem, which does not seem to get along with
rspec 3. This meant that we had to tie our tests to rspec 2 which
has become too inconvenient.

In order to remove the gem, use simple string matching instead.
Update the Gemfile so that it no longer requires the matchers and
no longer has rspec tied to 2.7.
2015-07-02 15:12:49 -07:00
Hailee Kenney 01f9b37c26 Merge pull request #30 from iankronquist/use-different-debuggers
Use different debuggers for ruby 2 and 1.9
2015-06-23 10:46:46 -07:00
Ian Kronquist ec328e082f Use different debuggers for ruby 2 and 1.9
The debugger gem does not support ruby 2.0.
The byebug gem does not support ruby < 2.0.
Conditionally specify the right gem for the right version of ruby.
2015-06-23 09:43:20 -07:00
Hailee Kenney 624646140f (maint) Fix small typo in CHANGELOG for 0.2.0 2015-03-17 16:05:57 -07:00
Morgan Haskel dfa4f65ab2 Merge pull request #29 from hkenney/maint/master/add_changelog
(maint) Add CHANGELOG and update for 0.2.0 release
2015-03-17 15:38:22 -07:00
Hailee Kenney 72411807f1 (maint) Add CHANGELOG and update for 0.2.0 release 2015-03-17 15:35:16 -07:00
Hailee Kenney f38a57f7f3 Merge pull request #28 from mhaskel/metadata_whitespace
Make the metadata match what's generated by the PMT
2015-03-17 14:36:09 -07:00
Morgan Haskel 2f9044bf8f Make the metadata match what's generated by the PMT
Otherwise there are issues installing/removing/upgrading
2015-03-17 14:29:43 -07:00
Hailee Kenney 6301b04343 (maint) Update version to 0.2.0 2015-03-16 09:58:00 -07:00
Henrik Lindberg 56ab5f2817 Merge pull request #27 from hkenney/issue/master/PDOC-25_patch_mangled_namespaces
(PDOC-25) Fix mangled puppet namespaces
2015-03-13 15:20:14 -07:00
Hailee Kenney 862b090221 (PDOC-25) Add tests to ensure namespaces are correct
Prior to this commit, there were no tests to check if namespaces
were being properly generated (which was why we did not catch the
bug earlier). Add a test for defined type and host class handlers
to ensure that namespaces are properly generated in code objects.
2015-03-13 10:48:29 -07:00
Hailee Kenney 685ebf54eb (PDOC-25) Fix mangled puppet namespaces
Prior to this commit, puppet namespaces would be totally mangled when
processed by YARD since YARD is looking for Ruby namespaces where the
first letter of each segment must be uppercase.

In order to fix this, patch the relevant regular expression constants
in YARD so that they will accept segments that begin with uppercase
and lowercase letters.

An upstream pull request has been accepted into YARD to add another
regex constant which is necessary to complete this patch. However until
the next version of the YARD gem is released, we must include a temporary
hack to fix the problematic method in question (as it is not yet using
the added variable). Once the new version is released, the conditional
statement in code_ext/yard.rb can be removed entirely and all we will
need to do is patch the two regex constants.
2015-03-12 16:51:00 -07:00
Hailee Kenney 93e584524d (maint) Update rspec to 2.14.1 for Jenkins
Prior to this commit the Gemfile required rspec 2.14.0 which was
not available in the rubbygems mirror for Jenkins. To prevent the
spec tests from failing in Jenkins, use rspec 2.14.1 instead.
2015-02-18 09:53:41 -08:00
Henrik Lindberg 6f7a983dc7 Merge pull request #26 from hkenney/issue/master/PDOC-27_3x_functions_should_accept_one_or_more_arguments
(PDOC-27) Don't require options for 3x functions
2015-02-17 17:37:47 -08:00
Hailee Kenney 849c731511 (PDOC-27) Make fix compatible with Ruby 2x
Prior to this commit, the fix for the 3x function issue was trying
to create an empty hash by calling Hash[ [[]] ] which in Ruby 1.9.3
produced and empty hash. However this is not the case in Ruby 2.0 and
up. Therefor, fix up the code so that it does not rely on Hash[ [[]] ]
creating and empty hash.
2015-02-17 11:28:26 -08:00
Hailee Kenney 0a3c37373c (maint) Update Gemfile to use rspec 2.14.0
Prior to this commit, the Gemfile for strings did not specify which
version of rspec to use. When it started using rspec 3, the tests
that relied upon the rspec-html-matchers gem began to fail, likely
because that gem is not yet compatible with the new version of rspec.

Update the Gemfile so that we explicitly use an older version of
rspec to prevent tests from failing. We will have to either wait
for rspec-html-matchers to catch up or find a new way of testing
the HTML output before we can update to rspec 3.
2015-02-13 15:53:22 -08:00
Hailee Kenney 5257ca4bed (PDOC-27) Don't require options for 3x functions
Prior to this commit, the 3x function handler assumed that at
least two arguments (the name and one or more additional arguments)
were passed into newfunction when creating a 3x function. However
that is not actually required, the only argument needed is the name.

Update the 3x function handler so that it will not throw and exception
if only one argument is given.
2015-02-12 14:22:53 -08:00
Henrik Lindberg d9d5ae6df9 Merge pull request #25 from hkenney/issue/master/PDOC-26_update_puppetx_module_name
(PDOC-26) Rename Puppetx to PuppetX
2015-02-06 16:49:18 -08:00
Hailee Kenney e5691d23c7 (PDOC-26) Rename Puppetx to PuppetX
Due to the changes in PUP-3900 which renamed Puppetx to PuppetX
and puppetx to puppet_x, strings was failing since the namespace
had not been updated in strings. In order to be compatible with this
change, update strings by renaming the namespace to match.

In order to ensure strings is still compatible with earlier versions
of puppet that don't include the namespace change, declare our own
PuppetX module. This way, if it is an older version and the namespace
is called Puppetx, the necessary PuppetX namespace will be created.
2015-02-06 14:08:42 -08:00
Henrik Lindberg 06959d4c44 Merge pull request #23 from hkenney/maint/master/update_travis_to_use_docker
(maint) Enable docker containers for travis
2015-01-29 08:00:30 -08:00
Henrik Lindberg 13771329fa Merge pull request #22 from hkenney/issue/master/PDOC-24_add_basic_templates_for_functions
(PDOC-24) Add basic templates for functions
2015-01-28 16:52:30 -08:00
Hailee Kenney aca451eb26 (maint) Enable docker containers for travis
Enable docker containers for travis so it will run faster.
2015-01-28 16:48:26 -08:00
Hailee Kenney 26945eacf3 (PDOC-24) Fix comments and remove unneeded sections
Prior to this commit, some of the comments in the code were not as
clear as they should have been and in some places comments were not
present where they were needed. Clean up existing comments and
add some for sections of code that are not very clear.

Additionally, some sections of the template for puppet namespaces
didn't really make sense to include, especially since we want the source
of truth for documentation of 3x functions to be the :doc string which is
passed in (not the comment block above the function). Thus, remove some of
the unneeded sections from the puppet namespace template.
2015-01-28 16:25:22 -08:00
Hailee Kenney 121bcfd2a7 (PDOC-24) Add support for @param in 3x functions
Prior to this commit, the @param tag was not supported for 3x
functions since we could not derive any information about the
parameter from the code itself. Since we would still like users
to be able to document parameters if they wish, update the code so
that if a parameter is documented in the 3x :doc string it will be
displayed in the HTML.
2015-01-28 14:17:20 -08:00
Hailee Kenney b9da8b164f (PDOC-24) Create helper class for templates
Prior to this commit some of the logic used to extract data from
comments for templates was duplicated and a little messy. Create
the TemplateHelper class so that can be simplified and cleaned up
to make things more readable and efficient.
2015-01-22 22:26:58 -08:00
Hailee Kenney 60b2802f04 (PDOC-24) Clean up code for HTML generation
Prior to this commit there was a lot of duplicated code around
the generation of HTML for templates. Clean up and simplify code by
adding an HTMLHelper class with helper functions which can be used
in place of repeated logic.
2015-01-22 15:21:01 -08:00
Hailee Kenney 5f60c99bfd (PDOC-24) Add custom header for puppet functions
Prior to this commit, all the HTML for puppet functions was just
generated by YARD as if it were a regular method. Since we ultimately
want to have our own custom templates, lay out the groundwork for customizing
the templates for functions and update the page headers to be more
readable.

At the moment the code is functional but contains a lot of duplication which
needs to be cleaned up.
2015-01-21 16:03:35 -08:00
Henrik Lindberg 345d72b2d7 Merge pull request #21 from hkenney/issue/master/PDOC-17_add_support_for_yard_tags
(PDOC-17) Add support for YARD tags in puppet code
2015-01-06 12:47:31 -08:00
Hailee Kenney 1fae19e5ae (PDOC-17) htmlify class/defined type descriptions
Prior to this commit we were not calling htmlify on the docstring
for the description of a puppet class on defined type. This meant that
the raw string would be displayed without paying attention to any
potential markdown or rdoc formatting present.

Now the YARD method htmlify is being called on the docstring so that
it will be displayed properly.

Additionally clean up an unclear comment and fix a small bug in
the way parameter information is processed.
2015-01-06 10:59:30 -08:00
Hailee Kenney e85f58a64e (PDOC-17) Changed header and remove sub-header
Prior to this commit there was a header and a sub-header for
defined types and classes. This was a little redundant so rather
than doing that, remove the sub-header and make the main header
more readable.
2014-12-30 15:20:59 -08:00
Hailee Kenney 1f2d9a2d8a (PDOC-17) Clean up code and update README
Do a bit of renaming and add some comments to make the processing
of parameter details a bit more clear. Additionally, update the
example in the README so that it will actually be parsed properly
by YARD (since YARD does not expect the one line title before the
description).
2014-12-18 13:34:43 -08:00
Hailee Kenney d15269458e (PDOC-17) Add TBD for unspecified parameter types
Prior to this commit if the type for a parameter was not specified
in the comment, nothing would be printed. Since we'll soon be adding
functionality which will determine the type programmatically, it
made more since to leave a place holder rather than nothing at all.
As such, the type is now listed as "TBD" if it is not specified
by the user in the comment.
2014-12-18 10:40:22 -08:00
Hailee Kenney 1cdf7d41e9 (PDOC-17) Fix up parameter documentation
Prior to this commit there were a few issues in the way information
about parameters was collected. The previous implementation relied
on parameters and their corresponding comments to be listed in the
same order. Now the parameter is matched to the corresponding comment
using the parameter name in the comment.

Additionally, if a comment is present for a parameter that does
not actually exist in the method it will appear as strike through
in the HTML.
2014-12-17 16:39:56 -08:00
Hailee Kenney de3c1e776d (PDOC-17) Add support for YARD tags in puppet code
Prior to this commit, most of the HTML created for documenting
puppet code was auto-generated by YARD, meaning that it was not
always presented in a way that was consistent or easy to read.

Now we are explicitly defining the HTML and styling that we want
to use when generating documentation for defined types and classes.
This means that we can define exactly how we want the output to look
so that is more compatible with puppet code.
2014-11-25 14:44:49 -08:00
Andrew Parker 78ba39b08b Merge pull request #20 from hkenney/maint/master/pdoc-11_update_readme_with_examples_and_resources
(PDOC-13) Update README with examples and resources
2014-10-21 09:05:58 -07:00
Hailee Kenney eafe3eaa32 (maint) Exclude files that cause YARD errors
Running `puppet strings server` generates documentation for all
modules in your modulepath, meaning that it also generates HTML
for strings itself. Since there are parts of strings that are not
meant to be documented with YARD, exclude the files that cause
error messages so that `puppet strings server` is not needlessly
noisy.

Additionally, make a few suggested changes to the README to make
it clearer and easier to read.
2014-10-20 17:37:49 -07:00