flac2mp3 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.7 2008-06-27
+
+* 1 enhancement:
+  * Can now run in silent mode
+
 == 0.2.6 2008-06-25
 
 * 1 enhancement:

data/bin/flac2mp3

@@ -15,7 +15,7 @@ require 'flac2mp3/version'
 
 # NOTE: the option -p/--path= is given as an example, and should probably be replaced in your application.
 
-OPTIONS = { :delete => false }
+OPTIONS = { :delete => false, :silent => false }
 MANDATORY_OPTIONS = %w[]
 
 parser = OptionParser.new do |opts|
@@ -29,7 +29,8 @@ BANNER
           "Show the #{File.basename($0)} version number and exit") { puts "flac2mp3 #{Flac2mp3::VERSION::STRING}"; exit }
   opts.on('-d', '--[no-]delete',
           "Delete the original file after conversion") { |delete|  OPTIONS[:delete] = delete }
-
+  opts.on('-s', '--silent',
+          "Don't show progress") { |silent|  OPTIONS[:silent] = silent }
   opts.on('-h', '--help',
           'Show this help message.') { puts opts; exit }
   opts.parse!(ARGV)
@@ -47,4 +48,4 @@ unless filename
   exit
 end
 
-Flac2mp3.convert(filename.dup, OPTIONS[:delete])
+Flac2mp3.convert(filename.dup, OPTIONS)

data/lib/flac2mp3.rb

@@ -5,17 +5,20 @@ require 'mp3info'
 
 module Flac2mp3
   class << self
-    def convert(filename, delete_flac = false)
+    def convert(filename, options = {})
       raise TypeError, "'#{filename}' is not a file" unless FileTest.file?(filename)
       filename.extend(Flac2mp3::StringExtensions)
       out_filename = output_filename(filename)
       out_filename.extend(Flac2mp3::StringExtensions)
       
-      system "flac -c -d #{filename.safequote} | lame --preset standard - #{out_filename.safequote}"
+      commands = { :flac => 'flac', :mp3 => 'lame' }
+      commands.each { |k, v|  v << ' --silent' } if options[:silent]
+      
+      system "#{commands[:flac]} --stdout --decode #{filename.safequote} | #{commands[:mp3]} --preset standard - #{out_filename.safequote}"
       
       mp3data(out_filename, flacdata(filename))
       
-      File.delete(filename) if delete_flac
+      File.delete(filename) if options[:delete]
     end
     
     def output_filename(filename)

data/lib/flac2mp3/version.rb

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

data/spec/flac2mp3_command_spec.rb

@@ -43,22 +43,37 @@ describe 'flac2mp3 command' do
   end
   
   it 'should pass on a true flac-deletion option if specified on the command line (using --delete)' do
-    Flac2mp3.expects(:convert).with(anything, true)
+    Flac2mp3.expects(:convert).with(anything, has_entry(:delete => true))
     run_command('blah', '--delete')
   end
   
   it 'should pass on a false flac-deletion option if specified on the command line (using --no-delete)' do
-    Flac2mp3.expects(:convert).with(anything, false)
+    Flac2mp3.expects(:convert).with(anything, has_entry(:delete => false))
     run_command('blah', '--no-delete')
   end
   
   it 'should pass on a true flac-deletion option if specified on the command line (using -d)' do
-    Flac2mp3.expects(:convert).with(anything, true)
+    Flac2mp3.expects(:convert).with(anything, has_entry(:delete => true))
     run_command('blah', '-d')
   end
   
   it 'should pass on a false flac-deletion option if nothing specified on the command line' do
-    Flac2mp3.expects(:convert).with(anything, false)
+    Flac2mp3.expects(:convert).with(anything, has_entry(:delete => false))
+    run_command('blah')
+  end
+  
+  it 'should pass on a true silence option if specified on the command line (using --silent)' do
+    Flac2mp3.expects(:convert).with(anything, has_entry(:silent => true))
+    run_command('blah', '--silent')
+  end
+  
+  it 'should pass on a true silence option if specified on the command line (using -s)' do
+    Flac2mp3.expects(:convert).with(anything, has_entry(:silent => true))
+    run_command('blah', '-s')
+  end
+  
+  it 'should pass on a false silence option if nothing specified on the command line' do
+    Flac2mp3.expects(:convert).with(anything, has_entry(:silent => false))
     run_command('blah')
   end
 end

data/spec/flac2mp3_spec.rb

@@ -49,11 +49,13 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
   before :each do
     @filename = 'blah.flac'
     FileTest.stubs(:file?).with(@filename).returns(true)
-    File.stubs(:delete)
     @output_filename = 'blah.mp3'
     Flac2mp3.stubs(:output_filename).with(@filename).returns(@output_filename)
     Flac2mp3.stubs(:system)
     
+    @filename.stubs(:safequote).returns('-blah-flac-')
+    @output_filename.stubs(:safequote).returns('-blah-mp3-')
+    
     @flacdata = {}
     Flac2mp3.stubs(:flacdata).with(@filename).returns(@flacdata)
     Flac2mp3.stubs(:mp3data)
@@ -65,7 +67,6 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
   
   it 'should extend the filename with the string extensions' do
     @filename.expects(:extend).with(Flac2mp3::StringExtensions).returns(@filename)
-    @filename.stubs(:safequote)
     Flac2mp3.convert(@filename)
   end
   
@@ -76,15 +77,11 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
   
   it 'should extend the output filename with the string extensions' do
     @output_filename.expects(:extend).with(Flac2mp3::StringExtensions).returns(@output_filename)
-    @output_filename.stubs(:safequote)
     Flac2mp3.convert(@filename)
   end
   
   it 'should use system commands to convert the FLAC to an MP3' do
-    @filename.stubs(:safequote).returns('-blah-flac-')
-    @output_filename.stubs(:safequote).returns('-blah-mp3-')
-    Flac2mp3.expects(:system).with("flac -c -d #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
-    
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
     Flac2mp3.convert(@filename)
   end
   
@@ -94,23 +91,42 @@ 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', true) }.should_not raise_error(ArgumentError)
+    lambda { Flac2mp3.convert('blah.flac', :delete => true) }.should_not raise_error(ArgumentError)
   end
   
   it 'should delete the original file if given a true value for the option' do
     File.expects(:delete).with(@filename)
-    Flac2mp3.convert(@filename, true)
+    Flac2mp3.convert(@filename, :delete => true)
   end
   
   it 'should not delete the original file if given a false value for the option' do
     File.expects(:delete).never
-    Flac2mp3.convert(@filename, false)
+    Flac2mp3.convert(@filename, :delete => false)
   end
   
   it 'should not delete the original file by default' do
     File.expects(:delete).never
     Flac2mp3.convert(@filename)
   end
+  
+  it 'should accept an option to run silently' do
+    lambda { Flac2mp3.convert('blah.flac', :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
+    Flac2mp3.expects(:system).with("flac --silent --stdout --decode #{@filename.safequote} | lame --silent --preset standard - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename, :silent => true)
+  end
+  
+  it 'should not tell the system commands to be silent if given a true value for the option' do
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename, :silent => false)
+  end
+  
+  it 'should not tell the system commands to be silent by default' do
+    Flac2mp3.expects(:system).with("flac --stdout --decode #{@filename.safequote} | lame --preset standard - #{@output_filename.safequote}")
+    Flac2mp3.convert(@filename)
+  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.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-06-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency