diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-07 16:46:24 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-07 16:46:24 -0800 |
| commit | 75af5827b68774d0300499fab969239bb8ae6d30 (patch) | |
| tree | 43042d5c9b4026f5ed628a3c75f9f8d05680738e /lib | |
| parent | 28095d7435bcab15b76ddfa4435d61653f2f890d (diff) | |
| download | puppet-75af5827b68774d0300499fab969239bb8ae6d30.tar.gz puppet-75af5827b68774d0300499fab969239bb8ae6d30.tar.xz puppet-75af5827b68774d0300499fab969239bb8ae6d30.zip | |
maint: Move puppetdoc settings to defaults so we can use them in tests
Paired-with: Daniel Pittman <daniel@puppetlabs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/doc.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/defaults.rb | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb index 3bfe41653..74811919e 100644 --- a/lib/puppet/application/doc.rb +++ b/lib/puppet/application/doc.rb @@ -1,7 +1,6 @@ require 'puppet/application' class Puppet::Application::Doc < Puppet::Application - should_not_parse_config run_mode :master @@ -140,7 +139,7 @@ COPYRIGHT Copyright (c) 2005-2007 Puppet Labs, LLC Licensed under the GNU Public License - HELP +HELP end def handle_unknown( opt, arg ) @@ -163,11 +162,6 @@ License files += command_line.args Puppet.info "scanning: #{files.inspect}" - Puppet.settings.setdefaults( - "puppetdoc", - - "document_all" => [false, "Document all resources"] - ) Puppet.settings[:document_all] = options[:all] || false begin require 'puppet/util/rdoc' diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 576acfeb6..f308d4476 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -822,4 +822,8 @@ module Puppet directories." ] ) + setdefaults( + :puppetdoc, + :document_all => [false, "Document all resources"] + ) end |