Update to ruby/mspec@16b5a0a

3 files changed, 33 insertions, 25 deletions

diff --git a/spec/mspec/lib/mspec/guards/bug.rb b/spec/mspec/lib/mspec/guards/bug.rb
index b1bfc6413e..b9ba75fd97 100644
--- a/spec/mspec/lib/mspec/guards/bug.rb
+++ b/spec/mspec/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
diff --git a/spec/mspec/lib/mspec/guards/guard.rb b/spec/mspec/lib/mspec/guards/guard.rb
index 322a08145d..3a6372a660 100644
--- a/spec/mspec/lib/mspec/guards/guard.rb
+++ b/spec/mspec/lib/mspec/guards/guard.rb
@@ -111,7 +111,7 @@ class SpecGuard
 
   def add(example)
     record example.description
-    MSpec.retrieve(:formatter).tally.counter.guards!
+    MSpec.formatter.tally.counter.guards!
   end
 
   def unregister
diff --git a/spec/mspec/lib/mspec/guards/version.rb b/spec/mspec/lib/mspec/guards/version.rb
index cb08fdac73..20f8c06d38 100644
--- a/spec/mspec/lib/mspec/guards/version.rb
+++ b/spec/mspec/lib/mspec/guards/version.rb
@@ -5,33 +5,40 @@ require 'mspec/guards/guard'
 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