lib/mercenary.rb in mercenary-0.3.4 vs lib/mercenary.rb in mercenary-0.3.5

@@ -1,16 +1,13 @@
-lib = File.expand_path('../', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "mercenary/version"
+require File.expand_path("../mercenary/version", __FILE__)
 require "optparse"
 require "logger"
 
 module Mercenary
-  autoload :Command,   "mercenary/command"
-  autoload :Option,    "mercenary/option"
-  autoload :Presenter, "mercenary/presenter"
-  autoload :Program,   "mercenary/program"
+  autoload :Command,   File.expand_path("../mercenary/command", __FILE__)
+  autoload :Option,    File.expand_path("../mercenary/option", __FILE__)
+  autoload :Presenter, File.expand_path("../mercenary/presenter", __FILE__)
+  autoload :Program,   File.expand_path("../mercenary/program", __FILE__)
 
   # Public: Instantiate a new program and execute.
   #
   # name - the name of your program
   #