github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Few minor improvements and pending cleanups:

Browse source 
* Clean up pending development dependencies from the logstash-core gemspec
* Add gems as a build dependency in the Gemfile, is used when doing an
  install-all task, and failed in the ci env (like octokit)
This commit is contained in:
Pere Urbon-Bayes 2015-05-07 12:40:42 +02:00
parent fe99f45499
commit 7675a19032
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -8,7 +8,9 @@ gem "ci_reporter", "1.9.3", :group => :development
gem "simplecov", :group => :development gem "simplecov", :group => :development
gem "coveralls", :group => :development gem "coveralls", :group => :development
gem "rspec", "~> 2.14.0", :group => :development gem "rspec", "~> 2.14.0", :group => :development
gem "logstash-devutils", "~> 0", :group => :development
gem "octokit", "3.8.0", :group => :build gem "octokit", "3.8.0", :group => :build
gem "stud", "~> 0.0.19", :group => :build gem "stud", "~> 0.0.19", :group => :build
gem "fpm", "~> 1.3.3", :group => :build gem "fpm", "~> 1.3.3", :group => :build
gem "rubyzip", "~> 1.1.7", :group => :build gem "rubyzip", "~> 1.1.7", :group => :build
gem "gems", "~> 0.8.3", :group => :build

12
Gemfile.jruby-1.9.lock
View file

@ -51,11 +51,20 @@ GEM
clamp (~> 0.6) clamp (~> 0.6)
ffi ffi
json (>= 1.7.7) json (>= 1.7.7)
gem_publisher (1.5.0)
gems (0.8.3)
http-cookie (1.0.2) http-cookie (1.0.2)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.6.9) i18n (0.6.9)
insist (1.0.0)
jrjackson (0.2.8) jrjackson (0.2.8)
json (1.8.2-java) 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) method_source (0.8.2)
mime-types (2.5) mime-types (2.5)
minitar (0.5.4) minitar (0.5.4)
@ -69,6 +78,7 @@ GEM
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
spoon (~> 0.0) spoon (~> 0.0)
rake (10.4.2)
rest-client (1.8.0) rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
@ -111,7 +121,9 @@ DEPENDENCIES
coveralls coveralls
file-dependencies (= 0.1.6) file-dependencies (= 0.1.6)
fpm (~> 1.3.3) fpm (~> 1.3.3)
gems (~> 0.8.3)
logstash-core (= 2.0.0.dev)! logstash-core (= 2.0.0.dev)!
logstash-devutils (~> 0)
octokit (= 3.8.0) octokit (= 3.8.0)
rspec (~> 2.14.0) rspec (~> 2.14.0)
rubyzip (~> 1.1.7) rubyzip (~> 1.1.7)

3
logstash-core.gemspec
View file

@ -48,7 +48,4 @@ Gem::Specification.new do |gem|
# https://github.com/rubinius/rubinius/issues/2632#issuecomment-26954565 # https://github.com/rubinius/rubinius/issues/2632#issuecomment-26954565
gem.add_runtime_dependency "racc" gem.add_runtime_dependency "racc"
end end
gem.add_development_dependency "rspec", "~> 2.14" #(MIT license)
gem.add_development_dependency "logstash-devutils", "~> 0"
end end

2
rakelib/plugin.rake
View file

@ -50,7 +50,7 @@ namespace "plugin" do
task.reenable # Allow this task to be run again task.reenable # Allow this task to be run again
end end
task "install-all" => [ "dependency:gems" ] do task "install-all" do
puts("[plugin:install-all] Installing all plugins from https://github.com/logstash-plugins") puts("[plugin:install-all] Installing all plugins from https://github.com/logstash-plugins")
install_plugins("--no-verify", *LogStash::RakeLib.fetch_all_plugins) install_plugins("--no-verify", *LogStash::RakeLib.fetch_all_plugins)