logstash-input-neo4j 0.9.2-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2598b74f4503354cdcf058219d351d72966e16
-  data.tar.gz: d82bd76694af70657a16534e373e82ea89fe877f
+  metadata.gz: 7acab107090c9375aa890f401e6f307b0ec33a39
+  data.tar.gz: 805211b5269a6f6c24872e0c85f111b1ec063f1d
 SHA512:
-  metadata.gz: 3d7b5d3ef2ba6cd0b8b0e3cae7b36a732ed9226c513069f2ffe86dfa7cee2c2a446b9d4dc95a338a009e8e80661d85d6791daa523513d53a415213e593051a23
-  data.tar.gz: aff4e6d28544adcbb464fd48bea5a0e2c6fbf37a406d5cadd74bba8a463fa5c7962addb29481f960744adb10c767764ed1ff570008eb6bdb6c3dd00d8ae9cb74
+  metadata.gz: 4e1b8510c9d6721c4c53a5d633094c3871f46e86f1a3ea9336234a42674b7d4e2655225193b77b74fddcbb4109192bcac36cd673550db255832813071c91e8dc
+  data.tar.gz: 2f2a9fbd2e7284ba1d6663c3ed900b9cbf53f20b186a7d460e67dbdbb89cf7af9f3dd02da41cc4e489fa11bb4c05407e11644ac1a60a38d346c30706789af2c2

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,19 +1,19 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/neo4j.rb

@@ -54,6 +54,10 @@ class LogStash::Inputs::Neo4j < LogStash::Inputs::Base
     end
   end # def run
 
+  def stop
+    @scheduler.shutdown if @scheduler
+  end
+
   private
   def setup_scheduler(queue)
     @scheduler = Rufus::Scheduler.new

data/logstash-input-neo4j.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-neo4j'
-  s.version         = '0.9.2'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Logstash Input for Neo4j"
   s.description     = "Output events to Neo4j"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
-  s.add_runtime_dependency 'logstash-core', '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
   s.add_runtime_dependency 'rufus-scheduler', '3.0.9'
 
   if RUBY_PLATFORM == 'java'
     s.platform = RUBY_PLATFORM
-    s.add_runtime_dependency 'neo4j', '>= 3.0'
+    s.add_runtime_dependency 'neo4j', '~> 4.0.0'
     s.add_runtime_dependency 'neo4j-community', '~> 2.0.0'
   end
 

data/spec/inputs/neo4j-client_spec.rb

@@ -2,27 +2,25 @@ require_relative "../spec_helper"
 
 describe "Neo4jrb::Client", :integration => true do
 
-
-  let(:path)   { "spec/fixtures/graph.db" }
-  let(:client) { Neo4jrb::Client.open(path) }
+  let(:client) { Neo4jrb::Client.open(temp_db_path) }
 
   it "can count all nodes within the database" do
-    expect(client.count_nodes).to eq(171)
+    expect(client.count_nodes).to eq(2)
   end
 
   context "while running a query" do
-    let(:query) { "MATCH (p:`Person`)-->(m:`Movie`) WHERE m.released = 2000 RETURN *" }
+    let(:query) { "MATCH (p:`person`)-->(m:`person`) WHERE p.name = 'personA' RETURN *" }
 
     subject(:resultset) { client.execute_query(query) }
 
     it "return the right amount of data" do
-      expect(resultset.count).to eq(24)
+      expect(resultset.count).to eq(1)
     end
 
     it "return the right type of data as array" do
        resultset.each do |result|
          result.map! { |e| e.labels.first }.flatten
-         expect(result).to eq([:Movie, :Person])
+         expect(result).to eq([:person, :person])
        end
     end
   end

data/spec/inputs/neo4j_spec.rb

@@ -22,8 +22,14 @@ describe LogStash::Inputs::Neo4j do
     expect { plugin.register }.to_not raise_error
   end
 
-  it "teardown without errors" do
-    expect { plugin.teardown }.to_not raise_error
+  it "close without errors" do
+    expect { plugin.close }.to_not raise_error
+  end
+
+  context "when interrupting the plugin" do
+    it_behaves_like "an interruptible input plugin" do
+      let(:config) { { "path" => path, "query" => query, "schedule" => "* 1 * * *"} }
+    end
   end
 
   context "event retrieval" do

data/spec/spec_helper.rb

@@ -1,8 +1,39 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/neo4j"
 require "logstash/inputs/neo4j-client"
-require 'ostruct'
+require "ostruct"
+require "fileutils"
 
 def load_fixture(name)
   IO.read("spec/fixtures/#{name}")
 end
+
+def temp_db_path
+  File.join(Dir.tmpdir, "graphdb")
+end
+
+def build_database(path)
+  session = ::Neo4j::Session.open(:embedded_db, path, :auto_commit => true)
+  session.start
+  Neo4j::Transaction.run do
+    nodeA = Neo4j::Node.create({name: 'personA'}, :person)
+    nodeB = Neo4j::Node.create({name: 'personB'}, :person)
+    nodeA.create_rel(:knows, nodeB, since: 2015)
+  end
+end
+
+def remove_database(path)
+  session = Neo4j::Session.current
+  session.shutdown
+  FileUtils.rm_rf(path)
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    build_database(temp_db_path)
+  end
+
+  config.after(:all) do
+    remove_database(temp_db_path)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-neo4j
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 2.0.1
 platform: java
 authors:
 - Pere Urbon-Bayes
@@ -9,153 +9,113 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rufus-scheduler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.9
+  name: rufus-scheduler
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: neo4j
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
+  name: neo4j
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: neo4j-community
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+  name: neo4j-community
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Output events to Neo4j
 email: pere.urbon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/neo4j-client.rb
 - lib/logstash/inputs/neo4j.rb
 - logstash-input-neo4j.gemspec
-- spec/fixtures/graph.db/active_tx_log
-- spec/fixtures/graph.db/index/lucene-store.db
-- spec/fixtures/graph.db/neostore
-- spec/fixtures/graph.db/neostore.id
-- spec/fixtures/graph.db/neostore.labeltokenstore.db
-- spec/fixtures/graph.db/neostore.labeltokenstore.db.id
-- spec/fixtures/graph.db/neostore.labeltokenstore.db.names
-- spec/fixtures/graph.db/neostore.labeltokenstore.db.names.id
-- spec/fixtures/graph.db/neostore.nodestore.db
-- spec/fixtures/graph.db/neostore.nodestore.db.id
-- spec/fixtures/graph.db/neostore.nodestore.db.labels
-- spec/fixtures/graph.db/neostore.nodestore.db.labels.id
-- spec/fixtures/graph.db/neostore.propertystore.db
-- spec/fixtures/graph.db/neostore.propertystore.db.arrays
-- spec/fixtures/graph.db/neostore.propertystore.db.arrays.id
-- spec/fixtures/graph.db/neostore.propertystore.db.id
-- spec/fixtures/graph.db/neostore.propertystore.db.index
-- spec/fixtures/graph.db/neostore.propertystore.db.index.id
-- spec/fixtures/graph.db/neostore.propertystore.db.index.keys
-- spec/fixtures/graph.db/neostore.propertystore.db.index.keys.id
-- spec/fixtures/graph.db/neostore.propertystore.db.strings
-- spec/fixtures/graph.db/neostore.propertystore.db.strings.id
-- spec/fixtures/graph.db/neostore.relationshipstore.db
-- spec/fixtures/graph.db/neostore.relationshipstore.db.id
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db.id
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db.names
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db.names.id
-- spec/fixtures/graph.db/neostore.schemastore.db
-- spec/fixtures/graph.db/neostore.schemastore.db.id
-- spec/fixtures/graph.db/schema/label/lucene/_0.fdt
-- spec/fixtures/graph.db/schema/label/lucene/_0.fdx
-- spec/fixtures/graph.db/schema/label/lucene/_0.fnm
-- spec/fixtures/graph.db/schema/label/lucene/_0.frq
-- spec/fixtures/graph.db/schema/label/lucene/_0.nrm
-- spec/fixtures/graph.db/schema/label/lucene/_0.tii
-- spec/fixtures/graph.db/schema/label/lucene/_0.tis
-- spec/fixtures/graph.db/schema/label/lucene/segments.gen
-- spec/fixtures/graph.db/schema/label/lucene/segments_1
-- spec/fixtures/graph.db/store_lock
 - spec/inputs/neo4j-client_spec.rb
 - spec/inputs/neo4j_spec.rb
 - spec/spec_helper.rb
@@ -181,51 +141,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Logstash Input for Neo4j
 test_files:
-- spec/fixtures/graph.db/active_tx_log
-- spec/fixtures/graph.db/index/lucene-store.db
-- spec/fixtures/graph.db/neostore
-- spec/fixtures/graph.db/neostore.id
-- spec/fixtures/graph.db/neostore.labeltokenstore.db
-- spec/fixtures/graph.db/neostore.labeltokenstore.db.id
-- spec/fixtures/graph.db/neostore.labeltokenstore.db.names
-- spec/fixtures/graph.db/neostore.labeltokenstore.db.names.id
-- spec/fixtures/graph.db/neostore.nodestore.db
-- spec/fixtures/graph.db/neostore.nodestore.db.id
-- spec/fixtures/graph.db/neostore.nodestore.db.labels
-- spec/fixtures/graph.db/neostore.nodestore.db.labels.id
-- spec/fixtures/graph.db/neostore.propertystore.db
-- spec/fixtures/graph.db/neostore.propertystore.db.arrays
-- spec/fixtures/graph.db/neostore.propertystore.db.arrays.id
-- spec/fixtures/graph.db/neostore.propertystore.db.id
-- spec/fixtures/graph.db/neostore.propertystore.db.index
-- spec/fixtures/graph.db/neostore.propertystore.db.index.id
-- spec/fixtures/graph.db/neostore.propertystore.db.index.keys
-- spec/fixtures/graph.db/neostore.propertystore.db.index.keys.id
-- spec/fixtures/graph.db/neostore.propertystore.db.strings
-- spec/fixtures/graph.db/neostore.propertystore.db.strings.id
-- spec/fixtures/graph.db/neostore.relationshipstore.db
-- spec/fixtures/graph.db/neostore.relationshipstore.db.id
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db.id
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db.names
-- spec/fixtures/graph.db/neostore.relationshiptypestore.db.names.id
-- spec/fixtures/graph.db/neostore.schemastore.db
-- spec/fixtures/graph.db/neostore.schemastore.db.id
-- spec/fixtures/graph.db/schema/label/lucene/_0.fdt
-- spec/fixtures/graph.db/schema/label/lucene/_0.fdx
-- spec/fixtures/graph.db/schema/label/lucene/_0.fnm
-- spec/fixtures/graph.db/schema/label/lucene/_0.frq
-- spec/fixtures/graph.db/schema/label/lucene/_0.nrm
-- spec/fixtures/graph.db/schema/label/lucene/_0.tii
-- spec/fixtures/graph.db/schema/label/lucene/_0.tis
-- spec/fixtures/graph.db/schema/label/lucene/segments.gen
-- spec/fixtures/graph.db/schema/label/lucene/segments_1
-- spec/fixtures/graph.db/store_lock
 - spec/inputs/neo4j-client_spec.rb
 - spec/inputs/neo4j_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,44 +0,0 @@
-*.lock
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# fixtures log files
-spec/fixtures/graph.db/nioneo_logical.log.*
-spec/fixtures/graph.db/tm_tx_log*
-spec/fixtures/graph.db/index/lucene.log.*
-spec/fixtures/graph.db/messages.log
-spec/fixtures/graph.db/index/lucene-store.db
-spec/fixtures/graph.db/neostore

data/Rakefile

@@ -1,24 +0,0 @@
-ROOT = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(ROOT, 'lib')
-Dir.glob('lib/**').each{ |d| $LOAD_PATH.unshift(File.join(ROOT, d)) }
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require "logstash/devutils/rake"
-
-require 'rspec'
-require 'rspec/core/rake_task'
-
-desc "Specs all at ones."
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.fail_on_error = true
-  t.verbose = false
-end

data/spec/fixtures/graph.db/active_tx_log

@@ -1 +0,0 @@
-tm_tx_log.1

data/spec/fixtures/graph.db/schema/label/lucene/_0.fnm

@@ -1 +0,0 @@
-����rangeQ
0labelQ
1

data/spec/fixtures/graph.db/schema/label/lucene/_0.nrm

@@ -1 +0,0 @@
-NRM�