logstash-input-yasuri 2.0.7 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd310111067847b9d64758af34491284a51fe44
-  data.tar.gz: 84b1f874b33c69834f9978ee5103a61319384e05
+  metadata.gz: 01514669c8c47d9e53f8b7fa8a3a0129e1c9a5cb
+  data.tar.gz: a1078fac99cb7a486d365ce283e164756f585773
 SHA512:
-  metadata.gz: 178abb9ac100f7424b8718362c67134e288c454a5fd82693363d8306b52fc8d58ab557524e0d7ee42e7010c03da22023d7ff7b0cf465cb90826498932bd827c4
-  data.tar.gz: 324f1a81204e2986ea9cdd075b0b9398a21efda74fbb296c75fc8b3c71c2b01bdf0c5ecb00c83526e823c42b19177eec29c6d8c676e6baf005d80f5b9cc56dc1
+  metadata.gz: 6b160f2e2a878ccb774a4445ca7383468d9f3624de9a3ce82c31768f55ef4a4a90bc7413bbf2b613426762e9378a2c0a6e6466bd3428526320d037914fb1b7e5
+  data.tar.gz: 115196cd90bb7e3a86314280433f1bb2788241c8c160c235b8dca2655a4b447519a07633e7da09af13644f2eba4ea31d46516404615c28e920801b80560dc694

data/README.md

@@ -52,11 +52,6 @@ gem build logstash-input-yasuri
 # generate logstash-input-yasuri-x.x.x.gem
 ```
 
-- publish gem
-```sh
-bundle exec rake publish_gem
-```
-
 ### 2. Running your unpublished Plugin in Logstash
 
 #### 2.1 Run in a local Logstash clone

data/lib/logstash/inputs/yasuri.rb

@@ -2,7 +2,6 @@
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
-require "rufus-scheduler"
 require "mechanize"
 require "yasuri"
 
@@ -11,47 +10,35 @@ class LogStash::Inputs::Yasuri < LogStash::Inputs::Base
 
   default :codec, "plain"
 
-  # logstash-input-yasuri require option :parse_tree or :parse_tree_path.
-  # If given both, logstash-input-yasuri use :parse_tree.
-
   # Parse tree as JSON.
   # Read https://github.com/tac0x2a/yasuri/blob/master/USAGE.md#construct-parse-tree
   config :parse_tree, :validate => :string
 
-  # Path to parse tree JSON file.
-  config :parse_tree_path, :validate => :string
-
   # Target web page url.
   config :url, :validate => :string
 
   # Split each results to individual events (struct or pages)
   config :split, :default => false
 
-  config :cron, :validate => :string, :default => '* * * * *'
+  config :interval, :validate => :number, :default => 60
 
   public
   def register
     @host = Socket.gethostname
     @agent = Mechanize.new
-    @scheduler = Rufus::Scheduler.new
-
-    # If given both, logstash-input-yasuri use :parse_tree.
-    tree = @parse_tree || File.read(@parse_tree_path)
-
-    @tree  = Yasuri.json2tree(tree)
+    @tree  = Yasuri.json2tree(@parse_tree)
   end # def register
 
   def run(queue)
     # we can abort the loop if stop? becomes true
-    @scheduler.cron @cron do
+    while !stop?
       # because the sleep interval can be big, when shutdown happens
       # we want to be able to abort the sleep
       # Stud.stoppable_sleep will frequently evaluate the given block
       # and abort the sleep(@interval) if the return value is true
       inner_run(queue)
-    end
-
-    @scheduler.join
+      Stud.stoppable_sleep(@interval) { stop? }
+    end # loop
   end # def run
 
   def stop
@@ -60,7 +47,6 @@ class LogStash::Inputs::Yasuri < LogStash::Inputs::Base
     #  * close sockets (unblocking blocking reads/accepts)
     #  * cleanup temporary files
     #  * terminate spawned threads
-    @scheduler.shutdown
   end
 
   def inner_run(queue)

data/logstash-input-yasuri.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-yasuri'
-  s.version         = '2.0.7'
+  s.version         = '5.0.3'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Web scraping input plugin for logstash."
   s.description     = "Web scraping input plugin for logstash."
@@ -18,10 +18,9 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-core-plugin-api', '~> 1'
+  s.add_runtime_dependency 'logstash-core-plugin-api', '~> 2'
   s.add_runtime_dependency 'stud', '>= 0.0.22'
   s.add_runtime_dependency 'yasuri', '~> 1.9'
-  s.add_runtime_dependency 'rufus-scheduler', '>= 0'
 
   s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
   s.add_development_dependency 'logstash-codec-plain'

data/spec/inputs/yasuri_spec.rb

@@ -30,14 +30,6 @@ describe LogStash::Inputs::Yasuri do
     )
   }
 
-  let(:input_from_parse_tree_file) {
-    input_from_parse_tree_file = LogStash::Plugin.lookup("input", "yasuri").new(
-      "split" => true,
-      "url" => "https://news.ycombinator.com/",
-      "parse_tree_path" => "spec/inputs/res/parse_tree.json"
-    )
-  }
-
   it "should register" do
     # register will try to load jars and raise if it cannot find jars or if org.apache.log4j.spi.LoggingEvent class is not present
     expect {input.register}.to_not raise_error
@@ -49,10 +41,4 @@ describe LogStash::Inputs::Yasuri do
     input.inner_run(queue)
     expect(queue.size).not_to be_zero
   end
-
-  it "enqueues some events from input_from_parse_tree_file" do
-    input_from_parse_tree_file.register
-    input_from_parse_tree_file.inner_run(queue)
-    expect(queue.size).not_to be_zero
-  end
 end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-yasuri
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 5.0.3
 platform: ruby
 authors:
 - tac0x2a
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: rufus-scheduler
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -122,7 +108,6 @@ files:
 - README.md
 - lib/logstash/inputs/yasuri.rb
 - logstash-input-yasuri.gemspec
-- spec/inputs/res/parse_tree.json
 - spec/inputs/yasuri_spec.rb
 homepage: https://github.com/tac0x2a/logstash-input-yasuri
 licenses:
@@ -146,10 +131,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: Web scraping input plugin for logstash.
 test_files:
-- spec/inputs/res/parse_tree.json
 - spec/inputs/yasuri_spec.rb

data/spec/inputs/res/parse_tree.json

@@ -1,17 +0,0 @@
-{
-  "node": "struct",
-  "name": "titles",
-  "path": "//td[@class='title'][not(@align)]",
-  "children": [
-    {
-      "node": "text",
-      "name": "title",
-      "path": "./a"
-    },
-    {
-      "node": "text",
-      "name": "url",
-      "path": "./a/@href"
-    }
-  ]
-}