Generalize VersionGuard and add #version_is to work with any version

* And not just the Ruby version.

Author: eregon

lib/mspec/guards/bug.rb

@@ -1,28 +1,29 @@
 require 'mspec/guards/version'
 
 class BugGuard < VersionGuard
-  def initialize(bug, version)
+  def initialize(bug, requirement)
     @bug = bug
-    if String === version
+    if String === requirement
       MSpec.deprecate "ruby_bug with a single version", 'an exclusive range ("2.1"..."2.3")'
-      @version = SpecVersion.new version, true
+      @requirement = SpecVersion.new requirement, true
+      super(FULL_RUBY_VERSION, requirement)
     else
-      super(version)
+      super(FULL_RUBY_VERSION, requirement)
     end
-    @parameters = [@bug, @version]
   end
 
   def match?
     return false if MSpec.mode? :no_ruby_bug
     return false unless PlatformGuard.standard?
-    if Range === @version
+
+    if Range === @requirement
       super
     else
-      FULL_RUBY_VERSION <= @version
+      FULL_RUBY_VERSION <= @requirement
     end
   end
 end
 
-def ruby_bug(bug, version, &block)
-  BugGuard.new(bug, version).run_unless(:ruby_bug, &block)
+def ruby_bug(bug, requirement, &block)
+  BugGuard.new(bug, requirement).run_unless(:ruby_bug, &block)
 end

lib/mspec/guards/version.rb

@@ -5,33 +5,40 @@
 class VersionGuard < SpecGuard
   FULL_RUBY_VERSION = SpecVersion.new SpecGuard.ruby_version(:full)
 
-  def initialize(version)
-    case version
+  def initialize(version, requirement)
+    version = SpecVersion.new(version) unless SpecVersion === version
+    @version = version
+
+    case requirement
     when String
-      @version = SpecVersion.new version
+      @requirement = SpecVersion.new requirement
     when Range
-      MSpec.deprecate "an empty version range end", 'a specific version' if version.end.empty?
-      a = SpecVersion.new version.begin
-      b = SpecVersion.new version.end
-      unless version.exclude_end?
+      MSpec.deprecate "an empty version range end", 'a specific version' if requirement.end.empty?
+      a = SpecVersion.new requirement.begin
+      b = SpecVersion.new requirement.end
+      unless requirement.exclude_end?
         MSpec.deprecate "ruby_version_is with an inclusive range", 'an exclusive range ("2.1"..."2.3")'
       end
-      @version = version.exclude_end? ? a...b : a..b
+      @requirement = requirement.exclude_end? ? a...b : a..b
     else
-      raise "version must be a String or Range but was a #{version.class}"
+      raise "version must be a String or Range but was a #{requirement.class}"
     end
-    @parameters = [version]
+    super(@version, @requirement)
   end
 
   def match?
-    if Range === @version
-      @version.include? FULL_RUBY_VERSION
+    if Range === @requirement
+      @requirement.include? @version
     else
-      FULL_RUBY_VERSION >= @version
+      @version >= @requirement
     end
   end
 end
 
-def ruby_version_is(*args, &block)
-  VersionGuard.new(*args).run_if(:ruby_version_is, &block)
+def version_is(base_version, requirement, &block)
+  VersionGuard.new(base_version, requirement).run_if(:version_is, &block)
+end
+
+def ruby_version_is(requirement, &block)
+  VersionGuard.new(VersionGuard::FULL_RUBY_VERSION, requirement).run_if(:ruby_version_is, &block)
 end

spec/guards/guard_spec.rb

@@ -254,7 +254,7 @@
   end
 
   it "allows to combine guards" do
-    guard1 = VersionGuard.new 'x.x.x'
+    guard1 = VersionGuard.new '1.2.3', 'x.x.x'
     VersionGuard.stub(:new).and_return(guard1)
     guard2 = PlatformGuard.new :dummy
     PlatformGuard.stub(:new).and_return(guard2)
@@ -360,7 +360,7 @@
   end
 
   it "allows to combine guards" do
-    guard1 = VersionGuard.new 'x.x.x'
+    guard1 = VersionGuard.new '1.2.3', 'x.x.x'
     VersionGuard.stub(:new).and_return(guard1)
     guard2 = PlatformGuard.new :dummy
     PlatformGuard.stub(:new).and_return(guard2)

spec/guards/version_spec.rb

@@ -14,44 +14,44 @@
 describe VersionGuard, "#match?" do
   before :each do
     hide_deprecation_warnings
-    stub_const "VersionGuard::FULL_RUBY_VERSION", SpecVersion.new('1.8.6')
+    @current = '1.8.6'
   end
 
   it "returns true when the argument is equal to RUBY_VERSION" do
-    VersionGuard.new('1.8.6').match?.should == true
+    VersionGuard.new(@current, '1.8.6').match?.should == true
   end
 
   it "returns true when the argument is less than RUBY_VERSION" do
-    VersionGuard.new('1.8').match?.should == true
-    VersionGuard.new('1.8.5').match?.should == true
+    VersionGuard.new(@current, '1.8').match?.should == true
+    VersionGuard.new(@current, '1.8.5').match?.should == true
   end
 
   it "returns false when the argument is greater than RUBY_VERSION" do
-    VersionGuard.new('1.8.7').match?.should == false
-    VersionGuard.new('1.9.2').match?.should == false
+    VersionGuard.new(@current, '1.8.7').match?.should == false
+    VersionGuard.new(@current, '1.9.2').match?.should == false
   end
 
   it "returns true when the argument range includes RUBY_VERSION" do
-    VersionGuard.new('1.8.5'..'1.8.7').match?.should == true
-    VersionGuard.new('1.8'..'1.9').match?.should == true
-    VersionGuard.new('1.8'...'1.9').match?.should == true
-    VersionGuard.new('1.8'..'1.8.6').match?.should == true
-    VersionGuard.new('1.8.5'..'1.8.6').match?.should == true
-    VersionGuard.new(''...'1.8.7').match?.should == true
+    VersionGuard.new(@current, '1.8.5'..'1.8.7').match?.should == true
+    VersionGuard.new(@current, '1.8'..'1.9').match?.should == true
+    VersionGuard.new(@current, '1.8'...'1.9').match?.should == true
+    VersionGuard.new(@current, '1.8'..'1.8.6').match?.should == true
+    VersionGuard.new(@current, '1.8.5'..'1.8.6').match?.should == true
+    VersionGuard.new(@current, ''...'1.8.7').match?.should == true
   end
 
   it "returns false when the argument range does not include RUBY_VERSION" do
-    VersionGuard.new('1.8.7'..'1.8.9').match?.should == false
-    VersionGuard.new('1.8.4'..'1.8.5').match?.should == false
-    VersionGuard.new('1.8.4'...'1.8.6').match?.should == false
-    VersionGuard.new('1.8.5'...'1.8.6').match?.should == false
-    VersionGuard.new(''...'1.8.6').match?.should == false
+    VersionGuard.new(@current, '1.8.7'..'1.8.9').match?.should == false
+    VersionGuard.new(@current, '1.8.4'..'1.8.5').match?.should == false
+    VersionGuard.new(@current, '1.8.4'...'1.8.6').match?.should == false
+    VersionGuard.new(@current, '1.8.5'...'1.8.6').match?.should == false
+    VersionGuard.new(@current, ''...'1.8.6').match?.should == false
   end
 end
 
 describe Object, "#ruby_version_is" do
   before :each do
-    @guard = VersionGuard.new 'x.x.x'
+    @guard = VersionGuard.new '1.2.3', 'x.x.x'
     VersionGuard.stub(:new).and_return(@guard)
     ScratchPad.clear
   end
@@ -88,3 +88,25 @@
     end.should raise_error(Exception)
   end
 end
+
+describe Object, "#version_is" do
+  before :each do
+    hide_deprecation_warnings
+  end
+
+  it "returns the expected values" do
+    version_is('1.2.3', '1.2.2').should == true
+    version_is('1.2.3', '1.2.3').should == true
+    version_is('1.2.3', '1.2.4').should == false
+
+    version_is('1.2.3', '1').should == true
+    version_is('1.2.3', '1.0').should == true
+    version_is('1.2.3', '2').should == false
+    version_is('1.2.3', '2.0').should == false
+
+    version_is('1.2.3', '1.2.2'..'1.2.4').should == true
+    version_is('1.2.3', '1.2.2'..'1.2.3').should == true
+    version_is('1.2.3', '1.2.2'...'1.2.3').should == false
+    version_is('1.2.3', '1.2.3'..'1.2.4').should == true
+  end
+end