Please review pull request #765: Maint/2.7.x/no private forges opened by (nfagerlund)
Description:
The module tool supports a private Forge right now, but only if you have THE
Forge -- the APIs are not public yet, and are still subject to change as we
build out new features. This commit changes the help text so that it doesn't
imply private repos to be an immediately viable thing.
- Opened: Fri May 11 21:29:43 UTC 2012
- Based on: puppetlabs:2.7.x (3b144bf7a093510436e215f92a47ab35c2236645)
- Requested merge: nfagerlund:maint/2.7.x/no-private-forges (4577d5c535470734544459541f31de17fad68c5a)
Diff follows:
diff --git a/lib/puppet/face/module/install.rb b/lib/puppet/face/module/install.rb
index db0a0eb..9827742 100644
--- a/lib/puppet/face/module/install.rb
+++ b/lib/puppet/face/module/install.rb
@@ -2,10 +2,9 @@
Puppet::Face.define(:module, '1.0.0') do
action(:install) do
- summary "Install a module from a repository or release archive."
+ summary "Install a module from the Forge or a release archive."
description <<-EOT
- Installs a module from the Puppet Forge, from a release archive file
- on-disk, or from a private Forge-like repository.
+ Installs a module from the Puppet Forge or from a release archive file.
The specified module will be installed into the directory
specified with the `--target-dir` option, which defaults to
diff --git a/lib/puppet/face/module/search.rb b/lib/puppet/face/module/search.rb
index 7632f56..c42e693 100644
--- a/lib/puppet/face/module/search.rb
+++ b/lib/puppet/face/module/search.rb
@@ -2,16 +2,16 @@
Puppet::Face.define(:module, '1.0.0') do
action(:search) do
- summary "Search a repository for a module."
+ summary "Search the Forge for a module."
description <<-EOT
- Searches a repository for modules whose names, descriptions, or keywords
+ Searches the Forge for modules whose names, descriptions, or keywords
match the provided search term.
EOT
returns "Array of module metadata hashes"
examples <<-EOT
- Search the default repository for a module:
+ Search the Forge for a module:
$ puppet module search puppetlabs
NAME DESCRIPTION AUTHOR KEYWORDS
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
