alacit 0.0.3 → 0.1.0

data/README.markdown

@@ -1,6 +1,6 @@
 ## AlacIt
 
-Apple Lossless conversion utility.  Converts FLAC and WAV audio files to Apple Lossless (ALAC) files in M4A format for importation into iTunes, iPhones, iPads, and iPods.
+Apple Lossless conversion utility.  Converts APE, FLAC, and WAV audio files to Apple Lossless (ALAC) files in M4A format for importation into iTunes, iPhones, iPads, and iPods.
 
 * Very Fast. An entire album in 10 to 15 seconds.
 * No quality loss
@@ -10,7 +10,7 @@ Apple Lossless conversion utility.  Converts FLAC and WAV audio files to Apple L
 
 ### Install
 
-Ensure you have Ruby 1.9.2 installed, and [FFmpeg](http://ffmpeg.org/), then type:
+Ensure you have Ruby 1.9.2+ installed, and [FFmpeg](http://ffmpeg.org/), then type:
 
     gem install alacit
 
@@ -18,7 +18,7 @@ Ensure you have Ruby 1.9.2 installed, and [FFmpeg](http://ffmpeg.org/), then typ
 
 #### Single Files
 
-Convert a single file.  This outputs a file called `song.m4v` in same directory.
+Convert a single file.  This outputs a file called `song.m4v` in same directory:
 
     alacit song.flac
 
@@ -28,7 +28,7 @@ Convert several individual files:
 
 #### Entire Directories
 
-Convert a single directory.  This finds and converts all `.flac` and `.wav` files in that directory:
+Convert a single directory.  This finds and converts all `.ape`, `.flac`, and `.wav` files in that directory:
 
     alacit ~/Music/Artist/Album
 
@@ -53,8 +53,8 @@ AlacIt won't overwrite existing files by default. If you need to, just force ove
 
 ### Dependencies
 
-* **Ruby 1.9.2**
-* **FFmpeg 0.8.0+** - As far back as 0.5.0 should work too.
+* **Ruby 1.9.2+**
+* **FFmpeg 0.8.0+**
   * **On OS X:**  Get [Homebrew](http://mxcl.github.com/homebrew/) and type `brew install ffmpeg`.
   * **On Linux:** `sudo apt-get install flac ffmpeg`
   * **Windows:**  [untested]

data/lib/alacit.rb

@@ -3,11 +3,11 @@
 # AlacIt
 #   by: Russell Brooks (russbrooks.com)
 #
-# Converts FLAC and WAV files to ALAC (Apple Lossless Audio Codec) files in
-# an M4A container for importation into iTunes. Fast. No loss in quality.
-# Basic metadata ports as well. Puts converted files in same dir as source.
+# Converts APE, FLAC, and WAV files to ALAC (Apple Lossless Audio Codec) files in
+# an M4A container for importation into iTunes. Fast.  No loss in quality.
+# Basic metadata ports as well.  Puts converted files in same dir as source.
 #
-# Dependency: FFmpeg 0.8.0+. But as far back as 0.5.0 should work too.
+# Dependency: FFmpeg 0.8.0+.
 #   On OS X : Get Homebrew and type `brew install ffmpeg`.
 #   On Linux: `sudo apt-get install flac ffmpeg`
 #   Windows : [untested]
@@ -40,14 +40,14 @@ module AlacIt
     end
 
     def convert_dir(source_dir)
-      source_glob = File.join(source_dir, '*.{flac,wav}')
+      source_glob = File.join(source_dir, '*.{ape,flac,wav}')
 
       unless Dir.glob(source_glob).empty?
         Dir.glob(source_glob) do |file|
           m4a_file = file.chomp(File.extname(file)) + '.m4a'
 
           if !File.exists?(m4a_file) || @options[:force]
-            command = 'ffmpeg -y -i "' + file + '" -acodec alac "' + m4a_file + '"'
+            command = 'ffmpeg -y -i "' + file + '" -c:a alac "' + m4a_file + '"'
             stdout_str, stderr_str, status = Open3.capture3(command)
 
             if status.success?
@@ -63,13 +63,13 @@ module AlacIt
           end
         end
       else
-        $stderr.puts 'Error: No FLAC or WAV files found.'
+        $stderr.puts 'Error: No APE, FLAC, or WAV files found.'
         return
       end
     end
 
     def convert_file(file)
-      if File.extname(file) =~ /(\.flac|\.wav)/i
+      if File.extname(file) =~ /(\.ape|\.flac|\.wav)/i
         if File.exists? file
           m4a_file = file.chomp(File.extname(file)) + '.m4a'
 
@@ -93,7 +93,7 @@ module AlacIt
           return
         end
       else
-        $stderr.puts "Error: #{file}: Not a FLAC or WAV file."
+        $stderr.puts "Error: #{file}: Not an APE, FLAC, or WAV file."
         return
       end
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module AlacIt
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/test/converter_test.rb

@@ -35,12 +35,22 @@ class AlacItTest < MiniTest::Unit::TestCase
     ARGV.clear
   end
 
+  def test_single_ape
+    FileUtils.cp 'test/fixtures/test.ape', @temp_dir
+    ARGV.clear
+    ARGV << File.join(@temp_dir, 'test.ape')
+    out, = capture_io { @app.convert }
+    assert_match /test\.ape converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test.m4a')), true
+  end
+
   def test_single_flac
     FileUtils.cp 'test/fixtures/test.flac', @temp_dir
     ARGV.clear
     ARGV << File.join(@temp_dir, 'test.flac')
     out, = capture_io { @app.convert }
     assert_match /test\.flac converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test.m4a')), true
   end
 
   def test_single_wav
@@ -49,6 +59,7 @@ class AlacItTest < MiniTest::Unit::TestCase
     ARGV << File.join(@temp_dir, 'test2.wav')
     out, = capture_io { @app.convert }
     assert_match /test2\.wav converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test2.m4a')), true
   end
 
   def test_mixed_directory
@@ -59,6 +70,8 @@ class AlacItTest < MiniTest::Unit::TestCase
     out, = capture_io { @app.convert }
     assert_match /test\.flac converted/, out
     assert_match /test2\.wav converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test.m4a')), true
+    assert_equal File.exists?(File.join(@temp_dir, 'test2.m4a')), true
   end
 
   def test_single_flac_file_exists
@@ -77,6 +90,7 @@ class AlacItTest < MiniTest::Unit::TestCase
     ARGV << '--force' << File.join(@temp_dir, 'test.flac')
     out, = capture_io { @app.convert }
     assert_match /test\.flac converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test.m4a')), true
   end
 
   def test_mixed_directory_file_exists
@@ -88,6 +102,7 @@ class AlacItTest < MiniTest::Unit::TestCase
     out, err = capture_io { @app.convert }
     assert_match /test\.m4a exists/, err
     assert_match /test2\.wav converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test2.m4a')), true
   end
 
   def test_mixed_directory_file_exists_force_overwrite
@@ -99,6 +114,8 @@ class AlacItTest < MiniTest::Unit::TestCase
     out, = capture_io { @app.convert }
     assert_match /test\.flac converted/, out
     assert_match /test2\.wav converted/, out
+    assert_equal File.exists?(File.join(@temp_dir, 'test.m4a')), true
+    assert_equal File.exists?(File.join(@temp_dir, 'test2.m4a')), true
   end
 
   def test_standard_exception_handling_invalid_option

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alacit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-12 00:00:00.000000000Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70364347268940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364347268940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Quickly convert entire directories of FLAC and WAV files to Apple Lossless
   (ALAC) for importation into iTunes, iPhones, iPads, and iPods.
 email: me@russbrooks.com
@@ -40,7 +45,11 @@ files:
 - lib/alacit.rb
 - lib/application.rb
 - lib/version.rb
+- pkg/alacit-0.0.2.gem
+- pkg/alacit-0.0.3.gem
+- pkg/alacit-0.1.0.gem
 - test/converter_test.rb
+- test/fixtures/test.ape
 - test/fixtures/test.flac
 - test/fixtures/test.m4a
 - test/fixtures/test2.wav
@@ -64,12 +73,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: FLAC and WAV to Apple Lossless (ALAC) batch conversion utility.
 test_files:
 - test/converter_test.rb
+- test/fixtures/test.ape
 - test/fixtures/test.flac
 - test/fixtures/test.m4a
 - test/fixtures/test2.wav