Use returns instead of exit

Need to return the exit code and let the runner app perform the exit

Fixes #1838
This commit is contained in:
Richard Pijnenburg 2014-10-03 09:54:07 +00:00 committed by Jordan Sissel
parent ec699e1f84
commit eb0b218c8c
4 changed files with 14 additions and 14 deletions

View file

@ -26,12 +26,12 @@ class LogStash::PluginManager::Install < Clamp::Command
unless gem_path = (plugin =~ /\.gem$/ && File.file?(plugin)) ? plugin : LogStash::PluginManager::Util.download_gem(plugin, version)
$stderr.puts ("Plugin does not exist '#{plugin}'. Aborting")
exit(99)
return 99
end
unless gem_meta = LogStash::PluginManager::Util.logstash_plugin?(gem_path)
$stderr.puts ("Invalid logstash plugin gem '#{plugin}'. Aborting...")
exit(99)
return 99
end
puts ("valid logstash plugin. Continueing...")
@ -42,7 +42,7 @@ class LogStash::PluginManager::Install < Clamp::Command
if Gem::Version.new(current.version) > Gem::Version.new(gem_meta.version)
unless LogStash::PluginManager::Util.ask_yesno("Do you wish to downgrade this plugin?")
$stderr.puts("Aborting installation")
exit(99)
return 99
end
end
@ -58,7 +58,7 @@ class LogStash::PluginManager::Install < Clamp::Command
inst.install plugin, version
specs, _ = inst.installed_gems
puts ("Successfully installed '#{specs.name}' with version '#{specs.version}'")
return 0
end
end # class Logstash::PluginManager

View file

@ -29,10 +29,10 @@ class LogStash::PluginManager::List < Clamp::Command
.select{|spec| group ? group == spec.metadata['logstash_group'] : true}
if specs.empty?
$stderr.puts ("No plugins found.")
exit(99)
return 0
end
specs.each {|spec| puts ("#{spec.name} (#{spec.version})") }
return 0
end
end # class Logstash::PluginManager

View file

@ -19,12 +19,12 @@ class LogStash::PluginManager::Uninstall < Clamp::Command
unless gem_data = LogStash::PluginManager::Util.logstash_plugin?(plugin)
$stderr.puts ("Trying to remove a non logstash plugin. Aborting")
exit(99)
return 99
end
puts ("Uninstalling plugin '#{plugin}' with version '#{gem_data.version}'.")
::Gem::Uninstaller.new(plugin, {}).uninstall
return
end
end # class Logstash::PluginManager

View file

@ -30,10 +30,10 @@ class LogStash::PluginManager::Update < Clamp::Command
specs = LogStash::PluginManager::Util.matching_specs(plugin).select{|spec| LogStash::PluginManager::Util.logstash_plugin?(spec) }
if specs.empty?
$stderr.puts ("No plugins found to update or trying to update a non logstash plugin.")
exit(99)
return 99
end
specs.each { |spec| update_gem(spec, version) }
return 0
end
@ -41,17 +41,17 @@ class LogStash::PluginManager::Update < Clamp::Command
unless gem_path = LogStash::PluginManager::Util.download_gem(spec.name, version)
$stderr.puts ("Plugin '#{spec.name}' does not exist remotely. Skipping.")
return nil
return 0
end
unless gem_meta = LogStash::PluginManager::Util.logstash_plugin?(gem_path)
$stderr.puts ("Invalid logstash plugin gem. skipping.")
return nil
return 99
end
unless Gem::Version.new(gem_meta.version) > Gem::Version.new(spec.version)
puts ("No newer version available for #{spec.name}. skipping.")
return nil
return 0
end
puts ("Updating #{spec.name} from version #{spec.version} to #{gem_meta.version}")
@ -68,7 +68,7 @@ class LogStash::PluginManager::Update < Clamp::Command
inst.install spec.name, gem_meta.version
specs, _ = inst.installed_gems
puts ("Update successful")
return 0
end
end # class Logstash::PluginManager