mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 22:57:16 -04:00
removed coveralls dev dependency, more .bundle dir cleanup, install without parameter fix
Fixes #2203
This commit is contained in:
parent
23b614d42b
commit
d2d2bc0175
6 changed files with 13 additions and 197 deletions
|
@ -53,7 +53,7 @@ module LogStash
|
||||||
[
|
[
|
||||||
"install",
|
"install",
|
||||||
"--gemfile=#{gem_file}",
|
"--gemfile=#{gem_file}",
|
||||||
"--without", "development",
|
"--without=development",
|
||||||
"--path", gem_path,
|
"--path", gem_path,
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
|
@ -77,10 +77,12 @@ Gem::Specification.new do |gem|
|
||||||
gem.add_runtime_dependency "insist", "1.0.0" #(Apache 2.0 license)
|
gem.add_runtime_dependency "insist", "1.0.0" #(Apache 2.0 license)
|
||||||
gem.add_runtime_dependency "rumbster" #(Apache 2.0 license) For faking smtp in email tests
|
gem.add_runtime_dependency "rumbster" #(Apache 2.0 license) For faking smtp in email tests
|
||||||
|
|
||||||
# Development Deps
|
|
||||||
gem.add_development_dependency "coveralls"
|
|
||||||
gem.add_runtime_dependency "logstash-devutils"
|
gem.add_runtime_dependency "logstash-devutils"
|
||||||
|
|
||||||
# Jenkins Deps
|
# Jenkins Deps
|
||||||
gem.add_runtime_dependency "ci_reporter", "1.9.3"
|
gem.add_runtime_dependency "ci_reporter", "1.9.3"
|
||||||
|
|
||||||
|
# Development Deps
|
||||||
|
# coveralls temporarily disabled because of Bundler bug with "without development" and gemspec
|
||||||
|
# gem.add_development_dependency "coveralls"
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,6 +13,10 @@ namespace "plugin" do
|
||||||
end # task "install"
|
end # task "install"
|
||||||
|
|
||||||
task "install-defaults" => [ "dependency:bundler" ] do
|
task "install-defaults" => [ "dependency:bundler" ] do
|
||||||
|
# because --path creates a .bundle/config file and changes bundler path
|
||||||
|
# we need to remove this file so it doesn't influence following bundler calls
|
||||||
|
FileUtils.rm_rf(::File.join(LogStash::Environment::LOGSTASH_HOME, "tools/.bundle"))
|
||||||
|
|
||||||
10.times do
|
10.times do
|
||||||
begin
|
begin
|
||||||
ENV["GEM_PATH"] = LogStash::Environment.logstash_gem_home
|
ENV["GEM_PATH"] = LogStash::Environment.logstash_gem_home
|
||||||
|
|
|
@ -211,6 +211,10 @@ namespace "vendor" do
|
||||||
Rake::Task["dependency:rbx-stdlib"] if LogStash::Environment.ruby_engine == "rbx"
|
Rake::Task["dependency:rbx-stdlib"] if LogStash::Environment.ruby_engine == "rbx"
|
||||||
Rake::Task["dependency:stud"].invoke
|
Rake::Task["dependency:stud"].invoke
|
||||||
|
|
||||||
|
# because --path creates a .bundle/config file and changes bundler path
|
||||||
|
# we need to remove this file so it doesn't influence following bundler calls
|
||||||
|
FileUtils.rm_rf(::File.join(LogStash::Environment::LOGSTASH_HOME, "tools/.bundle"))
|
||||||
|
|
||||||
10.times do
|
10.times do
|
||||||
begin
|
begin
|
||||||
ENV["GEM_PATH"] = LogStash::Environment.logstash_gem_home
|
ENV["GEM_PATH"] = LogStash::Environment.logstash_gem_home
|
||||||
|
|
|
@ -51,16 +51,9 @@ GEM
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
coercible (1.0.0)
|
coercible (1.0.0)
|
||||||
descendants_tracker (~> 0.0.1)
|
descendants_tracker (~> 0.0.1)
|
||||||
coveralls (0.7.2)
|
|
||||||
multi_json (~> 1.3)
|
|
||||||
rest-client (= 1.6.7)
|
|
||||||
simplecov (>= 0.7)
|
|
||||||
term-ansicolor (= 1.2.2)
|
|
||||||
thor (= 0.18.1)
|
|
||||||
descendants_tracker (0.0.4)
|
descendants_tracker (0.0.4)
|
||||||
thread_safe (~> 0.3, >= 0.3.1)
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.5)
|
|
||||||
equalizer (0.0.9)
|
equalizer (0.0.9)
|
||||||
ffi (1.9.6-java)
|
ffi (1.9.6-java)
|
||||||
ftw (0.0.42)
|
ftw (0.0.42)
|
||||||
|
@ -96,7 +89,6 @@ GEM
|
||||||
mocha (1.1.0)
|
mocha (1.1.0)
|
||||||
metaclass (~> 0.0.1)
|
metaclass (~> 0.0.1)
|
||||||
msgpack-jruby (1.4.0-java)
|
msgpack-jruby (1.4.0-java)
|
||||||
multi_json (1.10.1)
|
|
||||||
polyglot (0.3.5)
|
polyglot (0.3.5)
|
||||||
pry (0.10.1-java)
|
pry (0.10.1-java)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
|
@ -107,8 +99,6 @@ GEM
|
||||||
rack-protection (1.5.3)
|
rack-protection (1.5.3)
|
||||||
rack
|
rack
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
rest-client (1.6.7)
|
|
||||||
mime-types (>= 1.16)
|
|
||||||
rspec (2.14.1)
|
rspec (2.14.1)
|
||||||
rspec-core (~> 2.14.0)
|
rspec-core (~> 2.14.0)
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 2.14.0)
|
||||||
|
@ -129,11 +119,6 @@ GEM
|
||||||
shoulda-context (1.2.1)
|
shoulda-context (1.2.1)
|
||||||
shoulda-matchers (2.7.0)
|
shoulda-matchers (2.7.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
simplecov (0.9.1)
|
|
||||||
docile (~> 1.1.0)
|
|
||||||
multi_json (~> 1.0)
|
|
||||||
simplecov-html (~> 0.8.0)
|
|
||||||
simplecov-html (0.8.0)
|
|
||||||
sinatra (1.4.5)
|
sinatra (1.4.5)
|
||||||
rack (~> 1.4)
|
rack (~> 1.4)
|
||||||
rack-protection (~> 1.4)
|
rack-protection (~> 1.4)
|
||||||
|
@ -142,169 +127,10 @@ GEM
|
||||||
spoon (0.0.4)
|
spoon (0.0.4)
|
||||||
ffi
|
ffi
|
||||||
stud (0.0.18)
|
stud (0.0.18)
|
||||||
term-ansicolor (1.2.2)
|
|
||||||
tins (~> 0.8)
|
|
||||||
thor (0.18.1)
|
|
||||||
thread_safe (0.3.4-java)
|
thread_safe (0.3.4-java)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (0.13.2)
|
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
|
@ -318,5 +144,4 @@ PLATFORMS
|
||||||
java
|
java
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
coveralls
|
|
||||||
logstash!
|
logstash!
|
||||||
|
|
|
@ -63,16 +63,9 @@ GEM
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
coercible (1.0.0)
|
coercible (1.0.0)
|
||||||
descendants_tracker (~> 0.0.1)
|
descendants_tracker (~> 0.0.1)
|
||||||
coveralls (0.7.2)
|
|
||||||
multi_json (~> 1.3)
|
|
||||||
rest-client (= 1.6.7)
|
|
||||||
simplecov (>= 0.7)
|
|
||||||
term-ansicolor (= 1.2.2)
|
|
||||||
thor (= 0.18.1)
|
|
||||||
descendants_tracker (0.0.4)
|
descendants_tracker (0.0.4)
|
||||||
thread_safe (~> 0.3, >= 0.3.1)
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.5)
|
|
||||||
edn (1.0.6)
|
edn (1.0.6)
|
||||||
elasticsearch (1.0.6)
|
elasticsearch (1.0.6)
|
||||||
elasticsearch-api (= 1.0.6)
|
elasticsearch-api (= 1.0.6)
|
||||||
|
@ -493,8 +486,6 @@ GEM
|
||||||
rack
|
rack
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
redis (3.1.0)
|
redis (3.1.0)
|
||||||
rest-client (1.6.7)
|
|
||||||
mime-types (>= 1.16)
|
|
||||||
rspec (2.14.1)
|
rspec (2.14.1)
|
||||||
rspec-core (~> 2.14.0)
|
rspec-core (~> 2.14.0)
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 2.14.0)
|
||||||
|
@ -518,11 +509,6 @@ GEM
|
||||||
shoulda-matchers (2.7.0)
|
shoulda-matchers (2.7.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
simple_oauth (0.3.0)
|
simple_oauth (0.3.0)
|
||||||
simplecov (0.9.1)
|
|
||||||
docile (~> 1.1.0)
|
|
||||||
multi_json (~> 1.0)
|
|
||||||
simplecov-html (~> 0.8.0)
|
|
||||||
simplecov-html (0.8.0)
|
|
||||||
sinatra (1.4.5)
|
sinatra (1.4.5)
|
||||||
rack (~> 1.4)
|
rack (~> 1.4)
|
||||||
rack-protection (~> 1.4)
|
rack-protection (~> 1.4)
|
||||||
|
@ -533,12 +519,8 @@ GEM
|
||||||
ffi
|
ffi
|
||||||
statsd-ruby (1.2.0)
|
statsd-ruby (1.2.0)
|
||||||
stud (0.0.18)
|
stud (0.0.18)
|
||||||
term-ansicolor (1.2.2)
|
|
||||||
tins (~> 0.8)
|
|
||||||
thor (0.18.1)
|
|
||||||
thread_safe (0.3.4-java)
|
thread_safe (0.3.4-java)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (0.13.2)
|
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
|
@ -568,7 +550,6 @@ PLATFORMS
|
||||||
java
|
java
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
coveralls
|
|
||||||
logstash!
|
logstash!
|
||||||
logstash-codec-collectd
|
logstash-codec-collectd
|
||||||
logstash-codec-dots
|
logstash-codec-dots
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue