flac2mp3 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.1 2008-10-17
+
+* 1 enhancement:
+  * Content grouping ('tag', 'grouping') now carried over from FLAC to MP3 tags
+
 == 0.3.0 2008-07-29
 
 * 2 enhancements:

data/config/hoe.rb

@@ -2,11 +2,19 @@ require 'flac2mp3/version'
 
 AUTHOR = 'Yossef Mendelssohn'  # can also be an array of Authors
 EMAIL = 'ymendel@pobox.com'
-DESCRIPTION = "description of gem"
+DESCRIPTION = 'converter for FLAC to MP3'
 GEM_NAME = 'flac2mp3' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'yomendel' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+EXTRA_DEPENDENCIES = [
+  ['flacinfo-rb',  '>= 0.4'],
+  ['ruby-mp3info', '>= 0.5.1']
+]    # An array of rubygem dependencies [name, version]
+EXTRA_DEV_DEPENDENCIES = [
+  ['rspec', '>= 1.1.4'],
+  ['mocha', '>= 0.9.1']
+]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
 @config = nil
@@ -59,10 +67,8 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [       # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-    ['flacinfo-rb',  '>= 0.4'],
-    ['ruby-mp3info', '>= 0.5.1']
-  ]
+  p.extra_deps = EXTRA_DEPENDENCIES
+  p.extra_dev_deps = EXTRA_DEV_DEPENDENCIES
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/flac2mp3.rb

@@ -127,7 +127,8 @@ class Flac2mp3
         :tracktotal  => :TRCK,
         :discnumber  => :TPOS,
         :disctotal   => :TPOS,
-        :compilation => :TCMP
+        :compilation => :TCMP,
+        :tag         => :TIT1
       }
     end
     
@@ -160,7 +161,7 @@ class Flac2mp3
     end
     
     def tag2_fields
-      [:bpm, :composer, :compilation, :tracktotal, :tracknumber, :disctotal, :discnumber]
+      [:bpm, :composer, :compilation, :tracktotal, :tracknumber, :disctotal, :discnumber, :tag]
     end
     
     def tag_formats

data/lib/flac2mp3/version.rb

@@ -2,7 +2,7 @@ class Flac2mp3 #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/flac2mp3_command_spec.rb

@@ -9,11 +9,6 @@ describe 'flac2mp3 command' do
     end
   end
   
-  before :all do
-    path = File.join(File.dirname(__FILE__), *%w[.. bin])
-    ENV['PATH'] = [path, ENV['PATH']].join(':')
-  end
-  
   before :each do
     Flac2mp3.stubs(:convert)
     

data/spec/flac2mp3_spec.rb

@@ -129,6 +129,11 @@ describe Flac2mp3 do
   end
   
   describe 'querying options' do
+    before :each do
+      File.stubs(:read).returns('')
+      @flac2mp3.load_config
+    end
+    
     it 'should indicate the original file should be deleted when a true option is given' do
       @flac2mp3.set_options(:delete => true)
       @flac2mp3.delete?.should be(true)
@@ -750,6 +755,14 @@ describe Flac2mp3 do
 
       @flac2mp3.set_mp3data(@filename, @tags)
     end
+    
+    it "should use tag2 for 'tag' ('grouping')" do
+      @tags[:tag] = 'one, two, three, oclock'
+
+      @mp3tags2.expects(:TIT1=).with(@tags[:tag])
+
+      @flac2mp3.set_mp3data(@filename, @tags)
+    end
 
     it 'should set tag2 track to be a combination of tracknumber and tracktotal' do
       @tags[:tracknumber] = 4
@@ -871,6 +884,10 @@ describe Flac2mp3 do
       it "should map 'compilation' to 'TCMP'" do
         Flac2mp3.tag_mapping[:compilation].should == :TCMP
       end
+      
+      it "should map 'tag' to 'TIT1'" do
+        Flac2mp3.tag_mapping[:tag].should == :TIT1
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flac2mp3
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 -05:00
+date: 2008-10-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -40,9 +60,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
-description: description of gem
+description: converter for FLAC to MP3
 email: ymendel@pobox.com
 executables: 
 - flac2mp3
@@ -99,9 +119,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yomendel
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: description of gem
+summary: converter for FLAC to MP3
 test_files: []