@@ -14,7 +14,7 @@ class VersionGuard < SpecGuard def to_v(str) major, minor, tiny, patch = str.split "." - "%02d%02d%02d%04d" % [major, minor, tiny, patch].map { |x| x.to_i } + ("1%02d%02d%02d%04d" % [major, minor, tiny, patch].map { |x| x.to_i }).to_i end def ruby_version @@ -23,7 +23,7 @@ class VersionGuard < SpecGuard def match? case @version - when String + when Integer ruby_version >= @version when Range @version.include? ruby_version lib/mspec/guards/version.rb @@ -37,7 +37,7 @@ describe VersionGuard, "#ruby_version" do end it "returns 'RUBY_VERSION.RUBY_PATCHLEVEL'" do - @guard.ruby_version.should == '0108060114' + @guard.ruby_version.should == 10108060114 end end @@ -47,13 +47,13 @@ describe VersionGuard, "#to_v" do end it "returns a version string containing only digits" do - @guard.to_v("1.8.6.22").should == "0108060022" + @guard.to_v("1.8.6.22").should == 10108060022 end it "replaces missing version parts with zeros" do - @guard.to_v("1.8").should == "0108000000" - @guard.to_v("1.8.6").should == "0108060000" - @guard.to_v("1.8.7.333").should == "0108070333" + @guard.to_v("1.8").should == 10108000000 + @guard.to_v("1.8.6").should == 10108060000 + @guard.to_v("1.8.7.333").should == 10108070333 end end spec/guards/version_spec.rb 5574a73d0ac30fb70198ff165b6be4f8c078a35a Brian Ford bford@engineyard.com http://github.com/brixen/mspec/commit/f54c60ac9c4ac2c62b3d807d7b5f31666a7414f4 f54c60ac9c4ac2c62b3d807d7b5f31666a7414f4 2008-05-23T22:04:42-07:00 2008-05-23T22:00:07-07:00 Fix ruby_version_is guard to use Integers for performance on 1.9. b1203653fe1d9283c8cb246ed02974939e9654f0 Brian Ford bford@engineyard.com