X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=55a87f8324918f317b8c4b893ef752165f77bad8;hp=0402d602be047da95203f6fab5391bb2850a1171;hb=aebdf12adce2766e2957f88916fcae6374d4eb4b;hpb=a3b629b37a05b97d67620284d1c4536427fc5058 diff --git a/lib/mailshears.rb b/lib/mailshears.rb index 0402d60..55a87f8 100644 --- a/lib/mailshears.rb +++ b/lib/mailshears.rb @@ -1,21 +1,7 @@ -# Load the rest of the code we'll use. - -# And the necessary classes. -require 'mailshears/errors.rb' -require 'mailshears/exit_codes.rb' -require 'mailshears/postfixadmin_db' - -# Load the default config file first, and let the user override it. -require 'default_configuration' - -userconf_path = ENV['HOME'] + '/.mailshears.conf' -begin - # Don't crash if it doesn't exist. Maybe he likes the defaults? - require userconf_path -rescue LoadError -end - -Configuration::PLUGINS.each do |plugin_file| - require "mailshears/plugins/#{plugin_file}" -end +# Load only the files needed by our executable. The library files are +# supposed to require what they need themselves. +require 'common/configuration' +require 'common/errors' +require 'common/exit_codes' +require 'common/user_interface'