mspec 1.5.9 → 1.5.10

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2009-2-10}
+  s.date                      = %q{2009-3-1}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

data/lib/mspec/commands/mspec-ci.rb

@@ -13,6 +13,7 @@ class MSpecCI < MSpecScript
 
     options.doc " Ask yourself:"
     options.doc "  1. How to run the specs?"
+    options.doc "  2. How to modify the guard behavior?"
     options.doc "  2. How to display the output?"
     options.doc "  3. What action to perform?"
     options.doc "  4. When to perform it?"
@@ -24,9 +25,12 @@ class MSpecCI < MSpecScript
     options.name
     options.pretend
     options.background
-    options.unguarded
     options.interrupt
 
+    options.doc "\n How to modify the guard behavior"
+    options.unguarded
+    options.verify
+
     options.doc "\n How to display their output"
     options.formatters
     options.verbose

data/lib/mspec/commands/mspec-run.rb

@@ -20,9 +20,10 @@ class MSpecRun < MSpecScript
     options.doc " Ask yourself:"
     options.doc "  1. What specs to run?"
     options.doc "  2. How to modify the execution?"
-    options.doc "  3. How to display the output?"
-    options.doc "  4. What action to perform?"
-    options.doc "  5. When to perform it?"
+    options.doc "  3. How to modify the guard behavior?"
+    options.doc "  4. How to display the output?"
+    options.doc "  5. What action to perform?"
+    options.doc "  6. When to perform it?"
 
     options.doc "\n What specs to run"
     options.filters
@@ -35,16 +36,18 @@ class MSpecRun < MSpecScript
     options.randomize
     options.pretend
     options.background
-    options.unguarded
     options.interrupt
 
+    options.doc "\n How to modify the guard behavior"
+    options.unguarded
+    options.verify
+
     options.doc "\n How to display their output"
     options.formatters
     options.verbose
 
     options.doc "\n What action to perform"
     options.actions
-    options.verify
 
     options.doc "\n When to perform it"
     options.action_filters

data/lib/mspec/guards/background.rb

@@ -13,7 +13,9 @@ end
 class Object
   def process_is_foreground
     g = BackgroundGuard.new
+    g.name = :process_is_foreground
     yield if g.yield? true
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/bug.rb

@@ -4,17 +4,21 @@ class BugGuard < VersionGuard
   def initialize(bug, version)
     @bug = bug
     @version = SpecVersion.new version, true
+    self.parameters = [@bug, @version]
   end
 
   def match?
+    return false if MSpec.mode? :no_ruby_bug
     standard? && ruby_version <= @version
   end
 end
 
 class Object
-  def ruby_bug(bug="Please add a bug tracker number", version="0")
+  def ruby_bug(bug, version)
     g = BugGuard.new bug, version
+    g.name = :ruby_bug
     yield if g.yield? true
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/compliance.rb

@@ -2,12 +2,18 @@ require 'mspec/guards/guard'
 
 class CompliantOnGuard < SpecGuard
   def match?
+    if @args.include? :ruby
+      raise Exception, "improper use of compliant_on guard"
+    end
     standard? or implementation?(*@args)
   end
 end
 
 class NotCompliantOnGuard < SpecGuard
   def match?
+    if @args.include? :ruby
+      raise Exception, "improper use of not_compliant_on guard"
+    end
     standard? or !implementation?(*@args)
   end
 end
@@ -15,13 +21,17 @@ end
 class Object
   def compliant_on(*args)
     g = CompliantOnGuard.new(*args)
+    g.name = :compliant_on
     yield if g.yield?
+  ensure
     g.unregister
   end
 
   def not_compliant_on(*args)
     g = NotCompliantOnGuard.new(*args)
+    g.name = :not_compliant_on
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/conflict.rb

@@ -10,7 +10,9 @@ end
 class Object
   def conflicts_with(*modules)
     g = ConflictsGuard.new(*modules)
+    g.name = :conflicts_with
     yield if g.yield? true
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/endian.rb

@@ -28,13 +28,17 @@ end
 class Object
   def big_endian
     g = BigEndianGuard.new
+    g.name = :big_endian
     yield if g.yield?
+  ensure
     g.unregister
   end
 
   def little_endian
     g = LittleEndianGuard.new
+    g.name = :little_endian
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/extensions.rb

@@ -12,7 +12,9 @@ end
 class Object
   def extended_on(*args)
     g = ExtensionsGuard.new(*args)
+    g.name = :extended_on
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/guard.rb

@@ -2,21 +2,32 @@ require 'mspec/runner/mspec'
 require 'mspec/runner/actions/tally'
 
 class SpecGuard
-  def self.register
-    unless @registered
-      @tally = TallyAction.new
-      @tally.register
-      MSpec.register :finish, self
-      @registered = true
-    end
+  def self.report
+    @report ||= Hash.new { |h,k| h[k] = [] }
   end
 
-  def self.unregister
-    @tally.unregister if @tally
+  def self.clear
+    @report = nil
   end
 
   def self.finish
-    print "\n#{self.class}\n#{@tally.format}\n"
+    report.keys.sort.each do |key|
+      desc = report[key]
+      size = desc.size
+      spec = size == 1 ? "spec" : "specs"
+      print "\n\n#{size} #{spec} omitted by guard: #{key}:\n"
+      desc.each { |desc| print "\n", desc }
+    end
+
+    print "\n\n"
+  end
+
+  def self.guards
+    @guards ||= []
+  end
+
+  def self.clear_guards
+    @guards = []
   end
 
   # Returns a partial Ruby version string based on +which+. For example,
@@ -49,41 +60,54 @@ class SpecGuard
     !!key.match(/(mswin|mingw)/)
   end
 
+  attr_accessor :name, :parameters
 
   def initialize(*args)
-    @args = args
+    self.parameters = @args = args
   end
 
   def yield?(invert=false)
-    if MSpec.mode? :unguarded
-      return true
-    elsif MSpec.mode? :report
-      self.class.register
-      MSpec.register :before, self
+    return true if MSpec.mode? :unguarded
+
+    allow = match? ^ invert
+
+    if not allow and reporting?
+      MSpec.guard
+      MSpec.register :finish, SpecGuard
+      MSpec.register :add,    self
       return true
     elsif MSpec.mode? :verify
-      self.class.register
-      MSpec.register :after, self
       return true
     end
-    return match? ^ invert
+
+    allow
   end
 
   def ===(other)
     true
   end
 
-  def before(state)
+  def reporting?
+    MSpec.mode?(:report) or
+      (MSpec.mode?(:report_on) and SpecGuard.guards.include?(name))
+  end
+
+  def report_key
+    "#{name} #{parameters.join(", ")}"
+  end
+
+  def record(description)
+    SpecGuard.report[report_key] << description
   end
 
-  def after(state)
+  def add(example)
+    record example.description
+    MSpec.retrieve(:formatter).tally.counter.guards!
   end
 
   def unregister
-    MSpec.unregister :before, self
-    MSpec.unregister :after, self
-    MSpec.unregister :exclude, self
-    self.class.unregister
+    MSpec.unguard
+    MSpec.unregister :add, self
   end
 
   def implementation?(*args)

data/lib/mspec/guards/noncompliance.rb

@@ -12,7 +12,9 @@ end
 class Object
   def deviates_on(*args)
     g = NonComplianceGuard.new(*args)
+    g.name = :deviates_on
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/platform.rb

@@ -7,6 +7,7 @@ class PlatformGuard < SpecGuard
     else
       @options, @platforms = {}, args
     end
+    self.parameters = args
   end
 
   def match?
@@ -26,13 +27,17 @@ end
 class Object
   def platform_is(*args)
     g = PlatformGuard.new(*args)
+    g.name = :platform_is
     yield if g.yield?
+  ensure
     g.unregister
   end
 
   def platform_is_not(*args)
     g = PlatformGuard.new(*args)
+    g.name = :platform_is_not
     yield if g.yield? true
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/quarantine.rb

@@ -9,7 +9,9 @@ end
 class Object
   def quarantine!
     g = QuarantineGuard.new
+    g.name = :quarantine!
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/runner.rb

@@ -18,13 +18,17 @@ end
 class Object
   def runner_is(*args)
     g = RunnerGuard.new(*args)
+    g.name = :runner_is
     yield if g.yield?
+  ensure
     g.unregister
   end
 
   def runner_is_not(*args)
     g = RunnerGuard.new(*args)
+    g.name = :runner_is_not
     yield if g.yield? true
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/superuser.rb

@@ -9,7 +9,9 @@ end
 class Object
   def as_superuser
     g = SuperUserGuard.new
+    g.name = :as_superuser
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/support.rb

@@ -12,7 +12,9 @@ end
 class Object
   def not_supported_on(*args)
     g = SupportedGuard.new(*args)
+    g.name = :not_supported_on
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/tty.rb

@@ -12,7 +12,9 @@ end
 class Object
   def with_tty
     g = TTYGuard.new
+    g.name = :with_tty
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/guards/version.rb

@@ -11,6 +11,7 @@ class VersionGuard < SpecGuard
       b = SpecVersion.new version.last
       @version = version.exclude_end? ? a...b : a..b
     end
+    self.parameters = [version]
   end
 
   def ruby_version
@@ -29,7 +30,9 @@ end
 class Object
   def ruby_version_is(*args)
     g = VersionGuard.new(*args)
+    g.name = :ruby_version_is
     yield if g.yield?
+  ensure
     g.unregister
   end
 end

data/lib/mspec/matchers.rb

@@ -11,6 +11,7 @@ require 'mspec/matchers/eql'
 require 'mspec/matchers/equal'
 require 'mspec/matchers/equal_element'
 require 'mspec/matchers/equal_utf16'
+require 'mspec/matchers/have_constant'
 require 'mspec/matchers/have_instance_method'
 require 'mspec/matchers/have_method'
 require 'mspec/matchers/have_private_instance_method'

data/lib/mspec/matchers/have_constant.rb

@@ -0,0 +1,30 @@
+require 'mspec/matchers/stringsymboladapter'
+
+class HaveConstantMatcher
+  include StringSymbolAdapter
+
+  def initialize(name)
+    @name = convert_name name
+  end
+
+  def matches?(mod)
+    @mod = mod
+    @mod.constants.include? @name
+  end
+
+  def failure_message
+    ["Expected #{@mod} to have constant '#{@name.to_s}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@mod} NOT to have constant '#{@name.to_s}'",
+     "but it does"]
+  end
+end
+
+class Object
+  def have_constant(name)
+    HaveConstantMatcher.new name
+  end
+end