carnivore-files 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9885c8a235402d43bae2dc3f5d84598eb0f375b6
-  data.tar.gz: aca92773742ce3ca902354953862014b5fe93f79
+  metadata.gz: 21f87b83875a9836746133d6a3a25977a3828f1d
+  data.tar.gz: 2eae7f95014052a60389f86335dde13bab1028d4
 SHA512:
-  metadata.gz: d30c076521bc560341c3a9f7783159a84ea01f778b5a8e418a123f99a7846e977ec3732c2cbba3a3601c0071a4cf062ff4b4a6c95bebd30b38dc293fd3228197
-  data.tar.gz: 1234d420d862b4d228ed0584fa333a6b8bd4ba7d317519d5d902f5ef2151065c57904edc2dd63495a69350494b0d86155d4b49ed8296642878647f17ffe2e79b
+  metadata.gz: d7292143d29a6b5f53aa0841b669e1c945557b17d91dac81c5694babb72750e5759624be7f64cc4719fbcfcb31dde0061e6f36454147a5c15810c4b5252933b6
+  data.tar.gz: f547ded42f15317e74ca1c59294b2b45da6df929b8b083b919e42ec6da5f2726ea931f287f58582e227ede4161da434f208f4dc1e90ea9079a6bde7966d9d617

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.5.0
+* Update to latest carnivore
+* Refactor implementations
+
 # v0.3.2
 * Reset position prior to read
 

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_runtime_dependency 'carnivore', '>= 0.1.8'
-  s.add_runtime_dependency 'sleepy_penguin'
+  s.add_runtime_dependency 'carnivore', '>= 1.0.0', '< 2.0.0'
+  s.add_runtime_dependency 'sleepy_penguin', '~> 3.4'
   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

@@ -9,18 +9,17 @@ module Carnivore
       attr_reader :path
       # @return [Symbol] registry name of fetcher
       attr_reader :fetcher
-
-      trap_exit :fetcher_failure
-      finalizer :fetcher_destroyer
+      # @return [Queue] queue to hold messages
+      attr_reader :message_queue
 
       # Setup source
       #
       # @param args [Hash]
       # @option args [String] :path path to file
       # @option args [Symbol] :foundation underlying file interaction library
-      # @option args [Celluloid::Actor] :notify_actor actor to notify on line receive
       def setup(*_)
         @path = ::File.expand_path(args[:path])
+        @message_queue = Queue.new
         unless(args[:foundation])
           args[:foundation] = RUBY_PLATFORM == 'java' ? :poll : :penguin
         end
@@ -28,37 +27,18 @@ module Carnivore
 
       # Start the line fetcher
       def connect
-        @fetcher_name = "log_fetcher_#{name}".to_sym
         case args[:foundation].to_sym
         when :poll
-          @fetcher = Carnivore::Files::Util::Fetcher::Poll.new(args)
+          @fetcher = Carnivore::Files::Util::Fetcher::Poll.new(args.merge(:queue => message_queue))
         else
-          @fetcher = Carnivore::Files::Util::Fetcher::Penguin.new(args)
+          @fetcher = Carnivore::Files::Util::Fetcher::Penguin.new(args.merge(:queue => message_queue))
         end
-        self.link fetcher
         fetcher.async.start_fetcher
       end
 
-      # Restart file collector if unexpectedly failed
-      #
-      # @param object [Actor] crashed actor
-      # @param reason [Exception, NilClass]
-      def fetcher_failure(object, reason)
-        if(reason && object == fetcher)
-          error "File message collector unexpectedly failed: #{reason} (restarting)"
-          connect
-        end
-      end
-
-      def fetcher_destroyer
-        if(fetcher && fetcher.alive?)
-          fetcher.terminate
-        end
-      end
-
       # @return [Array<Hash>] return messages
-      def receive(*args)
-        format_message(Celluloid::Future.new{ fetcher.messages.pop }.value)
+      def receive(*_)
+        defer{ message_queue.pop }
       end
 
       # Send payload

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

@@ -10,7 +10,8 @@ module Carnivore
         autoload :Poll, 'carnivore-files/util/poll'
         autoload :Penguin, 'carnivore-files/util/penguin'
 
-        include Celluloid
+        include Zoidberg::SoftShell
+        include Zoidberg::Supervise
         include Carnivore::Utils::Logging
 
         # @return [String] path to file
@@ -28,12 +29,11 @@ module Carnivore
         # @param args [Hash] initialization args
         # @option args [String] :path path to file
         # @option args [String] :delimiter string delimiter to break messages
-        # @option args [Celluloid::Actor] :notify_actor actor to be notified on new messages
         def initialize(args={})
           @leftover = ''
           @path = ::File.expand_path(args[:path])
           @delimiter = args.fetch(:delimiter, "\n")
-          @messages = Queue.new
+          @messages = args.fetch(:queue, Queue.new)
         end
 
         # Start the line fetcher
@@ -57,10 +57,9 @@ module Carnivore
         def retrieve_lines
           if(io)
             io.pos = @history_pos if @history_pos
-            data = io.read(4096)
+            @leftover << io.read(4096).to_s
             while(data = io.read(4096))
-              @leftover << data
-              data = io.read(4096)
+              @leftover << data.to_s
             end
             @history_pos = io.pos
             result = @leftover.split(delimiter)
@@ -77,6 +76,7 @@ module Carnivore
         def build_io
           unless(io)
             if(::File.exists?(path))
+              @history_pos = 0
               @io = ::File.open(path, 'r')
               unless(@waited)
                 @io.seek(0, ::IO::SEEK_END) # fast-forward to EOF

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

@@ -5,7 +5,6 @@ module Carnivore
     module Util
       class Fetcher
 
-
         # NIO based fetcher
         class Penguin < Fetcher
           # @return [SP::Inotify]
@@ -27,7 +26,7 @@ module Carnivore
             loop do
               build_io
               notify.each do |event|
-                Celluloid::Future.new{ event.events }.value.each do |ev|
+                defer{ event.events }.each do |ev|
                   case ev
                   when :MODIFY
                     retrieve_lines.each do |l|
@@ -47,7 +46,6 @@ module Carnivore
             end
           end
 
-
           private
 
           # Build the IO and monitor
@@ -84,7 +82,7 @@ module Carnivore
               notify_descriptors[:file_wait] = notify.add_watch(directory, :OPEN)
               until(notified)
                 warn "Waiting for file to appear (#{path})"
-                event = Celluloid::Future.new{ notify.take }.value
+                event = defer{ notify.take }
                 notified = ::File.exists?(path)
               end
               notify.rm_watch(notify_descriptors.delete(:file_wait))

data/lib/carnivore-files/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-files
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sleepy_penguin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement