You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by bo...@apache.org on 2011/11/28 07:25:59 UTC
svn commit: r1206985 - in /buildr/trunk: CHANGELOG
lib/buildr/packaging/version_requirement.rb spec/version_requirement_spec.rb
Author: boisvert
Date: Mon Nov 28 06:25:58 2011
New Revision: 1206985
URL: http://svn.apache.org/viewvc?rev=1206985&view=rev
Log:
BUILDR-615 VersionRequirement.version? now returns true for versions following pattern "r9999", e.g. "r09"
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/packaging/version_requirement.rb
buildr/trunk/spec/version_requirement_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1206985&r1=1206984&r2=1206985&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Nov 28 06:25:58 2011
@@ -1,5 +1,7 @@
1.4.8 (Pending)
* Fixed: BUILDR-617 pom exclusion does not work (Kafka Liu)
+* Change: BUILDR-615 VersionRequirement.version? now returns true for
+ versions following pattern "r9999", e.g. "r09"
1.4.7 (2011-11-17)
* Added: Add a Findbugs extension.
Modified: buildr/trunk/lib/buildr/packaging/version_requirement.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/version_requirement.rb?rev=1206985&r1=1206984&r2=1206985&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/version_requirement.rb (original)
+++ buildr/trunk/lib/buildr/packaging/version_requirement.rb Mon Nov 28 06:25:58 2011
@@ -49,7 +49,7 @@ module Buildr
class << self
# is +str+ a version string?
def version?(str)
- /^\s*\d[#{VER_CHARS}]*\s*$/ === str
+ /^\s*r?\d[#{VER_CHARS}]*\s*$/ === str
end
# is +str+ a version requirement?
Modified: buildr/trunk/spec/version_requirement_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/version_requirement_spec.rb?rev=1206985&r1=1206984&r2=1206985&view=diff
==============================================================================
--- buildr/trunk/spec/version_requirement_spec.rb (original)
+++ buildr/trunk/spec/version_requirement_spec.rb Mon Nov 28 06:25:58 2011
@@ -136,8 +136,10 @@ describe Buildr::VersionRequirement, '#v
Buildr::VersionRequirement.version?('11.0').should be_true
Buildr::VersionRequirement.version?(' 11.0 ').should be_true
Buildr::VersionRequirement.version?('11.0-alpha').should be_true
+ Buildr::VersionRequirement.version?('r09').should be_true # BUILDR-615: com.google.guava:guava:jar:r09
Buildr::VersionRequirement.version?('a').should be_false
Buildr::VersionRequirement.version?('a1').should be_false
+ Buildr::VersionRequirement.version?('r').should be_false
end
end