From 1b0654ea41d15552c19f767570d4f551d617e742 Mon Sep 17 00:00:00 2001
From: Tekin Suleyman <tekin@tekin.co.uk>
Date: Thu, 29 May 2008 18:40:30 +0100
Subject: Ensure script/plugin installs ssh/git plugins. [#277 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 railties/lib/commands/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb
index d12d002c4e..105819ce90 100644
--- a/railties/lib/commands/plugin.rb
+++ b/railties/lib/commands/plugin.rb
@@ -163,7 +163,7 @@ class Plugin
   end
   
   def git_url?
-    @uri =~ /^git:\/\// || @url =~ /\.git$/
+    @uri =~ /^git:\/\// || @uri =~ /\.git$/
   end
   
   def installed?
-- 
cgit v1.2.3


From 0abf0da0016abc455145810d7060a10e0b56b0b6 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Sat, 31 May 2008 14:58:34 -0700
Subject: Don't provide the password with dbconsole unless explicitly opted in.

Some operating system configurations allow other users to view your process list
or environmental variables.  This option should not be used on shared hosts.

http://dev.mysql.com/doc/refman/5.0/en/password-security.html
http://www.postgresql.org/docs/8.3/static/libpq-envars.html
---
 railties/lib/commands/dbconsole.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb
index b81997aa59..17acb7b68f 100644
--- a/railties/lib/commands/dbconsole.rb
+++ b/railties/lib/commands/dbconsole.rb
@@ -2,8 +2,13 @@ require 'erb'
 require 'yaml'
 require 'optparse'
 
+include_password = false
+
 OptionParser.new do |opt|
-  opt.banner = "Usage: dbconsole [environment]"
+  opt.banner = "Usage: dbconsole [options] [environment]"
+  opt.on("-p", "--include-password", "Automatically provide the database from database.yml") do |v|
+    include_password = true
+  end
   opt.parse!(ARGV)
   abort opt.to_s unless (0..1).include?(ARGV.size)
 end
@@ -31,10 +36,13 @@ when "mysql"
     'port'      => '--port',
     'socket'    => '--socket',
     'username'  => '--user',
-    'password'  => '--password',
     'encoding'  => '--default-character-set'
   }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
 
+  if config['password'] && include_password
+    args << "--password=#{config['password']}"
+  end
+
   args << config['database']
 
   exec(find_cmd('mysql5', 'mysql'), *args)
@@ -43,7 +51,7 @@ when "postgresql"
   ENV['PGUSER']     = config["username"] if config["username"]
   ENV['PGHOST']     = config["host"] if config["host"]
   ENV['PGPORT']     = config["port"].to_s if config["port"]
-  ENV['PGPASSWORD'] = config["password"].to_s if config["password"]
+  ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && include_password
   exec(find_cmd('psql'), config["database"])
 
 when "sqlite"
-- 
cgit v1.2.3


From 9b75483bf361f44046d1cb86bd2acae6c4f856f3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 31 May 2008 15:51:01 -0700
Subject: Added better error message for when the class name is already used
 (and dont show suggestions if there are none)

---
 railties/lib/rails_generator/commands.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb
index 03b7d354a6..08ecbfb5cf 100644
--- a/railties/lib/rails_generator/commands.rb
+++ b/railties/lib/rails_generator/commands.rb
@@ -380,12 +380,14 @@ HELP
           # Thanks to Florian Gross (flgr).
           def raise_class_collision(class_name)
             message = <<end_message
-  The name '#{class_name}' is reserved by Ruby on Rails.
+  The name '#{class_name}' is either already used in your application or reserved by Ruby on Rails.
   Please choose an alternative and run this generator again.
 end_message
             if suggest = find_synonyms(class_name)
-              message << "\n  Suggestions:  \n\n"
-              message << suggest.join("\n")
+              if suggest.any?
+                message << "\n  Suggestions:  \n\n"
+                message << suggest.join("\n")
+              end
             end
             raise UsageError, message
           end
-- 
cgit v1.2.3


From fb89d7fa6d21a4b0faab753ff3a7c934d9d59883 Mon Sep 17 00:00:00 2001
From: Tim Morgan <tim@timmorgan.org>
Date: Fri, 16 May 2008 07:19:00 -0500
Subject: Run gem install as external command. [#210 state:resolved]

---
 railties/lib/rails/gem_dependency.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 2034841cd2..582861abf4 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -73,7 +73,7 @@ module Rails
     end
 
     def install
-      Gem::GemRunner.new.run(install_command)
+      puts `#{gem_command} #{install_command.join(' ')}`
     end
     
     def unpack_to(directory)
@@ -100,6 +100,10 @@ private ###################################################################
     def specification
       @spec ||= Gem.source_index.search(Gem::Dependency.new(@name, @requirement)).sort_by { |s| s.version }.last
     end
+    
+    def gem_command
+      RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
+    end
 
     def install_command
       cmd = %w(install) << @name
-- 
cgit v1.2.3


From 9c4f00350a61987afad50ebb8d319d7e889b6cfd Mon Sep 17 00:00:00 2001
From: rick <technoweenie@gmail.com>
Date: Sat, 31 May 2008 15:58:08 -0700
Subject: fix Gem installation command with versions

---
 railties/lib/rails/gem_dependency.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 582861abf4..22ee0e3601 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -73,7 +73,9 @@ module Rails
     end
 
     def install
-      puts `#{gem_command} #{install_command.join(' ')}`
+      cmd = "#{gem_command} #{install_command.join(' ')}"
+      puts cmd
+      puts %x(#{cmd})
     end
     
     def unpack_to(directory)
@@ -107,7 +109,7 @@ private ###################################################################
 
     def install_command
       cmd = %w(install) << @name
-      cmd << "--version" << "#{@requirement.to_s}" if @requirement
+      cmd << "--version" << %("#{@requirement.to_s}") if @requirement
       cmd << "--source"  << @source  if @source
       cmd
     end
-- 
cgit v1.2.3


From d5bcff172b6253684cf5cc3345a3d390096ba957 Mon Sep 17 00:00:00 2001
From: rick <technoweenie@gmail.com>
Date: Sat, 31 May 2008 16:36:34 -0700
Subject: Consolidate error messages for missing gems, and skip them when
 running rake gems:* tasks.  [rick]

---
 railties/lib/initializer.rb          | 43 ++++++++++++++++++++++++++----------
 railties/lib/rails/gem_dependency.rb |  1 -
 railties/lib/tasks/gems.rake         | 12 +++++++---
 3 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 8f963cb4a5..ca63fa734b 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -140,7 +140,8 @@ module Rails
       # pick up any gems that plugins depend on
       add_gem_load_paths
       load_gems
-
+      check_gem_dependencies
+      
       load_application_initializers
 
       # the framework is now fully initialized
@@ -153,6 +154,7 @@ module Rails
       initialize_routing
 
       # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
+      
       load_observers
     end
 
@@ -241,7 +243,24 @@ module Rails
     end
 
     def load_gems
-      @configuration.gems.each &:load
+      @configuration.gems.each(&:load)
+    end
+
+    def check_gem_dependencies
+      unloaded_gems = @configuration.gems.reject { |g| g.loaded? }
+      if unloaded_gems.size > 0
+        @gems_dependencies_loaded = false
+        # don't print if the gems rake tasks are being run
+        unless $rails_gem_installer
+          puts %{These gems that this application depends on are missing:}
+          unloaded_gems.each do |gem|
+            puts " - #{gem.name}"
+          end
+          puts %{Run "rake gems:install" to install them.}
+        end
+      else
+        @gems_dependencies_loaded = true
+      end
     end
 
     # Loads all plugins in <tt>config.plugin_paths</tt>.  <tt>plugin_paths</tt>
@@ -287,12 +306,8 @@ module Rails
     end
 
     def load_observers
-      if configuration.frameworks.include?(:active_record)
-        if @configuration.gems.any? { |g| !g.loaded? }
-          puts %{Unable to instantiate observers, some gems that this application depends on are missing.  Run "rake gems:install"}
-        else
-          ActiveRecord::Base.instantiate_observers
-        end
+      if @gems_dependencies_loaded && configuration.frameworks.include?(:active_record)
+        ActiveRecord::Base.instantiate_observers
       end
     end
 
@@ -447,14 +462,18 @@ module Rails
 
     # Fires the user-supplied after_initialize block (Configuration#after_initialize)
     def after_initialize
-      configuration.after_initialize_blocks.each do |block|
-        block.call
+      if @gems_dependencies_loaded
+        configuration.after_initialize_blocks.each do |block|
+          block.call
+        end
       end
     end
 
     def load_application_initializers
-      Dir["#{configuration.root_path}/config/initializers/**/*.rb"].sort.each do |initializer|
-        load(initializer)
+      if @gems_dependencies_loaded
+        Dir["#{configuration.root_path}/config/initializers/**/*.rb"].sort.each do |initializer|
+          load(initializer)
+        end
       end
     end
 
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 22ee0e3601..0e39f6fd0a 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -36,7 +36,6 @@ module Rails
       end
       @load_paths_added = true
     rescue Gem::LoadError
-      puts $!.to_s
     end
     
     def dependencies
diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake
index c18fea2d60..0321e60e0f 100644
--- a/railties/lib/tasks/gems.rake
+++ b/railties/lib/tasks/gems.rake
@@ -1,5 +1,5 @@
 desc "List the gems that this rails application depends on"
-task :gems => :environment do
+task :gems => 'gems:base' do
   Rails.configuration.gems.each do |gem|
     code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " "
     puts "[#{code}] #{gem.name} #{gem.requirement.to_s}"
@@ -10,8 +10,14 @@ task :gems => :environment do
 end
 
 namespace :gems do
+  task :base do
+    $rails_gem_installer = true
+    Rake::Task[:environment].invoke
+  end
+
   desc "Build any native extensions for unpacked gems"
   task :build do
+    $rails_gem_installer = true
     require 'rails/gem_builder'
     Dir[File.join(RAILS_ROOT, 'vendor', 'gems', '*')].each do |gem_dir|
       spec_file = File.join(gem_dir, '.specification')
@@ -24,14 +30,14 @@ namespace :gems do
   end
   
   desc "Installs all required gems for this application."
-  task :install => :environment do
+  task :install => :base do
     require 'rubygems'
     require 'rubygems/gem_runner'
     Rails.configuration.gems.each { |gem| gem.install unless gem.loaded? }
   end
 
   desc "Unpacks the specified gem into vendor/gems."
-  task :unpack => :environment do
+  task :unpack => :base do
     require 'rubygems'
     require 'rubygems/gem_runner'
     Rails.configuration.gems.each do |gem|
-- 
cgit v1.2.3


From 224c8e6afb464a4b04621189963ec03d1d3487d0 Mon Sep 17 00:00:00 2001
From: Dmitriy Timokhin <avanie@gmail.com>
Date: Wed, 7 May 2008 17:43:12 +0400
Subject: Expose GemPlugin load_paths so they can be added to
 Dependencies.load_paths. Also use full_gem_path as root of GemPlugin to make
 things compatible. [#213 state:resolved]

---
 railties/lib/rails/plugin.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 04f7e37a20..fdaec34c59 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -98,23 +98,19 @@ module Rails
       end               
   end
 
-  # This Plugin subclass represents a Gem plugin. It behaves exactly like a
-  # "traditional" Rails plugin, but doesn't expose any additional load paths,
-  # since RubyGems has already taken care of things.
+  # This Plugin subclass represents a Gem plugin. Although RubyGems has already
+  # taken care of $LOAD_PATH's, it have to expose its load_path's to add them
+  # to Dependencies.load_paths.
   class GemPlugin < Plugin
 
     # Initialize this plugin from a Gem::Specification.
     def initialize(spec)
-      super(File.join(spec.full_gem_path, "rails"))
+      super(File.join(spec.full_gem_path))
       @name = spec.name
     end
 
-    def valid?
-      true
-    end
-
-    def load_paths
-      []
+    def init_path
+      File.join(directory, 'rails', 'init.rb')
     end
   end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From a6e79083273dfb1a62aa8ff02db07454c65729ff Mon Sep 17 00:00:00 2001
From: rick <technoweenie@gmail.com>
Date: Sat, 31 May 2008 16:46:47 -0700
Subject: fix doc typos

---
 railties/lib/rails/plugin.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index fdaec34c59..256f4b0132 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -99,10 +99,9 @@ module Rails
   end
 
   # This Plugin subclass represents a Gem plugin. Although RubyGems has already
-  # taken care of $LOAD_PATH's, it have to expose its load_path's to add them
+  # taken care of $LOAD_PATHs, it exposes its load_paths to add them
   # to Dependencies.load_paths.
   class GemPlugin < Plugin
-
     # Initialize this plugin from a Gem::Specification.
     def initialize(spec)
       super(File.join(spec.full_gem_path))
-- 
cgit v1.2.3


From f9db7695fe3c148c8d1077f1564e5b94d126b83b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 31 May 2008 17:03:03 -0700
Subject: Making ready for release of 2.1

---
 railties/lib/rails/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index fea63beea9..48d24da52e 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
 module Rails
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 0
-    TINY  = 991
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
-- 
cgit v1.2.3


From 71528b1825ce5184b23d09f923cb72f4073ce8ed Mon Sep 17 00:00:00 2001
From: rick <technoweenie@gmail.com>
Date: Sat, 31 May 2008 17:22:16 -0700
Subject: Previously we only added the "lib" subdirectory to the load path when
 setting up gem dependencies for frozen gems. Now we add the "ext"
 subdirectory as well for those gems which have compiled C extensions as well.
 [Wincent Colaiuta]

[#268 state:resolved]
---
 railties/lib/rails/gem_dependency.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 0e39f6fd0a..9f088a18dd 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -31,7 +31,9 @@ module Rails
         args << @requirement.to_s if @requirement
         gem *args
       else
-        $LOAD_PATH << File.join(unpacked_paths.first, 'lib')
+        $LOAD_PATH.unshift File.join(unpacked_paths.first, 'lib')
+        ext = File.join(unpacked_paths.first, 'ext')
+        $LOAD_PATH.unshift(ext) if File.exist?(ext)
         @frozen = true
       end
       @load_paths_added = true
-- 
cgit v1.2.3


From a980eb8c7734f14109d8c2a02a88dafdf682e0dc Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 1 Jun 2008 13:18:31 -0700
Subject: Added Rack middleware to handle static files.

---
 railties/lib/initializer.rb       |  1 +
 railties/lib/rails/rack.rb        |  5 +++++
 railties/lib/rails/rack/static.rb | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 railties/lib/rails/rack.rb
 create mode 100644 railties/lib/rails/rack/static.rb

(limited to 'railties/lib')

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index ca63fa734b..bdadfeea8f 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -8,6 +8,7 @@ require 'rails/version'
 require 'rails/plugin/locator'
 require 'rails/plugin/loader'
 require 'rails/gem_dependency'
+require 'rails/rack'
 
 
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
new file mode 100644
index 0000000000..abcd0741bf
--- /dev/null
+++ b/railties/lib/rails/rack.rb
@@ -0,0 +1,5 @@
+module Rails
+  module Rack
+    autoload :Static, "rails/rack/static"
+  end
+end
diff --git a/railties/lib/rails/rack/static.rb b/railties/lib/rails/rack/static.rb
new file mode 100644
index 0000000000..45eb0e5921
--- /dev/null
+++ b/railties/lib/rails/rack/static.rb
@@ -0,0 +1,35 @@
+module Rails
+  module Rack
+    class Static
+      FILE_METHODS = %w(GET HEAD).freeze
+
+      def initialize(app)
+        @app = app
+        @file_server = ::Rack::File.new(File.join(RAILS_ROOT, "public"))
+      end
+
+      def call(env)
+        path        = env['PATH_INFO'].chomp('/')
+        method      = env['REQUEST_METHOD']
+        cached_path = (path.empty? ? 'index' : path) + ::ActionController::Base.page_cache_extension
+
+        if FILE_METHODS.include?(method)
+          if file_exist?(path)
+            return @file_server.call(env)
+          elsif file_exist?(cached_path)
+            env['PATH_INFO'] = cached_path
+            return @file_server.call(env)
+          end
+        end
+
+        @app.call(env)
+      end
+
+      private
+        def file_exist?(path)
+          full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
+          File.file?(full_path) && File.readable?(full_path)
+        end
+    end
+  end
+end
-- 
cgit v1.2.3