aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-04-21 12:23:15 -0500
committerJoshua Peek <josh@joshpeek.com>2008-04-21 12:23:15 -0500
commit1642b2362ecd627c5bdd9965ff3d527a95e2b244 (patch)
treeec8eb4c0b2b61bc0822b3d80f674fab3a75640af /railties
parent1a29a6717887ac1422bcce9067536987ee64f94d (diff)
downloadrails-1642b2362ecd627c5bdd9965ff3d527a95e2b244.tar.gz
rails-1642b2362ecd627c5bdd9965ff3d527a95e2b244.tar.bz2
rails-1642b2362ecd627c5bdd9965ff3d527a95e2b244.zip
Gem dependencies don't require a version. Also fixed up failing gem dependency tests.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/gem_dependency.rb4
-rw-r--r--railties/test/gem_dependency_test.rb4
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3985443ceb..2034841cd2 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -13,11 +13,9 @@ module Rails
@requirement = options[:requirement]
elsif options[:version]
@requirement = Gem::Requirement.create(options[:version])
- else
- raise ArgumentError.new('Must pass either :version or :requirement')
end
- @version = @requirement.instance_variable_get("@requirements").first.last if @requirement
+ @version = @requirement.instance_variable_get("@requirements").first.last if @requirement
@name = name.to_s
@lib = options[:lib]
@source = options[:source]
diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb
index 887ad53589..3ae0189327 100644
--- a/railties/test/gem_dependency_test.rb
+++ b/railties/test/gem_dependency_test.rb
@@ -1,5 +1,9 @@
require 'plugin_test_helper'
+class Rails::GemDependency
+ public :install_command, :unpack_command
+end
+
uses_mocha "Plugin Tests" do
class GemDependencyTest < Test::Unit::TestCase
def setup