From e609d83f1a7f49bf8a9549c480a67ee045950336 Mon Sep 17 00:00:00 2001 From: Jeff Schwab Date: Thu, 5 Mar 2009 21:30:26 -0500 Subject: Fixed an incompatibility with Ruby 1.9. Ruby 1.8 strings are Enumerable, but there is no String#lines method. In Ruby 1.9, the situation is reversed. To work around this disparity, the RailsEnvironment#externals method now explicitly checks whether a String responds_to? :lines. [#2130 state:committed] Signed-off-by: Jeremy Kemper --- railties/lib/commands/plugin.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib/commands') diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb index a67c2ab447..8589b1698d 100644 --- a/railties/lib/commands/plugin.rb +++ b/railties/lib/commands/plugin.rb @@ -134,7 +134,8 @@ class RailsEnvironment def externals return [] unless use_externals? ext = `svn propget svn:externals "#{root}/vendor/plugins"` - ext.reject{ |line| line.strip == '' }.map do |line| + lines = ext.respond_to?(:lines) ? ext.lines : ext + lines.reject{ |line| line.strip == '' }.map do |line| line.strip.split(/\s+/, 2) end end -- cgit v1.2.3