diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 2 | ||||
-rw-r--r-- | railties/lib/rails_generator/commands.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails_generator/lookup.rb | 3 | ||||
-rw-r--r-- | railties/lib/rails_generator/options.rb | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 23e295cd72..75f4f15e06 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.] + * Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [DHH] * Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [DHH] diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index 8d0ac52b03..0d039838d3 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -16,7 +16,7 @@ module Rails # Even more convenient access to commands. Include Commands in # the generator Base class to get a nice #command instance method # which returns a delegate for the requested command. - def self.append_features(base) + def self.included(base) base.send(:define_method, :command) do |command| Commands.instance(command, self) end diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb index 6ec6886485..06f1a9eb1b 100644 --- a/railties/lib/rails_generator/lookup.rb +++ b/railties/lib/rails_generator/lookup.rb @@ -48,8 +48,7 @@ module Rails # the generator and how to create it. A source is anything that # yields generators from #each. PathSource and GemSource are provided. module Lookup - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) base.use_component_sources! end diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index fe80f8340d..8301f5c5b5 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -3,8 +3,7 @@ require 'optparse' module Rails module Generator module Options - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) class << base if respond_to?(:inherited) |