Renaming base -> Command and Fixing bin/plugin list

Fixes #2946
This commit is contained in:
Pier-Hugues Pellerin 2015-04-07 10:08:09 -04:00 committed by Jordan Sissel
parent 090cf0186b
commit 7518a6aa3d
5 changed files with 17 additions and 14 deletions

View file

@ -1,4 +1,4 @@
class LogStash::PluginManager::Base < Clamp::Command
class LogStash::PluginManager::Command < Clamp::Command
def gemfile
@gemfile ||= LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, 'r+')).load
end

View file

@ -2,7 +2,7 @@ require "clamp"
require "logstash/namespace"
require "logstash/environment"
require "logstash/pluginmanager/util"
require "logstash/pluginmanager/base"
require "logstash/pluginmanager/command"
require "jar-dependencies"
require "jar_install_post_install_hook"
require "file-dependencies/gem"
@ -10,7 +10,7 @@ require "logstash/gemfile"
require "logstash/bundler"
require "fileutils"
class LogStash::PluginManager::Install < LogStash::PluginManager::Base
class LogStash::PluginManager::Install < LogStash::PluginManager::Command
parameter "[PLUGIN] ...", "plugin name(s) or file"
option "--version", "VERSION", "version of the plugin to install"
option "--[no-]verify", :flag, "verify plugin validity before installation", :default => true

View file

@ -1,9 +1,10 @@
require 'clamp'
require 'logstash/namespace'
require 'logstash/pluginmanager/util'
require 'logstash/pluginmanager/command'
require 'rubygems/spec_fetcher'
class LogStash::PluginManager::List < Clamp::Command
class LogStash::PluginManager::List < LogStash::PluginManager::Command
parameter "[PLUGIN]", "Part of plugin name to search for, leave empty for all plugins"
@ -36,6 +37,8 @@ class LogStash::PluginManager::List < Clamp::Command
specs = specs.select{|spec| gemfile.find(spec.name)} if installed?
specs = specs.select{|spec| spec.name =~ /#{plugin}/i} if plugin
specs = specs.select{|spec| spec.metadata['logstash_group'] == group} if group
specs
end
end
end # class Logstash::PluginManager

View file

@ -3,13 +3,13 @@ require "logstash/logging"
require "logstash/errors"
require "logstash/environment"
require "logstash/pluginmanager/util"
require "logstash/pluginmanager/base"
require "logstash/pluginmanager/command"
require "clamp"
require "logstash/gemfile"
require "logstash/bundler"
class LogStash::PluginManager::Uninstall < LogStash::PluginManager::Base
class LogStash::PluginManager::Uninstall < LogStash::PluginManager::Command
parameter "PLUGIN", "plugin name"
def execute

View file

@ -1,14 +1,14 @@
require 'clamp'
require 'logstash/namespace'
require 'logstash/pluginmanager/util'
require 'logstash/pluginmanager/base'
require 'jar-dependencies'
require 'jar_install_post_install_hook'
require 'file-dependencies/gem'
require "clamp"
require "logstash/namespace"
require "logstash/pluginmanager/util"
require "logstash/pluginmanager/command"
require "jar-dependencies"
require "jar_install_post_install_hook"
require "file-dependencies/gem"
require "logstash/gemfile"
require "logstash/bundler"
class LogStash::PluginManager::Update < LogStash::PluginManager::Base
class LogStash::PluginManager::Update < LogStash::PluginManager::Command
parameter "[PLUGIN] ...", "Plugin name(s) to upgrade to latest version"
def execute