Cleaned up requires

Panmind · Mar 20, 2010 · 671f4c3 · 671f4c3
1 parent 8ac456c
commit 671f4c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,5 @@
 require 'rubygems'
-$: << 'lib'
-require 'audioinfo'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'lib', 'audioinfo')
 
 begin
   require 'jeweler'

diff --git a/lib/audioinfo.rb b/lib/audioinfo.rb
@@ -1,18 +1,17 @@
-#!/usr/bin/env ruby
-
 require "iconv"
 require "stringio"
 
-$: << File.dirname(__FILE__)+"/audioinfo"
-
 require "mp3info"
 require "ogginfo"
-require "mpcinfo"
-require "apetag"
 require "wmainfo"
 require "mp4info"
 require "flacinfo"
 
+$: << File.expand_path(File.dirname(__FILE__))
+
+require "audioinfo/mpcinfo"
+require "audioinfo/apetag"
+
 class AudioInfoError < Exception ; end
 
 class AudioInfo