summaryrefslogtreecommitdiffstats
path: root/lib/puppet/interface/option.rb
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-04-27 12:12:05 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-04-27 12:12:05 -0700
commitebf49f98357f93b33e09c0ecbdee1c5c2db87569 (patch)
tree8500c7f7c87ca5f32f22a70fde97b738c0427f54 /lib/puppet/interface/option.rb
parent1aaf5fdc51e165c7d0f377450016cd4fb3767c02 (diff)
parent0256d67e1a51a37f2c87ec197bdff6ef3a6b269f (diff)
downloadpuppet-ebf49f98357f93b33e09c0ecbdee1c5c2db87569.tar.gz
puppet-ebf49f98357f93b33e09c0ecbdee1c5c2db87569.tar.xz
puppet-ebf49f98357f93b33e09c0ecbdee1c5c2db87569.zip
Merge branch 'feature/2.7.x/6962-finish-documentation-api-for-faces' into 2.7.x
Diffstat (limited to 'lib/puppet/interface/option.rb')
-rw-r--r--lib/puppet/interface/option.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb
index 3d3840ff6..b68bdeb12 100644
--- a/lib/puppet/interface/option.rb
+++ b/lib/puppet/interface/option.rb
@@ -1,6 +1,10 @@
require 'puppet/interface'
class Puppet::Interface::Option
+ include Puppet::Interface::TinyDocs
+ # For compatibility, deprecated, and should go fairly soon...
+ ['', '='].each { |x| alias :"desc#{x}" :"description#{x}" }
+
def initialize(parent, *declaration, &block)
@parent = parent
@optparse = []
@@ -80,7 +84,7 @@ class Puppet::Interface::Option
end
attr_reader :parent, :name, :aliases, :optparse
- attr_accessor :required, :desc
+ attr_accessor :required
attr_accessor :before_action
def before_action=(proc)