From 6c1a1ec6d24bb7a9f6f2be9f00c11c9185e415f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 15 Sep 2012 18:52:12 +0200 Subject: [PATCH] it's enviroNment --- app/controllers/publics_controller.rb | 2 +- app/models/app_config.rb | 8 ++++---- config/initializers/check_session_secret.rb | 2 +- config/initializers/enforce_ssl.rb | 2 +- config/initializers/faraday.rb | 2 +- config/initializers/fetch_featured_users.rb | 2 +- config/initializers/load_analyitics.rb | 2 +- config/initializers/newrelic.rb | 2 +- config/initializers/omniauth.rb | 2 +- config/initializers/version_header.rb | 2 +- ...ment_configuration.rb => environment_configuration.rb} | 2 +- lib/share_visibility_converter.rb | 2 +- lib/tasks/heroku.rake | 2 +- spec/support/deferred_garbage_collection.rb | 6 +++--- 14 files changed, 19 insertions(+), 19 deletions(-) rename lib/{enviroment_configuration.rb => environment_configuration.rb} (97%) diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb index 1524b2db2..e1d22fd31 100644 --- a/app/controllers/publics_controller.rb +++ b/app/controllers/publics_controller.rb @@ -13,7 +13,7 @@ class PublicsController < ApplicationController # I am commenting this line out for the time being to debug some apparent # issues on Heroku. # - # newrelic_ignore if EnviromentConfiguration.using_new_relic? + # newrelic_ignore if EnvironmentConfiguration.using_new_relic? skip_before_filter :set_header_data skip_before_filter :set_grammatical_gender diff --git a/app/models/app_config.rb b/app/models/app_config.rb index 2c79383b2..5d350e78a 100644 --- a/app/models/app_config.rb +++ b/app/models/app_config.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. require 'uri' -require Rails.root.join('lib', 'enviroment_configuration') +require Rails.root.join('lib', 'environment_configuration') class AppConfig < Settingslogic def self.source_file_name @@ -12,7 +12,7 @@ class AppConfig < Settingslogic return ENV['application_yml'] end config_file = Rails.root.join("config", "application.yml") - if !File.exists?(config_file) && (Rails.env == 'test' || Rails.env.include?("integration") || EnviromentConfiguration.heroku?) + if !File.exists?(config_file) && (Rails.env == 'test' || Rails.env.include?("integration") || EnvironmentConfiguration.heroku?) config_file = Rails.root.join("config", "application.yml.example") end config_file @@ -21,7 +21,7 @@ class AppConfig < Settingslogic namespace Rails.env def self.load! - unless EnviromentConfiguration.heroku? + unless EnvironmentConfiguration.heroku? if no_config_file? && !have_old_config_file? $stderr.puts <<-HELP ******** You haven't set up your Diaspora settings file. ********** @@ -57,7 +57,7 @@ Please do the following: Process.exit(1) end - if !EnviromentConfiguration.heroku? && no_cert_file_in_prod? + if !EnvironmentConfiguration.heroku? && no_cert_file_in_prod? $stderr.puts <<-HELP ******** Diaspora does not know where your SSL-CA-Certificates file is. ********** Please add the root certificate bundle (this is operating system specific) to application.yml. Defaults: diff --git a/config/initializers/check_session_secret.rb b/config/initializers/check_session_secret.rb index e943fdd8f..87e385c7e 100644 --- a/config/initializers/check_session_secret.rb +++ b/config/initializers/check_session_secret.rb @@ -1 +1 @@ -EnviromentConfiguration.ensure_secret_token! \ No newline at end of file +EnvironmentConfiguration.ensure_secret_token! \ No newline at end of file diff --git a/config/initializers/enforce_ssl.rb b/config/initializers/enforce_ssl.rb index 647643127..80f2bc97d 100644 --- a/config/initializers/enforce_ssl.rb +++ b/config/initializers/enforce_ssl.rb @@ -2,7 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -if EnviromentConfiguration.enforce_ssl? +if EnvironmentConfiguration.enforce_ssl? Rails.application.config.middleware.insert_before 0, Rack::SSL puts "Rack::SSL is enabled" end diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb index 6c3756d5b..cd96e1c28 100644 --- a/config/initializers/faraday.rb +++ b/config/initializers/faraday.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. options = {:timeout => 25} -options[:ssl] = {:ca_file => EnviromentConfiguration.ca_cert_file_location} +options[:ssl] = {:ca_file => EnvironmentConfiguration.ca_cert_file_location} Faraday.default_connection = Faraday::Connection.new(options) do |b| b.use FaradayMiddleware::FollowRedirects b.adapter Faraday.default_adapter diff --git a/config/initializers/fetch_featured_users.rb b/config/initializers/fetch_featured_users.rb index 8cc185846..b09c0b1d0 100644 --- a/config/initializers/fetch_featured_users.rb +++ b/config/initializers/fetch_featured_users.rb @@ -5,7 +5,7 @@ if AppConfig[:featured_users].present? && AppConfig[:community_spotlight].blank? puts "DEPRICATION WARNING (10/21/11): Please change `featured_users` in your application.yml to `community_spotlight`. Thanks!" end -unless EnviromentConfiguration.prevent_fetching_community_spotlight? +unless EnvironmentConfiguration.prevent_fetching_community_spotlight? print "Fetching community spotlight users from remote servers" AppConfig[:community_spotlight].each do |x| Webfinger.new(x).fetch diff --git a/config/initializers/load_analyitics.rb b/config/initializers/load_analyitics.rb index 0b804ffeb..338cd3c73 100644 --- a/config/initializers/load_analyitics.rb +++ b/config/initializers/load_analyitics.rb @@ -1,7 +1,7 @@ # Copyright (c) 2012, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -#hack to allow us to access app config, rather than putting in enviroments/production.rb +#hack to allow us to access app config, rather than putting in environments/production.rb if Rails.env == 'production' Diaspora::Application.configure do diff --git a/config/initializers/newrelic.rb b/config/initializers/newrelic.rb index 834fc0c24..5a7d107e8 100644 --- a/config/initializers/newrelic.rb +++ b/config/initializers/newrelic.rb @@ -2,6 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -if EnviromentConfiguration.using_new_relic? +if EnvironmentConfiguration.using_new_relic? require 'newrelic_rpm' end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index f4fff989f..6049dee4d 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -11,6 +11,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do end if SERVICES['facebook'] && SERVICES['facebook']['app_id'] && SERVICES['facebook']['app_secret'] provider :facebook, SERVICES['facebook']['app_id'], SERVICES['facebook']['app_secret'], { :display => "popup", :scope => "publish_actions,publish_stream,offline_access", - :client_options => {:ssl => {:ca_file => EnviromentConfiguration.ca_cert_file_location}}} + :client_options => {:ssl => {:ca_file => EnvironmentConfiguration.ca_cert_file_location}}} end end diff --git a/config/initializers/version_header.rb b/config/initializers/version_header.rb index b8fd33266..d9215a556 100644 --- a/config/initializers/version_header.rb +++ b/config/initializers/version_header.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. -if EnviromentConfiguration.cache_git_version? +if EnvironmentConfiguration.cache_git_version? git_cmd = `git log -1 --pretty="format:%H %ci"` if git_cmd =~ /^([\d\w]+?)\s(.+)$/ AppConfig[:git_revision] = $1 diff --git a/lib/enviroment_configuration.rb b/lib/environment_configuration.rb similarity index 97% rename from lib/enviroment_configuration.rb rename to lib/environment_configuration.rb index 7cd3590f1..c1b254ab5 100644 --- a/lib/enviroment_configuration.rb +++ b/lib/environment_configuration.rb @@ -2,7 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -module EnviromentConfiguration +module EnvironmentConfiguration def self.heroku? ENV['HEROKU'] diff --git a/lib/share_visibility_converter.rb b/lib/share_visibility_converter.rb index 61904adf8..c044570d3 100644 --- a/lib/share_visibility_converter.rb +++ b/lib/share_visibility_converter.rb @@ -1,4 +1,4 @@ -#we dont have the enviroment, and it is not carring over from the migration +#we dont have the environment, and it is not carring over from the migration unless defined?(Person) class Person < ActiveRecord::Base belongs_to :owner, :class_name => 'User' diff --git a/lib/tasks/heroku.rake b/lib/tasks/heroku.rake index 039de721b..174654ed2 100644 --- a/lib/tasks/heroku.rake +++ b/lib/tasks/heroku.rake @@ -2,7 +2,7 @@ #licensed under the Affero General Public License version 3 or later. See #the COPYRIGHT file. -require Rails.root.join('lib', 'enviroment_configuration') +require Rails.root.join('lib', 'environment_configuration') namespace :heroku do HEROKU_CONFIG_ADD_COMMAND = "heroku config:add" diff --git a/spec/support/deferred_garbage_collection.rb b/spec/support/deferred_garbage_collection.rb index fca56218a..85a59a8d8 100644 --- a/spec/support/deferred_garbage_collection.rb +++ b/spec/support/deferred_garbage_collection.rb @@ -7,7 +7,7 @@ class DeferredGarbageCollection @@last_gc_run = Time.now def self.start - return if unsupported_enviroment + return if unsupported_environment GC.disable if DEFERRED_GC_THRESHOLD > 0 end @@ -18,7 +18,7 @@ class DeferredGarbageCollection end def self.reconsider - return if unsupported_enviroment + return if unsupported_environment if (percent_used = self.memory_threshold) running_out_of_memory = percent_used > 90 @@ -34,7 +34,7 @@ class DeferredGarbageCollection end end - def self.unsupported_enviroment + def self.unsupported_environment ENV['TRAVIS'] # TODO: enable for ruby 1.9.3 or more RAM end