summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2011-02-03 15:14:51 -0800
committerJesse Wolfe <jes5199@gmail.com>2011-02-03 16:42:09 -0800
commitc61d6d0c133ba185bf63884b9e513df5234211cf (patch)
treec8e2710efce63bb0050d870af83da7fd1061af54
parentae78264c8c3cd8ec38128b13c265a07faa0eaa84 (diff)
downloadpuppet-c61d6d0c133ba185bf63884b9e513df5234211cf.tar.gz
puppet-c61d6d0c133ba185bf63884b9e513df5234211cf.tar.xz
puppet-c61d6d0c133ba185bf63884b9e513df5234211cf.zip
Maint: move puppet describe --help
-rw-r--r--lib/puppet/application/describe.rb53
-rwxr-xr-xlib/puppet/util/command_line/pi48
2 files changed, 53 insertions, 48 deletions
diff --git a/lib/puppet/application/describe.rb b/lib/puppet/application/describe.rb
index e76b347f6..0c7bea96d 100644
--- a/lib/puppet/application/describe.rb
+++ b/lib/puppet/application/describe.rb
@@ -180,6 +180,59 @@ class Puppet::Application::Describe < Puppet::Application
option("--list", "-l")
option("--meta","-m")
+ def help
+ <<-HELP
+
+SYNOPSIS
+========
+Print help about puppet types on the console. Run with '-h' to get
+detailed help.
+
+
+USAGE
+=====
+ puppet describe [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta]
+
+
+DESCRIPTION
+===========
+Prints details of Puppet types, providers and metaparameters on the
+console.
+
+
+OPTIONS
+=======
+help: Print this help text
+
+providers: Describe providers in detail for each type
+
+list: List all types
+
+meta: List all metaparameters
+
+short: List only parameters without detail
+
+
+EXAMPLE
+=======
+ puppet describe --list
+ puppet describe file --providers
+ puppet describe user -s -m
+
+
+AUTHOR
+======
+David Lutterkort
+
+
+COPYRIGHT
+=========
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
+License
+
+ HELP
+ end
+
def preinit
options[:parameters] = true
end
diff --git a/lib/puppet/util/command_line/pi b/lib/puppet/util/command_line/pi
deleted file mode 100755
index 3d80eea8f..000000000
--- a/lib/puppet/util/command_line/pi
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-
-#
-# = Synopsis
-#
-# Print help about puppet types on the console. Run with '-h' to get detailed
-# help.
-# = Usage
-#
-# puppet describe [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta]
-#
-# = Description
-#
-# Prints details of Puppet types, providers and metaparameters on the console.
-#
-# = Options
-#
-# help::
-# Print this help text
-#
-# providers::
-# Describe providers in detail for each type
-#
-# list::
-# List all types
-#
-# meta::
-# List all metaparameters
-#
-# short::
-# List only parameters without detail
-#
-# = Example
-#
-# puppet describe --list
-# puppet describe file --providers
-# puppet describe user -s -m
-#
-# = Author
-#
-# David Lutterkort
-#
-# = Copyright
-#
-# Copyright (c) 2005 Puppet Labs, LLC
-# Licensed under the GNU Public License
-
-#Puppet::Application[:describe].run