diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-10 19:58:43 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-12 16:12:08 -0700 |
| commit | 4eccd53da90593fad1b929eeea3b5d7d252c553e (patch) | |
| tree | 14a7f80fe98b554bd7599b8cb84b05089747bf96 /lib | |
| parent | 1b4d7a51d10b217c7f67f3876242fff6dc694faa (diff) | |
| download | puppet-4eccd53da90593fad1b929eeea3b5d7d252c553e.tar.gz puppet-4eccd53da90593fad1b929eeea3b5d7d252c553e.tar.xz puppet-4eccd53da90593fad1b929eeea3b5d7d252c553e.zip | |
(#6962) Implement Face#summary support for the help face.
We now use the summary information available in other faces as part of
emitting a list our list of available subcommands. This is seldom used in
faces, but enough emit the information to prove the concept.
Reviewed-By: Matt Robinson <matt@puppetlabs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/faces/help.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/faces/help.rb b/lib/puppet/faces/help.rb index e986d19b3..229a0dc81 100644 --- a/lib/puppet/faces/help.rb +++ b/lib/puppet/faces/help.rb @@ -27,10 +27,10 @@ Puppet::Faces.define(:help, '0.0.1') do if args.length == 0 then message << "Use: puppet [options] <subcommand> <action>" message << "" - message << "Available commands, from Puppet Faces:" + message << "Available subcommands, from Puppet Faces:" Puppet::Faces.faces.sort.each do |name| face = Puppet::Faces[name, :current] - message << format(" %-15s %s", face.name, 'REVISIT: face.desc') + message << format(" %-15s %s", face.name, face.summary) end else face = Puppet::Faces[args[0].to_sym, version] |