Commit graph

68 commits

Author SHA1 Message Date
Pier-Hugues Pellerin
202784281b plugins/bundler refactor
squashed 113 commits by @ph, @colinsurprenant, @jordansissel, @purbon, @jsvd

cleaning the environment.rb

initial work

remove multiples polyglot

force to load rubygems

notice

point to one config

update lock

bootstrap will package the standard application until we have the plugin manager on top of the gemfile

add the gem path to find bundler

fixing dependencies

add gemfiles and bundle

comment platform requiremments in the gemfile

Set `Gem.paths = ...` to the GEM_HOME

Without this, `bin/logstash` will error:

    LoadError: no such file to load -- bundler
         require at org/jruby/RubyKernel.java:1071
         require at C:/Users/jls/Documents/GitHub/logstash/vendor/jruby/lib/ruby/shared/rubygems/core_ext/kernel_require
.rb:55
         set_gem_paths! at C:/Users/jls/Documents/GitHub/logstash/lib/logstash/environment.rb:64
         (root) at C:\Users\jls\Documents\GitHub\logstash\lib\logstash\runner.rb:8

Patch JRuby's jar_installer.rb with a newer version

jar-dependencies is shipped by default with JRuby. However, the version
it ships with has a bug, and despite upgrading jar-dependencies to
0.1.7, which has the fix, JRuby continues to load the "shipped" version
which has a bug.

This patch will patch JRuby by copying in our own jar_installer.rb from
jar-dependencies master, This patching occurs while unpacking JRuby just
after `vendor:jruby`.

The jar_installer.rb is MIT-licensed and no changes were made.

Add `test:plugins` to test all installed plugins

Tell rspec to do the wildcards instead of trying to make the shell do it.

This fixes test runs on Windows (which doesn't do wildcards like this).
The solution was to tell RSpec to look for all files matching a certain path pattern
within the GEM_HOME.

do not run bundle install twice for test:plugins

Gemfile manipulation classes

Gemfile now in root

install POC with new Gemfile classes

specs for the Gemfile classes

header, some bug fixes

spec header

WIP pluginmanager refactor

generated format

updated .lock

unused file

removed --proxy option

fail elegantly

initial support for update

refactor invoke_bundler, debug output

removed old .lock file

no plugin Gemfile

use clamp error handling

reenable list, some cleanups

support for more finders

refactored using new finders

refactor using is_installed_plugin? and some cleanups

verify valid plugin and update all now only update plugins not all gems

support multiple plugins argument, --force option to bypass validation

list only explicitly installed plugins by default, --all option to include dependencies

support multiple plugins argument

renamed all_installed_plugins to all_installed_plugins_gem_specs and return specs, added comments

remove then

update_gem bug, comments

moved gems as development dependencies

updated .lock file

support for :without

--development option, better output feedback, cleanups

abort when no plugins

cosmetic

param fix, cleanups

removed deprecated .lock files

remove deprecated bundler_install_command and struggling with set_gem_paths

refactored all bundler stuff into LogStash::Bundler

rakelib refactor

refactored bundler code

Bundler.real_fuckin_reset

real_fuckin_reset is now reset_settings, removed unnecessary resetings, cleanups

duplicate plugins requirements merging

cleanups

added vendor:rake, cleanups

broke test tasks into 2 steps, first invoke install then test

rake task name fix

proper error exit code

Freezing the jar-dependencies, ruby-maven, tools

set gem paths on error

renamed TEST_PLUGINS to CORE_PLUGINS, added comments

replace test by core, cleanups

DRYied test tasks

missing gemspec

fixed output

correct image build for artifacts

removed deprecated Gemfiles

fix update with multiple plugins arguments

fix update with multiple plugins arguments

remove deprecated code

implicit begin, explicit block

spec for LogStash::Bundler

remove explit require of rubygems

renamed Environment.set_gem_paths! to bundler_setup!

rename Dsl to DSL

respect to_s contract and return empty string not nil

rename DSL.parse gemfile argument to gemfile_content

better error message

renamed --force to --[no-]verify

refactored exit error handling

use explicit array items in iterators

fix --development switch validation, cleaned bundler_options hash init

renamed is_xxx? methods to xxx?

use direct method call on collection

removed double negative, typo

move maven tools monkey patch into maven_tools_patch.rb

renamed build-image to prepare

fix forgotten argument name change

namespace cleanups

spec files glob pattern

cleanup

cleanup

cleanup

Fix the file-dependencies version to 0.1.5 to fix path issues on windows

monkeypatch Rubygems to silence ffi warning

list all plugin gems by default, new options

adding rake task to get faster feedback loop on windows

refactor bat scripts

Use an unreleased filedependencies gem and skip installing drupal

bump file-dependencies

use the released gem of file-dependencies

Add a set of scripts that simplify:   * The necessary setup for the CI test to be executed.   * The actuall CI test execution, having a different scripts for each     different workflow. This makes the test execution simpler and standard, so changes in internal task don't need big changes in the CI config. It also documents and makes easy for developers to run the tests.

Fixes #2640

refactored test to not depend on STDOUT

create a .rspec file to pass some options used while the code is in the testing environment

add coveralls and simplecov as a development dependencies so we can run coverage tests

remove unnecessary .bundle directory from the artifact

In a release, the .bundle/config has a BUNDLE_PATH setting that can
interfere by misleading the plugin manager into not seeing the
vendor/bundle path.

Fixes #2647

Fixes #2475
2015-02-20 17:31:44 +00:00
Pier-Hugues Pellerin
2ceb51e89d Make sure we freeze ruby-maven, maven-tools and jar-dependencies version
Fixes #2596
2015-02-12 15:43:03 +00:00
Richard Pijnenburg
9dc9c3ad7e Update package acceptance tests
- Use environment var LS_BRANCH to select which packages to use from which branch.

Fixes #2501
2015-02-03 14:09:19 +00:00
Jordan Sissel
a4da10e0cc Update bundler Gemfile.*.lock
Fixes #2455
2015-01-28 00:24:49 +00:00
Suyog Rao
e0124bb30a Skip some plugins
Fixes #2453
2015-01-27 23:59:17 +00:00
Joao Duarte
418d0ffd38 update jar_dependencies
Fixes #2445
2015-01-27 20:26:46 +00:00
Pere Urbon-Bayes
e08cad94c0 enabled coverage report again throw installing missing dependencies when the user run rake test:prep, user should use COVERAGE=true as before
Fixes #2412
2015-01-27 12:15:32 +00:00
Jordan Sissel
d029617b26 Provide our own ssl certs on Windows Ruby
This fixes a bug where Windows Ruby ships with insufficient ssl
certificate information and this causes gem installations to fail. This
patch is only applied under Windows ruby because JRuby is not affected
by it.

Fixes #2402

Fixes #2403
2015-01-27 01:11:05 +00:00
Pere Urbon-Bayes
2791465ac3 update the cavin version to 0.7.x branch
ammend lock files

Fixes #2409
2015-01-26 21:11:02 +00:00
Pier-Hugues Pellerin
00970ca9bc fix merge conflicts
Fixes #2280
2015-01-21 22:08:12 +00:00
Pier-Hugues Pellerin
da746907f3 revert
Fixes #2331
2015-01-14 23:46:37 +00:00
Pier-Hugues Pellerin
aa6a2728a5 Code review comments
Fixes #2331
2015-01-14 23:46:37 +00:00
Pere Urbon-Bayes
0c7c1d6e08 added examples into the filtered list when getting all plugins from github
Fixes #2342
2015-01-12 18:15:10 +00:00
Pere Urbon-Bayes
85918e1cb5 add logstash-codec-cef as its not released to rubygems so its not possible to be installed with the plugin all command
Fixes #2334
2015-01-12 10:17:42 +00:00
Pier-Hugues Pellerin
aabbb0cd34 Generating a new lock files with Bundler 1.7.9
Fixes #2274
2014-12-23 20:18:04 +00:00
Pier-Hugues Pellerin
8e99c982a2 Cleaning gems dependencies from the logstash.gemspec
Fixes #2274
2014-12-23 20:18:04 +00:00
Richard Pijnenburg
521a7320ac Refactor doc generation
- Use a generic task for installing all plugins
- Use refactored bundle install task

Fixes #2258
2014-12-17 19:56:32 +00:00
Pere Urbon-Bayes
549d9e3896 Make the test plugins install throw bundler, so we don't have to install them every time we run the test (it makes the thing slow). Refactor also the bundler install task into a single one, making calls to it when necessary.
Fixes #2237
2014-12-17 17:31:33 +00:00
Richard Pijnenburg
e796024cff Add doc generation tasks to logstash
Fixes #2256
2014-12-17 16:57:05 +00:00
Colin Surprenant
d2d2bc0175 removed coveralls dev dependency, more .bundle dir cleanup, install without parameter fix
Fixes #2203
2014-12-10 23:48:19 +00:00
Colin Surprenant
b0118cd911 remove old lock files
Fixes #2203
2014-12-10 23:48:19 +00:00
Colin Surprenant
427fd38da6 updated lock files
Fixes #2203
2014-12-10 23:48:19 +00:00
Colin Surprenant
552803abb2 solid path to logstash
Fixes #2203
2014-12-10 23:48:18 +00:00
Colin Surprenant
03386e499a tmp dummy lock file
Fixes #2203
2014-12-10 23:48:18 +00:00
Colin Surprenant
c39a02745c updated .lock files
Fixes #2203
2014-12-10 23:48:18 +00:00
Pier-Hugues Pellerin
b94175bf18 Adding bootstrap gem to the gem home
Fixes #2203
2014-12-10 23:48:18 +00:00
Joao Duarte
46a4951676 minor fixes to moving plugins gemfile to tools/
Fixes #2171
2014-12-04 17:09:58 +00:00
Joao Duarte
04d6a51261 move plugins gemfile to tools
Fixes #2171
2014-12-04 17:09:57 +00:00
Richard Pijnenburg
85e6192b55 More fixes
Fixes #2166
2014-12-03 17:04:10 +00:00
Richard Pijnenburg
2373bb68d3 Update Gemfile for package testing
Fixes #2119
2014-11-22 00:02:04 +00:00
Suyog Rao
a31ec08f9f Use v1.9.3 for gem ci_reporter. Fixes Jenkins tests 2014-10-10 11:53:08 -07:00
Colin Surprenant
16585ff8ad gem bundling refactor
update jruby jar to 1.7.15

pinned i18n dependency and cosmetic cleanups

new generated Gemfile lock

refactor gem bundling using stadalone setup & use standard Gemfile with gemspec

update to jruby 1.7.16 and remove jar-dependencies, bouncy-castle-java, jruby-openssl from gemspec

get ready for future plugins mechanism

Conflicts:
	logstash.gemspec
2014-10-06 17:08:16 -04:00
Suyog Rao
cdf6c85588 Merge @joekiller's Kafka plugin to logstash-core
Add documentation and tests
Use scala version 2.9.2 and Kafka 0.8.1.1
Closes #1472
2014-09-03 15:07:34 -07:00
Suyog Rao
e57264ccc0 Use updated grok version 2014-08-27 13:25:02 -07:00
Colin Surprenant
daf22ed1e7 logstash boot sequence cleanup & drip support fix
deprecated USE_JRUBY environment var
added USE_RUBY and USE_DRIP environment vars
centralized gem path handling in LogStash::Environment

use consistent discovery strategy
2014-07-13 20:09:40 -04:00
Colin Surprenant
84d938ebdc replace json parsers with JrJackson and Oj
refactored timestamps with new Timestamp class
closes #1434
2014-06-12 18:09:22 -04:00
Jordan Sissel
9ab36e44e1 accept new generated gemfile.lock 2014-04-28 15:52:40 -07:00
Richard Pijnenburg
4b173a5785 Add gemfile 2014-04-15 14:58:57 +02:00
Jordan Sissel
35789956c3 Merge branch '1.4.x' of github.com:elasticsearch/logstash into 1.4.x 2014-03-20 01:24:23 +00:00
Jordan Sissel
cc2bcbea7a Add s3 upload 2014-03-19 18:25:09 -07:00
Jordan Sissel
c82dc09586 Version bump 2014-03-19 23:10:40 +00:00
Jordan Sissel
7bbafecf37 Use 'make package' for building rpms/debs for contrib 2014-03-19 21:00:52 +00:00
Jordan Sissel
a9c28fe349 actually build rpm/debs 2014-03-14 00:12:32 +00:00
Jordan Sissel
92e87c8e6d bundler updated the MRI 1.9.1 lockfile 2014-03-13 23:43:44 +00:00
Jordan Sissel
36148fae62 Update gemfile.lock for jruby 2014-03-12 16:13:30 -07:00
Jordan Sissel
4886dc1e3c Add sinatra gem. This was accidentally removed in a previous commit.
This fixes 'bin/logstash web' to run correctly (was broken in an earlier
1.4.0 beta)
2014-03-12 14:51:00 -07:00
Jordan Sissel
e5383f28ce Add test coverage for LOGSTASH-1918 2014-03-12 14:02:05 -07:00
Jordan Sissel
94fe7a4d01 Update gemfile locks for various rubies.
Notable changes for JRuby:
* atomic 1.1.14-java -> 1.1.15-java
* aws-sdk 1.29.0 -> 1.35.0
* backports 3.3.5 -> 3.6.0
* bindata 1.6.0 -> 2.0.0
* cinch 2.0.10 -> 2.1.0
* docile 1.1.1 -> 1.1.3
* faraday 0.8.8 -> 0.9.0
* geoip 1.3.3 -> 1.3.5
* metaclass 0.0.1 -> 0.0.4
* metriks 0.9.9.5 -> 0.9.9.6
* minitest 5.0.8 -> 5.3.0
* msgpack-jruby 1.3.2-java -> 1.4.0-java
* multi_json 1.8.2 -> 1.8.4
* multipart-post 1.2.0 -> 2.0.0
* murmurhash3 0.1.3 -> 0.1.4
* nokogiri 1.6.0-java -> 1.6.1-java
* polyglot 0.3.3 -> 0.3.4
* redis 3.0.6 -> 3.0.7
* thread_safe 0.1.3-java -> 0.2.0-java
* user_agent_parser 2.1.1 -> 2.1.2
* xml-simple 1.1.2 -> 1.1.3
2014-02-27 14:23:28 -08:00
Aaron Mildenstein
aad144f801 No longer making the flatjar. 2014-02-27 15:44:10 -06:00
Jordan Sissel
5a026bb981 Build flatjar as well 2014-02-19 06:03:58 +00:00