flac2mp3 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2008-03-30
+
+* 1 bug fix:
+  * BPM is now actually carried over from FLAC to MP3 tags, not just thought to be.
+
 == 0.2.1 2008-03-30
 
 * 1 bug fix:

data/lib/flac2mp3.rb

@@ -24,7 +24,7 @@ module Flac2mp3
       {
         :album       => :album,
         :artist      => :artist,
-        :bpm         => :bpm,
+        :bpm         => :TBPM,
         :comment     => :comments,
         :composer    => :composer,
         :date        => :year,
@@ -50,7 +50,9 @@ module Flac2mp3
       Mp3Info.open(filename) do |mp3|
         tags.each do |key, value|
           next unless mp3tag = tag_mapping[key]
-          mp3.tag.send("#{mp3tag}=", value)
+          tag = mp3.tag
+          tag = mp3.tag2 if key == :bpm
+          tag.send("#{mp3tag}=", value)
         end
       end
     end

data/lib/flac2mp3/version.rb

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

data/spec/flac2mp3_command_spec.rb

@@ -1,6 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe 'flac2mp3 command' do
+  def run_command(*args)
+    Object.const_set(:ARGV, args)
+    begin
+      eval File.read(File.join(File.dirname(__FILE__), *%w[.. bin flac2mp3]))
+    rescue SystemExit
+    end
+  end
+  
   before :all do
     path = File.join(File.dirname(__FILE__), *%w[.. bin])
     ENV['PATH'] = [path, ENV['PATH']].join(':')
@@ -11,21 +19,22 @@ describe 'flac2mp3 command' do
   end
   
   it 'should exist' do
-    pending 'figuring out how to test this command'
-    
-    system('flac2mp3 blah').should be_true
+    lambda { run_command('blah') }.should_not raise_error(Errno::ENOENT)
   end
   
   it 'should require a filename' do
-    pending 'figuring out how to test this command'
-      
-    `flac2mp3`.should match(/usage:.+filename/i)
+    self.expects(:puts) { |text|  text.match(/usage.+filename/i) }
+    run_command
   end
   
   it 'should pass the filename to Flac2mp3 for conversion' do
-    pending 'figuring out how to test this command'
-    
     Flac2mp3.expects(:convert).with('blah')
-    system('flac2mp3 blah')
+    run_command('blah')
+  end
+  
+  it 'should duplicate the filename' do
+    filename = 'blah'
+    filename.expects(:dup).returns(filename)
+    run_command(filename)
   end
 end

data/spec/flac2mp3_spec.rb

@@ -134,8 +134,8 @@ describe Flac2mp3, 'providing a mapping of tags' do
     Flac2mp3.tag_mapping[:artist].should == :artist
   end
   
-  it "should map 'bpm' to 'bpm'" do
-    Flac2mp3.tag_mapping[:bpm].should == :bpm
+  it "should map 'bpm' to 'TBPM'" do
+    Flac2mp3.tag_mapping[:bpm].should == :TBPM
   end
   
   it "should map 'comment' to 'comments'" do
@@ -257,7 +257,8 @@ describe Flac2mp3, 'when setting MP3 tag data' do
     @filename = 'blah.mp3'
     @tags = {}
     @mp3tags = stub('mp3info tags')
-    @mp3info = stub('mp3info obj', :tag => @mp3tags)
+    @mp3tags2 = stub('mp3info tags 2')
+    @mp3info = stub('mp3info obj', :tag => @mp3tags, :tag2 => @mp3tags2)
     Mp3Info.stubs(:open).with(@filename).yields(@mp3info)
   end
   
@@ -307,9 +308,9 @@ describe Flac2mp3, 'when setting MP3 tag data' do
     @mp3tags.stubs(:artist=)
     @mp3tags.stubs(:genre_s=)
     
-    @mp3tags.expects(:bpm=).never
     @mp3tags.expects(:comments=).never
     @mp3tags.expects(:year=).never
+    @mp3tags.expects(:tracknum=).never
     
     Flac2mp3.mp3data(@filename, @tags)
   end
@@ -323,4 +324,12 @@ describe Flac2mp3, 'when setting MP3 tag data' do
     
     Flac2mp3.mp3data(@filename, @tags)
   end
+  
+  it 'should use tag2 for bpm' do
+    @tags[:bpm] = '5'
+    
+    @mp3tags2.expects(:TBPM=).with(@tags[:bpm])
+    
+    Flac2mp3.mp3data(@filename, @tags)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flac2mp3
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-30 00:00:00 -05:00
+date: 2008-04-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yomendel
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: description of gem