alsa-backup 0.0.8 → 0.10

data/spec/alsa_backup/cli_spec.rb

@@ -16,7 +16,7 @@ describe AlsaBackup::CLI, "execute" do
     options = { :file => @file, :length => 2 }.update(options)
     arguments = options.collect do |key,value| 
       if value
-        returning "--#{key}" do |argument|
+        "--#{key}".tap do |argument|
           argument << "=#{value}" unless value == true
         end
       end

data/spec/alsa_backup/length_recorder_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe AlsaBackup::LengthController do
+
+  def continue_after(frame_count)
+    simple_matcher("continue after #{frame_count} frames") do |actual|
+      actual.continue_after?(frame_count)
+    end
+  end
+  
+  describe AlsaBackup::LengthController::Loop do
+
+    before(:each) do
+      @controller = AlsaBackup::LengthController::Loop.new
+    end
+    
+    it "should always continue" do
+      @controller.should continue_after(123)
+    end
+
+  end
+
+  describe AlsaBackup::LengthController::FrameCount do
+
+    before(:each) do
+      @controller = AlsaBackup::LengthController::FrameCount.new(123)
+    end
+    
+    it "should not continue after controller frame count" do
+      @controller.should_not continue_after(@controller.frame_count)
+    end
+
+    it "should decrement controller frame count after each test" do
+      lambda {
+        @controller.continue_after?(10)
+      }.should change(@controller, :frame_count).by(-10)
+    end
+
+  end
+
+end

data/spec/alsa_backup/recorder_spec.rb

@@ -47,6 +47,20 @@ describe AlsaBackup::Recorder do
     @recorder.start
   end
 
+  describe "alsa_options" do
+    
+    it "should use buffer_time if specified" do
+      @recorder.buffer_time = 100000
+      @recorder.alsa_options[:buffer_time].should == 100000
+    end
+
+    it "should use period_time if specified" do
+      @recorder.period_time = 100000
+      @recorder.alsa_options[:period_time].should == 100000
+    end
+
+  end
+
   describe "error handler" do
 
     class TestErrorHandler
@@ -142,4 +156,20 @@ describe AlsaBackup::Recorder do
 
   end
 
+  describe "open_capture" do
+
+    it "should use specified device" do
+      @recorder.stub :device => "dummy"
+      ALSA::PCM::Capture.should_receive(:open).with("dummy", anything())
+      @recorder.open_capture {}
+    end
+    
+    it "should use alsa_options" do
+      @recorder.stub :alsa_options => { :dummy => true }
+      ALSA::PCM::Capture.should_receive(:open).with(anything(), @recorder.alsa_options)
+      @recorder.open_capture {}
+    end
+
+  end
+
 end

data/spec/alsa_backup/writer_spec.rb

@@ -8,7 +8,7 @@ describe AlsaBackup::Writer do
     @writer = AlsaBackup::Writer.new :directory => @directory, :file => @file
   end
 
-  describe "when created" do
+  context "when created" do
 
     it "should use the :directory option as directory" do
       AlsaBackup::Writer.new(:directory => @directory).directory.should == @directory
@@ -34,33 +34,103 @@ describe AlsaBackup::Writer do
     
   end
 
-  describe "on_close" do
+  describe "#on_close" do
+
+    class TestCallback
+
+      attr_reader :file
+
+      def call(file)
+        @file = file
+      end
+
+      def invoked?
+        not @file.nil?
+      end
+
+    end
+
+    let(:callback) { TestCallback.new }
+
+    before(:each) do
+      @writer.on_close_callbacks << callback
+    end
     
-    it "should include a callback which delete empty file" do
-      AlsaBackup::Writer.should_receive(:delete_empty_file).with(@file)
+    it "should check if file is empty" do
+      AlsaBackup::Writer.should_receive(:delete_empty_file).with(@file).and_return(true)
       @writer.on_close(@file)
     end
 
-    it "should invoke all on_close_callbacks" do
-      file_given_to_proc = nil
+    context "when file was empty" do
 
-      @writer.on_close_callbacks << Proc.new do |file| 
-        file_given_to_proc = file
+      before(:each) do
+        AlsaBackup::Writer.stub :delete_empty_file => true
+      end
+
+      it "should not invoke callbacks" do
+        @writer.on_close(@file)
+        callback.should_not be_invoked
       end
-      @writer.on_close(@file)
 
-      file_given_to_proc.should == @file
+    end
+
+    it "should invoke all on_close_callbacks" do
+      @writer.on_close(@file)
+      callback.should be_invoked
     end
 
     it "should ignore exception from callbacks" do
-      @writer.on_close_callbacks << Proc.new do |file| 
-        raise "Error"
-      end
+      callback.stub!(:call).and_raise("Error")
       lambda { @writer.on_close(@file) }.should_not raise_error
     end
 
   end
 
+  describe ".delete_empty_file" do
+
+    let(:file) { "tmp/deleted_empty_file" }
+
+    after(:each) do
+      File.delete(file) if File.exists?(file)      
+    end
+
+    context "when file contains 44 bytes or less" do
+
+      before(:each) do
+        File.open(file, "w") { |f| f.write 'a'*44 }
+      end
+
+      it "should remove a file" do
+        AlsaBackup::Writer.delete_empty_file(file)
+        File.exists?(file).should be_false
+      end
+
+      it "should return true" do
+        AlsaBackup::Writer.delete_empty_file(file).should be_true
+      end
+
+    end
+
+    context "when file contains more than 44 bytes" do
+
+      before(:each) do
+        File.open(file, "w") { |f| f.write "a"*45 }
+      end
+
+      it "should not remove the file" do
+        AlsaBackup::Writer.delete_empty_file(file)
+        File.exists?(file).should be_true
+      end
+
+      it "should return false" do
+        AlsaBackup::Writer.delete_empty_file(file).should be_false
+      end
+                                                      
+    end
+
+
+  end
+
   describe "file" do
     
     it "should accept file as string" do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rubygems' unless ENV['NO_RUBYGEMS']
+
 begin
   require 'spec'
 rescue LoadError

data/tasks/rspec.rake

@@ -14,12 +14,6 @@ EOS
   exit(0)
 end
 
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
 namespace :spec do
   desc "Generate spec HTML report"
   Spec::Rake::SpecTask.new('html') do |t|

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: alsa-backup
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  version: "0.10"
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,59 +14,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +01:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
         version: 1.0.10
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id005
 description: ALSA client to perform continuous recording
 email: 
 - alban@tryphon.eu
@@ -75,6 +110,8 @@ extra_rdoc_files:
 - PostInstall.txt
 files: 
 - .autotest
+- COPYING
+- COPYRIGHT
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -84,7 +121,6 @@ files:
 - 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
@@ -92,15 +128,16 @@ files:
 - lib/alsa_backup/recorder.rb
 - lib/alsa_backup/writer.rb
 - lib/sndfile.rb
+- lib/syslog_logger.rb
 - script/console
 - script/destroy
 - script/generate
-- spec/alsa/pcm_spec.rb
+- setup.rb
 - spec/alsa_backup/cli_spec.rb
 - spec/alsa_backup/core_ext_spec.rb
+- spec/alsa_backup/length_recorder_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
@@ -117,21 +154,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: alsa-backup
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ALSA client to perform continuous recording

data/lib/alsa.rb

@@ -1,299 +0,0 @@
-require 'ffi'
-
-require 'logger'
-
-module ALSA
-
-  def self.logger
-    unless @logger
-      @logger = Logger.new(STDERR)
-      @logger.level = Logger::WARN
-    end
-
-    @logger
-  end
-
-  def self.logger=(logger); @logger = logger; end
-
-  def self.try_to(message, &block)
-    logger.debug { message }
-    if ALSA::Native::error_code?(response = yield)
-      raise "cannot #{message} (#{ALSA::Native::strerror(response)})"
-    else
-      response
-    end
-  end
-
-  module Native
-    extend FFI::Library
-    ffi_lib "libasound.so"
-
-    attach_function :strerror, :snd_strerror, [:int], :string
-
-    def self.error_code?(response)
-      response < 0
-    end
-  end
-
-  module PCM
-
-    class Capture
-
-      attr_accessor :handle
-
-      def self.open(device, hardware_attributes = {}, &block)
-        Capture.new.open(device, hardware_attributes, &block)
-      end
-
-      def open(device, hardware_attributes = {}, &block)
-        capture_handle = FFI::MemoryPointer.new :pointer
-        ALSA::try_to "open audio device #{device}" do
-          ALSA::PCM::Native::open capture_handle, device, ALSA::PCM::Native::STREAM_CAPTURE, ALSA::PCM::Native::BLOCK
-        end
-        self.handle = capture_handle.read_pointer
-
-        self.hardware_parameters=hardware_attributes
-
-        if block_given?
-          begin
-            yield self 
-          ensure
-            self.close
-          end
-        end
-      end
-
-      def change_hardware_parameters
-        hw_params = HwParameters.new(self).default_for_device
-
-        begin
-          yield hw_params
-
-          ALSA::try_to "set hw parameters" do
-            ALSA::PCM::Native::hw_params self.handle, hw_params.handle
-          end
-        ensure
-          hw_params.free
-        end
-      end
-
-      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)
-        change_hardware_parameters do |hw_params|
-          hw_params.update_attributes(attributes)
-        end
-      end
-
-      def read
-        ALSA.logger.debug { "start read with #{hw_params.sample_rate}, #{hw_params.channels} channels"}
-
-        # use an 500ms buffer
-        frame_count = hw_params.sample_rate / 2
-        ALSA.logger.debug { "allocate #{hw_params.buffer_size_for(frame_count)} bytes for #{frame_count} frames" }
-        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
-
-      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.warn { "try to recover '#{ALSA::Native::strerror(response)}' on read"}
-            ALSA::PCM::Native::pcm_recover(self.handle, response, 1)
-          else
-            response
-          end
-        end
-
-        missing_frame_count = frame_count - read_count
-        if missing_frame_count > 0
-          ALSA.logger.debug { "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
-        ALSA::try_to "close audio device" do
-          ALSA::PCM::Native::close self.handle
-        end
-      end
-
-      class HwParameters
-
-        attr_accessor :handle, :device
-
-        def initialize(device = nil)
-          hw_params_pointer = FFI::MemoryPointer.new :pointer
-
-          ALSA::PCM::Native::hw_params_malloc hw_params_pointer        
-          self.handle = hw_params_pointer.read_pointer
-
-          self.device = device if device
-        end
-
-        def update_attributes(attributes)
-          attributes.each_pair { |name, value| send("#{name}=", value) }
-        end
-
-        def default_for_device
-          ALSA::try_to "initialize hardware parameter structure" do
-            ALSA::PCM::Native::hw_params_any device.handle, self.handle
-          end
-          self
-        end
-
-        def current_for_device
-          ALSA::try_to "retrieve current hardware parameters" do
-            ALSA::PCM::Native::hw_params_current device.handle, self.handle
-          end
-          self
-        end
-
-        def access=(access)
-          ALSA::try_to "set access type" do
-            ALSA::PCM::Native::hw_params_set_access self.device.handle, self.handle, ALSA::PCM::Native::Access.const_get(access.to_s.upcase)
-          end
-        end
-
-        def channels=(channels)
-          ALSA::try_to "set channel count : #{channels}" do
-            ALSA::PCM::Native::hw_params_set_channels self.device.handle, self.handle, channels
-          end
-        end
-
-        def sample_rate=(sample_rate)
-          ALSA::try_to "set sample rate" do
-            rate = FFI::MemoryPointer.new(:int)
-            rate.write_int(sample_rate)
-
-            dir = FFI::MemoryPointer.new(:int)
-            dir.write_int(0)
-
-            error_code = ALSA::PCM::Native::hw_params_set_rate_near self.device.handle, self.handle, rate, dir
-
-            rate.free
-            dir.free
-
-            error_code
-          end
-        end
-
-        def sample_rate
-          rate = nil
-          ALSA::try_to "get sample rate" do
-            rate_pointer = FFI::MemoryPointer.new(:int)
-            dir_pointer = FFI::MemoryPointer.new(:int)
-            dir_pointer.write_int(0)
-
-            error_code = ALSA::PCM::Native::hw_params_get_rate self.handle, rate_pointer, dir_pointer
-
-            rate = rate_pointer.read_int
-
-            rate_pointer.free
-            dir_pointer.free
-
-            error_code
-          end
-          rate
-        end
-
-        def sample_format=(sample_format)
-          ALSA::try_to "set sample format" do
-            ALSA::PCM::Native::hw_params_set_format self.device.handle, self.handle, ALSA::PCM::Native::Format.const_get(sample_format.to_s.upcase)
-          end
-        end
-
-        def sample_format
-          format = nil
-          FFI::MemoryPointer.new(:int) do |format_pointer|
-            ALSA::try_to "get sample format" do
-              ALSA::PCM::Native::hw_params_get_format self.handle, format_pointer
-            end
-            format = format_pointer.read_int
-          end
-          format
-        end
-
-        def channels
-          channels = nil
-          FFI::MemoryPointer.new(:int) do |channels_pointer|
-            ALSA::try_to "get channels" do
-              ALSA::PCM::Native::hw_params_get_channels self.handle, channels_pointer
-            end
-            channels = channels_pointer.read_int
-          end
-          channels
-        end
-
-        def buffer_size_for(frame_count)
-          ALSA::PCM::Native::format_size(self.sample_format, frame_count) * self.channels
-        end
-
-        def free
-          ALSA::try_to "unallocate hw_params" do
-            ALSA::PCM::Native::hw_params_free self.handle
-          end
-        end
-
-      end
-
-    end
-
-    module Native
-      extend FFI::Library
-      ffi_lib "libasound.so"
-
-      STREAM_CAPTURE = 1
-      BLOCK = 0
-      attach_function :open, :snd_pcm_open, [:pointer, :string, :int, :int], :int
-      attach_function :prepare, :snd_pcm_prepare, [ :pointer ], :int
-      attach_function :close, :snd_pcm_close, [:pointer], :int
-
-      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
-
-      attach_function :hw_params, :snd_pcm_hw_params, [ :pointer, :pointer ], :int
-      attach_function :hw_params_any, :snd_pcm_hw_params_any, [:pointer, :pointer], :int
-      attach_function :hw_params_current, :snd_pcm_hw_params_current, [ :pointer, :pointer ], :int
-
-
-      module Access
-        MMAP_INTERLEAVED = 0
-        MMAP_NONINTERLEAVED = 1
-        MMAP_COMPLEX = 2
-        RW_INTERLEAVED = 3
-        RW_NONINTERLEAVED = 4
-      end
-
-      attach_function :hw_params_set_access, :snd_pcm_hw_params_set_access, [ :pointer, :pointer, :int ], :int
-
-      module Format
-        S16_LE = 2
-      end
-      
-      attach_function :hw_params_set_format, :snd_pcm_hw_params_set_format, [ :pointer, :pointer, :int ], :int
-      attach_function :hw_params_get_format, :snd_pcm_hw_params_get_format, [ :pointer, :pointer ], :int
-      attach_function :hw_params_get_rate, :snd_pcm_hw_params_get_rate, [ :pointer, :pointer, :pointer ], :int
-      attach_function :hw_params_set_rate_near, :snd_pcm_hw_params_set_rate_near, [ :pointer, :pointer, :pointer, :pointer ], :int
-      attach_function :hw_params_set_channels, :snd_pcm_hw_params_set_channels, [ :pointer, :pointer, :uint ], :int
-      attach_function :hw_params_get_channels, :snd_pcm_hw_params_get_format, [ :pointer, :pointer ], :int
-      attach_function :hw_params_set_periods, :snd_pcm_hw_params_set_periods, [ :pointer, :pointer, :uint, :int ], :int
-
-      attach_function :format_size, :snd_pcm_format_size, [ :int, :uint ], :int
-    end
-  end
-end