[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Jesse Wolfe]

The following commit has been merged in the experimental branch:
commit c61d6d0c133ba185bf63884b9e513df5234211cf
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Feb 3 15:14:51 2011 -0800

    Maint: move puppet describe --help

diff --git a/lib/puppet/application/describe.rb b/lib/puppet/application/describe.rb
index e76b347..0c7bea9 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 3d80eea..0000000
--- 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

-- 
Puppet packaging for Debian