logstash-core 1.5.0.rc2.snapshot-java → 1.5.0.rc3-java

data/lib/logstash/pluginmanager/util.rb

@@ -1,5 +1,6 @@
-module LogStash::PluginManager
+require "rubygems/package"
 
+module LogStash::PluginManager
   # check for valid logstash plugin gem name & version or .gem file, logs errors to $stdout
   # uses Rubygems API and will remotely validated agains the current Gem.sources
   # @param plugin [String] plugin name or .gem file path
@@ -85,4 +86,4 @@ module LogStash::PluginManager
     # TODO: properly merge versions requirements
     plugin_list.uniq(&:first)
   end
-end
+end

data/lib/logstash/runner.rb

@@ -1,15 +1,17 @@
 # encoding: utf-8
 
+Thread.abort_on_exception = true
+
 Encoding.default_external = Encoding::UTF_8
 $START = Time.now
 $DEBUGLIST = (ENV["DEBUG"] || "").split(",")
 
+require "logstash/bundler"
+LogStash::Bundler.setup!
+
 require "logstash/environment"
-LogStash::Environment.bundler_setup!
 LogStash::Environment.load_locale!
 
-Thread.abort_on_exception = true
-
 require "logstash/namespace"
 require "logstash/program"
 

data/lib/logstash/util.rb

@@ -148,5 +148,4 @@ module LogStash::Util
       o
     end
   end
-
 end # module LogStash::Util

data/lib/logstash/util/accessors.rb

@@ -53,6 +53,12 @@ module LogStash::Util
       end
     end
 
+    def include?(accessor)
+      target, key = lookup_path(accessor)
+      return false unless target
+      target.is_a?(Array) ? !target[key.to_i].nil? : target.include?(key)
+    end
+
     private
 
     def lookup(accessor)

data/lib/logstash/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "1.5.0.rc2.snapshot"
+LOGSTASH_VERSION = "1.5.0-rc3"
 
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.

data/locales/en.yml

@@ -7,6 +7,11 @@ en:
     The error reported is: 
       %{error}
   logstash:
+    environment:
+      jruby-required:  >-
+        JRuby is required
+      missing-jars: >-
+        Could not find jar files under %{pattern}
     pipeline:
       worker-error: |-
         A plugin had an unrecoverable error. Will restart this plugin.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc2.snapshot
+  version: 1.5.0.rc3
 platform: java
 authors:
 - Jordan Sissel
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -166,48 +166,6 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jar-dependencies
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.7
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.7
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0.8
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: maven-tools
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: minitar
   version_requirements: !ruby/object:Gem::Requirement
@@ -236,20 +194,6 @@ dependencies:
         version: 0.1.6
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jruby-httpclient
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jrjackson
   version_requirements: !ruby/object:Gem::Requirement
@@ -368,15 +312,17 @@ files:
 - lib/logstash/outputs/base.rb
 - lib/logstash/patches.rb
 - lib/logstash/patches/bugfix_jruby_2558.rb
+- lib/logstash/patches/bundler.rb
 - lib/logstash/patches/cabin.rb
 - lib/logstash/patches/profile_require_calls.rb
+- lib/logstash/patches/rubygems.rb
 - lib/logstash/pipeline.rb
 - lib/logstash/plugin.rb
 - lib/logstash/pluginmanager.rb
+- lib/logstash/pluginmanager/command.rb
 - lib/logstash/pluginmanager/install.rb
 - lib/logstash/pluginmanager/list.rb
 - lib/logstash/pluginmanager/main.rb
-- lib/logstash/pluginmanager/maven_tools_patch.rb
 - lib/logstash/pluginmanager/uninstall.rb
 - lib/logstash/pluginmanager/update.rb
 - lib/logstash/pluginmanager/util.rb
@@ -399,7 +345,7 @@ files:
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/version.rb
 - locales/en.yml
-homepage: http://logstash.net/
+homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
 metadata: {}

data/lib/logstash/pluginmanager/maven_tools_patch.rb

@@ -1,12 +0,0 @@
-# This adds the "repo" element to the jar-dependencies DSL
-# allowing a gemspec to require a jar that exists in a custom
-# maven repository
-# Example:
-#   gemspec.requirements << "repo http://localhosty/repo"
-require 'maven/tools/dsl/project_gemspec'
-class Maven::Tools::DSL::ProjectGemspec
-  def repo(url)
-    @parent.repository(:id => url, :url => url)
-  end
-end
-