carnivore-files 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9393f45222d01b7842f08069591d1e50c3371dc
-  data.tar.gz: 515225fcea7f56ae7c1d4596c951ee3ca827668f
+  metadata.gz: c2ac46989db78c983618bce2a65e1fecc092da4f
+  data.tar.gz: dab411187db6ba936a6755e98f3dbebe2e9ed09b
 SHA512:
-  metadata.gz: 36b7787ad5dbbcff760a296a5dcb405d1998ed87451ecfd43bdd0461623629a8f368c7076f284409ceed821038af270837e886b5bcd803ccc4766d79013275e0
-  data.tar.gz: 435775b1547fa6920900783830c1fd5bbc057606608ed9a7bc7e934a3cf0bfc5790b693ffc41150a14ea0d4cc1573910867835cfc79a0c6eba477616b0814e67
+  metadata.gz: a4d63b3c974d2382e3fbf57f6503fb91a1250ee71451f65c24c418e6841973655b62a99e4a40cefb640b901190384568e1495dc11243c949c08f95588ee9b7d2
+  data.tar.gz: a0c601612f8c5188c39581dd9a3958142bb6918759e72a553ceacd9a9b12b41dc7759ac51912d382292085d72915aac71216eeb4b2d40491aeef832266d64e7f

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: ruby
 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
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nio4r
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -64,8 +64,8 @@ files:
 - lib/carnivore-files.rb
 - lib/carnivore-files/carn_file.rb
 - lib/carnivore-files/util/fetcher.rb
-- lib/carnivore-files/util/nio.rb
 - lib/carnivore-files/util/penguin.rb
+- lib/carnivore-files/util/poll.rb
 - lib/carnivore-files/version.rb
 homepage: https://github.com/carnivore-rb/carnivore-files
 licenses:

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