summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Updated CHANGELOG for 2.7.0rc2Daniel Pittman2011-05-061-0/+163
|
* Merge branch 'bug/2.7.x/7353-kill-for-humans-format-entirely' into 2.7.xDaniel Pittman2011-05-055-60/+18
|\
| * (#7353) Remove :for_humans format entirely.Daniel Pittman2011-05-055-60/+18
|/ | | | | | | Since we never shipped this in a real release, we don't need to maintain compatibility. So, remove it entirely from the codebase. Reviewed-By: Max Martin <max@puppetlabs.com>
* Merge remote-tracking branch 'nfagerlund/ticket/2.7.x/6962' into 2.7.xDaniel Pittman2011-05-0520-37/+438
|\
| * (Maint) Adjust documentation whitespacenfagerlund2011-05-0418-223/+225
| | | | | | | | | | The patch from issue #7221 permits indented heredocs. This patch takes advantage of that to make the doc strings less messy.
| * (#7303) Remove reference to not-yet-extant man actionnfagerlund2011-05-041-1/+0
| | | | | | | | We haven't implemented the `man` action yet, so let's not mention it until we have.
| * (#6962) Add self-documentation data to puppet facesnfagerlund2011-05-0418-27/+389
| | | | | | | | | | | | This patch adds documentation strings to most of the faces, actions, and options introduced in 2.7.0. There are a small number of TK notes remaining, and longer strings have not been indented to take advantage of the patch from issue #7221.
| * Maint: adjust faces.rb's help to match that of other applicationsnfagerlund2011-05-041-6/+44
| | | | | | | | | | | | Faces isn't a face, interestingly, so it doesn't get a summary line in the puppet help. This will output the appropriately-formatted manpage text using the normal mechanism.
* | Adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| |
* | add clean-up step to test for ticket_5477 to prevent site.pp from leaking to ↵Dominic Maraglia2011-05-041-0/+3
| | | | | | | | other tests
* | fixed test for ticket_7117Dominic Maraglia2011-05-041-0/+11
| | | | | | | | Need to restart puppet master to detect changes made to auth.conf
* | Merge branch 'tickets/2.7.x/7179' into 2.7.xPieter van de Bruggen2011-05-043-12/+7
|\ \ | |/ |/|
| * (#7179) Modify default ACL for /node/<name>.Pieter van de Bruggen2011-05-043-12/+7
| | | | | | | | | | | | | | By default, it is useful to permit an individual node to query information about itself, and there is no good reason to reject this by default. Paired-With: Nick Lewis
* | Merge branch 'tickets/2.7.x/7304' into 2.7.xNigel Kersten2011-05-041-6/+1
|\ \
| * | (#7304) Remove full puppet help output when subcommand cannot be foundNigel Kersten2011-05-041-6/+1
|/ / | | | | | | | | | | | | | | In order to make the error message more visible to the user, we tell them about the puppet help command but don't automatically run it, so the error doesn't scroll off the screen. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
* | adding test for ticket 7117Dominic Maraglia2011-05-041-3/+5
| |
* | Merge branch ↵Daniel Pittman2011-05-048-52/+141
|\ \ | | | | | | | | | 'bug/2.7.x/7353-unify-face-rendering-with-network-formathandler' into 2.7.x
| * | (#7353) Note the :for_humans compatibility issue.Daniel Pittman2011-05-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Where we need special support for :for_humans as an alias for :console, call it out in comments. This makes it clear to someone who wonders why what the actual underlying purpose of the whole thing is. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| * | (#7353) Use :console rendering format in our own code.Daniel Pittman2011-05-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now that we have unified things, stop using the compatibility name in favour of the new :console name for the output format. No functional effect beyond avoiding a deprecated output mode. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| * | (#7353) Unify rendering in the face_bace application.Daniel Pittman2011-05-042-50/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now move over to using only network FormatHandler rendering code for output, ditching all the support we had in the application. We include a compatibility shim to ensure that the :for_humans format that was supported for a while is now an alias for the :console format we are using moving forward. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| * | (#7353) Add 'console' format to FormatHandlerDaniel Pittman2011-05-042-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a console rendering format to the Network FormatHandler subsystem; it provides the same human-friendly textual rendering as the Faces application did, except it uses JSON rather than PP as the fall-back rendering mode. This paves the path for unification of all formatting into the same subsystem, rather than the half-measures we used to have. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
* | | Merge branch '2.7.x' of github.com:puppetlabs/puppet into 2.7.xDominic Maraglia2011-05-0317-24/+93
|\| |
| * | Merge branch ↵Daniel Pittman2011-05-034-15/+24
| |\ \ | | | | | | | | | | | | 'bug/2.7.x/7277-improve-secret-agent-face-and-supporting-actions' into 2.7.x
| | * | (#7277)Fixing all secret-agent functions, and the agent itselfLuke Kanies2011-05-034-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the behaviours and ensures that we have parity between the basic actions of the agent and the secret_agent. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com> Signed-off-by: Luke Kanies <luke@puppetlabs.com>
| * | | Merge branch 'ticket/2.7.x/7139' into 2.7.xNick Lewis2011-05-032-1/+8
| |\ \ \ | | |/ / | |/| |
| | * | (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was unconditionally removing the trailing file separator ('/'), which is only valid when the file separator isn't the entire path. This fixes 'puppet resource file <path>'. Paired-With: Jacob Helwig
| * | | (#7329) Consistent naming for rendering formats and hooks.Daniel Pittman2011-05-033-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We refer to rendering formats pretty consistently as `json`, `yaml`, `s`, and so forth; unqualified names. On the other hand, we refer to the rendering hooks *mostly* as `to_*`, except the `:for_humans` and `:json` formats. Which is kind of confusing because of the internal inconsistency, and because it doesn't match the public name. Fix the code to resolve both, so the `to_*` format still works, but we mostly expect to use the `*` version, to match public expectation.
| * | | Merge branch 'bug/2.7.x/7326-faces-broken-on-ruby-1.8.5' into 2.7.xDaniel Pittman2011-05-031-1/+4
| |\ \ \ | | |/ / | |/| |
| | * | (#7326) Fix faces on Ruby 1.8.5Daniel Pittman2011-05-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Turns out that String#each_line on Ruby 1.8.5 only takes a block, and will not return an enumerable. Rewrite to use split(/\n/) which has the same effect but works on all our platforms.
| * | | Merge branch 'tickets/2.7.x/7117-authconf-should-respect-environments' into ↵Jacob Helwig2011-05-032-3/+7
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 2.7.x * tickets/2.7.x/7117-authconf-should-respect-environments: (#7117) Return the environment as a Puppet::Node::Environment in uri2indirection
| | * | (#7117) Return the environment as a Puppet::Node::Environment in uri2indirectionJacob Helwig2011-05-032-3/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The environment returned by uri2indirection used to be a Puppet::Node::Environment. When this changed to simply being the string of the environment name, this broke assumptions made in other areas of the code. Paired-with: Nick Lewis <nick@puppetlabs.com>
| * | Merge branch ↵Daniel Pittman2011-05-036-2/+27
| |\ \ | | | | | | | | | | | | 'bug/2.7.x/7276-return-value-from-plugin-download-is-not-user-friendly' into 2.7.x
| | * | (#7276) Better reporting from the plugin download action.Daniel Pittman2011-05-032-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of just returning vague values, return useful information when rendering for a human being. Based on work by Luke Kaines <luke@puppetlabs.com> in https://github.com/lak/puppet/commit/a61cc770ca9b2cad744b5b21b9776a834d6ca895 Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
| | * | (#7276) Create a plugin face application.Daniel Pittman2011-05-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need a boilerplate application file and class to expose a face on the command line; this adds that for the plugin face, to expose it to users. Based on work by Luke Kaines <luke@puppetlabs.com> in https://github.com/lak/puppet/commit/a61cc770ca9b2cad744b5b21b9776a834d6ca895 Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
| | * | (#6962) Added 'returns' block to action documentation.Daniel Pittman2011-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to be able to document the data returned from an action, since this is one of the most critical parts of the API for Ruby developers. This adds a multiline documentation block that captures that. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
| | * | maint: remove emacs 'coding' cookie from files.Daniel Pittman2011-05-032-2/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | This is unnecessary, and only turned up because Matz &c. impose their taste on the rest of the world through the Emacs Ruby mode. Since people are starting to clone that, and it doesn't add value, eliminate it everywhere. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
* / / add base test for ticket 7117Dominic Maraglia2011-05-031-0/+20
|/ /
* | Merge branch 'feature/2.7.x/7278-improve-catalog-select-action' into 2.7.xDaniel Pittman2011-05-031-1/+17
|\ \
| * | (#7278) Improve utility of the Catalog select actionLuke Kanies2011-05-031-1/+17
|/ / | | | | | | | | | | | | | | This extends the catalog select action to be able to return more than a single type, as well as supporting both programmatic and human focused rendering of the return value. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
* | Merge branch 'feature/2.7.x/7279-add-action-to-file-face' into 2.7.xDaniel Pittman2011-05-034-1/+60
|\ \ | |/ |/|
| * (#7279) Adding some basic file actionsLuke Kanies2011-05-034-1/+60
|/ | | | | | | | | | | | | | Add the ability to download a file into the local filebucket using a puppet URI or from disk. Also, the ability to store into the filebucket. These provide at least basic UI for moving data around using the filebucket service, and act as an example of how further work can be done. Also, update the code to eliminate a couple of redundant checks on arguments, and add some basic testing around the actions. Mostly only that they exist, at this point. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
* Merge branch 'bug/2.7.x/7314-backtrace-when-face-has-syntax-error' into 2.7.xDaniel Pittman2011-05-0218-52/+72
|\
| * (#7314) Faces fail horribly when one has a syntax error.Daniel Pittman2011-05-023-14/+34
| | | | | | | | | | | | | | | | | | | | When we hit a syntax error in any face, a whole bunch of unrelated face things would blow up in horrible ways. Stack traces for all... Now, instead, we catch that fault but specifically only in the face file and report it through our error logs, then quietly ignore the face. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| * maint: move the indirector face base out of puppet/faceDaniel Pittman2011-05-0215-36/+35
| | | | | | | | | | | | | | | | | | We used to shove the base class Puppet::Face::Indirector next to the actual faces; this made a bunch of things, including testing, confusing. Instead, move it away into the indirector where it lives with the rest of the indirector related things. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| * maint: reset more global state in testing faces...Daniel Pittman2011-05-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we query for all faces we need to scan the entire Ruby load path, look for everything that looks like a face, and load it up. That is a fairly expensive operation, especially on a platform that has slow I/O. *cough* EC2 *cough* Because of that we only scan once, and assume that the list is static thereafter; this works OK out in the field, but sucks in testing where that global state gets in the way of the rest of our fiddling under the hood. This resets the '@loaded' member of the collection additionally, which is what should be done since we have reset the rest of the collection at the same time. We don't bother to reset it, as an extra scan during tests is not a problem. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
* | Merge branch 'bug/2.7.x/7315-puppet-status-can't-render-as-json' into 2.7.xDaniel Pittman2011-05-022-1/+5
|\ \
| * | (#7315) Fix `to_pson` method to render correctly.Daniel Pittman2011-05-022-1/+5
| |/ | | | | | | | | | | | | | | Puppet::Status had an outdated implementation of the `to_pson` hook, so would fail to render when asked. Changes to the faces system exposed this, resulting in a backtrace if the user wanted JSON output on the CLI. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
* | Merge branch 'bug/2.7.x/better-error-reporting-in-face-cli-facade' into 2.7.xDaniel Pittman2011-05-025-63/+54
|\ \ | |/ |/|
| * (#7304) Improve help from `puppet foo`Daniel Pittman2011-05-023-8/+6
| | | | | | | | | | | | | | This addresses two of the four points: we now quote the subcommand name, and emit 'Usage: ' before the usage information on the puppet command line. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| * (#7317) better error handling in CLI face facade.Daniel Pittman2011-05-022-55/+48
|/ | | | | | | | | | | The error handling code in the face CLI facade was pretty terrible: it make a bunch of assumptions about the structure of the error message it got back, and used exceptions to communicate inside the same function. Instead, we handle errors uniformly without raising and catching in the same method, report more nicely, and exit cleanly in all cases. Reviewed-By: Nick Lewis <nick@puppetlabs.com>