environment.rb in instiki-0.10.1

- old
+ new
@@ -1,82 +1,82 @@
-if RUBY_VERSION < '1.8.1' 
-  puts 'Instiki requires Ruby 1.8.1+'
-  exit
-end
-
-# Enable UTF-8 support
-$KCODE = 'u'
-require 'jcode'
-
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
-RAILS_ENV  = ENV['RAILS_ENV'] || 'production' unless defined? RAILS_ENV
-
-unless defined? ADDITIONAL_LOAD_PATHS
-  # Mocks first.
-  ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
-
-  # Then model subdirectories.
-  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"]) 
-  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
-
-  # Followed by the standard includes.
-  ADDITIONAL_LOAD_PATHS.concat %w(
-    app 
-    app/models 
-    app/controllers 
-    app/helpers 
-    app/apis 
-    components 
-    config 
-    lib 
-    vendor 
-    vendor/rails/railties
-    vendor/rails/railties/lib
-    vendor/rails/actionpack/lib
-    vendor/rails/activesupport/lib
-    vendor/rails/activerecord/lib
-    vendor/rails/actionmailer/lib
-    vendor/rails/actionwebservice/lib
-    vendor/madeleine-0.7.1/lib
-    vendor/RedCloth-3.0.3/lib
-    vendor/rubyzip-0.5.6
-  ).map { |dir| "#{File.expand_path(File.join(RAILS_ROOT, dir))}"
-  }.delete_if { |dir| not File.exist?(dir) }
-
-  # Prepend to $LOAD_PATH
-  ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
-end
-
-# Require Rails libraries.
-require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
-
-require 'active_support'
-require 'action_controller'
-
-require_dependency 'instiki_errors'
-require_dependency 'active_record_stub'
-
-# Environment specific configuration
-require_dependency "environments/#{RAILS_ENV}"
-
-# Configure defaults if the included environment did not.
-unless defined? RAILS_DEFAULT_LOGGER
-  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
-  ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
-  if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
-    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
-    ActionController::Base.logger.level = Logger::DEBUG
-  else
-    RAILS_DEFAULT_LOGGER.level = Logger::INFO
-    ActionController::Base.logger.level = Logger::INFO
-  end
-end
-
-ActionController::Base.template_root ||= "#{RAILS_ROOT}/app/views/"
-ActionController::Routing::Routes.reload
-Controllers = Dependencies::LoadingModule.root(
-  File.join(RAILS_ROOT, 'app', 'controllers'),
-  File.join(RAILS_ROOT, 'components')
-)
-
-require 'wiki_service'
-Socket.do_not_reverse_lookup = true
+if RUBY_VERSION < '1.8.1' 
+  puts 'Instiki requires Ruby 1.8.1+'
+  exit
+end
+
+# Enable UTF-8 support
+$KCODE = 'u'
+require 'jcode'
+
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
+RAILS_ENV  = ENV['RAILS_ENV'] || 'production' unless defined? RAILS_ENV
+
+unless defined? ADDITIONAL_LOAD_PATHS
+  # Mocks first.
+  ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+
+  # Then model subdirectories.
+  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"]) 
+  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
+
+  # Followed by the standard includes.
+  ADDITIONAL_LOAD_PATHS.concat %w(
+    app 
+    app/models 
+    app/controllers 
+    app/helpers 
+    app/apis 
+    components 
+    config 
+    lib 
+    vendor 
+    vendor/rails/railties
+    vendor/rails/railties/lib
+    vendor/rails/actionpack/lib
+    vendor/rails/activesupport/lib
+    vendor/rails/activerecord/lib
+    vendor/rails/actionmailer/lib
+    vendor/rails/actionwebservice/lib
+    vendor/madeleine-0.7.1/lib
+    vendor/RedCloth-3.0.3/lib
+    vendor/rubyzip-0.5.8/lib
+  ).map { |dir| "#{File.expand_path(File.join(RAILS_ROOT, dir))}"
+  }.delete_if { |dir| not File.exist?(dir) }
+
+  # Prepend to $LOAD_PATH
+  ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+end
+
+# Require Rails libraries.
+require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
+
+require 'active_support'
+require 'action_controller'
+
+require_dependency 'instiki_errors'
+require_dependency 'active_record_stub'
+
+# Environment specific configuration
+require_dependency "environments/#{RAILS_ENV}"
+
+# Configure defaults if the included environment did not.
+unless defined? RAILS_DEFAULT_LOGGER
+  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
+  ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
+  if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
+    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
+    ActionController::Base.logger.level = Logger::DEBUG
+  else
+    RAILS_DEFAULT_LOGGER.level = Logger::INFO
+    ActionController::Base.logger.level = Logger::INFO
+  end
+end
+
+ActionController::Base.template_root ||= "#{RAILS_ROOT}/app/views/"
+ActionController::Routing::Routes.reload
+Controllers = Dependencies::LoadingModule.root(
+  File.join(RAILS_ROOT, 'app', 'controllers'),
+  File.join(RAILS_ROOT, 'components')
+)
+
+require 'wiki_service'
+Socket.do_not_reverse_lookup = true