flac2mp3 0.2.5 → 0.2.6

data/History.txt

@@ -1,7 +1,12 @@
+== 0.2.6 2008-06-25
+
+* 1 enhancement:
+  * Can now optionally delete the original FLAC file after conversion.
+
 == 0.2.5 2008-05-12
 
 * 1 bug fix:
-  * Composer now actually carried over from FLAC to MP# tags, not just thought to be.
+  * Composer now actually carried over from FLAC to MP3 tags, not just thought to be.
   
 * 3 enhancements:
   * Compilation flag carried over.

data/bin/flac2mp3

@@ -11,10 +11,11 @@ end
 
 require 'optparse'
 require 'flac2mp3'
+require 'flac2mp3/version'
 
 # NOTE: the option -p/--path= is given as an example, and should probably be replaced in your application.
 
-OPTIONS = {}
+OPTIONS = { :delete => false }
 MANDATORY_OPTIONS = %w[]
 
 parser = OptionParser.new do |opts|
@@ -26,6 +27,9 @@ BANNER
   opts.separator ''
   opts.on('-v', '--version',
           "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('-h', '--help',
           'Show this help message.') { puts opts; exit }
   opts.parse!(ARGV)
@@ -43,4 +47,4 @@ unless filename
   exit
 end
 
-Flac2mp3.convert(filename.dup)
+Flac2mp3.convert(filename.dup, OPTIONS[:delete])

data/lib/flac2mp3.rb

@@ -5,7 +5,7 @@ require 'mp3info'
 
 module Flac2mp3
   class << self
-    def convert(filename)
+    def convert(filename, delete_flac = false)
       raise TypeError, "'#{filename}' is not a file" unless FileTest.file?(filename)
       filename.extend(Flac2mp3::StringExtensions)
       out_filename = output_filename(filename)
@@ -14,6 +14,8 @@ module Flac2mp3
       system "flac -c -d #{filename.safequote} | lame --preset standard - #{out_filename.safequote}"
       
       mp3data(out_filename, flacdata(filename))
+      
+      File.delete(filename) if delete_flac
     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  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/flac2mp3_command_spec.rb

@@ -16,6 +16,10 @@ describe 'flac2mp3 command' do
   
   before :each do
     Flac2mp3.stubs(:convert)
+    
+    [:ARGV, :OPTIONS, :MANDATORY_OPTIONS].each do |const|
+      Object.send(:remove_const, const) if Object.const_defined?(const)
+    end
   end
   
   it 'should exist' do
@@ -28,7 +32,7 @@ describe 'flac2mp3 command' do
   end
   
   it 'should pass the filename to Flac2mp3 for conversion' do
-    Flac2mp3.expects(:convert).with('blah')
+    Flac2mp3.expects(:convert).with('blah', anything)
     run_command('blah')
   end
   
@@ -37,4 +41,24 @@ describe 'flac2mp3 command' do
     filename.expects(:dup).returns(filename)
     run_command(filename)
   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)
+    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)
+    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)
+    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)
+    run_command('blah')
+  end
 end

data/spec/flac2mp3_spec.rb

@@ -27,6 +27,7 @@ describe Flac2mp3, 'when converting' do
     Flac2mp3.stubs(:system)
     Flac2mp3.stubs(:flacdata)
     Flac2mp3.stubs(:mp3data)
+    File.stubs(:delete)
   end
 
   it 'should require a filename' do
@@ -48,6 +49,7 @@ 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)
@@ -90,6 +92,25 @@ describe Flac2mp3, 'when converting and given a filename belonging to a regular
     Flac2mp3.expects(:mp3data).with(@output_filename, @flacdata)
     Flac2mp3.convert(@filename)
   end
+  
+  it 'should accept an option to delete the flac' do
+    lambda { Flac2mp3.convert('blah.flac', 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)
+  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)
+  end
+  
+  it 'should not delete the original file by default' do
+    File.expects(:delete).never
+    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.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-12 00:00:00 -05:00
+date: 2008-06-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: flacinfo-rb
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-mp3info
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yomendel
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: description of gem