| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Termini lists are now being generated in the help templates. This commit
removes the hardcoded lists from each of the affected faces.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| |\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Older versions of egrep do not support the character class
"\s". Changed:
puppet resource service | egrep -B1 "ensure\s*=>.*'running"
to:
puppet resource service | egrep -B1 "ensure.*=>.*'running"
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Several schedule spec tests made assumptions about the system clock,
which resulted in intermittent failures.
Also found some issues with schedule ranges, filed it as bug #7369 and
created a pending schedule test for it.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The test for ticket 7117 producedes spurious failures due to timing:
a curl command is executed from an agent to a freshly started
Puppet Master; if the Puppet Master is not ready to accept the connection
the test will fail. Added an until loop that issues simple curl
command to see if the Puppet Master is up and ready
|
| |/ / / / |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* ticket/2.7.x/7507:
(#7507) Add exclude filter for ruby 1.9 spec failures
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Exclude spec test for multiple writer processes as this fails
intermittently on ruby 1.9.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* ticket/2.7.x/7507:
(#7502) Fixed parser spec for ruby 1.8.5
(#7507) Add more 1.9 filters
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The first method is not available on Enumerable in ruby 1.8.5, so when
it is mixed into ASTArray, you can't call first.
Reviewed-By: Matt Robinson <matt@puppetlabs.com>
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Additionally we fixed a scoping issue with the File type.
Paired-With: Matt Robinson <matt@puppetlabs.com>
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 2.7.next: (42 commits)
(#6395) Add extpuppet help, eval, and interfaces
Adding a sleep state post starting master
maint: fix spec_helper inclusions again.
(#7523) Refactor the grammar to reduce duplication
(#7114) Fix specs for ssh authorized key parsed provider
(#7114) Target returns correct value
(#7114) Add integration tests for authorized_key
(#7114) Improve unit tests for ssh_authorized_key
(#7114) Improve value validation for authorized_key
(#7300) Fix instances method of mount provider
(#7259) Remove ActiveRecord requirement from indirector face spec
(#7259) Do not try to load all Terminus classes when configuring the Indirector
(#3836) External nodes should only capture stdout
Revert "(#7220) Add the ability to "inherit" options."
maint: sync 'authconfig' to 'rest_authconfig' setting
adding test for ticket 7139
(#7139) Accept '/' as a valid path in filesets
(#7300) Add specs for the mount provider
case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make things more consistant
(#6845) Mount writes incorrect vfstab entries
...
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* feature/2.7.next/6395_envpuppet:
(#6395) Add extpuppet help, eval, and interfaces
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This patch add three features to the envpuppet helper script.
First, if --help is passed as the first argument, a helpful message is
printed.
Second, if ENVPUPPET_BLEEDING=true when envpuppet is executed,
additional repositories are enabled. The only addition at this time is
puppet-interfaces, which heavily modifies the behavior of Puppet itself
and may or may not be desired.
Third, if no arguments are passed to the script, bourne compatible shell
statements are printed to STDOUT which may be directly evaluated in the
current shell. This is to help people who prefer to directly set
RUBYLIB and PATH in their development workflows, which I've noticed to
be the case for many people.
For example:
eval $(envpuppet)
Signed-off-by: Jeff McCune <jeff@puppetlabs.com>
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | |\ \ \ |
|
| | | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* ticket/2.6.next/3836:
(#3836) External nodes should only capture stdout
|
| | | |/ / /
| | | | |
| | | | |
| | | | | |
This patch prevents stdout and stderr from being combined by Puppet::Util.execute, when used by Puppet::Indirector::Exec for external nodes.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Occasional spurious errors seen when running this test -- curl
reports an SSL protocol error; I suspect this is actually a timing
issue related to starting up the master and not being
ready to to accecpt connections.
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit unifies some paths in the grammar, which had previously been
duplicated to avoid shift/reduce conflicts. Merging these paths together and
separating only the conflicting structures leads to a cleaner grammar, with
fewer holes.
Several bugs are fixed as a result:
(#3129) Nested class names beginning with numbers work correctly
(#5268) Hyphens in class names work correctly
(#5817) Hashes and arrays can now be passed to functions (hashes require parentheses)
Additionally, expressions are now legal in most places where they would make
sense, when previously only bare rvalues were allowed.
Paired-With: Markus Roberts
Reviewed-By: Matt Robinson
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We got rid of the '../../spec_helper' style requires, but a few of them snuck
back in in recent changes. This purges them out, replaced with the header:
#!/usr/bin/env rspec
require 'spec_helper'
Reviewed-By: Nick Lewis <nick@puppetlabs.com>
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These tests were unnecessarily creating a stub resource, as well as failing to
re-initvars on the provider before each test. This led to test ordering
failures, and incompatibilities with the other commits in this series. Now we
use a real resource, and properly reinitialize before each test.
Paired-With: Josh Cooper
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix the ssh_authorized_key parsedfile provider to return the current
target value instead of the should value.
Without this change puppet always thinks that the target property is in
sync and thus will never move one key to the correct file.
Reviewed-By: Nick Lewis
Reviewed-By: Josh Cooper
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add tests to show the issue that one key is not moved from one keyfile
to another keyfile if target is not in sync.
Reviewed-By: Nick Lewis
Reviewed-By: Josh Cooper
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add tests to check if the type supports valid values for all the
properties. Also check if the type rejects values that are invalid.
Reviewed-By: Nick Lewis
Reviewed-By: Josh Cooper
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Whitespaces in any of the properties can lead to incorrect entries in
the authorized_keys file.
Reviewed-By: Nick Lewis
Reviewed-By: Josh Cooper
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The instance method now behaves like the prefetch method: After parsing
/etc/(v)fstab run mount to update the ensure state from either
:unmounted to :mounted and from :absent to :ghost
Reviewed-By: Nick Lewis
Reviewed-By: Josh Cooper
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add specs to demonstrate that the instances method is currently broken
because it does not take the actual mountstate into account.
As a result running "puppet resource mount" on the commandline will
report every mount that appears in /etc/(v)fstab as unmounted.
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
'tickets/2.7.x/7259-make-active-record-test-requirement-optional' into 2.7.next
* tickets/2.7.x/7259-make-active-record-test-requirement-optional:
(#7259) Remove ActiveRecord requirement from indirector face spec
(#7259) Do not try to load all Terminus classes when configuring the Indirector
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
"should be able to return a list of terminuses for a given
indirection" was calling Puppet::Indirector::Face.terminus_classes,
which is just a thin wrapper around
Puppet::Indirector::Terminus.terminus_classes, which would attempt to
load all Terminus classes. This would cause problems if not all of
the prerequisites for all of the Terminus classes were installed (For
example: ActiveRecord).
Now we only test that the thin wrapper appropriately munges the output
from Puppet::Indirector::Terminus.terminus_classes, since the method
being wrapped should have its own tests for the behavior that was
being tested originally.
Paired-with: Nick Lewis <nick@puppetlabs.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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>
|
| | |\| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 2.7.x:
(#7469) Add license to test face so tests pass
(#7264) Docs: Clarify that subscribe/notify imply require/before
(#7468) Stub spec that tries to connect to pypi.python.org
Prevent spec failure caused by network device mock leak
Fix #7299 - do not require net/ssh for running rake spec
Resolved Conflicts:
lib/puppet/util/network_device.rb
spec/unit/util/network_device_spec.rb
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit 9329a1f33b4d7df81ad8661de74f8a3656428570.
Conflicts:
spec/unit/interface/action_builder_spec.rb
spec/unit/interface/action_spec.rb
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
We changed the name of the authconfig setting to specify 'rest_', but this
branch merge didn't sync the change through all the tests. Now resolved by
renaming the configuration option in the test also.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
|
| | |\ \ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fix conflicts in the changelog, and one agent spec in favour of the 2.7.next
version of the code.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | |\ \ \ \ \ \ |
|
| | | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
2.6.next
* toddz/feature/2.6.next/vim-indenting:
vim: Initial ftplugin and indent support
|
