kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes Plugin#requires_redmine accept a range of versions (#12299). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10827 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-11-17 10:55:38 +00:00
parent b3cf67cad4
commit 4bd1e887d9
2 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/redmine/plugin.rb
View File

@ -160,33 +160,52 @@ module Redmine #:nodoc:
# # Requires Redmine 0.7.3 or higher
# requires_redmine :version_or_higher => '0.7.3'
# requires_redmine '0.7.3'
# requires_redmine '0.7'
#
# # Requires a specific Redmine version
# requires_redmine :version => '0.7.3' # 0.7.3 only
# requires_redmine :version => '0.7' # 0.7.x
# requires_redmine :version => ['0.7.3', '0.8.0'] # 0.7.3 or 0.8.0
#
# # Requires a Redmine version within a range
# requires_redmine :version => '0.7.3'..'0.9.1' # >= 0.7.3 and <= 0.9.1
# requires_redmine :version => '0.7'..'0.9' # >= 0.7.x and <= 0.9.x
def requires_redmine(arg)
arg = { :version_or_higher => arg } unless arg.is_a?(Hash)
arg.assert_valid_keys(:version, :version_or_higher)
current = Redmine::VERSION.to_a
arg.each do |k, v|
v = [] << v unless v.is_a?(Array)
versions = v.collect {|s| s.split('.').collect(&:to_i)}
arg.each do |k, req|
case k
when :version_or_higher
raise ArgumentError.new("wrong number of versions (#{versions.size} for 1)") unless versions.size == 1
unless (current <=> versions.first) >= 0
raise PluginRequirementError.new("#{id} plugin requires Redmine #{v} or higher but current is #{current.join('.')}")
raise ArgumentError.new(":version_or_higher accepts a version string only") unless req.is_a?(String)
unless compare_versions(req, current) <= 0
raise PluginRequirementError.new("#{id} plugin requires Redmine #{req} or higher but current is #{current.join('.')}")
end
when :version
unless versions.detect {|ver| current.slice(0, ver.size) == ver}
raise PluginRequirementError.new("#{id} plugin requires one the following Redmine versions: #{v.join(', ')} but current is #{current.join('.')}")
req = [req] if req.is_a?(String)
if req.is_a?(Array)
unless req.detect {|ver| compare_versions(ver, current) == 0}
raise PluginRequirementError.new("#{id} plugin requires one the following Redmine versions: #{req.join(', ')} but current is #{current.join('.')}")
end
elsif req.is_a?(Range)
unless compare_versions(req.first, current) <= 0 && compare_versions(req.last, current) >= 0
raise PluginRequirementError.new("#{id} plugin requires a Redmine version between #{req.first} and #{req.last} but current is #{current.join('.')}")
end
else
raise ArgumentError.new(":version option accepts a version string, an array or a range of versions")
end
end
end
true
end
def compare_versions(requirement, current)
requirement = requirement.split('.').collect(&:to_i)
requirement <=> current.slice(0, requirement.size)
end
private :compare_versions
# Sets a requirement on a Redmine plugin version
# Raises a PluginRequirementError exception if the requirement is not met
#

35
test/unit/lib/redmine/plugin_test.rb
View File

@ -87,6 +87,7 @@ class Redmine::PluginTest < ActiveSupport::TestCase
plugin = Redmine::Plugin.register(:foo) {}
Redmine::VERSION.stubs(:to_a).returns([2, 1, 3, "stable", 10817])
# Specific version without hash
assert plugin.requires_redmine('2.1.3')
assert plugin.requires_redmine('2.1')
assert_raise Redmine::PluginRequirementError do
@ -96,16 +97,7 @@ class Redmine::PluginTest < ActiveSupport::TestCase
plugin.requires_redmine('2.2')
end
assert plugin.requires_redmine(:version_or_higher => '0.1.0')
assert plugin.requires_redmine(:version_or_higher => '2.1.3')
assert plugin.requires_redmine(:version_or_higher => '2.1')
assert_raise Redmine::PluginRequirementError do
plugin.requires_redmine(:version_or_higher => '2.2.0')
end
assert_raise Redmine::PluginRequirementError do
plugin.requires_redmine(:version_or_higher => '2.2')
end
# Specific version
assert plugin.requires_redmine(:version => '2.1.3')
assert plugin.requires_redmine(:version => ['2.1.3', '2.2.0'])
assert plugin.requires_redmine(:version => '2.1')
@ -118,6 +110,29 @@ class Redmine::PluginTest < ActiveSupport::TestCase
assert_raise Redmine::PluginRequirementError do
plugin.requires_redmine(:version => '2.2')
end
# Version range
assert plugin.requires_redmine(:version => '2.0.0'..'2.2.4')
assert plugin.requires_redmine(:version => '2.1.3'..'2.2.4')
assert plugin.requires_redmine(:version => '2.0.0'..'2.1.3')
assert plugin.requires_redmine(:version => '2.0'..'2.2')
assert plugin.requires_redmine(:version => '2.1'..'2.2')
assert plugin.requires_redmine(:version => '2.0'..'2.1')
assert_raise Redmine::PluginRequirementError do
plugin.requires_redmine(:version => '2.1.4'..'2.2.4')
end
# Version or higher
assert plugin.requires_redmine(:version_or_higher => '0.1.0')
assert plugin.requires_redmine(:version_or_higher => '2.1.3')
assert plugin.requires_redmine(:version_or_higher => '2.1')
assert_raise Redmine::PluginRequirementError do
plugin.requires_redmine(:version_or_higher => '2.2.0')
end
assert_raise Redmine::PluginRequirementError do
plugin.requires_redmine(:version_or_higher => '2.2')
end
end
def test_requires_redmine_plugin