lib/armoire.rb in armoire-1.4.0 vs lib/armoire.rb in armoire-1.4.1

@@ -3,16 +3,10 @@
 require 'erb'
 
 require "armoire/setting"
 require "armoire/version"
 
-if defined?(Rails::Railtie)
-  require "armoire/railtie"
-elsif defined?(Rails.configuration)
-  require "armoire/init"
-end
-
 class Armoire
   include Singleton
 
   attr_accessor :settings
   attr_writer :environment
@@ -46,6 +40,12 @@
   # When the settings file cannot be read, this exception will be raised
   class MissingSettingsFile < StandardError; end
 
   # When a config setting isn't set, this exception will be raised
   class ConfigSettingMissing < StandardError; end
+end
+
+if defined?(Rails::Railtie)
+  require "armoire/railtie"
+elsif defined?(Rails.configuration)
+  require "armoire/init"
 end