From 7656ba73ddfd883b36a01c81147ae69e80773bce Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Thu, 22 Apr 2010 12:04:10 -0700 Subject: feature #2276 Single Executable: CommandLine can be instantiated refactor CommandLine to be an object Signed-off-by: Jesse Wolfe --- lib/puppet/util/command_line.rb | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index 5fe07b28d..6e67fd706 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -1,6 +1,6 @@ module Puppet module Util - module CommandLine + class CommandLine def self.subcommand_name(*args) subcommand_name, args = subcommand_and_args(*args) return subcommand_name @@ -42,6 +42,48 @@ module Puppet [ zero, argv ] end end + + def self.appdir + File.join('puppet', 'application') + end + + def self.available_subcommands + appdir = File.join('puppet', 'application') + absolute_appdir = $:.collect { |x| File.join(x,'puppet','application') }.detect{ |x| File.directory?(x) } + Dir[File.join(absolute_appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')} + end + + def self.usage_message + usage = "Usage: puppet command " + available = "Available commands are: #{available_subcommands.sort.join(', ')}" + [usage, available].join("\n") + end + + def initialize( zero = $0, argv = ARGV, stdin = STDIN ) + @zero = zero + @argv = argv.dup + @stdin = stdin + + @subcommand_name, @args = self.class.subcommand_and_args( @zero, @argv, @stdin ) + end + + attr :subcommand_name + attr :args + + def execute + if subcommand_name.nil? + puts self.class.usage_message + elsif self.class.available_subcommands.include?(subcommand_name) #subcommand + require File.join(self.class.appdir, subcommand_name) + Puppet::Application[subcommand_name].run + else + abort "Error: Unknown command #{subcommand_name}.\n#{usage_message}" + end + end + + def legacy_executable_name + LegacyName[ subcommand_name ] + end end end end -- cgit