Refactor config/ directory

* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User

1 files changed, 11 insertions, 16 deletions

diff --git a/config/load_config.rb b/config/load_config.rb
index f7f060ccb..faef94b60 100644
--- a/config/load_config.rb
+++ b/config/load_config.rb
@@ -1,41 +1,36 @@
 require 'configurate'
 
-rails_root = Pathname.new(__FILE__).dirname.join('..').expand_path
+rails_root = File.expand_path('../../', __FILE__)
 rails_env = ENV['RACK_ENV']
 rails_env ||= ENV['RAILS_ENV']
 rails_env ||= 'development'
 
-require rails_root.join('lib', 'configuration_methods')
+require File.join(rails_root, 'lib', 'configuration_methods')
 
-config_dir = rails_root.join("config")
-
-if File.exists?(config_dir.join("application.yml"))
-  $stderr.puts "ATTENTION: There's a new configuration system, please remove your"
-  $stderr.puts "           application.yml and migrate your settings."
-end
+config_dir = File.join rails_root, 'config'
 
 
 AppConfig ||= Configurate::Settings.create do
   add_provider Configurate::Provider::Dynamic
   add_provider Configurate::Provider::Env
   
-  unless heroku? || rails_env == "test" || File.exists?(config_dir.join("diaspora.yml"))
+  unless heroku? || rails_env == "test" || File.exists?(File.join(config_dir, 'diaspora.yml'))
     $stderr.puts "FATAL: Configuration not found. Copy over diaspora.yml.example"
     $stderr.puts "       to diaspora.yml and edit it to your needs."
-    Process.exit(1)
+    exit!
   end
   
   add_provider Configurate::Provider::YAML,
-               config_dir.join("diaspora.yml"),
-               namespace: rails_env, required: false
+               File.join(config_dir, 'diaspora.yml'),
+               namespace: rails_env, required: false unless rails_env == 'test'
   add_provider Configurate::Provider::YAML,
-               config_dir.join("diaspora.yml"),
+               File.join(config_dir, 'diaspora.yml'),
                namespace: "configuration", required: false
   add_provider Configurate::Provider::YAML,
-               config_dir.join("defaults.yml"),
+               File.join(config_dir, 'defaults.yml'),
                namespace: rails_env
   add_provider Configurate::Provider::YAML,
-               config_dir.join("defaults.yml"),
+               File.join(config_dir, 'defaults.yml'),
                namespace: "defaults"
 
   extend Configuration::Methods
@@ -45,6 +40,6 @@ AppConfig ||= Configurate::Settings.create do
      environment.certificate_authorities.empty? ||
      !File.file?(environment.certificate_authorities.get))
     $stderr.puts "FATAL: Diaspora doesn't know where your certificate authorities are. Please ensure they are set to a valid path in diaspora.yml"
-    Process.exit(1)
+    exit!
   end
 end