summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-05-24 17:04:17 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit3696d951f70f5b94b49619dfbc57138d5241bbb8 (patch)
tree9032825792f576a84311d4025fea316bf3ae565d /lib/puppet
parent0fc41aed7056e645f1d41a7ef6a00a34344dde38 (diff)
downloadpuppet-3696d951f70f5b94b49619dfbc57138d5241bbb8.tar.gz
puppet-3696d951f70f5b94b49619dfbc57138d5241bbb8.tar.xz
puppet-3696d951f70f5b94b49619dfbc57138d5241bbb8.zip
[#3865] External subcommands
This patch allows the puppet single-executable to invoke external, hyphenated subcommands, much like how git does.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/command_line.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb
index 8a010bb76..8c8eb91d5 100644
--- a/lib/puppet/util/command_line.rb
+++ b/lib/puppet/util/command_line.rb
@@ -51,10 +51,23 @@ module Puppet
require_application subcommand_name
Puppet::Application.find(subcommand_name).new(self).run
else
- abort "Error: Unknown command #{subcommand_name}.\n#{usage_message}"
+ unless execute_external_subcommand
+ abort "Error: Unknown command #{subcommand_name}.\n#{usage_message}"
+ end
end
end
+ def execute_external_subcommand
+ external_command = "puppet-#{subcommand_name}"
+
+ require 'puppet/util'
+ path_to_subcommand = Puppet::Util.binary( external_command )
+ return false unless path_to_subcommand
+
+ system( path_to_subcommand, *args )
+ true
+ end
+
def legacy_executable_name
LegacyName[ subcommand_name ]
end