summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | (#6962) Give copyright and license for all faces.Daniel Pittman2011-04-2617-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have the capability, mark all our faces copyright the company and under the Apache 2 license, which indeed they are.
| * | | | | | | | (#6962) Fill out documentation on Faces and ActionsDaniel Pittman2011-04-265-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the documentation we had written, wiring it into the existing faces and actions. This helps fill out the need to document these things before they ship.
| * | | | | | | | (#6962) Move documentation support into a module.Daniel Pittman2011-04-265-184/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that we have identical documentation behaviour in the face and action code, it should properly be written once. So, move it into a module, extend the other classes with it, and have done.
| * | | | | | | | (#6962) Extend documentation API for Faces.Daniel Pittman2011-04-265-28/+433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the remaining documentation mechanisms to the Face instances, allowing them to build and report correct documentation, licensing and ownership for the help face to build on.
* | | | | | | | | Merge branch 'tickets/2.7.x/7251' into 2.7.xPieter van de Bruggen2011-04-263-8/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | (#7251) Let exceptions raised in decorators rise.Pieter van de Bruggen2011-04-263-8/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to write before_action advice that does basic option validation very easily. Reviewed-By: Daniel Pittman
* | | | | | | | | Merge branch 'tickets/2.7.x/7249' into 2.7.xPieter van de Bruggen2011-04-261-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | (#7249) Publicize ActionBuilder DSL methods.Pieter van de Bruggen2011-04-261-14/+14
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change permits users to call functions with a reference to `self` that can augment the in-progress action declaration, which can be helpful in some more involved cases. Reviewed-By: Max Martin Reviewed-By: Daniel Pittman
* | | | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | | | | | | | |
* | | | | | | | | Merge branch 'ticket/2.7.x/7101-template-compilation' into 2.7.xMax Martin2011-04-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/7101-template-compilation: (#7101) Fix template error messages in Ruby 1.8.5
| * | | | | | | | (#7101) Fix template error messages in Ruby 1.8.5Max Martin2011-04-261-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lib/puppet/parser/templatewrapper.rb#script_line was calling .first on a String object, which in Ruby > 1.8.5 will return the entire string, but in 1.8.5 will cause an exception. This change (proposed by Markus Roberts) removes the call to .first and adds a condition for when the template error involves the file not being found. Reviewed-by: Jesse Wolfe
* | | | | | | | Merge branch 'ticket/2.7.x/7137-spurious-warnings' into 2.7.xMax Martin2011-04-251-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/7137-spurious-warnings: (#7137) Get rid of spurious info messages in useradd
| * | | | | | | | (#7137) Get rid of spurious info messages in useraddMax Martin2011-04-251-2/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage of the useradd provider was leading to spurious log messages of this form: info: /User[nigel]: Provider useradd does not support features manages_aix_lam; not managing attribute ia_load_module This was due to the ia_load_module parameter requiring manages_aix_lam and additionally having a defaultto value of "compat." Paired-with: Matt Robinson <matt@puppetlabs.com>
* | | | | | | | Fix test ticket_6928_puppet_master_parse_failsDominic Maraglia2011-04-251-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output for error conditions changed causing a regex to fail
* | | | | | | | maint: add the 'to', 'not_to', and 'to_not' aliases to rspec...Daniel Pittman2011-04-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, add them if they are not already added by rspec itself, which means that we can use them without blowing up older installations.
* | | | | | | | Merge branch 'feature/2.7.x/7157-automatic-non-zero-exit-codes' into 2.7.xDaniel Pittman2011-04-2236-203/+234
|\ \ \ \ \ \ \ \
| * | | | | | | | (#7157) Return a non-zero exit code on face failure.Daniel Pittman2011-04-223-12/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a face or action fails we should exit non-zero on the CLI to signal this to our caller. "Fails" is defined as "raises an exception"; we don't treat any return value as a significant failure. Reviewed-By: Jesse Wolf <jesse@puppetlabs.com>
| * | | | | | | | maint: use the exit_with helper everywhere...Daniel Pittman2011-04-2218-190/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have the exit_with matcher, we should use it everywhere that we previously stubbed, expected, or caught the exit status in an ad-hoc way. Reviewed-By: Jesse Wolf <jesse@puppetlabs.com>
| * | | | | | | | maint: add an "exit was called" matcher for rspec.Daniel Pittman2011-04-221-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of places that want to test if exit was called in a block of code or not, which we did in a whole pile of ad-hoc ways. Instead, better to have a custom matcher that tests specifically for the correct exit exception being thrown, and the right error code in it. Reviewed-By: Jesse Wolf <jesse@puppetlabs.com>
| * | | | | | | | maint: clean up test headers on face spec files.Daniel Pittman2011-04-2215-1/+43
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A whole pile of spec files for faces were not pulling in the regular spec_helper, or the puppet/face library before they used it. This worked fine by coincidence when they ran together, but blew up if run separately. Reviewed-By: Jesse Wolf <jesse@puppetlabs.com>
* | | | | | | | Merge branch 'ticket/2.7.x/7080-reverts' into 2.7.xMax Martin2011-04-216-266/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/7080-reverts: Revert "Fixing Facts pson methods more resilient" Revert "(7080) Adding json support to Indirector Request" Revert "Adding json support to Puppet::Node"
| * | | | | | | | Revert "Fixing Facts pson methods more resilient"Max Martin2011-04-212-36/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07a7a68a25eb9b21189751c27f90f972224ea533. The JSON patch series has caused problems with the inventory service, and further discussion is needed to decide how to serialize objects to PSON with regards to future compatibility. Conflicts: spec/unit/node/facts_spec.rb Paired-with:Matt Robinson <matt@puppetlabs.com>
| * | | | | | | | Revert "(7080) Adding json support to Indirector Request"Max Martin2011-04-212-144/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0615cbc1eea67ef8caf4edbc8b7b3d3ce618f4d. The JSON patch series has caused problems with the inventory service, and further discussion is needed to decide how to serialize objects to PSON with regards to future compatibility. Conflicts: spec/unit/indirector/request_spec.rb Paired-with:Matt Robinson <matt@puppetlabs.com>
| * | | | | | | | Revert "Adding json support to Puppet::Node"Max Martin2011-04-212-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d3c94e62386ec03617015f6e6269b1de805954ea. The JSON patch series has caused problems with the inventory service, and further discussion is needed to decide how to serialize objects to PSON with regards to future compatibility. Conflicts (Manually resolved): spec/unit/node_spec.rb Paired-with: Matt Robinson <matt@puppetlabs.com>
* | | | | | | | | Merge branch 'ticket/2.7.x/7084' into 2.7.xJesse Wolfe2011-04-215-18/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix #7084 Make the log messages produced by whits less confusingJesse Wolfe2011-04-215-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the logging behavior of Whits so that instead of talking about whits directly, we refer to the Class, Stage, or recursive resource that they are sentinals for. In the case where a "completion" Whit is notified by a resource, getting a notification at all is counterinutitive, so I've changed the output to a "debug"-priority message that describes what's happening. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
* | | | | | | | | | Merge branch ↵Daniel Pittman2011-04-212-3/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'bug/2.7.x/7121-the-'configurer'-face-should-download-plugins-and-send-reports' into 2.7.x
| * | | | | | | | | | (#7121) Download plugins and upload reports in secret agent!Daniel Pittman2011-04-212-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a plugin face, able to download plugins, and wires both that and the report face in to upload the result of the catalog run. This fills out the standard, boring agent behaviour and makes this a semi-credible replacement. Reviewed-By: Max Martin <max@puppetlabs.com>
* | | | | | | | | | | maint: fix a race in catalog compilation versioning.Daniel Pittman2011-04-211-0/+7
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation has a whole pile of time dependencies in our comparisons, we had a whole pile of races across the code. We could try and fix the comparisons to work better, but that is actually harder than it sounds thanks to the architecture. Instead, freeze time for each test, ensuring that we consistently get the result expected.
* | | | | | | | | | Merge remote-tracking branch ↵Daniel Pittman2011-04-2118-17/+67
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'remotes/lak/tickets/next/7118-summaries_for_all_faces' into 2.7.x Fix conflicts due to version drift in: lib/puppet/face/certificate.rb lib/puppet/face/facts.rb lib/puppet/face/node.rb lib/puppet/face/secret_agent.rb spec/lib/puppet/face/basetest.rb spec/unit/face/help_spec.rb Reviewed-By: Markus Roberts <markus@puppetlabs.com>
| * | | | | | | | | | (7118) Adding summaries for all facesLuke Kanies2011-04-1418-18/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's usually just a one-liner, but when I saw an obvious opportunity for longer docs, I've added a @longdocs variable that can be converted to longer forms when ready. Signed-off-by: Luke Kanies <luke@puppetlabs.com>
* | | | | | | | | | | Merge branch 'feature/2.7.x/7181-rename-configurer-face' into 2.7.xDaniel Pittman2011-04-214-9/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | (#7181) Rename configurer face to secret_agent.Daniel Pittman2011-04-214-9/+7
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a much more useful public name, especially given the code is aimed to eventually replace the agent entirely. Until then this is pleasant enough to talk about. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | | | | | | | | * Merge branch 'tickets/next/7481' into nextJames Turnbull2011-05-123-0/+78
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/next/7481: Fixed #7481 - Added MIT license to Thomas Bellman's function code
| | | | | | | | | | * Fixed #7481 - Added MIT license to Thomas Bellman's function codeJames Turnbull2011-05-123-0/+78
| | | | | | | | | |/
| | | | | | | | | * Merge branch 'ticket/next/7264-metaparameter_reference' into nextnfagerlund2011-05-111-40/+44
| | | | | | | | |/|
| | | | | | | | | * (#7264) Docs: Clarify that subscribe/notify imply require/beforenfagerlund2011-05-111-40/+44
| | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a doc string only commit. The metaparameter reference was not clear about subscribe and notify being supersets of require and before, respectively. This commit also cleans up some unrelated quoting, arrow-alignment, and language flow issues.
| | | | | | | | * Merge branch 'next'Max Martin2011-04-2711-11/+285
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * next: (#7101) Fix template error messages in Ruby 1.8.5 (#3420) Nagios "name" attribute does not output correctly (#4487) When setting environment on a host, ensure it is a string. add test for ticket 7101 add test for ticket 7101 (#7220) Add the ability to "inherit" options. (#6487) Add some testing for OS X version support in DirectoryService provider (#6487) Directoryservice provider will fail in future OS releases (#6368) Make the File type autorequire its nearest ancestor directory
| | | | | | | | | * Merge branch '2.7.next' into nextMax Martin2011-04-2711-11/+285
| | | | | | | | | |\ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7.next: (#3420) Nagios "name" attribute does not output correctly (#4487) When setting environment on a host, ensure it is a string. add test for ticket 7101 (#7220) Add the ability to "inherit" options. (#6487) Add some testing for OS X version support in DirectoryService provider (#6487) Directoryservice provider will fail in future OS releases (#6368) Make the File type autorequire its nearest ancestor directory
| | | * | | | | | | Merge branch '2.6.next' into 2.7.nextMax Martin2011-04-276-9/+120
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (#3420) Nagios "name" attribute does not output correctly (#4487) When setting environment on a host, ensure it is a string. add test for ticket 7101 (#6487) Add some testing for OS X version support in DirectoryService provider (#6487) Directoryservice provider will fail in future OS releases
| | | | * | | | | | Merge branch 'tickets/2.6.next/3420' into 2.6.nextJosh Cooper2011-04-261-1/+9
| | | | |\ \ \ \ \ \
| | | | | * | | | | | (#3420) Nagios "name" attribute does not output correctlyJim Pirzyk2011-04-261-1/+9
| | | | | | | | | | |
| | | | * | | | | | | Merge branch 'tickets/2.6.next/4487' into 2.6.nextJosh Cooper2011-04-262-0/+15
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | (#4487) When setting environment on a host, ensure it is a string.Josh Cooper2011-04-262-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change when environment strings were read out of the storeconfigs database, they were eventually converted up to Puppet::Node::Environment objects. When these objects are returned to the storeconfigs database, ActiveRecord dumps them as YAML, which begins the death-spiral of YAML. This change makes it so the host will always store the environment as a string, preventing the Puppet::Node::Environment object from being YAMLized, and stored as such in the database. This change was based on one by Richard Crowley. Paired-with: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com> Signed-off-by: Richard Crowley <r@rcrowley.org>
| | | | * | | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | | | | | | | | | | |
| | | | * | | | | | | | Merge branch ↵Jacob Helwig2011-04-222-8/+71
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions' into 2.6.next * tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions: (#6487) Add some testing for OS X version support in DirectoryService provider (#6487) Directoryservice provider will fail in future OS releases
| | | | | * | | | | | | (#6487) Add some testing for OS X version support in DirectoryService providerJacob Helwig2011-04-221-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds some basic testing around whether url, or plist data is used for the various versions of OS X. Unfortunately this involves stubbing larger sections of the implementation than we'd like, but this did not attempt to re-structure the implementation at all. Paired-with: Josh Cooper <josh@puppetlabs.com>
| | | | | * | | | | | | (#6487) Directoryservice provider will fail in future OS releasesGary Larizza2011-04-221-8/+11
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes a case statement in the get_exec_pramble and single_report methods. In its place is an if statement that will cause Puppet to fail if its being run on an OS X system with a version < 10.4. This if-statement will also allow Puppet to run in 10.7. Signed-off-by: Gary Larizza <ccshots@gmail.com>
| | | * | | | | | | | Merge branch 'tickets/2.7.next/7220' into 2.7.nextPieter van de Bruggen2011-04-254-0/+125
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | (#7220) Add the ability to "inherit" options.Pieter van de Bruggen2011-04-254-0/+125
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Matt Robinson