Standardize how we're requiring config/environment

lib/tasks/batch_inviter.rake

@@ -17,7 +17,7 @@ namespace :invites do
     end
 
 
-    require File.dirname(__FILE__) + '/../../config/environment'
+   require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
 
     filename = args[:filename]
     start = args[:start].to_i || 0

lib/tasks/db.rake

@@ -34,7 +34,7 @@ namespace :db do
 
   desc 'Delete the collections in the current RAILS_ENV database'
   task :purge do
-    require File.dirname(__FILE__) + '/../../config/environment'
+    require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
 
     puts "Purging the database for #{Rails.env}..."
 
@@ -78,7 +78,7 @@ namespace :db do
 
   task :fix_diaspora_handle do
     puts "fixing the people in this seed"
-    require File.dirname(__FILE__) + '/../../config/environment'
+    require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
     Person.where(:url => 'example.org').all.each{|person|
       if person.owner
         person.url = AppConfig[:pod_url]
@@ -90,7 +90,7 @@ namespace :db do
   end
 
   task :move_private_key do
-    require File.dirname(__FILE__) + '/../../config/environment'
+    require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
     User.all.each do |user|
       if user.serialized_private_key.nil?
         user.serialized_private_key = user.person.serialized_key

lib/tasks/migrations.rake

@@ -21,7 +21,7 @@ namespace :migrations do
 
   desc 'import data to mysql'
   task :import_to_mysql do
-    require 'config/environment'
+    require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
     migrator = DataConversion::ImportToMysql.new
     migrator.full_path = "/tmp/data_conversion/csv"
     migrator.log("**** Starting import to MySQL database #{ActiveRecord::Base.connection.current_database} ****")
@@ -36,7 +36,7 @@ namespace :migrations do
 
   desc 'absolutify all existing image references'
   task :absolutify_image_references do
-    require File.join(Rails.root,"config/environment")
+    require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
 
     Photo.all.each do |photo|
       unless photo.remote_photo_path
@@ -63,7 +63,7 @@ namespace :migrations do
   end
 
   task :upload_photos_to_s3 do
-    require File.join(Rails.root,"config/environment")
+    require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
     puts AppConfig[:s3_key]
     
     connection = Aws::S3.new( AppConfig[:s3_key], AppConfig[:s3_secret])

lib/tasks/resque.rake

@@ -1,5 +1,5 @@
 require 'resque/tasks'
 task "resque:setup" do
-  require 'config/environment'
+  require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
   Rails.logger.info("event=resque_setup rails_env=#{Rails.env}")
 end

script/websocket_server.rb

@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require File.dirname(__FILE__) + '/../config/environment'
+require File.join(File.dirname(__FILE__), '..', 'config', 'environment')
 require File.dirname(__FILE__) + '/../lib/diaspora/web_socket'
 
 at_exit do

spec/spec_helper.rb

@@ -5,7 +5,7 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails)
+require File.join(File.dirname(__FILE__), '..', 'config', 'environment') unless defined?(Rails)
 require 'helper_methods'
 require 'rspec/rails'
 require 'webmock/rspec'