diff --git a/Gemfile b/Gemfile index 4fa89e9f7..f182b7718 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,9 @@ gem "ci_reporter", "1.9.3", :group => :development gem "simplecov", :group => :development gem "coveralls", :group => :development gem "rspec", "~> 2.14.0", :group => :development +gem "logstash-devutils", "~> 0", :group => :development gem "octokit", "3.8.0", :group => :build gem "stud", "~> 0.0.19", :group => :build gem "fpm", "~> 1.3.3", :group => :build gem "rubyzip", "~> 1.1.7", :group => :build +gem "gems", "~> 0.8.3", :group => :build diff --git a/Gemfile.jruby-1.9.lock b/Gemfile.jruby-1.9.lock index 5cbfb1215..f2ca5322d 100644 --- a/Gemfile.jruby-1.9.lock +++ b/Gemfile.jruby-1.9.lock @@ -51,11 +51,20 @@ GEM clamp (~> 0.6) ffi json (>= 1.7.7) + gem_publisher (1.5.0) + gems (0.8.3) http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.6.9) + insist (1.0.0) jrjackson (0.2.8) json (1.8.2-java) + logstash-devutils (0.0.13-java) + gem_publisher + insist (= 1.0.0) + minitar + rake + rspec (~> 2.14.0) method_source (0.8.2) mime-types (2.5) minitar (0.5.4) @@ -69,6 +78,7 @@ GEM method_source (~> 0.8.1) slop (~> 3.4) spoon (~> 0.0) + rake (10.4.2) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -111,7 +121,9 @@ DEPENDENCIES coveralls file-dependencies (= 0.1.6) fpm (~> 1.3.3) + gems (~> 0.8.3) logstash-core (= 2.0.0.dev)! + logstash-devutils (~> 0) octokit (= 3.8.0) rspec (~> 2.14.0) rubyzip (~> 1.1.7) diff --git a/logstash-core.gemspec b/logstash-core.gemspec index 03c12988e..4bd54c557 100644 --- a/logstash-core.gemspec +++ b/logstash-core.gemspec @@ -48,7 +48,4 @@ Gem::Specification.new do |gem| # https://github.com/rubinius/rubinius/issues/2632#issuecomment-26954565 gem.add_runtime_dependency "racc" end - - gem.add_development_dependency "rspec", "~> 2.14" #(MIT license) - gem.add_development_dependency "logstash-devutils", "~> 0" end diff --git a/rakelib/plugin.rake b/rakelib/plugin.rake index b3968bfc8..9c2065c1f 100644 --- a/rakelib/plugin.rake +++ b/rakelib/plugin.rake @@ -50,7 +50,7 @@ namespace "plugin" do task.reenable # Allow this task to be run again end - task "install-all" => [ "dependency:gems" ] do + task "install-all" do puts("[plugin:install-all] Installing all plugins from https://github.com/logstash-plugins") install_plugins("--no-verify", *LogStash::RakeLib.fetch_all_plugins)