fwd 0.3.0 → 0.3.1

data/.gitignore

@@ -1,2 +1,3 @@
 tmp/
 log/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fwd (0.3.0)
+    fwd (0.3.1)
       connection_pool
       eventmachine-le
       servolux

data/fwd.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.name        = File.basename(__FILE__, '.gemspec')
   s.summary     = "fwd >>"
   s.description = "The minimalistic stream forwarder"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
 
   s.authors     = ["Black Square Media"]
   s.email       = "info@blacksquaremedia.com"
@@ -28,4 +28,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler"
   s.add_development_dependency "rspec"
   s.add_development_dependency "yard"
-end
+end

data/lib/fwd/buffer.rb

@@ -3,7 +3,7 @@ class Fwd::Buffer
   def_delegators :core, :root, :prefix, :logger
 
   MAX_SIZE = 64 * 1024 * 1024 # 64M
-  attr_reader :core, :interval, :rate, :count, :limit, :timer, :fd, :path
+  attr_reader :core, :interval, :rate, :count, :limit, :timer, :fd
 
   # Constructor
   # @param [Fwd] core
@@ -37,19 +37,28 @@ class Fwd::Buffer
 
   # @return [Boolean] true if flush is due
   def flush?
-    (@rate > 0 && @count >= @rate) || (@limit > 0 && @path.size >= @limit)
+    return unless @fd
+    (@rate > 0 && @count >= @rate) || (@limit > 0 && @fd.size >= @limit)
   end
 
   # (Force) rotate buffer file
   def rotate!
-    FileUtils.mv(@path.to_s, @path.to_s.sub(/\.open$/, ".closed")) if @path
-    @fd, @path = new_file
+    return if @fd && @fd.size.zero?
+
+    if @fd
+      logger.debug { "Rotate #{File.basename(@fd.path)} (#{@fd.size / 1024} kB)" }
+      FileUtils.mv(@fd.path, @fd.path.sub(/\.open$/, ".closed"))
+    end
+
+    @fd = new_file
   rescue Errno::ENOENT
   end
 
   # @return [Boolean] true if rotation is due
   def rotate?
-    !@fd || @path.size > MAX_SIZE
+    @fd.nil? || @fd.size > MAX_SIZE
+  rescue Errno::ENOENT
+    false
   end
 
   private
@@ -60,9 +69,9 @@ class Fwd::Buffer
         path = root.join("#{generate_name}.open")
       end
       FileUtils.mkdir_p root.to_s
-      file = File.open(path, "wb")
+      file = path.open("wb")
       file.sync = true
-      [file, path]
+      file
     end
 
     def reschedule!

data/lib/fwd/output.rb

@@ -23,10 +23,11 @@ class Fwd::Output
   # Callback
   def forward!
     Dir[root.join("#{prefix}.*.closed")].each do |file|
-      reserve(file) do |data|
+      ok = reserve(file) do |data|
         logger.debug { "Flushing #{File.basename(file)}, #{data.size.fdiv(1024).round} kB" }
         write(data)
       end
+      break unless ok
     end
   end
 
@@ -45,12 +46,15 @@ class Fwd::Output
       target = Pathname.new(file.sub(/\.closed$/, ".reserved"))
       FileUtils.mv file, target.to_s
 
-      if yield(target.read)
+      result = yield(target.read)
+      if result
         target.unlink
       else
         logger.error "Flushing of #{target} failed."
         FileUtils.mv target.to_s, target.to_s.sub(/\.reserved$/, ".closed")
       end
+
+      result
     rescue Errno::ENOENT
       # Ignore if file was alread flushed by another process
     end

data/spec/fwd/buffer_spec.rb

@@ -23,7 +23,6 @@ describe Fwd::Buffer do
   its(:limit)    { should be(2048) }
   its(:timer)    { should be(timer) }
   its(:fd)       { should be_instance_of(File) }
-  its(:path)     { should be_instance_of(Pathname) }
   its(:logger)   { should be(Fwd.logger) }
 
   describe "concat" do
@@ -31,7 +30,7 @@ describe Fwd::Buffer do
       lambda {
         subject.concat("x" * 1024)
       }.should change {
-        subject.path.size
+        subject.fd.size
       }.by(1024)
     end
   end
@@ -40,14 +39,22 @@ describe Fwd::Buffer do
     before  { buffer }
     subject { lambda { buffer.rotate! } }
 
-    it { should change { buffer.path } }
-    it { should change { buffer.fd } }
-    it { should change { files.size }.by(1) }
+    describe "when changed" do
+      before { buffer.concat("x" * 1024) }
 
-    it 'should archive previous file' do
-      previous = buffer.path
-      subject.call
-      files.should include(previous.sub("open", "closed").to_s)
+      it { should change { buffer.fd.path } }
+      it { should change { files.size }.by(1) }
+
+      it 'should archive previous file' do
+        previous = buffer.fd.path
+        subject.call
+        files.should include(previous.sub("open", "closed").to_s)
+      end
+    end
+
+    describe "when unchanged" do
+      it { should_not change { buffer.fd.path } }
+      it { should_not change { files.size } }
     end
   end
 
@@ -71,7 +78,8 @@ describe Fwd::Buffer do
     end
 
     it 'should rotate file' do
-      lambda { subject.flush! }.should change { subject.path }
+      subject.concat("x")
+      lambda { subject.flush! }.should change { subject.fd.path }
       files.size.should == 2
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le