Changeset 6447

Timestamp:

03/18/07 13:47:08 (3 years ago)

Author:

bitsweat

Message:

Merge [6445] from trunk. Consistently canonicalizes RAILS_ROOT on Windows and other platforms. References #6755.

Files:

• branches/1-2-stable/railties/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/railties/environments/boot.rb (modified) (1 diff)
• branches/1-2-stable/railties/lib/initializer.rb (modified) (7 diffs)
• branches/1-2-stable/railties/lib/railties_path.rb (modified) (1 diff)

branches/1-2-stable/railties/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows.  #6755 [Jeremy Kemper, trevor]
+
+
-*1.2.3* (March 12th, 2007)
-

branches/1-2-stable/railties/environments/boot.rb

@@ -1 +1 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
-
-
-
-
-
-
-
-
-
-
-
+
-
-unless defined?(Rails::Initializer)

branches/1-2-stable/railties/lib/initializer.rb

@@ -1 +1 @@
-require 'logger'
-require 'set'
-
-
+
+
+
+
+
+
-
-RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
@@ -192 +196 @@
-          load_plugin path
-        end
- 
+
-      $LOAD_PATH.uniq!
-    end
@@ -308 +312 @@
-    def initialize_temporary_directories
-      if configuration.frameworks.include?(:action_controller)
-RAILS_ROOT
+configuration.root_path
-        ActionController::Base.session_options[:tmpdir] = File.exist?(session_path) ? session_path : Dir::tmpdir
-
-RAILS_ROOT
+configuration.root_path
-        if File.exist?(cache_path)
-          ActionController::Base.fragment_cache_store = :file_store, cache_path
@@ -415 +419 @@
-  #   Rails::Initializer.run(:process, config)
-  class Configuration
+    # The application's base directory.
+    attr_reader :root_path
+
-    # A stub for setting options on ActionController::Base
-    attr_accessor :action_controller
@@ -498 +505 @@
-    # values.
-    def initialize
+      set_root_path!
+
-      self.frameworks                   = default_frameworks
-      self.load_paths                   = default_load_paths
@@ -517 +526 @@
-    end
-
+    # Set the root_path to RAILS_ROOT and canonicalize it.
+    def set_root_path!
+      raise 'RAILS_ROOT is not set' unless defined?(::RAILS_ROOT)
+      raise 'RAILS_ROOT is not a directory' unless File.directory?(::RAILS_ROOT)
+
+      @root_path =
+        # Pathname is incompatible with Windows, but Windows doesn't have
+        # real symlinks so File.expand_path is safe.
+        if RUBY_PLATFORM =~ /(:?mswin|mingw)/
+          File.expand_path(::RAILS_ROOT)
+
+        # Otherwise use Pathname#realpath which respects symlinks.
+        else
+          Pathname.new(::RAILS_ROOT).realpath.to_s
+        end
+    end
+
-    # Loads and returns the contents of the #database_configuration_file. The
-    # contents of the file are processed via ERB before being sent through
@@ -576 +602 @@
-
-    private
-      def root_path
-        ::RAILS_ROOT
-      end
-
-      def framework_root_path
-        defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails"

branches/1-2-stable/railties/lib/railties_path.rb

@@ -1 @@
-expand_path(File.join(File.dirname(__FILE__), '..')
+join(File.dirname(__FILE__), '..'