taglib2 0.1.4 → 0.1.5

data/ChangeLog

@@ -1,3 +1,9 @@
+# 0.1.5
+Fix a bug when TagLib::File.new method is called with a second argument
+Migrate to minitest (tests are now supported for ruby 1.9).
+
+# 0.1.4
+Fix a segfault (when BadPath exception is raised)
 Add tests files in gem package
 
 # 0.1.3

data/Rakefile

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 =begin
-Copyright 2010 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.

data/compat/taglib.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright 2010-2011 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.

data/lib/taglib2.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright 2010 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.
@@ -23,5 +23,5 @@ require "taglib2.so"
 
 #:main: TagLib::File
 module TagLib
-VERSION=[0, 1, 4]
+VERSION=[0, 1, 5]
 end

data/taglib2.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2010-2011 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.
@@ -121,7 +121,7 @@ file_init(int argc, VALUE* argv, VALUE self)
 	}
 	else
 	{
-        taglib_file_new_type(StringValuePtr(path), NUM2INT(type));
+        tgFile=taglib_file_new_type(StringValuePtr(path), NUM2INT(type));
 	}
     if (tgFile==NULL)
         rb_raise(eBadFile, "Bad file");

data/tests/compat.rb

@@ -19,10 +19,8 @@ This file is part of ruby-taglib2.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
-class CompatTest < Test::Unit::TestCase
-	@@read=TaglibTestsUtil.read
-
-	def test_badpath_new
- 		assert_nothing_raised{TagLib::BadPath.new}
+class BadPathTest < MiniTest::Unit::TestCase
+	def test_raise
+ 		assert_raises(TagLib::BadPath){raise TagLib::BadPath}
 	end
 end

data/tests/constants.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright 2010-2011 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.
@@ -19,7 +19,7 @@ This file is part of ruby-taglib2.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
-class ConstantsTest < Test::Unit::TestCase
+class ConstantsTest < MiniTest::Unit::TestCase
 	def test_mpeg
 		assert_instance_of(Fixnum, TagLib::MPEG)
 	end

data/tests/exceptions.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright 2010-2011 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.
@@ -19,20 +19,20 @@ This file is part of ruby-taglib2.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
-class BadFileTest < Test::Unit::TestCase
-	def test_new
- 		assert_nothing_raised{TagLib::BadFile.new}
+class BadFileTest < MiniTest::Unit::TestCase
+	def test_raise
+ 		assert_raises(TagLib::BadFile){raise TagLib::BadFile}
 	end
 end
 
-class BadTagTest < Test::Unit::TestCase
-	def test_new
- 		assert_nothing_raised{TagLib::BadTag.new}
+class BadTagTest < MiniTest::Unit::TestCase
+	def test_raise
+ 		assert_raises(TagLib::BadTag){raise TagLib::BadTag}
 	end
 end
 
-class BadAudioPropertiesTest < Test::Unit::TestCase
-	def test_new
- 		assert_nothing_raised{TagLib::BadAudioProperties.new}
+class BadAudioPropertiesTest < MiniTest::Unit::TestCase
+	def test_raise
+ 		assert_raises(TagLib::BadAudioProperties){raise TagLib::BadAudioProperties}
 	end
 end

data/tests/file.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright 2010-2011 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.
@@ -19,47 +19,50 @@ This file is part of ruby-taglib2.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
-class TLFileTest < Test::Unit::TestCase
-	@@tmp=TaglibTestsUtil.tmp
-	@@read=TaglibTestsUtil.read
-	@@empty=TaglibTestsUtil.empty
-	@@write=TaglibTestsUtil.write
-	@@exceptions=TaglibTestsUtil.exceptions
-
-	def TLFileTest.suite
-		suite=super
-		def suite.setup
-			TaglibTestsUtil.setup
-		end
-		def suite.teardown
-			TaglibTestsUtil.teardown
-		end
-		suite
-	end
+class TagLibFileTest < MiniTest::Unit::TestCase
+	dir=File.expand_path(File.dirname(__FILE__))
+	tmp=File.join(dir, 'tmp')
+	data=File.join(dir, 'data')
+	READ=File.join(tmp, 'read.wav')
+	EMPTY=File.join(tmp, 'empty')
+	WRITE=File.join(tmp, 'write.wav')
+	EXCEPTIONS=File.join(tmp, 'exceptions.ogg')
+
+	FileUtils.mkdir(tmp)
+	FileUtils.copy(File.join(data, 'silence.wav'), READ)
+	FileUtils.copy(File.join(data, 'empty'), EMPTY)
+	FileUtils.copy(File.join(data, 'silence.wav'), WRITE)
+	FileUtils.copy(File.join(data, 'exceptions.ogg'), EXCEPTIONS)	
+
+	MiniTest::Unit.after_tests{FileUtils.remove_entry_secure(tmp)}
 
 	def test_new
-		assert_nothing_raised{TagLib::File.new(@@read)}
+		assert_instance_of(TagLib::File, TagLib::File.new(READ))
+	end
+
+	def test_new2
+		assert_instance_of(TagLib::File, TagLib::File.new(READ, TagLib::OggVorbis))
 	end
 
 	def test_badfile
-		assert_raise(TagLib::BadFile){TagLib::File.new(@@empty)}
+		assert_raises(TagLib::BadFile){TagLib::File.new(EMPTY)}
 	end
 
 	def test_badtag
-		assert_raise(TagLib::BadTag){
-			f=TagLib::File.new(@@exceptions)
+		assert_raises(TagLib::BadTag){
+			f=TagLib::File.new(EXCEPTIONS)
 			f.title
 		}
 	end
 
 	def test_badaudio
-		assert_raise(TagLib::BadAudioProperties){
-			f=TagLib::File.new(@@exceptions)
+		assert_raises(TagLib::BadAudioProperties){
+			f=TagLib::File.new(EXCEPTIONS)
 			f.length
 		}
 	end
 
-	def read_tag(file, tag)
+	def check_tag(file, tag)
 		assert_equal(tag[:title], file.title)
 		assert_equal(tag[:artist], file.artist)
 		assert_equal(tag[:album], file.album)
@@ -69,18 +72,20 @@ class TLFileTest < Test::Unit::TestCase
 		assert_equal(tag[:track], file.track)
 	end
 
-	def test_read
-		f=TagLib::File.new(@@read)
-		read_tag(f, {:title=>'Title', :artist=>'Artist', :album=>'Album',
+
+	def test_readtag
+		f=TagLib::File.new(READ)
+		check_tag(f, {:title=>'Title', :artist=>'Artist', :album=>'Album',
 			:comment=>'Comment', :genre=>'Genre', :year=>2010, :track=>12})
-#		assert_equal(, f.length)
-		assert_equal(62, f.bitrate)
+		assert_equal(3, f.length)
+		assert_equal(64, f.bitrate)
 		assert_equal(8000, f.samplerate)
 		assert_equal(1, f.channels)
 	end
 
 	def test_write
-		f=TagLib::File.new(@@write)
+		f=TagLib::File.new(WRITE)
+		assert_instance_of(TagLib::File, f)
 		f.title="title"
 		f.artist="artist"
 		f.album="album"
@@ -88,16 +93,14 @@ class TLFileTest < Test::Unit::TestCase
 		f.genre="genre"
 		f.year=1020
 		f.track=21
-		f.save
-		read_tag(TagLib::File.new(@@write), {:title=>'title', :artist=>'artist',
+		assert_equal(true, f.save)
+		check_tag(TagLib::File.new(WRITE), {:title=>'title', :artist=>'artist',
 			:album=>'album', :comment=>'comment', :genre=>'genre',
 			:year=>1020, :track=>21})
 	end
-	
+
 	def test_close
-		assert_nothing_raised{
-			f=TagLib::File.new(@@read)
-			f.close
-		}
+		f=TagLib::File.new(READ)
+		assert_equal(f, f.close)
 	end
 end

data/tests/tests.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright 2010-2011 Vincent Carmona
+Copyright 2010-2012 Vincent Carmona
 vinc4mai+taglib@gmail.com
 
 This file is part of ruby-taglib2.
@@ -19,79 +19,30 @@ This file is part of ruby-taglib2.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
-require "test/unit"
-require 'ftools'
+require 'fileutils'
+require 'minitest/autorun'
 
-class Test::Unit::TestSuite
-	alias :old_testunit_run_for_taglib2 :run
-	def run(result, &progress_block)
-		setup if respond_to?(:setup)
-		old_testunit_run_for_taglib2(result, &progress_block)
-		teardown if respond_to?(:teardown)
-	end
-end
-
-class TaglibTestsUtil
-	dir=File.expand_path(File.dirname(__FILE__))
-	@@tmp=File.join(dir, 'tmp')
-	@@read=File.join(@@tmp, 'read.wav')
-	@@empty=File.join(@@tmp, 'empty')
-	@@write=File.join(@@tmp, 'write.wav')
-	@@exceptions=File.join(@@tmp, 'exceptions.ogg')
-
-	def TaglibTestsUtil.tmp
-		@@tmp
-	end
-
-	def TaglibTestsUtil.read
-		@@read
-	end
-
-	def TaglibTestsUtil.empty
-		@@empty
-	end
-
-	def TaglibTestsUtil.write
-		@@write
-	end
-
-	def TaglibTestsUtil.exceptions
-		@@exceptions
-	end
-
-	def TaglibTestsUtil.clean
-		if File.exists?(@@tmp)
-			File.delete(*Dir.glob(File.join(@@tmp, '*')))
-			Dir.rmdir(@@tmp)
-		end
-	end
-
-	def TaglibTestsUtil.setup
-		data=File.join(@@tmp, '..', 'data')
-		TaglibTestsUtil.clean
-		File.makedirs(@@tmp)
-		File.copy(File.join(data, 'silence.wav'), @@read)
-		File.copy(File.join(data, 'empty'), @@empty)
-		File.copy(File.join(data, 'silence.wav'), @@write)
-		File.copy(File.join(data, 'exceptions.ogg'), @@exceptions)
-	end
-
-	def TaglibTestsUtil.teardown
-		TaglibTestsUtil.clean
-	end
+compat=false
+if ARGV.include?('--compat')
+	ARGV.delete('--compat')
+	compat=true
 end
 
 dir=File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $:.unshift(dir)
 $:.unshift(File.join(dir, 'lib'))
-if ARGV.include?('--compat')
-	ARGV.delete('--compat')
+if compat
 	$:.unshift(File.join(dir, 'compat'))
 	require 'taglib'
-	require 'tests/compat'
 else
 	require "taglib2"
 end
-require 'tests/constants'
-require 'tests/exceptions'
-require 'tests/file'
+puts "taglib2 version #{TagLib::VERSION.join('.')}"
+
+tests=%w(constants exceptions file)
+tests << "compat" if compat
+if Kernel.respond_to? :require_relative
+	tests.each{|test| require_relative test}
+else#DEPRECATED: ruby1.8
+	tests.each{|test| require File.join(dir, 'tests', test)}
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: taglib2
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Vincent Carmona
@@ -36,7 +36,7 @@ cert_chain:
   oxzIRXlS
   -----END CERTIFICATE-----
 
-date: 2012-01-21 00:00:00 Z
+date: 2012-02-20 00:00:00 Z
 dependencies: []
 
 description: 
@@ -52,12 +52,12 @@ files:
 - compat/taglib.rb
 - taglib2.c
 - extconf.rb
-- tests/data/silence.wav
 - tests/data/empty
 - tests/data/exceptions.ogg
+- tests/data/silence.wav
 - tests/tests.rb
-- tests/exceptions.rb
 - tests/constants.rb
+- tests/exceptions.rb
 - tests/file.rb
 - tests/compat.rb
 - ChangeLog