alsa-backup 0.0.8 → 0.10

data/COPYRIGHT

@@ -0,0 +1,14 @@
+Copyright © 2009, 2010 Alban Peignier, Florent Peyraud
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General public License for more details.
+
+You should have received a copy of the GNU General public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/Manifest.txt

@@ -1,4 +1,6 @@
 .autotest
+COPYING
+COPYRIGHT
 History.txt
 Manifest.txt
 PostInstall.txt
@@ -8,7 +10,6 @@ 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
@@ -16,15 +17,16 @@ lib/alsa_backup/length_controller.rb
 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

data/README.rdoc

@@ -1,6 +1,6 @@
 = AlsaBackup
 
-* http://github.com/alban.peignier/alsa-backup
+* http://projects.tryphon.eu/alsa-backup
 
 == DESCRIPTION:
 
@@ -78,29 +78,19 @@ See config.sample.
 == INSTALL:
 
   sudo apt-get install libasound2 libsndfile1
-  sudo gem install --source http://gems.github.com albanpeignier-alsa-backup
+  sudo gem install --source http://gemcutter.org alsa-backup
 
 == LICENSE:
 
-(The MIT License)
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-Copyright (c) 2009 Alban Peignier 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General public License for more details.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+You should have received a copy of the GNU General public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/Rakefile

@@ -1,65 +1,65 @@
-require 'rubygems' unless ENV['NO_RUBYGEMS']
-%w[rake rake/clean fileutils newgem hoe rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/alsa_backup'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec('alsa-backup') do |p|
-  p.version = AlsaBackup::VERSION
-  p.readme_file   = 'README.rdoc'
-  p.developer('Alban Peignier', 'alban@tryphon.eu')
-  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'], [ 'newgem', ">= #{::Newgem::VERSION}" ], [ 'daemons', '>= 1.0.10' ]
-  ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  p.url = 'http://projects.tryphon.eu/alsa-backup'
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-desc 'Recreate Manifest.txt to include ALL files'
-task :manifest do
-  `rake check_manifest | patch -p0 > Manifest.txt`
-end
-
-desc "Generate a #{$hoe.name}.gemspec file"
-task :gemspec do
-  File.open("#{$hoe.name}.gemspec", "w") do |file|
-    file.puts $hoe.spec.to_ruby
-  end
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-task :default => :spec
-
-namespace :gems do
-  task :install do
-    gems = %w{active_support ffi rspec daemons}
-    sh "sudo gem install #{gems.join(' ')}"
-  end
-end
-
-require 'debian/build'
-
-include Debian::Build
-require 'debian/build/config'
-
-namespace "package" do
-  Package.new(:"alsa-backup") do |t|
-    t.version = '0.0.8'
-    t.debian_increment = 1
-
-    t.source_provider = GitExportProvider.new
-  end
-end
-
-require 'debian/build/tasks'
+require 'rubygems' unless ENV['NO_RUBYGEMS']
+%w[rake rake/clean fileutils newgem hoe rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/alsa_backup'
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.spec('alsa-backup') do |p|
+  p.version = AlsaBackup::VERSION
+  p.readme_file   = 'README.rdoc'
+  p.developer('Alban Peignier', 'alban@tryphon.eu')
+  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'], [ 'newgem', ">= #{::Newgem::VERSION}" ], [ 'daemons', '>= 1.0.10' ]
+  ]
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
+  p.url = 'http://projects.tryphon.eu/alsa-backup'
+  
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+end
+
+desc 'Recreate Manifest.txt to include ALL files'
+task :manifest do
+  `rake check_manifest | patch -p0 > Manifest.txt`
+end
+
+desc "Generate a #{$hoe.name}.gemspec file"
+task :gemspec do
+  File.open("#{$hoe.name}.gemspec", "w") do |file|
+    file.puts $hoe.spec.to_ruby
+  end
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+task :default => :spec
+
+namespace :gems do
+  task :install do
+    gems = %w{active_support ffi rspec daemons}
+    sh "sudo gem install #{gems.join(' ')}"
+  end
+end
+
+require 'debian/build'
+
+include Debian::Build
+require 'debian/build/config'
+
+namespace "package" do
+  Package.new(:"alsa-backup") do |t|
+    t.version = '0.10'
+    t.debian_increment = 1
+
+    t.source_provider = GitExportProvider.new
+  end
+end
+
+require 'debian/build/tasks'

data/alsa-backup.gemspec

@@ -2,46 +2,46 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alsa-backup}
-  s.version = "0.0.8"
+  s.version = "0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2010-01-23}
+  s.date = %q{2010-10-14}
   s.default_executable = %q{alsa-backup}
   s.description = %q{ALSA client to perform continuous recording}
   s.email = ["alban@tryphon.eu"]
   s.executables = ["alsa-backup"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  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.files = [".autotest", "COPYING", "COPYRIGHT", "History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "TODO", "alsa-backup.gemspec", "bin/alsa-backup", "config.sample", "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", "lib/syslog_logger.rb", "script/console", "script/destroy", "script/generate", "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/fixtures/config_test.rb", "spec/sndfile/info_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
   s.homepage = %q{http://projects.tryphon.eu/alsa-backup}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{alsa-backup}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ALSA client to perform continuous recording}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi>, [">= 0.3.5"])
-      s.add_runtime_dependency(%q<newgem>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<newgem>, [">= 1.5.3"])
       s.add_runtime_dependency(%q<daemons>, [">= 1.0.10"])
-      s.add_development_dependency(%q<newgem>, [">= 1.5.2"])
-      s.add_development_dependency(%q<hoe>, [">= 2.5.0"])
+      s.add_development_dependency(%q<newgem>, [">= 1.5.3"])
+      s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
     else
       s.add_dependency(%q<ffi>, [">= 0.3.5"])
-      s.add_dependency(%q<newgem>, [">= 1.5.2"])
+      s.add_dependency(%q<newgem>, [">= 1.5.3"])
       s.add_dependency(%q<daemons>, [">= 1.0.10"])
-      s.add_dependency(%q<newgem>, [">= 1.5.2"])
-      s.add_dependency(%q<hoe>, [">= 2.5.0"])
+      s.add_dependency(%q<newgem>, [">= 1.5.3"])
+      s.add_dependency(%q<hoe>, [">= 2.6.2"])
     end
   else
     s.add_dependency(%q<ffi>, [">= 0.3.5"])
-    s.add_dependency(%q<newgem>, [">= 1.5.2"])
+    s.add_dependency(%q<newgem>, [">= 1.5.3"])
     s.add_dependency(%q<daemons>, [">= 1.0.10"])
-    s.add_dependency(%q<newgem>, [">= 1.5.2"])
-    s.add_dependency(%q<hoe>, [">= 2.5.0"])
+    s.add_dependency(%q<newgem>, [">= 1.5.3"])
+    s.add_dependency(%q<hoe>, [">= 2.6.2"])
   end
 end

data/lib/alsa_backup.rb

@@ -5,7 +5,7 @@ require 'active_support'
 require 'logger'
 
 module AlsaBackup
-  VERSION = '0.0.8'
+  VERSION = '0.10'
 
   def self.recorder
     @recorder ||= AlsaBackup::Recorder.new

data/lib/alsa_backup/core_ext.rb

@@ -5,6 +5,20 @@ class Time
     self.change(attribute => actual - actual%modulo)
   end
 
+  # FIXME cloned by waiting correct require 'active_support/..' for active_support > 3
+  def change(options)
+    ::Time.send(
+                self.utc? ? :utc : :local, 
+                options[:year]  || self.year, 
+                options[:month] || self.month, 
+                options[:mday]  || self.mday, 
+                options[:hour]  || self.hour, 
+                options[:min]   || (options[:hour] ? 0 : self.min),
+                options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
+                options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
+                )
+  end
+  
 end
 
 class File

data/lib/alsa_backup/recorder.rb

@@ -15,7 +15,7 @@ module AlsaBackup
     end
 
     attr_accessor :file, :directory, :error_handler
-    attr_accessor :device, :sample_rate, :channels
+    attr_accessor :device, :sample_rate, :channels, :buffer_time, :period_time
 
     def start(seconds_to_record = nil)
       length_controller = self.length_controller(seconds_to_record)
@@ -39,7 +39,14 @@ module AlsaBackup
     end
 
     def open_capture(&block)
-      ALSA::PCM::Capture.open(device, format(:sample_format => :s16_le), &block)      
+      ALSA::PCM::Capture.open(device, alsa_options, &block)      
+    end
+
+    def alsa_options
+      format(:sample_format => :s16_le).tap do |alsa_options|
+        alsa_options[:buffer_time] = buffer_time if buffer_time
+        alsa_options[:period_time] = period_time if period_time
+      end
     end
 
     def handle_error(e, try_to_continue = true)

data/lib/alsa_backup/writer.rb

@@ -19,9 +19,7 @@ module AlsaBackup
       @file = options[:file]
       @format = options[:format]
 
-      @on_close_callbacks = [ Proc.new do |file| 
-                                Writer.delete_empty_file(file)
-                              end ]
+      @on_close_callbacks = []
       @on_close_callbacks << options[:on_close] if options[:on_close]
     end
 
@@ -59,6 +57,9 @@ module AlsaBackup
 
     def on_close(file)
       AlsaBackup.logger.info('close current file')
+      return if Writer.delete_empty_file(file)
+
+      AlsaBackup.logger.debug("invoke #{@on_close_callbacks.size} callback(s)")
       @on_close_callbacks.each do |callback|
         begin
           callback.call(file) 

data/lib/syslog_logger.rb

@@ -0,0 +1,190 @@
+require 'syslog'
+require 'logger'
+
+##
+# SyslogLogger is a Logger work-alike that logs via syslog instead of to a
+# file.  You can add SyslogLogger to your Rails production environment to
+# aggregate logs between multiple machines.
+#
+# By default, SyslogLogger uses the program name 'rails', but this can be
+# changed via the first argument to SyslogLogger.new.
+#
+# NOTE! You can only set the SyslogLogger program name when you initialize
+# SyslogLogger for the first time.  This is a limitation of the way
+# SyslogLogger uses syslog (and in some ways, a limitation of the way
+# syslog(3) works).  Attempts to change SyslogLogger's program name after the
+# first initialization will be ignored.
+#
+# = Sample usage with Rails
+#
+# == config/environment/production.rb
+#
+# Add the following lines:
+#
+#   require 'syslog_logger'
+#   RAILS_DEFAULT_LOGGER = SyslogLogger.new
+#
+# == config/environment.rb
+#
+# In 0.10.0, change this line:
+#
+#   RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+#
+# to:
+#
+#   RAILS_DEFAULT_LOGGER ||= Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+#
+# Other versions of Rails should have a similar change.
+#
+# == BSD syslog setup
+#
+# === /etc/syslog.conf
+#
+# Add the following lines:
+#
+#  !rails
+#  *.*                                             /var/log/production.log
+#
+# Then touch /var/log/production.log and signal syslogd with a HUP
+# (killall -HUP syslogd, on FreeBSD).
+#
+# === /etc/newsyslog.conf
+#
+# Add the following line:
+#
+#   /var/log/production.log                 640  7     *    @T00  Z
+#
+# This creates a log file that is rotated every day at midnight, gzip'd, then
+# kept for 7 days.  Consult newsyslog.conf(5) for more details.
+#
+# == syslog-ng setup
+#
+# === syslog-ng.conf
+#
+# destination rails_log { file("/var/log/production.log"); };
+# filter f_rails { program("rails.*"); };
+# log { source(src); filter(f_rails); destination(rails_log); };
+#
+# == Starting
+#
+# Now restart your Rails app.  Your production logs should now be showing up
+# in /var/log/production.log.  If you have mulitple machines, you can log them
+# all to a central machine with remote syslog logging for analysis.  Consult
+# your syslogd(8) manpage for further details.
+
+class SyslogLogger
+
+  ##
+  # The version of SyslogLogger you are using.
+
+  VERSION = '1.4.0'
+
+  ##
+  # Maps Logger warning types to syslog(3) warning types.
+
+  LOGGER_MAP = {
+    :unknown => :alert,
+    :fatal   => :err,
+    :error   => :warning,
+    :warn    => :notice,
+    :info    => :info,
+    :debug   => :debug,
+  }
+
+  ##
+  # Maps Logger log levels to their values so we can silence.
+
+  LOGGER_LEVEL_MAP = {}
+
+  LOGGER_MAP.each_key do |key|
+    LOGGER_LEVEL_MAP[key] = Logger.const_get key.to_s.upcase
+  end
+
+  ##
+  # Maps Logger log level values to syslog log levels.
+
+  LEVEL_LOGGER_MAP = {}
+
+  LOGGER_LEVEL_MAP.invert.each do |level, severity|
+    LEVEL_LOGGER_MAP[level] = LOGGER_MAP[severity]
+  end
+
+  ##
+  # Builds a methods for level +meth+.
+
+  def self.make_methods(meth)
+    eval <<-EOM, nil, __FILE__, __LINE__ + 1
+      def #{meth}(message = nil)
+        return true if #{LOGGER_LEVEL_MAP[meth]} < @level
+        SYSLOG.#{LOGGER_MAP[meth]} clean(message || yield)
+        return true
+      end
+
+      def #{meth}?
+        @level <= Logger::#{meth.to_s.upcase}
+      end
+    EOM
+  end
+
+  LOGGER_MAP.each_key do |level|
+    make_methods level
+  end
+
+  ##
+  # Log level for Logger compatibility.
+
+  attr_accessor :level
+
+  ##
+  # Fills in variables for Logger compatibility.  If this is the first
+  # instance of SyslogLogger, +program_name+ may be set to change the logged
+  # program name.
+  #
+  # Due to the way syslog works, only one program name may be chosen.
+
+  def initialize(program_name = 'rails')
+    @level = Logger::DEBUG
+
+    return if defined? SYSLOG
+    self.class.const_set :SYSLOG, Syslog.open(program_name)
+  end
+
+  ##
+  # Almost duplicates Logger#add.  +progname+ is ignored.
+
+  def add(severity, message = nil, progname = nil, &block)
+    severity ||= Logger::UNKNOWN
+    return true if severity < @level
+    message = clean(message || block.call)
+    SYSLOG.send LEVEL_LOGGER_MAP[severity], clean(message)
+    return true
+  end
+
+  ##
+  # Allows messages of a particular log level to be ignored temporarily.
+  #
+  # Can you say "Broken Windows"?
+
+  def silence(temporary_level = Logger::ERROR)
+    old_logger_level = @level
+    @level = temporary_level
+    yield
+  ensure
+    @level = old_logger_level
+  end
+
+  private
+
+  ##
+  # Clean up messages so they're nice and pretty.
+
+  def clean(message)
+    message = message.to_s.dup
+    message.strip!
+    message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
+    message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
+    return message
+  end
+
+end
+