From d2d2bc01752688f0d691b9aad94edad24a3d6691 Mon Sep 17 00:00:00 2001 From: Colin Surprenant Date: Wed, 10 Dec 2014 13:59:15 -0800 Subject: [PATCH] removed coveralls dev dependency, more .bundle dir cleanup, install without parameter fix Fixes #2203 --- lib/logstash/environment.rb | 2 +- logstash.gemspec | 6 +- rakelib/plugin.rake | 4 + rakelib/vendor.rake | 4 + tools/Gemfile.jruby-1.9.lock | 175 --------------------------- tools/Gemfile.plugins.jruby-1.9.lock | 19 --- 6 files changed, 13 insertions(+), 197 deletions(-) diff --git a/lib/logstash/environment.rb b/lib/logstash/environment.rb index 61c3c9fba..d175874e5 100644 --- a/lib/logstash/environment.rb +++ b/lib/logstash/environment.rb @@ -53,7 +53,7 @@ module LogStash [ "install", "--gemfile=#{gem_file}", - "--without", "development", + "--without=development", "--path", gem_path, ] end diff --git a/logstash.gemspec b/logstash.gemspec index 5deec66a4..b9f9baaa7 100644 --- a/logstash.gemspec +++ b/logstash.gemspec @@ -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 "rumbster" #(Apache 2.0 license) For faking smtp in email tests - # Development Deps - gem.add_development_dependency "coveralls" gem.add_runtime_dependency "logstash-devutils" # Jenkins Deps 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 diff --git a/rakelib/plugin.rake b/rakelib/plugin.rake index 1c6623756..8414340c8 100644 --- a/rakelib/plugin.rake +++ b/rakelib/plugin.rake @@ -13,6 +13,10 @@ namespace "plugin" do end # task "install" 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 begin ENV["GEM_PATH"] = LogStash::Environment.logstash_gem_home diff --git a/rakelib/vendor.rake b/rakelib/vendor.rake index e8652a21e..3f848095d 100644 --- a/rakelib/vendor.rake +++ b/rakelib/vendor.rake @@ -211,6 +211,10 @@ namespace "vendor" do Rake::Task["dependency:rbx-stdlib"] if LogStash::Environment.ruby_engine == "rbx" 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 begin ENV["GEM_PATH"] = LogStash::Environment.logstash_gem_home diff --git a/tools/Gemfile.jruby-1.9.lock b/tools/Gemfile.jruby-1.9.lock index e0d5924d0..bfbf3dd20 100644 --- a/tools/Gemfile.jruby-1.9.lock +++ b/tools/Gemfile.jruby-1.9.lock @@ -51,16 +51,9 @@ GEM coderay (1.1.0) coercible (1.0.0) 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) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.2.5) - docile (1.1.5) equalizer (0.0.9) ffi (1.9.6-java) ftw (0.0.42) @@ -96,7 +89,6 @@ GEM mocha (1.1.0) metaclass (~> 0.0.1) msgpack-jruby (1.4.0-java) - multi_json (1.10.1) polyglot (0.3.5) pry (0.10.1-java) coderay (~> 1.1.0) @@ -107,8 +99,6 @@ GEM rack-protection (1.5.3) rack rake (10.4.2) - rest-client (1.6.7) - mime-types (>= 1.16) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -129,11 +119,6 @@ GEM shoulda-context (1.2.1) shoulda-matchers (2.7.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) rack (~> 1.4) rack-protection (~> 1.4) @@ -142,169 +127,10 @@ GEM spoon (0.0.4) ffi stud (0.0.18) - term-ansicolor (1.2.2) - tins (~> 0.8) - thor (0.18.1) thread_safe (0.3.4-java) tilt (1.4.1) - tins (0.13.2) treetop (1.4.15) 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) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -318,5 +144,4 @@ PLATFORMS java DEPENDENCIES - coveralls logstash! diff --git a/tools/Gemfile.plugins.jruby-1.9.lock b/tools/Gemfile.plugins.jruby-1.9.lock index c96ec7841..4582b5009 100644 --- a/tools/Gemfile.plugins.jruby-1.9.lock +++ b/tools/Gemfile.plugins.jruby-1.9.lock @@ -63,16 +63,9 @@ GEM coderay (1.1.0) coercible (1.0.0) 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) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.2.5) - docile (1.1.5) edn (1.0.6) elasticsearch (1.0.6) elasticsearch-api (= 1.0.6) @@ -493,8 +486,6 @@ GEM rack rake (10.4.2) redis (3.1.0) - rest-client (1.6.7) - mime-types (>= 1.16) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -518,11 +509,6 @@ GEM shoulda-matchers (2.7.0) activesupport (>= 3.0.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) rack (~> 1.4) rack-protection (~> 1.4) @@ -533,12 +519,8 @@ GEM ffi statsd-ruby (1.2.0) stud (0.0.18) - term-ansicolor (1.2.2) - tins (~> 0.8) - thor (0.18.1) thread_safe (0.3.4-java) tilt (1.4.1) - tins (0.13.2) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -568,7 +550,6 @@ PLATFORMS java DEPENDENCIES - coveralls logstash! logstash-codec-collectd logstash-codec-dots