albanpeignier-alsa-backup 0.0.1 → 0.0.3

data/.autotest

@@ -1,3 +1,4 @@
 Autotest.add_hook :initialize do |autotest|
   autotest.add_exception(/tmp/)
+  autotest.add_exception(/log/)
 end

data/History.txt

@@ -1,4 +1,13 @@
+== 0.0.3
+
+* Support --background to daemonize process
+* Support --pidfile option
+* Rename existing file
+
+== 0.0.2 2009-05-19
+
+* Improve capture by support partial reads and recovering errors
+
 == 0.0.1 2009-05-14
 
-* 1 major enhancement:
-  * Initial release
+* Initial release

data/Manifest.txt

@@ -4,20 +4,26 @@ Manifest.txt
 PostInstall.txt
 README.rdoc
 Rakefile
+TODO
 alsa-backup.gemspec
 bin/alsa.backup
 config.sample
 lib/alsa.rb
 lib/alsa_backup.rb
 lib/alsa_backup/cli.rb
+lib/alsa_backup/core_ext.rb
+lib/alsa_backup/length_controller.rb
 lib/alsa_backup/recorder.rb
+lib/alsa_backup/writer.rb
 lib/sndfile.rb
 script/console
 script/destroy
 script/generate
 spec/alsa/pcm_spec.rb
 spec/alsa_backup/cli_spec.rb
+spec/alsa_backup/core_ext_spec.rb
 spec/alsa_backup/recorder_spec.rb
+spec/alsa_backup/writer_spec.rb
 spec/alsa_backup_spec.rb
 spec/fixtures/config_test.rb
 spec/sndfile/info_spec.rb

data/README.rdoc

@@ -32,7 +32,43 @@ will load the specified configuration
 
 == CONFIGURATION:
 
-See config.sample for the moment.
+The configuration file is a Ruby file. This piece of code can
+configurate the AlsaBacup recorder :
+
+  AlsaBackup.config do |recorder|
+    # configure recorder here :
+    recorder.file = "record.wav"
+  end
+
+=== Recorder File 
+
+The recorder file can be specified as a simple string :
+
+  recorder.file = "record.wav"
+
+The recorder file can be specified by a Proc which returns the string :
+
+  recorder.file = Proc.new {
+    Time.now.strftime("%Y/%m-%b/%d-%a/%Hh.wav")
+  }
+
+will use the current time to create file names like these :
+
+  2009/05-May/17-Sun/19h.wav
+  2009/05-May/17-Sun/20h.wav
+
+To use different files every 15 minutes :
+
+  recorder.file = Proc.new {
+    Time.now.floor(:min, 15).strftime("%Y/%m-%b/%d-%a/%Hh%M.wav")
+  }
+
+will create files like these : 
+
+  2009/05-May/17-Sun/19h00.wav
+  2009/05-May/17-Sun/19h15.wav
+
+See config.sample.
 
 == REQUIREMENTS:
 
@@ -41,16 +77,14 @@ See config.sample for the moment.
 
 == INSTALL:
 
-* sudo apt-get install libasound2 libsndfile1
-* sudo gem install ruby-ffi
-
-* sudo gem install --source http://gems.github.com albanpeignier-alsa-backup
+  sudo apt-get install libasound2 libsndfile1
+  sudo gem install --source http://gems.github.com albanpeignier-alsa-backup
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2009 FIXME Alban Peignier 
+Copyright (c) 2009 Alban Peignier 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,7 +9,7 @@ $hoe = Hoe.new('alsa-backup', AlsaBackup::VERSION) do |p|
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
-    ['ffi','>= 0.3.5'],
+    ['ffi','>= 0.3.5'], ['newgem', ">= #{::Newgem::VERSION}"]
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]
@@ -25,3 +25,10 @@ require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 task :default => :spec
+
+namespace :gems do
+  task :install do
+    gems = %w{activesupport ffi rspec}
+    sh "sudo gem install #{gems.join(' ')}"
+  end
+end

data/TODO

@@ -0,0 +1,4 @@
+* configurable channels
+* configurable sample rate
+* configurable alsa device
+* improve spec coverage

data/alsa-backup.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alsa-backup}
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-05-18}
+  s.date = %q{2009-05-21}
   s.default_executable = %q{alsa.backup}
   s.description = %q{ALSA client to perform continuous recording}
   s.email = ["alban.peignier@free.fr"]
   s.executables = ["alsa.backup"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = [".autotest", "History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "alsa-backup.gemspec", "bin/alsa.backup", "config.sample", "lib/alsa.rb", "lib/alsa_backup.rb", "lib/alsa_backup/cli.rb", "lib/alsa_backup/recorder.rb", "lib/sndfile.rb", "script/console", "script/destroy", "script/generate", "spec/alsa/pcm_spec.rb", "spec/alsa_backup/cli_spec.rb", "spec/alsa_backup/recorder_spec.rb", "spec/alsa_backup_spec.rb", "spec/fixtures/config_test.rb", "spec/sndfile/info_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
+  s.files = [".autotest", "History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "TODO", "alsa-backup.gemspec", "bin/alsa.backup", "config.sample", "lib/alsa.rb", "lib/alsa_backup.rb", "lib/alsa_backup/cli.rb", "lib/alsa_backup/core_ext.rb", "lib/alsa_backup/length_controller.rb", "lib/alsa_backup/recorder.rb", "lib/alsa_backup/writer.rb", "lib/sndfile.rb", "script/console", "script/destroy", "script/generate", "spec/alsa/pcm_spec.rb", "spec/alsa_backup/cli_spec.rb", "spec/alsa_backup/core_ext_spec.rb", "spec/alsa_backup/recorder_spec.rb", "spec/alsa_backup/writer_spec.rb", "spec/alsa_backup_spec.rb", "spec/fixtures/config_test.rb", "spec/sndfile/info_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/alban.peignier/alsa-backup}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -27,16 +27,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi>, [">= 0.3.5"])
+      s.add_runtime_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_development_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<ffi>, [">= 0.3.5"])
       s.add_dependency(%q<newgem>, [">= 1.4.1"])
+      s.add_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<ffi>, [">= 0.3.5"])
     s.add_dependency(%q<newgem>, [">= 1.4.1"])
+    s.add_dependency(%q<newgem>, [">= 1.4.1"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/config.sample

@@ -38,6 +38,25 @@ AlsaBackup.config do |recorder|
   # Define where the files are created
   #
   #recorder.directory = "/var/lib/alsa.backup"
+
+  # 
+  # Customize error handler during record
+  # 
+
+  # To sleep 30 seconds on error
+  #recorder.error_handler = Proc.new do |exception| 
+  #  30
+  #end
+
+  # To fail on any error
+  #recorder.error_handler = Proc.new do |exception| 
+  #  false
+  #end
+
+  # To sleep the default time
+  #recorder.error_handler = Proc.new do |exception| 
+  #  true
+  #end
 end
 
 

data/lib/alsa.rb

@@ -18,7 +18,7 @@ module ALSA
 
   def self.try_to(message, &block)
     logger.debug('alsa') { message }
-    if (response = yield) < 0
+    if ALSA::Native::error_code?(response = yield)
       raise "cannot #{message} (#{ALSA::Native::strerror(response)})"
     else
       response
@@ -30,6 +30,10 @@ module ALSA
     ffi_lib "libasound.so"
 
     attach_function :strerror, :snd_strerror, [:int], :string
+
+    def self.error_code?(response)
+      response < 0
+    end
   end
 
   module PCM
@@ -77,6 +81,7 @@ module ALSA
       def hardware_parameters
         HwParameters.new(self).current_for_device
       end
+      alias_method :hw_params, :hardware_parameters
 
       def hardware_parameters=(attributes= {})
         attributes = {:access => :rw_interleaved}.update(attributes)
@@ -86,21 +91,33 @@ module ALSA
       end
 
       def read
-        frame_count = hardware_parameters.sample_rate
-        buffer = FFI::MemoryPointer.new(hardware_parameters.buffer_size_for(frame_count))
+        frame_count = hw_params.sample_rate / 2
+        
+        FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(frame_count)) do |buffer|
+          begin
+            read_buffer buffer, frame_count
+          end while yield buffer, frame_count
+        end
+      end
 
-        continue = true
-        while continue
-          read_count = ALSA::try_to "read from audio interface" do
-            ALSA::PCM::Native::readi(self.handle, buffer, frame_count)
+      def read_buffer(buffer, frame_count)
+        read_count = ALSA::try_to "read from audio interface" do
+          response = ALSA::PCM::Native::readi(self.handle, buffer, frame_count)
+          if ALSA::Native::error_code?(response)
+            ALSA.logger.debug('alsa') { "try to recover '#{ALSA::Native::strerror(response)}' on read"}
+            ALSA::PCM::Native::pcm_recover(self.handle, response, 1)
+          else
+            response
           end
-
-          raise "can't read expected frame count (#{read_count}/#{frame_count})" unless read_count == frame_count
-          
-          continue = yield buffer, read_count
         end
 
-        buffer.free
+        missing_frame_count = frame_count - read_count
+        if missing_frame_count > 0
+          ALSA.logger.debug('alsa') { "re-read missing frame count: #{missing_frame_count}"}
+          read_buffer_size = hw_params.buffer_size_for(read_count)
+          # buffer[read_buffer_size] doesn't return a MemoryPointer
+          read_buffer(buffer + read_buffer_size, missing_frame_count)
+        end
       end
 
       def close
@@ -242,6 +259,8 @@ module ALSA
 
       attach_function :readi, :snd_pcm_readi, [ :pointer, :pointer, :ulong ], :long
 
+      attach_function :pcm_recover, :snd_pcm_recover, [ :pointer, :int, :int ], :int
+
       attach_function :hw_params_malloc, :snd_pcm_hw_params_malloc, [:pointer], :int
       attach_function :hw_params_free, :snd_pcm_hw_params_free, [:pointer], :int
 

data/lib/alsa_backup.rb

@@ -10,7 +10,7 @@ require 'activesupport'
 require 'logger'
 
 module AlsaBackup
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 
   def self.recorder
     @recorder ||= AlsaBackup::Recorder.new
@@ -33,15 +33,9 @@ module AlsaBackup
 
 end
 
-class Time
-
-  def floor(attribute, modulo)
-    actual = self.send(attribute)
-    self.change(attribute => actual - actual%modulo)
-  end
-
-end
-
+require 'alsa_backup/core_ext'
+require 'alsa_backup/length_controller'
+require 'alsa_backup/writer'
 require 'alsa_backup/recorder'
 
 

data/lib/alsa_backup/cli.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'daemons'
 
 module AlsaBackup
   class CLI
@@ -23,6 +24,10 @@ module AlsaBackup
                 "Base directory") { |arg| options[:directory] = arg }
         opts.on("-c", "--config=CONFIG", String,
                 "Configuration file") { |arg| options[:config] = arg }
+        opts.on("-p", "--pid=PID_FILE", String,
+                "File to write the process pid") { |arg| options[:pid] = arg }
+        opts.on("-b", "--background", nil,
+                "Daemonize the process") { |arg| options[:daemonize] = true }
         opts.on("-h", "--help",
                 "Show this help message.") { stdout.puts opts; exit }
         opts.parse!(arguments)
@@ -36,9 +41,16 @@ module AlsaBackup
 
       AlsaBackup.recorder.file = options[:file] if options[:file]
       AlsaBackup.recorder.directory = options[:directory] if options[:directory]
+
+      pid_file = File.expand_path(options[:pid]) if options[:pid]
+
+      Daemonize.daemonize(nil, "alsa.backup") if options[:daemonize]
+      File.write(pid_file, $$) if pid_file
       
       length = options[:length].to_i if options[:length]
       AlsaBackup.recorder.start(length)
+    rescue Exception => e
+      AlsaBackup.logger.fatal(e)
     end
   end
 end

data/lib/alsa_backup/core_ext.rb

@@ -0,0 +1,42 @@
+class Time
+
+  def floor(attribute, modulo)
+    actual = self.send(attribute)
+    self.change(attribute => actual - actual%modulo)
+  end
+
+end
+
+class File
+
+  def self.extension(file)
+    if file =~ /(\.[^.]*)$/
+      $1
+    else
+      ""
+    end
+  end
+
+  def self.suffix_basename(file, suffix)
+    dirname = File.dirname(file)
+    
+    dirname = 
+      case dirname
+      when "/": "/"
+      when ".": ""
+      else
+        dirname + "/"
+      end
+
+    extension = File.extension(file)
+    dirname +
+      File.basename(file, extension) +
+      suffix +
+      extension
+  end
+
+  def self.write(file, content)
+    File.open(file, "w") { |f| f.puts content }
+  end
+
+end

data/lib/alsa_backup/length_controller.rb

@@ -0,0 +1,19 @@
+module AlsaBackup
+  module LengthController
+    class Loop
+      def continue_after?(frame_count)
+        true
+      end
+    end
+
+    class FrameCount
+      def initialize(frame_count)
+        @frame_count = frame_count
+      end
+
+      def continue_after?(frame_count)
+        (@frame_count -= frame_count) > 0
+      end
+    end
+  end
+end

data/lib/alsa_backup/recorder.rb

@@ -1,71 +1,65 @@
 require 'alsa'
-require 'sndfile'
-
-require 'fileutils'
 
 module AlsaBackup
   class Recorder
 
     def initialize(file = "record.wav")
-      @file = file
-      @directory = "."
+      @file = File.basename(file)
+      @directory = File.dirname(file)
+
+      @error_handler = Proc.new { |e| true }
     end
 
-    attr_accessor :file, :directory
+    attr_accessor :file, :directory, :error_handler
 
     def start(seconds_to_record = nil)
-      frames_to_record = format[:sample_rate] * seconds_to_record if seconds_to_record
-
-      # prepare sndfile
-      self.sndfile
+      length_controller = self.length_controller(seconds_to_record)
 
-      ALSA::PCM::Capture.open("hw:0", self.format(:sample_format => :s16_le)) do |capture|
-        capture.read do |buffer, frame_count|
-          self.sndfile.write buffer, frame_count
-          if frames_to_record
-            (frames_to_record -= frame_count) > 0
-          else
-            true
+      Writer.open(directory, file, format(:format => "wav pcm_16")) do |writer|
+        ALSA::PCM::Capture.open("hw:0", self.format(:sample_format => :s16_le)) do |capture|
+          capture.read do |buffer, frame_count|
+            writer.write buffer, frame_count
+            length_controller.continue_after? frame_count
           end
         end
       end
+    rescue Interrupt
+      AlsaBackup.logger.debug('recorder interrupted')      
     rescue Exception => e
       AlsaBackup.logger.error(e)
-      raise e
-    ensure
-      @sndfile.close if @sndfile
-    end
+      AlsaBackup.logger.debug { e.backtrace.join("\n") }
 
-    def file
-      case @file
-      when Proc
-        @file.call
+      if seconds_to_record.nil? and continue_on_error?(e)
+        retry
       else
-        @file
+        raise e
       end
     end
 
-    def target_file
-      File.join self.directory, self.file
+    def continue_on_error?(e)
+      error_handler_response = @error_handler.call(e) if @error_handler
+
+      if error_handler_response
+        sleep_time = Numeric === error_handler_response ? error_handler_response : 5
+        AlsaBackup.logger.warn("sleep #{sleep_time}s before retrying")
+        sleep sleep_time
+      end
+
+      error_handler_response
     end
 
     def format(additional_parameters = {})
       {:sample_rate => 44100, :channels => 2}.merge(additional_parameters)
     end
 
-    def sndfile
-      target_file = self.target_file
-      raise "no recording file" unless target_file
-
-      unless @sndfile and @sndfile.path == target_file
-        @sndfile.close if @sndfile
-        AlsaBackup.logger.info "new file #{target_file}"
-
-        FileUtils.mkdir_p File.dirname(target_file)
-        @sndfile = Sndfile::File.new(target_file, "w", self.format(:format => "wav pcm_16"))
+    def length_controller(seconds_to_record)
+      if seconds_to_record
+        AlsaBackup::LengthController::FrameCount.new format[:sample_rate] * seconds_to_record 
+      else
+        AlsaBackup::LengthController::Loop.new
       end
-      @sndfile
     end
-    
+
   end
+
 end

data/lib/alsa_backup/writer.rb

@@ -0,0 +1,92 @@
+require 'sndfile'
+require 'fileutils'
+
+module AlsaBackup
+  class Writer
+
+    attr_accessor :directory, :file, :format
+
+    def self.default_format
+      {:sample_rate => 44100, :channels => 2, :format => "wav pcm_16"}
+    end
+
+    def initialize(directory, file, format = Writer.default_format)
+      @directory = directory
+      @file = file
+      @format = format
+    end
+
+    def self.open(directory, file, format, &block)
+      writer = Writer.new(directory, file, format).prepare
+
+      begin
+        yield writer
+      ensure
+        writer.close
+      end
+    end
+
+    def prepare
+      # prepare sndfile
+      self.sndfile
+      self
+    end
+
+    def write(*arguments)
+      self.sndfile.write *arguments
+    end
+
+    def close
+      if @sndfile
+        AlsaBackup.logger.info('close current file')
+        @sndfile.close 
+      end
+      @sndfile = nil
+    end
+
+    def file
+      case @file
+      when Proc
+        @file.call
+      else
+        @file
+      end
+    end
+
+    def target_file
+      File.join self.directory, self.file
+    end
+
+    def sndfile
+      target_file = self.target_file
+      raise "no recording file" unless target_file
+
+      unless @sndfile and @sndfile.path == target_file
+        @sndfile.close if @sndfile
+
+        Writer.rename_existing_file(target_file)
+        AlsaBackup.logger.info{"new file #{File.expand_path target_file}"}
+
+        FileUtils.mkdir_p File.dirname(target_file)
+        @sndfile = Sndfile::File.new(target_file, "w", self.format)
+      end
+      @sndfile
+    end
+
+    def self.rename_existing_file(file)
+      if File.exists?(file)
+        index = 1
+
+        while File.exists?(new_file = File.suffix_basename(file, "-#{index}"))
+          index += 1
+
+          raise "can't find a free file for #{file}" if index > 1000
+        end
+
+        AlsaBackup.logger.warn "rename existing file #{File.basename(file)} into #{new_file}"
+        File.rename(file, new_file)
+      end
+    end
+
+  end
+end

data/spec/alsa_backup/cli_spec.rb

@@ -15,7 +15,12 @@ describe AlsaBackup::CLI, "execute" do
   def execute_cli(options = {})
     options = { :file => @file, :length => 2 }.update(options)
     arguments = options.collect do |key,value| 
-      "--#{key}=#{value}" if value
+      case value
+      when true: "--#{key}"
+      when nil: nil
+      else
+        "--#{key}=#{value}" 
+      end
     end.compact
     
     AlsaBackup::CLI.execute(@stdout_io, *arguments)
@@ -59,4 +64,16 @@ describe AlsaBackup::CLI, "execute" do
     AlsaBackup.recorder.file.should == argument_file
   end
 
+  it "should write pid in specified file" do
+    pid_file = test_file("pid")
+    execute_cli :pid => pid_file
+
+    IO.read(pid_file).strip.should == $$.to_s
+  end
+
+  it "should write pid in specified file" do
+    Daemonize.should_receive(:daemonize)
+    execute_cli :background => true
+  end
+
 end

data/spec/alsa_backup/core_ext_spec.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe Time do
+  
+  describe "floor" do
+    
+    it "should change xh41 on xh49 for min with a modulo of 10" do
+      time = Time.now.change(:min => 49)
+      time.floor(:min, 10).should == time.change(:min => 40)
+    end
+
+  end
+
+end
+
+describe File do
+  
+  describe "extension" do
+    
+    it "should be .rb for test.rb" do
+      File.extension('test.rb').should == '.rb'
+    end
+
+    it "should be '.' for 'test.'" do
+      File.extension('test.').should == '.'
+    end
+
+    it "should be blank for 'test'" do
+      File.extension('test').should be_blank
+    end
+
+  end
+
+  describe "suffix_basename" do
+
+    def take_this_form(expected_file)
+      simple_matcher("have this #{expected_file}") do |actual|
+        File.suffix_basename(actual,'<prefix>') == expected_file
+      end
+    end
+
+    it { 'test.rb'.should take_this_form('test<prefix>.rb') }
+    
+    it "should return test<prefix> for test" do
+      File.suffix_basename('test','<prefix>').should == 'test<prefix>'
+    end
+
+    it "should return /path/test<prefix>.rb for /patest" do
+      File.suffix_basename('/path/test.rb','<prefix>').should == '/path/test<prefix>.rb'
+    end
+
+    it "should return /test<prefix>.rb for /test.rb" do
+      File.suffix_basename('/path/test.rb','<prefix>').should == '/path/test<prefix>.rb'
+    end
+
+  end
+
+end

data/spec/alsa_backup/recorder_spec.rb

@@ -13,19 +13,72 @@ describe AlsaBackup::Recorder do
     lambda { @recorder.start(2) }.should_not raise_error
   end
 
-  describe "file" do
+  describe "error handler" do
+
+    class TestErrorHandler
+
+      def initialize(proc)
+        proc = Proc.new { |e| proc } unless Proc == proc
+        @proc = proc
+      end
+
+      def call(e)
+        if @proc
+          response = @proc.call(e)
+          @proc = nil
+          response
+        end
+      end
+
+    end
     
-    it "should accept file as string" do
-      @recorder.file = file_name = "dummy"
-      @recorder.file.should == file_name
+    before(:each) do
+      AlsaBackup::Writer.stub!(:open).and_raise("dummy")
+      @recorder.stub!(:sleep)
     end
 
-    it "should accept file as Proc" do
-      file_name = "dummy"
-      @recorder.file = Proc.new { file_name }
-      @recorder.file.should == file_name
+    it "should raise error when error handler is nil" do
+      @recorder.error_handler = nil
+      lambda { @recorder.start }.should raise_error
     end
-    
+
+    it "should raise error when error handler returns nil or false" do
+      @recorder.error_handler = TestErrorHandler.new(nil)
+      lambda { @recorder.start }.should raise_error
+    end
+
+    def start_recorder(limit = nil)
+      @recorder.start(limit)
+    rescue RuntimeError
+
+    end
+
+    it "should retry when error handler returns something (not false or nil)" do
+      @recorder.error_handler = TestErrorHandler.new(true)
+      AlsaBackup::Writer.should_receive(:open).twice().and_raise("dummy")
+
+      start_recorder
+    end
+
+    it "should use the error handler response as sleep time if numerical" do
+      @recorder.error_handler = TestErrorHandler.new(error_handler_response = 5)
+      @recorder.should_receive(:sleep).with(error_handler_response)
+      start_recorder
+    end
+
+    it "should sleep 5 seconds when the error handler response is a number" do
+      @recorder.error_handler = TestErrorHandler.new(true)
+      @recorder.should_receive(:sleep).with(5)
+      start_recorder
+    end
+
+    it "should not use error handler when recorder is started with a time length" do
+      @recorder.error_handler = mock("error_handler")
+      @recorder.error_handler.should_not_receive(:call)
+
+      start_recorder(2)
+    end
+
   end
 
 end

data/spec/alsa_backup/writer_spec.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe AlsaBackup::Writer do
+
+  before(:each) do
+    @file = "test.wav"
+    @directory = test_directory
+    @recorder = AlsaBackup::Writer.new(@file, @directory)
+  end
+
+  describe "file" do
+    
+    it "should accept file as string" do
+      @recorder.file = file_name = "dummy"
+      @recorder.file.should == file_name
+    end
+
+    it "should accept file as Proc" do
+      file_name = "dummy"
+      @recorder.file = Proc.new { file_name }
+      @recorder.file.should == file_name
+    end
+    
+  end
+
+  describe "rename_existing_file" do
+
+    it "should keep file if not exists" do
+      File.should_receive(:exists?).with(@file).and_return(false)
+      File.should_not_receive(:rename)
+      AlsaBackup::Writer.rename_existing_file(@file)
+    end
+
+    it "should try to suffix with '-n' to find a free name" do
+      File.stub!(:exists?).and_return(true)
+
+      free_file = File.suffix_basename(@file, "-99")
+      File.should_receive(:exists?).with(free_file).and_return(false)
+
+      File.should_receive(:rename).with(@file, free_file)
+      AlsaBackup::Writer.rename_existing_file(@file)
+    end
+
+    it "should raise an error when no free file is found" do
+      File.stub!(:exists?).and_return(true)
+      lambda do
+        AlsaBackup::Writer.rename_existing_file(@file)
+      end.should raise_error
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -9,13 +9,20 @@ end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'alsa_backup'
 
+def test_directory
+  File.dirname(__FILE__) + '/../tmp'
+end
+
 def test_file(name = 'test.wav')
-  File.dirname(__FILE__) + '/../tmp/' + name
+  File.join(test_directory, name)
 end
 
 def fixture_file(name)
   File.dirname(__FILE__) + '/fixtures/' + name
 end
 
+log_dir = File.dirname(__FILE__) + '/../log/'
+Dir.mkdir(log_dir) unless File.exists?(log_dir)
+
 ALSA::logger = AlsaBackup.logger = 
-  Logger.new(File.dirname(__FILE__) + '/../log/test.log') 
+  Logger.new(File.join(log_dir,'test.log'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-alsa-backup
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: alsa.backup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.5
     version: 
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -61,20 +71,26 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
+- TODO
 - alsa-backup.gemspec
 - bin/alsa.backup
 - config.sample
 - lib/alsa.rb
 - lib/alsa_backup.rb
 - lib/alsa_backup/cli.rb
+- lib/alsa_backup/core_ext.rb
+- lib/alsa_backup/length_controller.rb
 - lib/alsa_backup/recorder.rb
+- lib/alsa_backup/writer.rb
 - lib/sndfile.rb
 - script/console
 - script/destroy
 - script/generate
 - spec/alsa/pcm_spec.rb
 - spec/alsa_backup/cli_spec.rb
+- spec/alsa_backup/core_ext_spec.rb
 - spec/alsa_backup/recorder_spec.rb
+- spec/alsa_backup/writer_spec.rb
 - spec/alsa_backup_spec.rb
 - spec/fixtures/config_test.rb
 - spec/sndfile/info_spec.rb