ruby-audio 1.4.0 → 1.5.0

data/Rakefile

@@ -3,46 +3,79 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'spec/rake/spectask'
+require 'rake/extensiontask'
+require 'rake/extensioncompiler'
+require 'mini_portile'
 
-spec = Gem::Specification.new do |s|
-  s.name    = 'ruby-audio'
-  s.version = '1.4.0'
-  s.summary = 'ruby-audio wraps around libsndfile to provide simplified sound reading and writing support to ruby programs'
-  s.authors  = ['Stephen Augenstein']
-  s.email    = 'perl.programmer@gmail.com'
-  s.homepage = 'http://github.com/warhammerkid/ruby-audio'
-
-  s.platform      = Gem::Platform::RUBY
-  s.rdoc_options  << '--line-numbers' << '--main' << 'README.rdoc'
-  s.rdoc_options  += FileList['ext/**/*.c', 'README.rdoc']
-  s.files         = FileList['README.rdoc', 'Rakefile', 'LICENSE', 'lib/**/*.rb', 'spec/**/*.{rb,opts,wav,mp3}', 'ext/extconf.rb', 'ext/*.{c,h}']
-  s.extensions    = ["ext/extconf.rb"]
-  s.test_files    = Dir[*['spec/**/*_spec.rb']]
-
-  s.requirements << 'libsndfile (http://www.mega-nerd.com/libsndfile/)'
-end
-
-desc 'Default: Run the tests'
+desc 'Default: run the specs.'
 task :default => :spec
 
-# Rake gem & package routines
-Rake::GemPackageTask.new(spec).define
+# I don't want to depend on bundler, so we do it the bundler way without it
+gemspec_path = 'ruby-audio.gemspec'
+spec = begin
+  eval(File.read(File.join(File.dirname(__FILE__), gemspec_path)), TOPLEVEL_BINDING, gemspec_path)
+rescue LoadError => e
+  original_line = e.backtrace.find { |line| line.include?(gemspec_path) }
+  msg  = "There was a LoadError while evaluating #{gemspec_path}:\n  #{e.message}"
+  msg << " from\n  #{original_line}" if original_line
+  msg << "\n"
+  puts msg
+  exit
+end
 
-desc 'Generate a gemspec file'
-task :gemspec do
-  File.open("#{spec.name}.gemspec", 'w') do |f|
-    f.write spec.to_ruby
-  end
+$recipes = {}
+LIBSNDFILE_VERSION = '1.0.24'
+$recipes[:libsndfile] = MiniPortile.new "libsndfile", LIBSNDFILE_VERSION
+$recipes[:libsndfile].files << "http://www.mega-nerd.com/libsndfile/files/libsndfile-#{LIBSNDFILE_VERSION}.tar.gz"
+$recipes.each { |_, recipe| recipe.host = Rake::ExtensionCompiler.mingw_host }
+
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--options', 'spec/spec.opts']
 end
 
-desc "Generate documentation"
+desc 'Generate documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ruby-audio'
-  rdoc.options  = spec.rdoc_options
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.title    = spec.name
+  rdoc.options += spec.rdoc_options
+  rdoc.rdoc_files.include(*spec.extra_rdoc_files)
+  rdoc.rdoc_files.include("lib")
 end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', 'spec/spec.opts']
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_zip = false
+  pkg.need_tar = false
+end
+
+Rake::ExtensionTask.new('rubyaudio_ext', spec) do |ext|
+  if RUBY_PLATFORM =~ /mswin|mingw/ then
+    # No cross-compile on win, so compile extension to lib/1.[89]
+    RUBY_VERSION =~ /(\d+\.\d+)/
+    ext.lib_dir = "lib/#{$1}"
+  else
+    ext.cross_compile = true
+    ext.cross_platform = 'x86-mingw32'
+    ext.cross_config_options << "--with-sndfile-dir=#{$recipes[:libsndfile].path}"
+    ext.cross_compiling do |gem_spec|
+      gem_spec.post_install_message = "You installed the binary version of this gem!"
+    end
+  end
+end
+
+namespace :cross do
+  task :libsndfile do
+    recipe = $recipes[:libsndfile]
+    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
+  end
+end
+task :cross => ["cross:libsndfile"]
+
+desc "Build gem packages"
+task :gems do
+  sh "rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2"
 end

data/ext/rubyaudio_ext/extconf.rb

@@ -0,0 +1,32 @@
+require 'mkmf'
+
+$CFLAGS.gsub!("-arch i386", "")
+$LDFLAGS.gsub!("-arch i386", "")
+
+dir_config('sndfile')
+
+# Mega-Nerd windows installer installs as libsndfile-1.dll
+if RUBY_PLATFORM =~ /(mswin|mingw|cygwin)/
+  sndfile_lib = 'sndfile-1'
+else
+  sndfile_lib = 'sndfile'
+end
+
+INCLUDE_DIRS = ['/opt/local/include', '/usr/local/include', 'C:/Program Files/Mega-Nerd/libsndfile/include', 'C:/Program Files (x86)/Mega-Nerd/libsndfile/include']
+LIB_DIRS = ['/opt/local/lib', '/usr/local/lib', 'C:/Program Files/Mega-Nerd/libsndfile', 'C:/Program Files (x86)/Mega-Nerd/libsndfile']
+
+# libsndfile requirements
+find_header 'sndfile.h', *INCLUDE_DIRS
+unless ['sndfile-1', 'sndfile'].any? {|lib| find_library lib, 'sf_open', *LIB_DIRS}
+  fail <<-EOM
+  Can't find libsndfile (http://www.mega-nerd.com/libsndfile/)
+
+  Try passing --with-sndfile-dir or --with-sndfile-lib and --with-sndfile-include
+  options to extconf. If there are spaces in the path on windows, it may not work.
+  EOM
+end
+
+# Check for format support
+have_const('SF_FORMAT_OGG', 'sndfile.h')
+
+create_makefile 'rubyaudio_ext'

data/lib/ruby-audio.rb

@@ -1,4 +1,10 @@
-require 'rubyaudio_ext'
+begin
+  # Fat binaries for Windows
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/rubyaudio_ext"
+rescue LoadError
+  require "rubyaudio_ext"
+end
 require 'ruby-audio/buffer'
 require 'ruby-audio/sound_info'
 require 'ruby-audio/sound'

data/ruby-audio.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name        = 'ruby-audio'
+  s.version     = '1.5.0'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Stephen Augenstein']
+  s.email       = ['perl.programmer@gmail.com']
+  s.homepage    = 'http://github.com/warhammerkid/ruby-audio'
+  s.summary     = 'libsndfile wrapper for ruby'
+  s.description = 'ruby-audio wraps around libsndfile to provide simplified sound reading and writing support to ruby programs'
+
+  s.files         = Dir['ruby-audio.gemspec', 'README.rdoc', 'LICENSE', 'Rakefile', 'lib/**/*.rb', 'spec/**/*.{rb,opts,wav,mp3}', 'ext/**/*.{c,h,rb}']
+  s.test_files    = Dir['spec/**/*_spec.rb']
+  s.extensions    = Dir["ext/**/extconf.rb"]
+
+  s.requirements << 'libsndfile (http://www.mega-nerd.com/libsndfile/)'
+
+  s.has_rdoc         = true
+  s.extra_rdoc_files = Dir['README.rdoc', 'ext/**/*.c']
+  s.rdoc_options     = ['--line-numbers', '--main', 'README.rdoc']
+end

data/spec/spec_helper.rb

@@ -7,6 +7,5 @@ rescue LoadError
 end
 require 'spec/autorun'
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ruby-audio'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-audio
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Stephen Augenstein
@@ -15,22 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -05:00
+date: 2011-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: 
-email: perl.programmer@gmail.com
+description: ruby-audio wraps around libsndfile to provide simplified sound reading and writing support to ruby programs
+email: 
+- perl.programmer@gmail.com
 executables: []
 
 extensions: 
-- ext/extconf.rb
-extra_rdoc_files: []
-
+- ext/rubyaudio_ext/extconf.rb
+extra_rdoc_files: 
+- README.rdoc
+- ext/rubyaudio_ext/ra_buffer.c
+- ext/rubyaudio_ext/ra_sound.c
+- ext/rubyaudio_ext/ra_soundinfo.c
+- ext/rubyaudio_ext/rubyaudio_ext.c
 files: 
+- ruby-audio.gemspec
 - README.rdoc
-- Rakefile
 - LICENSE
+- Rakefile
 - lib/ruby-audio/buffer.rb
 - lib/ruby-audio/sound.rb
 - lib/ruby-audio/sound_info.rb
@@ -43,14 +49,14 @@ files:
 - spec/data/what.wav
 - spec/data/what2.wav
 - spec/data/what.mp3
-- ext/extconf.rb
-- ext/ra_buffer.c
-- ext/ra_sound.c
-- ext/ra_soundinfo.c
-- ext/rubyaudio_ext.c
-- ext/ra_buffer.h
-- ext/ra_sound.h
-- ext/ra_soundinfo.h
+- ext/rubyaudio_ext/ra_buffer.c
+- ext/rubyaudio_ext/ra_sound.c
+- ext/rubyaudio_ext/ra_soundinfo.c
+- ext/rubyaudio_ext/rubyaudio_ext.c
+- ext/rubyaudio_ext/ra_buffer.h
+- ext/rubyaudio_ext/ra_sound.h
+- ext/rubyaudio_ext/ra_soundinfo.h
+- ext/rubyaudio_ext/extconf.rb
 has_rdoc: true
 homepage: http://github.com/warhammerkid/ruby-audio
 licenses: []
@@ -60,11 +66,6 @@ rdoc_options:
 - --line-numbers
 - --main
 - README.rdoc
-- ext/ra_buffer.c
-- ext/ra_sound.c
-- ext/ra_soundinfo.c
-- ext/rubyaudio_ext.c
-- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,7 +92,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: ruby-audio wraps around libsndfile to provide simplified sound reading and writing support to ruby programs
+summary: libsndfile wrapper for ruby
 test_files: 
 - spec/buffer_spec.rb
 - spec/sound_info_spec.rb

data/ext/extconf.rb

@@ -1,29 +0,0 @@
-require 'mkmf'
-
-$CFLAGS.gsub!("-arch i386", "")
-$LDFLAGS.gsub!("-arch i386", "")
-
-dir_config('sndfile')
-
-# Mega-Nerd windows installer installs as libsndfile-1.dll
-if RUBY_PLATFORM =~ /(mswin|mingw|cygwin)/
-  sndfile_lib = 'sndfile-1'
-else
-  sndfile_lib = 'sndfile'
-end
-
-# libsndfile requirements
-find_header 'sndfile.h', '/opt/local/include', '/usr/local/include', 'C:/Program Files/Mega-Nerd/libsndfile/include'
-unless find_library sndfile_lib, 'sf_open', '/opt/local/lib', '/usr/local/lib', 'C:/Program Files/Mega-Nerd/libsndfile'
-  fail <<-EOM
-  Can't find libsndfile (http://www.mega-nerd.com/libsndfile/)
-
-  Try passing --with-sndfile-dir or --with-sndfile-lib and --with-sndfile-include
-  options to extconf.
-  EOM
-end
-
-# Check for format support
-have_const('SF_FORMAT_OGG', 'sndfile.h')
-
-create_makefile 'rubyaudio_ext'