flac2mp3 0.2.7 → 0.2.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.8 2008-07-21
+
+* 1 enhancement:
+  * Can now take encoding options for lame (defaults to --preset standard)
+
 == 0.2.7 2008-06-27
 
 * 1 enhancement:

data/bin/flac2mp3

@@ -31,6 +31,8 @@ BANNER
           "Delete the original file after conversion") { |delete|  OPTIONS[:delete] = delete }
   opts.on('-s', '--silent',
           "Don't show progress") { |silent|  OPTIONS[:silent] = silent }
+  opts.on('-e', '--encoding=ENCODING', String,
+          "Set lame encoding options", "Default: --preset standard") { |encoding|  OPTIONS[:encoding] = encoding }
   opts.on('-h', '--help',
           'Show this help message.') { puts opts; exit }
   opts.parse!(ARGV)

data/lib/flac2mp3.rb

@@ -13,8 +13,10 @@ module Flac2mp3
       
       commands = { :flac => 'flac', :mp3 => 'lame' }
       commands.each { |k, v|  v << ' --silent' } if options[:silent]
+      encoding = options[:encoding]
+      encoding = default_encoding if encoding.to_s.strip.empty?
       
-      system "#{commands[:flac]} --stdout --decode #{filename.safequote} | #{commands[:mp3]} --preset standard - #{out_filename.safequote}"
+      system "#{commands[:flac]} --stdout --decode #{filename.safequote} | #{commands[:mp3]} #{encoding} - #{out_filename.safequote}"
       
       mp3data(out_filename, flacdata(filename))
       
@@ -100,5 +102,12 @@ module Flac2mp3
       end
       mp3_tags
     end
+    
+    
+    private
+    
+    def default_encoding
+      '--preset standard'
+    end
   end
 end

data/lib/flac2mp3/version.rb

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

data/spec/flac2mp3_command_spec.rb

@@ -76,4 +76,19 @@ describe 'flac2mp3 command' do
     Flac2mp3.expects(:convert).with(anything, has_entry(:silent => false))
     run_command('blah')
   end
+  
+  it 'should pass on the encoding option specified on the command line' do
+    Flac2mp3.expects(:convert).with(anything, has_entry(:encoding => '--preset fast standard'))
+    run_command('blah', '--encoding', '--preset fast standard')
+  end
+  
+  it 'should pass on the encoding option specified in shorthand on the command line' do
+    Flac2mp3.expects(:convert).with(anything, has_entry(:encoding => '--preset fast standard'))
+    run_command('blah', '-e', '--preset fast standard')
+  end
+  
+  it 'should pass on no encoding option if none specified on the command line' do
+    Flac2mp3.expects(:convert).with(anything, Not(has_key(:encoding)))
+    run_command('blah')
+  end
 end

data/spec/flac2mp3_spec.rb

@@ -91,7 +91,7 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
   end
   
   it 'should accept an option to delete the flac' do
-    lambda { Flac2mp3.convert('blah.flac', :delete => true) }.should_not raise_error(ArgumentError)
+    lambda { Flac2mp3.convert(@filename, :delete => true) }.should_not raise_error(ArgumentError)
   end
   
   it 'should delete the original file if given a true value for the option' do
@@ -110,7 +110,7 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
   end
   
   it 'should accept an option to run silently' do
-    lambda { Flac2mp3.convert('blah.flac', :silent => true) }.should_not raise_error(ArgumentError)
+    lambda { Flac2mp3.convert(@filename, :silent => true) }.should_not raise_error(ArgumentError)
   end
   
   it 'should tell the system commands to be silent if given a true value for the option' do
@@ -127,6 +127,30 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
     Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
     Flac2mp3.convert(@filename)
   end
+  
+  it 'should accept an option for encoding options' do
+    lambda { Flac2mp3.convert(@filename, :encoding => '--preset fast standard') }.should_not raise_error(ArgumentError)
+  end
+  
+  it 'should use the encoding options if given' do
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --vbr-new -V2 -h - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename, :encoding => '--vbr-new -V2 -h')
+  end
+  
+  it 'should default the encoding to --preset standard if no encoding options given' do
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename)
+  end
+  
+  it 'should default the encoding to --preset standard if nil encoding options given' do
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename, :encoding => nil)
+  end
+  
+  it 'should default the encoding to --preset standard if blank encoding options given' do
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename, :encoding => ' ')
+  end
 end
 
 describe Flac2mp3, 'when converting and given a filename not belonging to a regular file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flac2mp3
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-27 00:00:00 -05:00
+date: 2008-07-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: description of gem
 email: ymendel@pobox.com
 executables: