notified_tail 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de79d0364ed841a57e4ceda6da11fbd9ae8ab27
-  data.tar.gz: 15fa18f4bd0b73d769f404b5f540da291dfdc6e4
+  metadata.gz: 9aa8eddca759a4256d8851d8030427c2e0e6acd7
+  data.tar.gz: 2f8488e69e14240075c0e1addf5bf81a68d0b37a
 SHA512:
-  metadata.gz: bfda4eecd072f4e105977d57e8d6243b695aa3551efe895a220929a58dd7bc06041ab6036a0daea8114c39fc5824939a13117a34f02b4733ca87c8ac42bd208b
-  data.tar.gz: cdc766f181af75455dbd6e80313de323fd7c1e300d190c7a5f6604ad3a8d942b9e0679dde230dfc77e3923e6f9122230f10949162ae8b5cd41064488cf3008ab
+  metadata.gz: 8a00b5626010f98902847ddf6ee1e14148d94d3d2c07b7636aa49f1a5a3f52ef7ab139d1fb6b576397f1c4b0df2f3148118d4d368574bafd8eb6f7a54fc5de1e
+  data.tar.gz: 1d159c3305817fddf09c81dc6175bf65497647a94d9ba0923954223ee00430c5165a66c8a0785b7ec4f0a00c54f8016d115c1533208feac28273f023ffe8a0c2

data/lib/notified_tail.rb

@@ -16,7 +16,7 @@ class NotifiedTail
     new.tail(file_path, opts, &on_line)
   end
 
-  def tail(file_path, opts, &on_line)
+  def tail(file_path, opts={}, &on_line)
     @file_path = file_path
     @stopped = false
     seek_end = opts.fetch(:seek_end, true)
@@ -64,12 +64,12 @@ class NotifiedTail
         require 'rb-kqueue'
         @queue = KQueue::Queue.new
         @queue.watch_file(file_path, :extend) { block.call }
-        @queue.run
+        @queue.run unless @stopped
       when /linux/
         require 'rb-inotify'
         @queue = INotify::Notifier.new
         @queue.watch(file_path, :modify) { block.call }
-        @queue.run
+        @queue.run unless @stopped
       else
         poll(file_path, &block)
       end

data/notified_tail.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'notified_tail'
-  spec.version       = '0.2.1'
+  spec.version       = '0.2.2'
   spec.authors       = ['Peter Winton']
   spec.email         = ['pwinton@indigobio.com']
   spec.summary       = %q{Low latency file tailing in ruby}

data/spec/lib/notified_tail_spec.rb

@@ -1,16 +1,17 @@
 require 'rspec'
 require 'securerandom'
 require 'notified_tail'
+require 'fileutils'
 
 describe NotifiedTail do
   describe '#tail' do
     let!(:seek_end) { false }
     let!(:force_poll) { false }
+    let!(:fn) { SecureRandom.uuid }
+    after(:each) { File.delete(fn) }
 
     shared_examples 'tail -f' do
       let!(:lines) { [] }
-      let!(:fn) { SecureRandom.uuid }
-      after(:each) { File.delete(fn) }
 
       it 'tails a growing file, line by line' do
 
@@ -35,11 +36,6 @@ describe NotifiedTail do
         append(fn, "line with words\n")
         watcher.join
       end
-
-      def append(fn, text)
-        File.open(fn, 'a') { |f| f.print(text) }
-        sleep(0.1)
-      end
     end
 
     shared_examples 'tail -f -n 9999PB' do
@@ -75,5 +71,52 @@ describe NotifiedTail do
       it_behaves_like 'tail -f -n 9999PB'
     end
 
+    it 'can be stopped before new data is tailed' do
+      File.write(fn, "hello\n")
+
+      thread = Thread.start do
+        notifier = NotifiedTail.new
+        notifier.tail(fn, seek_end: false) do |line|
+          print "saw #{line.inspect}\n"
+          if line == 'hello'
+            Thread.start do
+              expect(notifier.instance_variable_get(:@queue)).to be_nil
+              notifier.stop
+            end
+          end
+        end
+      end
+
+      thread.join
+    end
+
+    it 'can be stopped after new data is tailed (must write to the file)' do
+      thread = Thread.start do
+        notifier = NotifiedTail.new
+        notifier.tail(fn, seek_end: false) do |line|
+          print "saw #{line.inspect}\n"
+          if line == 'there'
+            Thread.start do
+              expect(notifier.instance_variable_get(:@queue)).to_not be_nil
+              notifier.stop
+              File.open(notifier.file_path, 'a'){|f| f.print("\n")}
+            end
+          end
+        end
+      end
+      sleep(0.25) # let the notifier start up
+
+      append(fn, "hello\n")
+      sleep(0.5)
+      append(fn, "there\n")
+
+      thread.join
+    end
+
+    def append(fn, text)
+      File.open(fn, 'a') { |f| f.print(text) }
+      sleep(0.1)
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notified_tail
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Peter Winton