lib/rundock/runner.rb in rundock-0.4.16 vs lib/rundock/runner.rb in rundock-0.5.0

- old
+ new

@@ -6,11 +6,11 @@ ScenarioNotFoundError = Class.new(StandardError) RUNDOCK_PLUGINS = %w(operation hook) class << self def run(options) - Logger.debug 'Starting Rundoc:' + Logger.debug 'Starting Rundock:' runner = self.new(options) runner.load_plugins runner.build(options) runner.run @@ -26,17 +26,17 @@ def run @scenario.run end def build(options) - if options[:scenario] || options[:hostgroup] + if options[:scenario] || options[:targetgroup] if options[:scenario] && !FileTest.exist?(options[:scenario]) raise ScenarioNotFoundError, "'#{options[:scenario]}' scenario file is not found." - elsif options[:hostgroup] && !FileTest.exist?(options[:hostgroup]) - raise ScenarioNotFoundError, "'#{options[:hostgroup]}' hostgroup file is not found." + elsif options[:targetgroup] && !FileTest.exist?(options[:targetgroup]) + raise ScenarioNotFoundError, "'#{options[:targetgroup]}' targetgroup file is not found." end - options[:scenario] = options[:hostgroup] if options[:hostgroup] + options[:scenario] = options[:targetgroup] if options[:targetgroup] # parse scenario if options[:scenario] =~ %r{^(http|https)://} # read from http/https open(options[:scenario]) do |f|