summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/resource.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-04-30 14:54:07 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit63e2e56d3172bdc80aaca5f5ddde5811728e3c76 (patch)
tree38e3607fe83223d135f1c327682dbd8698bb138d /lib/puppet/application/resource.rb
parentb6e2ce6a85c953fcd57a3b837ccaa794a634dc22 (diff)
downloadpuppet-63e2e56d3172bdc80aaca5f5ddde5811728e3c76.tar.gz
puppet-63e2e56d3172bdc80aaca5f5ddde5811728e3c76.tar.xz
puppet-63e2e56d3172bdc80aaca5f5ddde5811728e3c76.zip
feature #2276 Single Executable: subcommand method
Extract the logic to determine the subcommand name into a method. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/application/resource.rb')
-rw-r--r--lib/puppet/application/resource.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/application/resource.rb b/lib/puppet/application/resource.rb
index ae4349850..78aed95c5 100644
--- a/lib/puppet/application/resource.rb
+++ b/lib/puppet/application/resource.rb
@@ -38,11 +38,12 @@ Puppet::Application.new(:resource) do
end
command(:main) do
- type = ARGV.shift or raise "You must specify the type to display"
+ args = Puppet::Util::CommandLine.args
+ type = args.shift or raise "You must specify the type to display"
typeobj = Puppet::Type.type(type) or raise "Could not find type #{type}"
- name = ARGV.shift
+ name = args.shift
params = {}
- ARGV.each do |setting|
+ args.each do |setting|
if setting =~ /^(\w+)=(.+)$/
params[$1] = $2
else