diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-06-08 18:41:16 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-06-08 18:41:16 -0700 |
| commit | 8ccd00963d91f168438eaec4b29a18cd4a1ac583 (patch) | |
| tree | 85e15c5ef9390454438fb300c5baa38a7f2f5f3e /lib/puppet/interface/action.rb | |
| parent | 376e0f04af01810d00eede4de52744bb8c8e1681 (diff) | |
| parent | d4c499dfdbd94f5272278e1ba87a75915607c3d7 (diff) | |
| download | puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.gz puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.xz puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.zip | |
Merge branch '2.7rc' into 2.7.x
Diffstat (limited to 'lib/puppet/interface/action.rb')
| -rw-r--r-- | lib/puppet/interface/action.rb | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb index 748888c2e..185302b07 100644 --- a/lib/puppet/interface/action.rb +++ b/lib/puppet/interface/action.rb @@ -48,28 +48,7 @@ class Puppet::Interface::Action attr_doc :returns attr_doc :arguments def synopsis - output = PrettyPrint.format do |s| - s.text("puppet #{@face.name}") - s.text(" #{name}") unless default? - s.breakable - - options.each do |option| - option = get_option(option) - wrap = option.required? ? %w{ < > } : %w{ [ ] } - - s.group(0, *wrap) do - option.optparse.each do |item| - unless s.current_group.first? - s.breakable - s.text '|' - s.breakable - end - s.text item - end - end - end - s.text(" #{arguments}") if arguments - end + build_synopsis(@face.name, default? ? nil : name, arguments) end ######################################################################## |