summaryrefslogtreecommitdiffstats
path: root/lib/puppet/interface.rb
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-06-08 18:41:16 -0700
committerNick Lewis <nick@puppetlabs.com>2011-06-08 18:41:16 -0700
commit8ccd00963d91f168438eaec4b29a18cd4a1ac583 (patch)
tree85e15c5ef9390454438fb300c5baa38a7f2f5f3e /lib/puppet/interface.rb
parent376e0f04af01810d00eede4de52744bb8c8e1681 (diff)
parentd4c499dfdbd94f5272278e1ba87a75915607c3d7 (diff)
downloadpuppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.gz
puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.xz
puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.zip
Merge branch '2.7rc' into 2.7.x
Diffstat (limited to 'lib/puppet/interface.rb')
-rw-r--r--lib/puppet/interface.rb21
1 files changed, 1 insertions, 20 deletions
diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb
index 10e2ec8d7..6be8b6930 100644
--- a/lib/puppet/interface.rb
+++ b/lib/puppet/interface.rb
@@ -76,26 +76,7 @@ class Puppet::Interface
# splits out this should merge into a module that both the action and face
# include. --daniel 2011-04-17
def synopsis
- output = PrettyPrint.format do |s|
- s.text("puppet #{name} <action>")
- 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
- end
+ build_synopsis self.name, '<action>'
end