summaryrefslogtreecommitdiffstats
path: root/lib/puppet
Commit message (Collapse)AuthorAgeFilesLines
* (#7828) Fix whitespace in synopsis generator.Daniel Pittman2011-06-073-42/+33
| | | | | | | | | | | | | | | | We accidentally omitted whitespace between multiple options while building the synopsis. This fixes that, by introducing a breakable space in the right location. Additionally, we extract the code that was 99 percent identical from the face and action synopsis generators, push it down into the documentation module, and then invoke it from both places. This eliminates the duplicate code, allowing me to fix that bug once and have it apply to both parts of the code; this is pretty much assured to be true any time we change the synopsis generation. Reviewed-By: Nick Fagerlund <nick.fagerlund@puppetlabs.com>
* (#6873) Add Static Compiler terminus to 2.7.0Luke Kaines2011-06-071-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the static compiler terminus to the release. This wraps the default compiler terminus, and post-processes the catalog to rewrite every file reference using the 'puppet://' URI/protocol into filebucket references that use the MD5 checksum of the file contents. This provides a genuinely static catalog, in terms of content: there are no external dependencies that can change to make the behaviour of applying this catalog change. It also eliminates the describe calls from file checking, as all the metadata is stored locally in the catalog. This can be a substantial performance increase for nodes, especially those that manage large trees of recursive files. To use this set the `catalog_terminus` to `static_compiler`; the resultant catalog will then reference only static content. This does not, however, put the required files into the filebucket on the client. There are some limitations of this code: * Files are all read into memory rather than streamed. This will definitely cause problems with large files, but the filebucket doesn't currently handle streaming. * We think the recursion behavior is equivalent, but can't really guarantee it without a good bit of testing. * You have to populate the client filebucket manually. We don't have any support for doing this automatically, not even through variant access to the catalog downloader. * Behavior on the server is currently undefined if your puppet masters are behind a load balancer and they're configured to do fileserving through that load balancer. It should work, but it probably won't be that fast. You can see https://github.com/lak/puppet-static-compiler for the original prototype this was inherited from, which includes some example code for scanning the downloaded catalog and fetching resources into the filebucket. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
* Merge branch 'bug/2.7rc/7728-resource-failure-leads-to-extra-warnings' into ↵Daniel Pittman2011-06-071-2/+20
|\ | | | | | | 2.7rc
| * (#7728) Suppress notifications from container whits.Daniel Pittman2011-06-071-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduced changes to our graph to reduce the number of edges when we had container dependencies. As part of this the 'whit' object was created, and used as an intermediate vertex to simplify processing. During that change we introduced additional reporting, based on those whit objects, about containment relationships during resource application failure. Specifically, we would now report that the containing class(es) and stages of any failed resource were failed, point-blank. This was unclear, because the entire class had not failed, but only part of it, but also unhelpful, because it turned a single failure into at least one additional report that contained no additional information. Now, instead, we suppress reporting for the whit resources. We still process them identically; just the report is eliminated. It isn't absolutely clear that this is the correct long term direction for handling these objects, but it is the minimal change for the RC release. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
* | (#7764, 7775, 7778) Revisions to Faces help textnfagerlund2011-06-0723-209/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Per UX review of help text, this commit makes several changes over the breadth of the Faces help: * Preface API-only action summaries/descriptions with "API only." (issue #7775) * Provide both CLI and API info in "returns," with the CLI info first. (issue #7778) * Summaries should be sentences. (Add punctuation.) * First sentences of descriptions should reiterate summaries. (Summaries and descriptions should be displayed far enough apart that this isn't a problem.) * Standardize on "subcommand" instead of "face" when talking about the entity you invoke at the command line. (Use "face" when describing API use.) * Fix outdated or clunky text in several faces.
* | (#7773, 7776, 7764) Several help template tweaksnfagerlund2011-06-074-30/+19
|/ | | | | | | | | | | | Per UX review of help output, this commit makes several changes to templates and shared help text: * Change "unknown" to "undocumented" * Remove copyright from short help * Point readers to the man pages (issue 7773) * Remove examples from short help (issue 7776) * Remove summary from short help and make it a fallback for description * Edit common option summaries to fit on a single 80-col line
* Merge branch 'bug/2.7rc/7624-resource-purging-causes-audit-messages' into 2.7rcDaniel Pittman2011-06-061-1/+9
|\
| * (#7624) Manually fetch all properties in instances.Luke Kaines2011-06-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed the `:audit => :all` flag on creation of an instance from a Puppet type, we stopped fetching all the properties. This had flow-on consequences that were visible from the outside; while some places did their own work to ensure that properties were fetched, others didn't. We now open-code the loop that creates and fetches those properties, to ensure that we have the same data without going through the :audit machinery. This resolves the excessive logging, and also eliminates the behavioural change that we introduced in the previous commit. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
* | (#7632) Make secret_agent application compatible with secret_agent facenfagerlund2011-06-062-19/+3
|/ | | | | | | | | | | | | | | Running `puppet secret_agent` was failing with an error in validate_args (in interface/action.rb), because the application was trying to pass the certname as an argument to the synchronize action. Also, it was trying to submit the report a second time. Reviewing the code with Nick0, we found that the application wasn't inheriting from FaceBase and was duplicating a lot of work, and were able to resolve the issue by basically deleting the whole thing. This patch makes secret_agent behave like the other Faces apps, and makes synchronize the default action of the secret_agent face. We left the `run_mode :agent` line in the application because of bug #7802. Paired-with: Nick Lewis <nick@puppetlabs.com>
* (#7624) Auditing should not be enabled by default for purged resources.Dan Bode2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | - Auditing creates logging messages as of 2.6.5 so it should not be enabled by default. - This patch removes the :audit => :all settting from resources created via self.instances (which is used for purging). Please note that we believe this change to be safe, and *should* not result in user-visible behavioural differences when you use the `instances` method on a type, but we can't give you a perfect assurance of that. If you do have code that depends on the current behaviour, and it misbehaves after this patch, please let us know so we can weep ^W find another solution that works for everyone. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com> Reviewed-By: Nigel Kersten <nigel@puppetlabs.com>
* (#7746) Fix bootstrap issues from #7717 fix.Daniel Pittman2011-06-011-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, turns out the fix in #7717 introduced a failure when starting the Puppet master on some versions of Ruby. Weird stuff. I figured it out, eventually. You see, the process of bootstrapping Puppet is ... complex. This file, like many of our early initialization files, has an incestuous relationship between the order of files loaded, code executed at load time, and code executed in other files at runtime. When we construct this object we have not yet actually loaded the global puppet object, so we can't use any methods in it. That includes all the logging stuff, which is used by the deprecation warning subsystem. On the other hand, we can't just load the logging system, because that depends on the top level Puppet module being bootstrapped. It doesn't actually load the stuff it uses, though, for hysterical raisins. Finally, we can't actually just load the top level Puppet module. This one is precious: it turns out that some of the code loaded in the top level Puppet module has a dependency on the run mode values. Run mode is set correctly *only* when the application is loaded, and if it is wrong when the top level code is brought in we end up with the wrong settings scattered through some of the defaults. Which means that we have a dependency cycle that runs: 1. The binary creates an instance of P::U::CL. 2. That identifies the application to load. 3. It does, then instantiates the application. 4. That sets the run-mode. 5. That then loads the top level Puppet module. 6. Finally, we get to where we can use the top level stuff So, essentially, we see a dependency between runtime code in this file, run-time code in the application, and load-time code in the top level module. Which leads me to our current horrible hack: we stash away the message we wanted to log about deprecation, then send it to our logging system once we have done enough bootstrapping that it will, y'know, actually work. I would have liked to fix this, but that is going to be a whole pile of work digging through and decrufting all the global state from the local state, and working out what depends on what else in the product. Oh, and we use a global because we have *two* instances of a P::U::CL object during the startup sequence. I don't know why. Reviewed-By: Nigel Kersten <nigel@puppetlabs.com> Reviewed-By: Nick Lewis <nick@puppetlabs.com> Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
* (#7683) Use ronn, when available, to render the output.Daniel Pittman2011-06-011-0/+48
| | | | | | | | | | | | | | | | We now look for ronn(1), and if it is available ask it to generate the *roff output, delegate that to man(1) directly, and show the result to the user in their pager. If ronn(1) isn't available we delegate to $MANPAGER, $PAGER, less, most, or more, in that order, to paginate the raw markdown. Not nearly so nice, but better than doing nothing. Finally, if none of those pagers are available we fall through to the default behaviour of puppet rendering the output, which more or less results in a direct dump to the console. Nice. Reviewed-By: Nick Fagerlund <nick.fagerlund@puppetlabs.com>
* (#7683) Add a 'man' face and subcommand to Puppet.Daniel Pittman2011-06-012-0/+51
| | | | | | | | | | This is the minimal wrapper, cloning a good deal of the logic from help, that runs our face through the 'man' template and returns ronn-formatted Markdown. This provides the crudest baseline possible for getting man-style output, but lets us move forward to improve behaviour. Reviewed-By: Nick Fagerlund <nick.fagerlund@puppetlabs.com>
* maint: remove obsolete work-around code from help face.Daniel Pittman2011-06-011-3/+0
| | | | | | | | | | | | | The application wrapper for help used to disable the inherited 'render' method from FaceBase - specifically, to avoid the behaviour of rendering strings poorly. Now that we have support for good output in the upstream method, this is unnecessary, so we can eliminate the stub method entirely and use the default behaviour. (This also enables rendering the help into JSON or YAML, against the odds that someone actually cares about that. ;)
* (#7699) Don't duplicate inherited action names on faces.Daniel Pittman2011-06-011-1/+4
| | | | | | | | | | | | | | We earlier moved to duplicating Action objects in the Faces subsystem to ensure they had the correct binding context during execution and introspection. This was correct, but introduced a bug where we would report both the parent and child binding as separate entries with duplicate names, in the list of actions. This flowed on to the help output, where it would cause every inherited action to be listed twice: once on the parent, once on the child. (This was actually worse if the inheritance was deeper: we would duplicate once for every level between the instance and the origin of the action.)
* (#7177) Deprecate implicit 'puppet apply' for 2.7.0Daniel Pittman2011-06-011-2/+24
| | | | | | | | | | | | | | | | | | | | Back in prehistory (eg: 0.25 era), 'puppet' was the name for the agent, and could be used directly to apply a manifest as well as to communicate with the puppet master process. During the 2.6 series we moved to a single binary, but continued to support older scripts by detecting invocations that looked like the traditional scripting uses and implicitly turning those into a call to 'puppet apply'. Now, with the 2.7.0 release, we are moving to deprecate that behaviour. We still do the same detection, and still run the old manifests, but we now emit a deprecation warning directing people to use 'puppet apply' directly. We intend to remove the behaviour entirely in the 2.8 release, which also paves the way to nicer handling of the command line. Reviewed-By: Randall Hansen <randall@puppetlabs.com> Reviewed-By: Nick Fagerlund <nick.fagerlund@puppetlabs.com>
* (#7717) Layout cleanup for subcommand extraction.Daniel Pittman2011-06-011-5/+11
| | | | | | This transforms the layout of the code, to make it easier to work with, but makes no functional changes. Done separately to make clearer the functional changes vs the non-functional changes.
* #7211: nasty logic error with global Face options taking arguments.Daniel Pittman2011-05-311-1/+1
| | | | | | | | | | | | A logic error meant that global Face options that took arguments were mishandled: we never consumed the argument, so we read this: puppet facts --render-as json find $(hostname) ...as meaning "invoke the 'json' action on the 'facts' face"... This fixes that problem, so we now correctly handle both optional and non-optional arguments to global Face options.
* #7211: more helpful error messages in various cases.Daniel Pittman2011-05-311-6/+20
| | | | | | | | | | | | We were emitting a bunch of unhelpful failure messages, surrounding invalid actions and especially default actions interacting with the command-line. This cleans those up, to give a helpful, informative, and correct message in all cases. Notably, we no longer report that there is no "default" action when you specify an unknown action on a face. This change revealed some other weaknesses in our unit tests, now correctly, that result in slightly more robust code.
* (#7708) Delete extended documentation from configuration referencenfagerlund2011-05-271-101/+26
| | | | | | | | | | The auto-generated references are meant to be pithy, dense, and fast -- to be references, not guides. The configuration reference was front-loaded with several pages of explanatory text that properly belongs in the guides on the docs site. This commit removes that text in preparation for a reorganization of the docs. This is a doc string only commit.
* (#7707) Document signals in puppet agent and puppet master helpnfagerlund2011-05-272-0/+22
| | | | | | | | | Previously, the signals accepted by the agent and master daemons were only documented in the configuration reference, which didn't make any particular sense. This commit moves their documentation to a blurb in the relevant man pages. This is a doc string only commit.
* (#5318) Always notice changes to manifests when compiling.Daniel Pittman2011-05-271-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are asked to compile a catalog we need to update the set of known resource types, along with the node declaration, from the pool of manifests on disk. This is, obviously, a per-environment pool of resource types. To reduce the scope of the race where an update to those manifest files on disk can be updated during a compilation, we tried to cache the set of known resources in the current thread at the start of compilation, then flush it after compile finished and used the cache unconditionally if it was set. Theoretically, this would assure us that we would parse the set of manifests once, use them for the entire compile, flush the cache, and then carry on. Practically, this was enforced as described: flush *after* the compile, assume this would mean that it was clear at the start of the next compile. That presumably worked more or less right until a change was made to push extra data into the catalog at the start of the 2.6 series; that made serialization of the catalog depend on the pool of known resource types. When that happened we would reload the cache (and reparse the manifests) during serialization, but after compilation ... and leave that in the thread cache, so the precondition for the compiler was no longer true. It would see the cache as of the end of the previous compile run, not the start of the next compile run. This, in turn, was what made Puppet wait for multiple runs of the agent before showing you a change in your manifests under Passenger, but *not* under Webrick: Passenger would reuse the same thread for the next request, cache in place, while Webrick would create a new thread and (by side-effect) "flush" the cache as the compiler expected. To minimally fix this, with as little change of side-effect as possible, we move the cache flush from after compile runs to before compile runs. This might have minimal memory cost until another compile request runs in the same thread, because we cache the data longer, but most models won't cause that to be too much trouble. Reviewed-By: Matt Robinson <matt@puppetlabs.com>
* (#7557) Remove Faces ApplicationMatt Robinson2011-05-261-122/+0
| | | | | | | | It used to be that to list the faces available and their actions and options, you had this legacy based face application. This functionality has all been moved into the puppet help face application. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* Merge branch 'ticket/2.7rc/maint-faces_docs_spec_fixes' into ↵Matt Robinson2011-05-264-27/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | ticket/2.7rc/maint-doc_changes_without_failures * ticket/2.7rc/maint-faces_docs_spec_fixes: maint: Fix order dependent spec failure for face indirection (#7690) Don't blow up when listing terminuses available for faces maint: Dedup the loadpath so we don't have to walk it multiple times Maint: Fix ellipses for short descriptions Resolved Conflicts: lib/puppet/interface/documentation.rb
| * (#7690) Don't blow up when listing terminuses available for facesMatt Robinson2011-05-263-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, in order to list the available terminuses for an indirected face we loaded all the the terminuses in order to list them. This meant that if a terminus like active_record didn't have the dependencies it needed, the documentation would raise errors and not list terminuses. <Puppet::Error: Could not autoload filename uninitialized constant Object::ActiveRecord> Now we just list the terminuses available in the load path without trying to load them. The terminus will still raise an error if you try to use it without its dependencies being met. Paired-with: Max Martin <max@puppetlabs.com>
| * maint: Dedup the loadpath so we don't have to walk it multiple timesMatt Robinson2011-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | If the user's path has duplicate entries, we end up looking at them multiple times. This has bitten people in the past in that if you get a lot of duplication it can make autloading a lot slower. Really the user shouldn't be duplicating their path, but since we can't control that, this is a safe fix to prevent them from having autoload slowness. Paired-with: Max Martin <max@puppetlabs.com>
| * Maint: Fix ellipses for short descriptionsnfagerlund2011-05-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | Previously, we were adding ellipsis to any short_description, which was misleading; they were only necessary when we were truncating in the _middle_ of a paragraph. This commit changes the behavior, and updates the tests to show when we expect ellipsis. Paired-with: Matt Robinson <matt@puppetlabs.com>
* | (#7563) DRY: Remove indirector boilerplate from individual facesnfagerlund2011-05-2612-113/+0
| | | | | | | | | | Termini lists are now being generated in the help templates. This commit removes the hardcoded lists from each of the affected faces.
* | (#7564) Finish templatesnfagerlund2011-05-265-60/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a rebase of the following commits: * (#7563) Add a template for manpages In order to generate manpages in a reasonably maintainable way, we need to format text from the Faces help API for use with Ronn (https://github.com/rtomayko/ronn/). This commit adds a man template to the help templates folder; it has been verified to generate Ronn-friendly input text. It isn't currently called by any applications, but can be demonstrated by exchanging it for face.erb. * (#7634) Change ERB trim mode used in the Faces help API <%= something -%> tags (note the minus) are unavoidably necessary at at least one point in the Faces help templates. ERB objects instantiated with the % trim mode will blow up horribly whenever one of these tags appears. This commit changes the trim mode to `-` and refactors all help templates accordingly. * (#7563) Refactor short help templates This commit attempts to bring the short face and action help templates closer to the goals of fitting cleanly on one screen, fitting the prevailing *nix aesthetic, and being useful without overwhelming the user.
* | (#7561) Complete help text for all faces and actionsnfagerlund2011-05-2622-257/+628
| | | | | | | | | | | | Faces help output relies on input from the documentation methods in each of the faces to be documented. This commit calls those methods in each of our faces, with varying levels of detail depending on their complexity.
* | Maint: Add ellipsis to generated short_descriptions.nfagerlund2011-05-261-1/+1
| | | | | | | | | | | | | | Auto-generated short descriptions cut off at five lines with no indication that they are truncated. This commit adds ellipsis in brackets to indicate incompleteness.
* | (#6962) Add "arguments" method to help APInfagerlund2011-05-261-0/+2
|/ | | | | | | | | | Since some actions take arguments and some do not, action synopses were incomplete and ambiguous. This commit adds a method for explicitly declaring what argument(s) an action takes, and places the arguments at the appropriate spot in the action's synopsis. By convention, individual arguments should be wrapped in angle brackets.
* (#7681) Allow array variables as resource referencesNick Lewis2011-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit df088c9ba16dce50c17a79920c1ac186db67b9e9 introduced a regression where $files = ["/tmp/one", "/tmp/two"] file { "/tmp/one": content => "one", } file { "/tmp/two": content => "two", } file { "/tmp/three": content => "three", require => File[$files], } no longer worked. File[$files] was concatenating the elements of $files to create a single title, instead of expanding to multiple File dependencies. Since resource reference titles are implicitly wrapped in an array, if one of the elements of that array is a variable containing an array, the list of titles is a nested array. Prior to the change causing the regression, we would flatten arrays when evaluating them, under certain circumstances. We no longer ever flatten AST arrays when evaluating them, so anywhere that we really do need a flattened array, we have to manually flatten it. ResourceReference expects its list of titles to be a single, flat list of titles, so we have to make it so. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
* maint: move trap call to Signal so we can stub it for specsMatt Robinson2011-05-191-1/+1
| | | | | | | | | | Also removed some monkey patching on Signal that would have theoretically done this without having to explicitly call trap on Signal in order to stub it, but it's not working. This allows us to ctrl+c (send SIGINT) in the middle of a spec run. Paired-with: Josh Cooper <josh@puppetlabs.com>
* (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-181-1/+1
| | | | | | | | | | | | When configuring the Indirector routes, we should only try loading the Terminus classes that are referenced by the configuration. Previously, we were loading all Terminus classes, which would cause errors if we didn't have all of the prerequisites for all of them, even if the ones with missing prerequisites weren't being used by the configuration. Paired-with: Nick Lewis <nick@puppetlabs.com>
* Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.xMatt Robinson2011-05-171-1/+1
|\ | | | | | | | | | | * ticket/2.7.x/7507-filter_19_failures: (#7507) Add ability to filter Ruby 1.9 spec failures (#7507) Fix when_invoked action specs in Ruby 1.9
| * (#7507) Fix when_invoked action specs in Ruby 1.9Matt Robinson2011-05-171-1/+1
| | | | | | | | | | | | | | | | Ruby 1.9 is strict about argument arity for methods that are metaprogrammatically defined. A ton of specs that were setting up when_invoked didn't pass options even though they should have been. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* | (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9Nick Lewis2011-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | This method was relying on the implicit join in Ruby 1.8's Array#to_s, eg. [1,2,3].to_s => "123". The behavior in Ruby 1.9 is more akin to Array#inspect, eg. [1,2,3].to_s => "[1, 2, 3]". Since the array we were building was lines to be printed, the latter behavior is incorrect. So we just join into a single string, which prints consistently in all versions of Ruby. Paired-With: Josh Cooper Original patch by Aria Stewart <aredridel@nbtsc.org>
* | (#7298) require 'English' to provide $CHILD_STATUS in Ruby 1.9Nick Lewis2011-05-161-0/+1
|/ | | | | | | | | This had been coming from 'cgi', but in Ruby 1.9, cgi no longer requires English. Since we use $CHILD_STATUS when execing, we need to have it available, so require it manually. This also provides the other named special globals, should we choose to use them. Paired-With: Josh Cooper
* (#7291) Fix issues with instance_methods in Ruby 1.9Matt Robinson2011-05-165-7/+7
| | | | | | | | | | | | | | | | | | | | | instance_methods in Ruby 1.8.7 returns an array of strings, but returns an array of symbols in 1.9.2. This manifested itself when running the tests because in 1.9.2 we were trying to call sub on a sybmol. The original proposed solution was to monkey patch symbols to have a sub method, but this didn't deal with the real issue of need to check whether a method was defined, and actually made it worse. Turns out that checking for the presence of a method in an array that may contain symbols and may contain strings is better done by just calling method_defined? instead. This patch addresses all the places ack turned up the code doing this include? check instead of directly calling method_defined?. Thanks to Alex Sharp ajsharp@gmail.com for pointing out the Ruby 1.9 problems and working toward a solution. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
* (#7291) Fixed ascii problem with Ruby 1.9.2Matt Robinson2011-05-161-1/+1
| | | | | | | | | | | | | | As with the previous commit, there was a problem loading a face because Ruby 1.9.2 doesn't like using non-standard ascii characters without declaring the encoding at the top of the file. SyntaxError Exception: /Users/matthewrobinson/work/puppet/lib/puppet/face/resource.rb:10: invalid multibyte char (US-ASCII) Rather than declare the encoding to allow the French word, I've translated it (after having to look it up myself). Reviewed-by: Pieter van de Bruggen <pieter@puppetlabs.com>
* (#7291) Fix Ruby 1.9 face failuresMatt Robinson2011-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | The certificate face wasn't being loaded, but it wasn't clear from the test failure why: lib/puppet/interface.rb:61:in `[]': Could not find Puppet Face :certificate (Puppet::Error) The problem is that when the certificate face is required you get: SyntaxError Exception: /Users/matthewrobinson/work/puppet/lib/puppet/face/certificate.rb:11: invalid multibyte char (US-ASCII) However this error is caught and logged, but then ignored. This behavior was a decision in #7314 and is currently under review. A space character in the description was ASCII 160 instead of the typical ASCII 32 Reviewed-by: Pieter van de Bruggen <pieter@puppetlabs.com>
* (#7264) Docs: Clarify that subscribe/notify imply require/beforenfagerlund2011-05-121-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.
* Prevent spec failure caused by network device mock leakBrice Figureau2011-05-071-0/+5
| | | | | | | We were leaking some mocks in the network device singleton from tests to tests. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #7299 - do not require net/ssh for running rake specBrice Figureau2011-05-071-1/+3
| | | | | | | This is a different fix than the one proposed by Stefan Schulte, based on Luke comments. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* (#7353) Remove :for_humans format entirely.Daniel Pittman2011-05-053-39/+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.