carnivore-files 0.2.2-java → 0.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbd33b4233a2a79fa6084a851e877e7049cb112
-  data.tar.gz: 03990ee4ba3898b06cba3bb5707f0ae2ff384b10
+  metadata.gz: c88542fcad8f3f813897a86e70dbefefeb85a430
+  data.tar.gz: f22152fdfe0db531bd0d434b4ca6dc3d360a8fa3
 SHA512:
-  metadata.gz: bdd854f660a2ca204a0445d6c7dd4252be6b7713cdb0544b60e96b3bb62b8ed99b183f409c01101aa90e2d74435036e9a1583efe79d33b646c96bbdfa2d27d20
-  data.tar.gz: 170772e2d4b8f71907e507b2cbfa51e9da6f3b6763e3768e32a98636df1907979ea394958fcc41be3559260e22aede2274d9a68ed2fa41c9e56464612fe7b1c9
+  metadata.gz: 98e5d3d64b4e647e18e203570c9d742d66341c82a705b738f6e3471bf2792233e77e1605259b0d7a5ef8a3f0c01f56af58cf31651dfa5986caa91abbcb491486
+  data.tar.gz: f29e42c186b24f4dbc276f77a06910bbea68f6135c7e03f6d1b5345373f7bd099d33fc42d286751759f629c64b0f4ddc2bb937c44aa63c8bae19719944dab5e7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.3.0
+* Remove nio based fetcher implementation
+* Add polling based fetcher implementation
+
+_NOTE: This release removes nio4r. The source still behaves the same, but
+	if specific functionality provided by nio4r was required, it is no
+	longer available._
+
 # v0.2.2
 * Clean up file content fetcher implementations
 

data/carnivore-files.gemspec

@@ -10,8 +10,8 @@ spec = Gem::Specification.new do |s|
   s.description = 'Carnivore file source'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_dependency 'carnivore', '>= 0.1.8'
-  s.add_dependency 'sleepy_penguin'
-  s.add_dependency 'nio4r'
+  s.add_runtime_dependency 'carnivore', '>= 0.1.8'
+  s.add_runtime_dependency 'sleepy_penguin'
+  s.add_development_dependency 'pry'
   s.files = Dir['{lib}/**/**/*'] + %w(carnivore-files.gemspec README.md CHANGELOG.md)
 end

data/lib/carnivore-files/carn_file.rb

@@ -22,7 +22,7 @@ module Carnivore
       def setup(*_)
         @path = ::File.expand_path(args[:path])
         unless(args[:foundation])
-          args[:foundation] = RUBY_PLATFORM == 'java' ? :nio4r : :penguin
+          args[:foundation] = RUBY_PLATFORM == 'java' ? :poll : :penguin
         end
       end
 
@@ -30,8 +30,8 @@ module Carnivore
       def connect
         @fetcher_name = "log_fetcher_#{name}".to_sym
         case args[:foundation].to_sym
-        when :nio, :nio4r
-          @fetcher = Carnivore::Files::Util::Fetcher::Nio.new(args)
+        when :poll
+          @fetcher = Carnivore::Files::Util::Fetcher::Poll.new(args)
         else
           @fetcher = Carnivore::Files::Util::Fetcher::Penguin.new(args)
         end

data/lib/carnivore-files/util/fetcher.rb

@@ -7,7 +7,7 @@ module Carnivore
       # Fetch lines from file
       class Fetcher
 
-        autoload :Nio, 'carnivore-files/util/nio'
+        autoload :Poll, 'carnivore-files/util/poll'
         autoload :Penguin, 'carnivore-files/util/penguin'
 
         include Celluloid

data/lib/carnivore-files/util/poll.rb

@@ -0,0 +1,60 @@
+require 'carnivore-files'
+
+module Carnivore
+  module Files
+    module Util
+      class Fetcher
+
+        # Polling fetcher
+        class Poll < Fetcher
+
+          # Start the fetcher
+          def start_fetcher
+            loop do
+              build_io
+              ino = io.stat.ino
+              retrieve_lines.each do |line|
+                self.messages << line
+              end
+              pos = io.pos
+              sleep(1)
+              begin
+                if(io.size < pos || ino != File.stat(path).ino)
+                  destroy_io
+                  @waited = true
+                end
+              rescue Errno::ENOENT
+                destroy_io
+                @waited = true
+              end
+            end
+          end
+
+          # Destroy the IO instance and monitor
+          #
+          # @return [TrueClass]
+          def destroy_io
+            if(io)
+              io.close
+              @io = nil
+            end
+            true
+          end
+
+          # Wait helper for file to appear (2 second intervals)
+          #
+          # @return [TrueClass]
+          def wait_for_file
+            warn "Waiting for file to appear (#{path})"
+            until(::File.exists?(path))
+              @waited = true
+              sleep(2)
+            end
+            info "File has appeared (#{path})!"
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/carnivore-files/version.rb

@@ -1,6 +1,6 @@
 module Carnivore
   module Files
     # Current version of library
-    VERSION = Gem::Version.new('0.2.2')
+    VERSION = Gem::Version.new('0.3.0')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-files
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: java
 authors:
 - Chris Roberts
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -25,7 +25,7 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: nio4r
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -37,7 +37,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
-  type: :runtime
+  type: :development
 description: Carnivore file source
 email: code@chrisroberts.org
 executables: []
@@ -48,7 +48,7 @@ files:
 - lib/carnivore-files/carn_file.rb
 - lib/carnivore-files/version.rb
 - lib/carnivore-files/util/penguin.rb
-- lib/carnivore-files/util/nio.rb
+- lib/carnivore-files/util/poll.rb
 - lib/carnivore-files/util/fetcher.rb
 - carnivore-files.gemspec
 - README.md

data/lib/carnivore-files/util/nio.rb

@@ -1,98 +0,0 @@
-require 'nio'
-
-module Carnivore
-  module Files
-    module Util
-      class Fetcher
-
-        # NIO based fetcher
-        class Nio < Fetcher
-
-          # @return [NIO::Monitor]
-          attr_accessor :monitor
-          # @return [NIO::Selector]
-          attr_accessor :selector
-
-          # Create new instance
-          #
-          # @param args [Hash] initialization arguments (unused)
-          def initialize(args={})
-            super
-            @selector = NIO::Selector.new
-            every(5) do
-              check_file
-            end
-          end
-
-          # Start the fetcher
-          def start_fetcher
-            loop do
-              build_io
-              messages = nil
-              Celluloid::Future.new{ selector.select }.value.each do |mon|
-                retrieve_lines.each do |l|
-                  self.messages << l
-                end
-              end
-            end
-          end
-
-          private
-
-          # Check for file and destroy monitor if file has changed
-          def check_file
-            if(io)
-              begin
-                unless(io.stat.ino == ::File.stat(path).ino)
-                  destroy_io
-                  @waited = true
-                end
-              rescue Errno::ENOENT
-                destroy_io
-              end
-            end
-          end
-
-          # Build the IO instance if found
-          #
-          # @return [TrueClass]
-          def build_io
-            result = super
-            if(result && @monitor.nil?)
-              @monitor = selector.register(io, :r)
-            end
-            result
-          end
-
-          # Destroy the IO instance and monitor
-          #
-          # @return [TrueClass]
-          def destroy_io
-            if(monitor)
-              selector.deregister(monitor)
-              @monitor = nil
-            end
-            if(io)
-              io.close
-              @io = nil
-            end
-            true
-          end
-
-          # Wait helper for file to appear (5 sleep second intervals)
-          #
-          # @return [TrueClass]
-          def wait_for_file
-            warn "Waiting for file to appear (#{path})"
-            until(::File.exists?(path))
-              @waited = true
-              sleep(5)
-            end
-            info "File has appeared (#{path})!"
-          end
-
-        end
-      end
-    end
-  end
-end