taglib-ruby 1.1.2 → 2.0.0

data/lib/taglib/version.rb

@@ -2,9 +2,9 @@
 
 module TagLib
   module Version
-    MAJOR = 1
-    MINOR = 1
-    PATCH = 2
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/taglib-ruby.gemspec

@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     'README.md'
   ]
   s.files = [
+    '.github/FUNDING.yml',
     '.rubocop.yml',
     '.yardopts',
     'CHANGELOG.md',

data/tasks/ext.rake

@@ -1,25 +1,19 @@
 # frozen-string-literal: true
 
+require_relative 'build'
+
 # Extension tasks and cross-compiling
 
 host = 'i686-w64-mingw32'
-$plat = ENV['PLATFORM'] || 'i386-mingw32'
-
-taglib_version = ENV['TAGLIB_VERSION'] || '1.9.1'
-taglib = "taglib-#{taglib_version}"
-
-tmp = "#{Dir.pwd}/tmp"
-tmp_arch = "#{tmp}/#{$plat}"
 toolchain_file = "#{Dir.pwd}/ext/win.cmake"
-install_dir = "#{tmp_arch}/#{taglib}"
-install_dll = "#{install_dir}/bin/libtag.dll"
-install_so = "#{install_dir}/lib/libtag.so"
-$cross_config_options = ["--with-opt-dir=#{install_dir}"]
+install_dll = "#{Build.install_dir}/bin/libtag.dll"
+$cross_config_options = ["--with-opt-dir=#{Build.install_dir}"]
 
-taglib_url = "https://github.com/taglib/taglib/archive/v#{taglib_version}.tar.gz"
+taglib_url = "https://github.com/taglib/taglib/archive/v#{Build.version}.tar.gz"
 taglib_options = ['-DCMAKE_BUILD_TYPE=Release',
                   '-DBUILD_EXAMPLES=OFF',
                   '-DBUILD_TESTS=OFF',
+                  '-DBUILD_TESTING=OFF', # used since 1.13 instead of BUILD_TESTS
                   '-DBUILD_BINDINGS=OFF', # 1.11 builds bindings by default
                   '-DBUILD_SHARED_LIBS=ON', # 1.11 builds static by default
                   '-DWITH_MP4=ON', # WITH_MP4, WITH_ASF only needed with taglib 1.7, will be default in 1.8
@@ -27,7 +21,7 @@ taglib_options = ['-DCMAKE_BUILD_TYPE=Release',
 
 def configure_cross_compile(ext)
   ext.cross_compile = true
-  ext.cross_platform = $plat
+  ext.cross_platform = Build.plat
   ext.cross_config_options.concat($cross_config_options)
   ext.cross_compiling do |gem|
     gem.files << 'lib/libtag.dll'
@@ -75,43 +69,33 @@ task :cross do
   ENV['CXX'] = "#{host}-g++"
 end
 
-file "#{tmp_arch}/stage/lib/libtag.dll" => [install_dll] do |f|
+file "#{Build.tmp_arch}/stage/lib/libtag.dll" => [install_dll] do |f|
   install install_dll, f
 end
 
-file install_dll => ["#{tmp}/#{taglib}"] do
-  chdir "#{tmp}/#{taglib}" do
-    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file} #{taglib_options})
+file install_dll => [Build.source] do
+  chdir Build.source do
+    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{Build.install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file} #{taglib_options})
     sh 'make VERBOSE=1'
     sh 'make install'
   end
 end
 
-task vendor: [install_so]
+task vendor: [Build.library]
 
-file install_so => ["#{tmp_arch}/#{taglib}", "#{tmp_arch}/#{taglib}-build", "#{tmp}/#{taglib}"] do
-  chdir "#{tmp_arch}/#{taglib}-build" do
-    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} #{taglib_options} #{tmp}/#{taglib})
-    sh 'make install VERBOSE=1'
+file Build.library => [Build.install_dir, Build.build_dir, Build.source] do
+  chdir Build.build_dir do
+    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{Build.install_dir} #{taglib_options} #{Build.source})
+    sh 'make install -j 4 VERBOSE=1'
   end
 end
 
-directory "#{tmp_arch}/#{taglib}"
-directory "#{tmp_arch}/#{taglib}-build"
+directory Build.install_dir
+directory Build.build_dir
+directory Build.tmp
 
-file "#{tmp}/#{taglib}" => ["#{tmp}/#{taglib}.tar.gz"] do
-  chdir tmp do
-    sh "tar xzf #{taglib}.tar.gz"
-  end
+file Build.source do
+  sh "git clone --depth=1 --branch=v#{Build.version} https://github.com/taglib/taglib.git #{Build.source}"
+  sh "git -C #{Build.source} submodule init"
+  sh "git -C #{Build.source} submodule update --depth=1"
 end
-
-file "#{tmp}/#{taglib}.tar.gz" => [tmp] do |t|
-  require 'open-uri'
-  puts "Downloading #{taglib_url}"
-
-  File.open(t.name, 'wb') do |f|
-    IO.copy_stream(open(taglib_url), f)
-  end
-end
-
-directory tmp

data/tasks/swig.rake

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+require_relative 'build'
+
 # Tasks for generating SWIG wrappers in ext
 
 # Execute SWIG for the specified extension.
@@ -11,9 +13,11 @@
 def run_swig(mod)
   swig = `which swig`.chomp
   swig = `which swig2.0`.chomp if swig.empty?
+  swiglib = `swig -swiglib`.chomp
+  abort 'swig failed' unless $?.success?
 
   # Standard search location for headers
-  include_args = %w[-I/usr/local/include -I/usr/include]
+  include_args = "-I#{Build.install_dir}/include"
 
   if ENV.key?('TAGLIB_DIR')
     unless File.directory?(ENV['TAGLIB_DIR'])
@@ -21,14 +25,20 @@ def run_swig(mod)
     end
 
     # Push it in front to get it searched first.
-    include_args.unshift("-I#{ENV['TAGLIB_DIR']}/include")
+    include_args = "-I#{ENV['TAGLIB_DIR']}/include"
   end
 
-  sh "cd ext/#{mod} && #{swig} -c++ -ruby -autorename -initname #{mod} #{include_args.join(' ')} #{mod}.i"
+  Dir.chdir("ext/#{mod}") do
+    sh "#{swig} -c++ -ruby -autorename -initname #{mod} #{include_args} #{mod}.i"
+    wrap = "#{mod}_wrap.cxx"
+    wrapdata = File.read(wrap)
+    File.write(wrap, wrapdata.gsub(swiglib, '/swig'))
+  end
 end
 
 task swig:
-  ['ext/taglib_base/taglib_base_wrap.cxx',
+  [Build.library,
+   'ext/taglib_base/taglib_base_wrap.cxx',
    'ext/taglib_mpeg/taglib_mpeg_wrap.cxx',
    'ext/taglib_id3v1/taglib_id3v1_wrap.cxx',
    'ext/taglib_id3v2/taglib_id3v2_wrap.cxx',

data/test/id3v2_write_test.rb

@@ -54,7 +54,7 @@ class TestID3v2Write < Test::Unit::TestCase
     end
 
     should 'be able to save ID3v2.3' do
-      success = @file.save(TagLib::MPEG::File::ID3v2, true, 3)
+      success = @file.save(TagLib::MPEG::File::ID3v2, TagLib::File::StripOthers, TagLib::ID3v2::V3)
       assert_equal true, success
       @file.close
       @file = nil

data/test/wav_examples_test.rb

@@ -19,7 +19,7 @@ class WAVExamples < Test::Unit::TestCase
 
       # Saving ID3v2 cover-art to disk
       TagLib::RIFF::WAV::File.open("#{DATA_FILE_PREFIX}sample.wav") do |file|
-        id3v2_tag = file.tag
+        id3v2_tag = file.id3v2_tag
         cover = id3v2_tag.frame_list('APIC').first
         ext = cover.mime_type.rpartition('/')[2]
         File.open("#{DATA_FILE_PREFIX}cover-art.#{ext}", 'wb') { |f| f.write cover.picture }

data/test/wav_file_test.rb

@@ -40,7 +40,7 @@ class WAVFileTest < Test::Unit::TestCase
 
     context 'ID3V2 tag' do
       setup do
-        @tag = @file.tag
+        @tag = @file.id3v2_tag
       end
 
       should 'exist' do

data/test/wav_file_write_test.rb

@@ -33,18 +33,18 @@ class WAVFileWriteTest < Test::Unit::TestCase
     end
 
     should 'have one picture frame' do
-      assert_equal 2, @file.tag.frame_list('APIC').size
+      assert_equal 2, @file.id3v2_tag.frame_list('APIC').size
     end
 
     should 'be able to remove all picture frames' do
-      @file.tag.remove_frames('APIC')
+      @file.id3v2_tag.remove_frames('APIC')
       success = @file.save
       assert success
       @file.close
       @file = nil
 
       reloaded do |file|
-        assert_equal 0, file.tag.frame_list('APIC').size
+        assert_equal 0, file.id3v2_tag.frame_list('APIC').size
       end
     end
 
@@ -58,18 +58,18 @@ class WAVFileWriteTest < Test::Unit::TestCase
       apic.picture = picture_data
       apic.type = TagLib::ID3v2::AttachedPictureFrame::BackCover
 
-      @file.tag.add_frame(apic)
+      @file.id3v2_tag.add_frame(apic)
       success = @file.save
       assert success
       @file.close
       @file = nil
 
       reloaded do |file|
-        assert_equal 3, file.tag.frame_list('APIC').size
+        assert_equal 3, file.id3v2_tag.frame_list('APIC').size
       end
 
       reloaded do |file|
-        written_apic = file.tag.frame_list('APIC')[2]
+        written_apic = file.id3v2_tag.frame_list('APIC')[2]
         assert_equal 'image/jpeg', written_apic.mime_type
         assert_equal 'desc', written_apic.description
         assert_equal picture_data, written_apic.picture

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taglib-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Robin Stocker
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".github/FUNDING.yml"
 - ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -279,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - taglib (libtag1-dev in Debian/Ubuntu, taglib-devel in Fedora/RHEL)
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby interface for the taglib C++ library