Make pruning use the correct config and clean up *before* running tests, too.

[mailshears.git] / lib / mailshears.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index e159b09b3b6ca6c93dce474a1d0106b1ae261b42..bda9f0dd46b0dd20ac5d8b3d3ca243f234b88038 100644 (file)
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,21 +1,8 @@
-# Load the rest of the code we'll use.
+# Load the rest of the code we'll use. This loads what we'll need in
+# the executables; the library files are supposed to require what they
+# need.
 
-# 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.rb'
-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
+require 'common/configuration'
+require 'common/errors'
+require 'common/exit_codes'