From ddd6bc4446027623b6cebc9cea7ccaea7394a1e9 Mon Sep 17 00:00:00 2001 From: Christoph Schiessl Date: Tue, 23 Feb 2010 18:49:11 +0100 Subject: [PATCH] remove rubygems (version >= 1.3.6) deprecation message by replacing Gem::Dependency#version_requirements with Gem::Dependency#requirement Signed-off-by: Prem Sichanugrist --- railties/lib/rails/gem_dependency.rb | 4 ++-- railties/test/gem_dependency_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 06d830b..6dc5c0c 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -83,7 +83,7 @@ module Rails specification.dependencies.reject do |dependency| dependency.type == :development end.map do |dependency| - GemDependency.new(dependency.name, :requirement => dependency.version_requirements) + GemDependency.new(dependency.name, :requirement => (dependency.respond_to?(:requirement) ? dependency.requirement : dependency.version_requirements)) end end @@ -116,7 +116,7 @@ module Rails end def requirement - r = version_requirements + r = Gem::Dependency.instance_methods.include?("requirement") ? super : version_requirements (r == Gem::Requirement.default) ? nil : r end diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb index a4cf6f7..a165016 100644 --- a/railties/test/gem_dependency_test.rb +++ b/railties/test/gem_dependency_test.rb @@ -174,7 +174,7 @@ class GemDependencyTest < Test::Unit::TestCase def test_gem_from_directory_name dummy_gem = Rails::GemDependency.from_directory_name('dummy-gem-1.1', false) assert_equal 'dummy-gem', dummy_gem.name - assert_equal '= 1.1', dummy_gem.version_requirements.to_s + assert_equal '= 1.1', dummy_gem.requirement.to_s end def test_gem_from_directory_name_loads_specification_successfully -- 1.7.0