mspec 1.5.0 → 1.5.1

data/README

@@ -187,6 +187,9 @@ use nested or shared 'describe' blocks as appropriate and use the
 
 == Guards
 
+Since Ruby is not completely isolated from its platform or execution environment, the spec files may contain guards: conditions placed around a spec or a set of specs to enable or disable them. 
+
+You can find an overview of the current guards and their usage in: http://rubyspec.org/wiki/mspec/Guards .
 
 == Helpers
 

data/Rakefile

@@ -16,7 +16,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{2008-05-21}
+  s.date                      = %q{2008-11-12}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

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

@@ -46,13 +46,14 @@ class MSpecCI < MSpecScript
     options.doc "\n     $ mspec ci --spec-debug -S 'this crashes'"
     options.doc ""
 
-    @patterns = options.parse argv
-    @patterns = config[:ci_files] if @patterns.empty?
+    patterns = options.parse argv
+    patterns = config[:ci_files] if patterns.empty?
+    @files = files patterns
   end
 
   def run
     MSpec.register_tags_patterns config[:tags_patterns]
-    MSpec.register_files files(@patterns)
+    MSpec.register_files @files
     filter = TagFilter.new(:exclude,
         "fails", "critical", "unstable", "incomplete", "unsupported")
     filter.register

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

@@ -8,6 +8,12 @@ require 'mspec/utils/script'
 
 
 class MSpecRun < MSpecScript
+  def initialize
+    super
+
+    config[:files] = []
+  end
+
   def options(argv=ARGV)
     options = MSpecOptions.new "mspec run [options] (FILE|DIRECTORY|GLOB)+", 30, config
 
@@ -53,17 +59,19 @@ class MSpecRun < MSpecScript
     options.doc "\n     $ mspec --spec-debug -S 'this crashes' path/to/the_file_spec.rb"
     options.doc ""
 
-    @patterns = options.parse argv
-    if @patterns.empty?
+    patterns = options.parse argv
+    patterns = config[:files] if patterns.empty?
+    if patterns.empty?
       puts options
       puts "No files specified."
       exit 1
     end
+    @files = files patterns
   end
 
   def run
     MSpec.register_tags_patterns config[:tags_patterns]
-    MSpec.register_files files(@patterns)
+    MSpec.register_files @files
 
     MSpec.process
     exit MSpec.exit_code

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

@@ -80,12 +80,13 @@ class MSpecTag < MSpecScript
     options.doc "\n     $ mspec tag --list fails path/to/the/specs"
     options.doc ""
 
-    @patterns = options.parse argv
-    if @patterns.empty?
+    patterns = options.parse argv
+    if patterns.empty?
       puts options
       puts "No files specified."
       exit 1
     end
+    @files = files patterns
   end
 
   def register
@@ -97,7 +98,7 @@ class MSpecTag < MSpecScript
     when :list, :list_all
       tagger = TagListAction.new config[:tagger] == :list_all ? nil : config[:ltags]
       MSpec.register_mode :pretend
-      config[:formatter] = nil
+      config[:formatter] = false
     else
       raise ArgumentError, "No recognized action given"
     end
@@ -108,7 +109,7 @@ class MSpecTag < MSpecScript
 
   def run
     MSpec.register_tags_patterns config[:tags_patterns]
-    MSpec.register_files files(@patterns)
+    MSpec.register_files @files
 
     MSpec.process
     exit MSpec.exit_code

data/lib/mspec/matchers.rb

@@ -16,3 +16,4 @@ require 'mspec/matchers/match_yaml'
 require 'mspec/matchers/raise_error'
 require 'mspec/matchers/output'
 require 'mspec/matchers/output_to_fd'
+require 'mspec/matchers/respond_to'

data/lib/mspec/matchers/respond_to.rb

@@ -0,0 +1,24 @@
+class RespondToMatcher
+  def initialize(expected)
+    @expected = expected
+  end
+
+  def matches?(actual)
+    @actual = actual
+    @actual.respond_to?(@expected)
+  end
+
+  def failure_message
+    ["Expected #{@actual.inspect} (#{@actual.class})", "to respond to #{@expected}"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@actual.inspect} (#{@actual.class})", "not to respond to #{@expected}"]
+  end
+end
+
+class Object
+  def respond_to(expected)
+    RespondToMatcher.new(expected)
+  end
+end

data/lib/mspec/mocks/mock.rb

@@ -88,6 +88,9 @@ module Mock
 
   def self.verify_call(obj, sym, *args, &block)
     compare = *args
+    if RUBY_VERSION >= '1.9'
+      compare = compare.first if compare.length <= 1
+    end
 
     key = replaced_key obj, sym
     proxies = mocks[key] + stubs[key]

data/lib/mspec/mocks/proxy.rb

@@ -88,6 +88,9 @@ class MockProxy
   def with(*args)
     raise ArgumentError, "you must specify the expected arguments" if args.empty?
     @arguments = *args
+    if RUBY_VERSION >= '1.9'
+      @arguments = @arguments.first if @arguments.length <= 1
+    end
     self
   end
 

data/lib/mspec/runner/actions/tally.rb

@@ -1,5 +1,5 @@
 class Tally
-  attr_reader :files, :examples, :expectations, :failures, :errors
+  attr_accessor :files, :examples, :expectations, :failures, :errors
 
   def initialize
     @files = @examples = @expectations = @failures = @errors = 0

data/lib/mspec/runner/context.rb

@@ -105,7 +105,7 @@ class ContextState
 
   # Returns a description string generated from self and all parents
   def description
-    @description ||= parents.inject([]) { |l,s| l << s.to_s }.join(" ")
+    @description ||= parents.map { |p| p.to_s }.join(" ")
   end
 
   # Injects the before/after blocks and examples from the shared

data/lib/mspec/runner/formatters.rb

@@ -1,7 +1,9 @@
 require 'mspec/runner/formatters/dotted'
+require 'mspec/runner/formatters/file'
 require 'mspec/runner/formatters/specdoc'
 require 'mspec/runner/formatters/html'
 require 'mspec/runner/formatters/summary'
 require 'mspec/runner/formatters/unit'
 require 'mspec/runner/formatters/spinner'
+require 'mspec/runner/formatters/method'
 require 'mspec/runner/formatters/yaml'

data/lib/mspec/runner/formatters/dotted.rb

@@ -47,7 +47,7 @@ class DottedFormatter
 
   # Callback for the MSpec :before event. Resets the
   # +#exception?+ and +#failure+ flags.
-  def before(state)
+  def before(state = nil)
     @failure = @exception = false
   end
 
@@ -67,7 +67,7 @@ class DottedFormatter
   #   . = No failure or error
   #   F = An ExpectationNotMetError was raised
   #   E = Any exception other than ExpectationNotMetError
-  def after(state)
+  def after(state = nil)
     unless exception?
       print "."
     else
@@ -93,6 +93,6 @@ class DottedFormatter
   # A convenience method to allow printing to different outputs.
   def print(*args)
     @out.print(*args)
-    @out.flush
+    @out.flush rescue nil #IronRuby throws a .NET exception on IO.flush
   end
 end

data/lib/mspec/runner/formatters/file.rb

@@ -0,0 +1,19 @@
+require 'mspec/runner/formatters/dotted'
+
+class FileFormatter < DottedFormatter
+  # Unregisters DottedFormatter#before, #after methods and
+  # registers #load, #unload, which perform the same duties
+  # as #before, #after in DottedFormatter.
+  def register
+    super
+
+    MSpec.unregister :before,    self
+    MSpec.unregister :after,     self
+
+    MSpec.register   :load,      self
+    MSpec.register   :unload,    self
+  end
+
+  alias_method :load, :before
+  alias_method :unload, :after
+end

data/lib/mspec/runner/formatters/method.rb

@@ -0,0 +1,93 @@
+require 'mspec/runner/formatters/dotted'
+
+class MethodFormatter < DottedFormatter
+  attr_accessor :methods
+
+  def initialize(out=nil)
+    super
+    @methods = Hash.new do |h, k|
+      hash = {}
+      hash[:examples]     = 0
+      hash[:expectations] = 0
+      hash[:failures]     = 0
+      hash[:errors]       = 0
+      hash[:exceptions]   = []
+      h[k] = hash
+    end
+  end
+
+  # Returns the type of method as a "class", "instance",
+  # or "unknown".
+  def method_type(sep)
+    case sep
+    when '.', '::'
+      "class"
+    when '#'
+      "instance"
+    else
+      "unknown"
+    end
+  end
+
+  # Callback for the MSpec :before event. Parses the
+  # describe string into class and method if possible.
+  # Resets the tallies so the counts are only for this
+  # example.
+  def before(state)
+    super
+
+    # The pattern for a method name is not correctly
+    # restrictive but it is simplistic and useful
+    # for our purpose.
+    /^([A-Za-z_]+\w*)(\.|#|::)([^ ]+)/ =~ state.describe
+    @key = $1 && $2 && $3 ? "#{$1}#{$2}#{$3}" : state.describe
+
+    unless methods.key? @key
+      h = methods[@key]
+      h[:class]       = "#{$1}"
+      h[:method]      = "#{$3}"
+      h[:type]        = method_type $2
+      h[:description] = state.description
+    end
+
+    tally.counter.examples     = 0
+    tally.counter.expectations = 0
+    tally.counter.failures     = 0
+    tally.counter.errors       = 0
+
+    @exceptions = []
+  end
+
+  # Callback for the MSpec :after event. Sets or adds to
+  # tallies for the example block.
+  def after(state)
+    h = methods[@key]
+    h[:examples]     += tally.counter.examples
+    h[:expectations] += tally.counter.expectations
+    h[:failures]     += tally.counter.failures
+    h[:errors]       += tally.counter.errors
+    @exceptions.each do |exc|
+      h[:exceptions] << "#{exc.message}\n#{exc.backtrace}\n"
+    end
+  end
+
+  # Callback for the MSpec :finish event. Prints out the
+  # summary information in YAML format for all the methods.
+  def finish
+    print "---\n"
+
+    methods.each do |key, hash|
+      print key.inspect, ":\n"
+      print "  class: ",        hash[:class].inspect,        "\n"
+      print "  method: ",       hash[:method].inspect,       "\n"
+      print "  type: ",         hash[:type],                 "\n"
+      print "  description: ",  hash[:description].inspect,  "\n"
+      print "  examples: ",     hash[:examples],             "\n"
+      print "  expectations: ", hash[:expectations],         "\n"
+      print "  failures: ",     hash[:failures],             "\n"
+      print "  errors: ",       hash[:errors],               "\n"
+      print "  exceptions:\n"
+      hash[:exceptions].each { |exc| print "  - ", exc.inspect, "\n" }
+    end
+  end
+end

data/lib/mspec/runner/mspec.rb

@@ -276,7 +276,7 @@ module MSpec
       File.open(file, "w") do |f|
         lines.each do |line|
           unless pattern =~ line.chomp
-            f.puts line
+            f.puts line unless line.empty?
           else
             deleted = true
           end

data/lib/mspec/utils/options.rb

@@ -256,12 +256,16 @@ class MSpecOptions
         config[:formatter] = HtmlFormatter
       when 'd', 'dot', 'dotted'
         config[:formatter] = DottedFormatter
+      when 'f', 'file'
+        config[:formatter] = FileFormatter
       when 'u', 'unit', 'unitdiff'
         config[:formatter] = UnitdiffFormatter
       when 'm', 'summary'
         config[:formatter] = SummaryFormatter
       when 'a', '*', 'spin'
         config[:formatter] = SpinnerFormatter
+      when 't', 'method'
+        config[:formatter] = MethodFormatter
       when 'y', 'yaml'
         config[:formatter] = YamlFormatter
       else
@@ -275,9 +279,11 @@ class MSpecOptions
     doc "       s, spec, specdoc         SpecdocFormatter"
     doc "       h, html,                 HtmlFormatter"
     doc "       d, dot, dotted           DottedFormatter"
+    doc "       f, file                  FileFormatter"
     doc "       u, unit, unitdiff        UnitdiffFormatter"
     doc "       m, summary               SummaryFormatter"
     doc "       a, *, spin               SpinnerFormatter"
+    doc "       t, method                MethodFormatter"
     doc "       y, yaml                  YamlFormatter\n"
 
     on("-o", "--output", "FILE",

data/lib/mspec/utils/script.rb

@@ -16,7 +16,7 @@ class MSpecScript
 
   def initialize
     config[:tags_dir]  = 'spec/tags'
-    config[:formatter] = DottedFormatter
+    config[:formatter] = nil
     config[:includes]  = []
     config[:excludes]  = []
     config[:patterns]  = []
@@ -52,6 +52,9 @@ class MSpecScript
   end
 
   def register
+    if config[:formatter].nil?
+      config[:formatter] = @files.size < 50 ? DottedFormatter : FileFormatter
+    end
     config[:formatter].new(config[:output]).register if config[:formatter]
 
     MatchFilter.new(:include, *config[:includes]).register    unless config[:includes].empty?
@@ -76,11 +79,20 @@ class MSpecScript
     end
   end
 
+  def entries(pattern)
+    expanded = File.expand_path(pattern)
+    return [pattern] if File.file?(expanded)
+    return Dir[pattern+"/**/*_spec.rb"].sort if File.directory?(expanded)
+    Dir[pattern]
+  end
+
   def files(list)
     list.inject([]) do |files, item|
-      stat = File.stat(File.expand_path(item))
-      files << item if stat.file?
-      files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory?
+      if item[0] == ?^
+        files -= entries(item[1..-1])
+      else
+        files += entries(item)
+      end
       files
     end
   end
@@ -89,6 +101,7 @@ class MSpecScript
     $VERBOSE = nil unless ENV['OUTPUT_WARNINGS']
     script = new
     script.load 'default.mspec'
+    script.load RUBY_VERSION.split('.')[0,2].join('.') + ".mspec"
     script.load '~/.mspecrc'
     script.options
     script.signals

data/lib/mspec/version.rb

@@ -1,3 +1,3 @@
 module MSpec
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/spec/commands/mspec_ci_spec.rb

@@ -10,6 +10,7 @@ describe MSpecCI, "#options" do
 
     @script = MSpecCI.new
     @script.stub!(:config).and_return(@config)
+    @script.stub!(:files).and_return([])
   end
 
   it "enables the config option" do
@@ -76,16 +77,11 @@ describe MSpecCI, "#run" do
     TagFilter.stub!(:new).and_return(@filter)
     @filter.stub!(:register)
 
-    stat = mock("stat")
-    stat.stub!(:file?).and_return(true)
-    stat.stub!(:directory?).and_return(false)
-    File.stub!(:expand_path)
-    File.stub!(:stat).and_return(stat)
-
     @config = { :ci_files => ["one", "two"] }
     @script = MSpecCI.new
     @script.stub!(:exit)
     @script.stub!(:config).and_return(@config)
+    @script.stub!(:files).and_return(["one", "two"])
     @script.options
   end
 

data/spec/commands/mspec_run_spec.rb

@@ -2,6 +2,16 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/runner/mspec'
 require 'mspec/commands/mspec-run'
 
+describe MSpecRun, ".new" do
+  before :each do
+    @script = MSpecRun.new
+  end
+
+  it "sets config[:files] to an empty list" do
+    @script.config[:files].should == []
+  end
+end
+
 describe MSpecRun, "#options" do
   before :each do
     @stdout, $stdout = $stdout, IOStub.new
@@ -98,33 +108,35 @@ end
 
 describe MSpecRun, "#run" do
   before :each do
-    MSpec.stub!(:process)
-
-    stat = mock("stat")
-    stat.stub!(:file?).and_return(true)
-    stat.stub!(:directory?).and_return(false)
-    File.stub!(:expand_path)
-    File.stub!(:stat).and_return(stat)
-
-    options = mock("MSpecOptions", :null_object => true)
-    options.stub!(:parse).and_return(["one", "two"])
-    MSpecOptions.stub!(:new).and_return(options)
-
-    @config = { }
     @script = MSpecRun.new
     @script.stub!(:exit)
-    @script.stub!(:config).and_return(@config)
-    @script.options
+    @spec_dir = File.expand_path(File.dirname(__FILE__)+"/fixtures")
+    @file_patterns = [
+      @spec_dir+"/level2",
+      @spec_dir+"/one_spec.rb",
+      @spec_dir+"/two_spec.rb"]
+    @files = [
+      @spec_dir+"/level2/three_spec.rb",
+      @spec_dir+"/one_spec.rb",
+      @spec_dir+"/two_spec.rb"]
+    @script.options @file_patterns
   end
 
   it "registers the tags patterns" do
-    @config[:tags_patterns] = [/spec/, "tags"]
+    @script.config[:tags_patterns] = [/spec/, "tags"]
     MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"])
     @script.run
   end
 
   it "registers the files to process" do
-    MSpec.should_receive(:register_files).with(["one", "two"])
+    MSpec.should_receive(:register_files).with(@files)
+    @script.run
+  end
+
+  it "uses config[:files] if no files are given on the command line" do
+    @script.config[:files] = @file_patterns
+    MSpec.should_receive(:register_files).with(@files)
+    @script.options []
     @script.run
   end
 

data/spec/commands/mspec_tag_spec.rb

@@ -234,12 +234,6 @@ describe MSpecTag, "#run" do
   before :each do
     MSpec.stub!(:process)
 
-    stat = mock("stat")
-    stat.stub!(:file?).and_return(true)
-    stat.stub!(:directory?).and_return(false)
-    File.stub!(:expand_path)
-    File.stub!(:stat).and_return(stat)
-
     options = mock("MSpecOptions", :null_object => true)
     options.stub!(:parse).and_return(["one", "two"])
     MSpecOptions.stub!(:new).and_return(options)
@@ -248,6 +242,7 @@ describe MSpecTag, "#run" do
     @script = MSpecTag.new
     @script.stub!(:exit)
     @script.stub!(:config).and_return(@config)
+    @script.stub!(:files).and_return(["one", "two"])
     @script.options
   end
 
@@ -283,6 +278,9 @@ describe MSpecTag, "#register" do
     @config[:astrings] = []
     @config[:ltags] = ["fails", "unstable"]
 
+    @script.stub!(:files).and_return([])
+    @script.options "fake"
+
     @t = mock("TagAction")
     @t.stub!(:register)
 
@@ -329,9 +327,9 @@ describe MSpecTag, "#register" do
       @script.register
     end
 
-    it "sets config[:formatter] to nil" do
+    it "sets config[:formatter] to false" do
       @script.register
-      @config[:formatter].should be_nil
+      @config[:formatter].should be_false
     end
   end
 
@@ -351,9 +349,9 @@ describe MSpecTag, "#register" do
       @script.register
     end
 
-    it "sets config[:formatter] to nil" do
+    it "sets config[:formatter] to false" do
       @script.register
-      @config[:formatter].should be_nil
+      @config[:formatter].should be_false
     end
   end
 end

data/spec/matchers/respond_to_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/respond_to'
+
+describe RespondToMatcher do
+  it "matches when actual does respond_to? expected" do
+    RespondToMatcher.new(:to_s).matches?(Object.new).should == true
+    RespondToMatcher.new(:inject).matches?([]).should == true
+    RespondToMatcher.new(:[]).matches?(1).should == true
+    RespondToMatcher.new(:[]=).matches?("string").should == true
+  end
+
+  it "does not match when actual does not respond_to? expected" do
+    RespondToMatcher.new(:to_i).matches?(Object.new).should == false
+    RespondToMatcher.new(:inject).matches?(1).should == false
+    RespondToMatcher.new(:non_existent_method).matches?([]).should == false
+    RespondToMatcher.new(:[]=).matches?(1).should == false
+  end
+
+  it "provides a useful failure message" do
+    matcher = RespondToMatcher.new(:non_existent_method)
+    matcher.matches?('string')
+    matcher.failure_message.should == ["Expected \"string\" (String)", "to respond to non_existent_method"]
+  end
+
+  it "provides a useful negative failure message" do
+    matcher = RespondToMatcher.new(:to_i)
+    matcher.matches?(4.2)
+    matcher.negative_failure_message.should == ["Expected 4.2 (Float)", "not to respond to to_i"]
+  end
+end

data/spec/runner/formatters/dotted_spec.rb

@@ -40,12 +40,15 @@ describe DottedFormatter, "#register" do
 end
 
 describe DottedFormatter, "#print" do
+  before :each do
+    $stdout = IOStub.new
+  end
+
   after :each do
     $stdout = STDOUT
   end
 
   it "writes to $stdout by default" do
-    $stdout = IOStub.new
     formatter = DottedFormatter.new
     formatter.print "begonias"
     $stdout.should == "begonias"
@@ -58,6 +61,18 @@ describe DottedFormatter, "#print" do
     formatter.print "begonias"
     out.should == "begonias"
   end
+
+  it "flushes the IO output" do
+    $stdout.should_receive(:flush)
+    formatter = DottedFormatter.new
+    formatter.print "begonias"
+  end
+
+  it "rescues errors from flush" do
+    $stdout.should_receive(:flush).and_raise(RuntimeError.new)
+    formatter = DottedFormatter.new
+    formatter.print("begonias").should == nil
+  end
 end
 
 describe DottedFormatter, "#exception" do

data/spec/runner/formatters/file_spec.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mspec/runner/formatters/file'
+require 'mspec/runner/mspec'
+require 'mspec/runner/example'
+
+describe FileFormatter, "#register" do
+  before :each do
+    @formatter = FileFormatter.new
+  end
+
+  it "registers self with MSpec for :load, :unload actions" do
+    MSpec.stub!(:register)
+    MSpec.should_receive(:register).with(:load, @formatter)
+    MSpec.should_receive(:register).with(:unload, @formatter)
+    @formatter.register
+  end
+
+  it "unregisters self with MSpec for :before, :after actions" do
+    MSpec.stub!(:unregister)
+    MSpec.should_receive(:unregister).with(:before, @formatter)
+    MSpec.should_receive(:unregister).with(:after, @formatter)
+    @formatter.register
+  end
+end
+
+describe FileFormatter, "#load" do
+  before :each do
+    @state = ExampleState.new ContextState.new("describe"), "it"
+    @formatter = FileFormatter.new
+    @formatter.exception ExceptionState.new(nil, nil, ExpectationNotMetError.new("Failed!"))
+  end
+
+  it "resets the #failure? flag to false" do
+    @formatter.failure?.should be_true
+    @formatter.load @state
+    @formatter.failure?.should be_false
+  end
+
+  it "resets the #exception? flag to false" do
+    @formatter.exception?.should be_true
+    @formatter.load @state
+    @formatter.exception?.should be_false
+  end
+end
+
+describe FileFormatter, "#unload" do
+  before :each do
+    $stdout = @out = IOStub.new
+    @formatter = FileFormatter.new
+    @state = ExampleState.new ContextState.new("describe"), "it"
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "prints a '.' if there was no exception raised" do
+    @formatter.unload(@state)
+    @out.should == "."
+  end
+
+  it "prints an 'F' if there was an expectation failure" do
+    exc = ExpectationNotMetError.new "failed"
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.unload(@state)
+    @out.should == "F"
+  end
+
+  it "prints an 'E' if there was an exception other than expectation failure" do
+    exc = MSpecExampleError.new("boom!")
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.unload(@state)
+    @out.should == "E"
+  end
+
+  it "prints an 'E' if there are mixed exceptions and exepctation failures" do
+    exc = ExpectationNotMetError.new "failed"
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+    exc = MSpecExampleError.new("boom!")
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.unload(@state)
+    @out.should == "E"
+  end
+end

data/spec/runner/formatters/html_spec.rb

@@ -37,7 +37,7 @@ describe HtmlFormatter, "#start" do
     "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-<title>Spec Output For #{ruby_name} (1.8.6)</title>
+<title>Spec Output For #{ruby_name} (#{RUBY_VERSION})</title>
 <style type="text/css">
 ul {
   list-style: none;

data/spec/runner/formatters/method_spec.rb

@@ -0,0 +1,177 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mspec/runner/formatters/method'
+require 'mspec/runner/mspec'
+require 'mspec/runner/example'
+
+describe MethodFormatter, "#method_type" do
+  before :each do
+    @formatter = MethodFormatter.new
+  end
+
+  it "returns 'class' if the separator is '.' or '::'" do
+    @formatter.method_type('.').should == "class"
+    @formatter.method_type('::').should == "class"
+  end
+
+  it "returns 'instance' if the separator is '#'" do
+    @formatter.method_type('#').should == "instance"
+  end
+
+  it "returns 'unknown' for all other cases" do
+    @formatter.method_type(nil).should == "unknown"
+  end
+end
+
+describe MethodFormatter, "#before" do
+  before :each do
+    @formatter = MethodFormatter.new
+    MSpec.stub!(:register)
+    @formatter.register
+  end
+
+  it "resets the tally counters to 0" do
+    @formatter.tally.counter.examples = 3
+    @formatter.tally.counter.expectations = 4
+    @formatter.tally.counter.failures = 2
+    @formatter.tally.counter.errors = 1
+
+    state = ExampleState.new ContextState.new("describe"), "it"
+    @formatter.before state
+    @formatter.tally.counter.examples.should == 0
+    @formatter.tally.counter.expectations.should == 0
+    @formatter.tally.counter.failures.should == 0
+    @formatter.tally.counter.errors.should == 0
+  end
+
+  it "records the class, method if available" do
+    state = ExampleState.new ContextState.new("Some#method"), "it"
+    @formatter.before state
+    key = "Some#method"
+    @formatter.methods.keys.should include(key)
+    h = @formatter.methods[key]
+    h[:class].should == "Some"
+    h[:method].should == "method"
+    h[:description].should == "Some#method it"
+  end
+
+  it "does not record class, method unless both are available" do
+    state = ExampleState.new ContextState.new("Some method"), "it"
+    @formatter.before state
+    key = "Some method"
+    @formatter.methods.keys.should include(key)
+    h = @formatter.methods[key]
+    h[:class].should == ""
+    h[:method].should == ""
+    h[:description].should == "Some method it"
+  end
+
+  it "sets the method type to unknown if class and method are not available" do
+    state = ExampleState.new ContextState.new("Some method"), "it"
+    @formatter.before state
+    key = "Some method"
+    h = @formatter.methods[key]
+    h[:type].should == "unknown"
+  end
+
+  it "sets the method type based on the class, method separator" do
+    [["C#m", "instance"], ["C.m", "class"], ["C::m", "class"]].each do |k, t|
+      state = ExampleState.new ContextState.new(k), "it"
+      @formatter.before state
+      h = @formatter.methods[k]
+      h[:type].should == t
+    end
+  end
+
+  it "clears the list of exceptions" do
+    state = ExampleState.new ContextState.new("describe"), "it"
+    @formatter.exceptions << "stuff"
+    @formatter.before state
+    @formatter.exceptions.should be_empty
+  end
+end
+
+describe MethodFormatter, "#after" do
+  before :each do
+    @formatter = MethodFormatter.new
+    MSpec.stub!(:register)
+    @formatter.register
+  end
+
+  it "sets the tally counts" do
+    state = ExampleState.new ContextState.new("Some#method"), "it"
+    @formatter.before state
+
+    @formatter.tally.counter.examples = 3
+    @formatter.tally.counter.expectations = 4
+    @formatter.tally.counter.failures = 2
+    @formatter.tally.counter.errors = 1
+
+    @formatter.after state
+    h = @formatter.methods["Some#method"]
+    h[:examples].should == 3
+    h[:expectations].should == 4
+    h[:failures].should == 2
+    h[:errors].should == 1
+  end
+
+  it "renders the list of exceptions" do
+    state = ExampleState.new ContextState.new("Some#method"), "it"
+    @formatter.before state
+
+    exc = ExpectationNotMetError.new "failed"
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+
+    @formatter.after state
+    h = @formatter.methods["Some#method"]
+    h[:exceptions].should == [
+      %[failed\n\n],
+      %[failed\n\n]
+    ]
+  end
+end
+
+describe MethodFormatter, "#after" do
+  before :each do
+    $stdout = IOStub.new
+    context = ContextState.new "Class#method"
+    @state = ExampleState.new(context, "runs")
+    @formatter = MethodFormatter.new
+    MSpec.stub!(:register)
+    @formatter.register
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "prints a summary of the results of an example in YAML format" do
+    @formatter.before @state
+    @formatter.tally.counter.examples = 3
+    @formatter.tally.counter.expectations = 4
+    @formatter.tally.counter.failures = 2
+    @formatter.tally.counter.errors = 1
+
+    exc = ExpectationNotMetError.new "failed"
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.exception ExceptionState.new(@state, nil, exc)
+
+    @formatter.after @state
+    @formatter.finish
+    $stdout.should ==
+%[---
+"Class#method":
+  class: "Class"
+  method: "method"
+  type: instance
+  description: "Class#method runs"
+  examples: 3
+  expectations: 4
+  failures: 2
+  errors: 1
+  exceptions:
+  - "failed\\n\\n"
+  - "failed\\n\\n"
+]
+  end
+end

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ class MOSConfig < Hash
     self[:target]    = 'ruby'
     self[:command]   = nil
     self[:ltags]     = []
+    self[:files]     = []
   end
 end
 

data/spec/utils/options_spec.rb

@@ -664,6 +664,16 @@ describe "The -f, --format FORMAT option" do
     end
   end
 
+  it "sets the FileFormatter with FORMAT 'f', 'file'" do
+    ["-f", "--format"].each do |opt|
+      ["f", "file"].each do |f|
+        @config[:formatter] = nil
+        @options.parse [opt, f]
+        @config[:formatter].should == FileFormatter
+      end
+    end
+  end
+
   it "sets the UnitdiffFormatter with FORMAT 'u', 'unit', or 'unitdiff'" do
     ["-f", "--format"].each do |opt|
       ["u", "unit", "unitdiff"].each do |f|
@@ -693,6 +703,26 @@ describe "The -f, --format FORMAT option" do
       end
     end
   end
+
+  it "sets the MethodFormatter with FORMAT 't' or 'method'" do
+    ["-f", "--format"].each do |opt|
+      ["t", "method"].each do |f|
+        @config[:formatter] = nil
+        @options.parse [opt, f]
+        @config[:formatter].should == MethodFormatter
+      end
+    end
+  end
+
+  it "sets the YamlFormatter with FORMAT 'y' or 'yaml'" do
+    ["-f", "--format"].each do |opt|
+      ["y", "yaml"].each do |f|
+        @config[:formatter] = nil
+        @options.parse [opt, f]
+        @config[:formatter].should == YamlFormatter
+      end
+    end
+  end
 end
 
 describe "The -o, --output FILE option" do

data/spec/utils/script_spec.rb

@@ -32,6 +32,34 @@ describe MSpecScript, "#config" do
   end
 end
 
+describe MSpecScript, ".main" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+  end
+
+  before :each do
+    @version = RUBY_VERSION
+    @script = mock("MSpecScript", :null_object => true)
+    MSpecScript.stub!(:new).and_return(@script)
+  end
+
+  after :each do
+    Object.const_set :RUBY_VERSION, @version
+  end
+
+  it "attempts to load a config file based on RUBY_VERSION" do
+    Object.const_set :RUBY_VERSION, "1.8.9"
+    version = "1.8.mspec"
+    @script.should_receive(:load).with(version)
+    MSpecScript.main
+  end
+end
+
 describe MSpecScript, ".main" do
   before :each do
     @script = mock("MSpecScript", :null_object => true)
@@ -81,7 +109,7 @@ describe MSpecScript, "#initialize" do
 
   it "sets the default config values" do
     @config[:tags_dir].should   == 'spec/tags'
-    @config[:formatter].should  == DottedFormatter
+    @config[:formatter].should  == nil
     @config[:includes].should   == []
     @config[:excludes].should   == []
     @config[:patterns].should   == []
@@ -162,8 +190,8 @@ describe MSpecScript, "#register" do
     @script.register
   end
 
-  it "does not register the formatter if config[:formatter] is nil" do
-    @script.config[:formatter] = nil
+  it "does not register the formatter if config[:formatter] is false" do
+    @script.config[:formatter] = false
     @script.register
   end
 end
@@ -269,29 +297,51 @@ describe MSpecScript, "#signals" do
   end
 end
 
+describe MSpecScript, "#entries" do
+  before :each do
+    @script = MSpecScript.new
+  end
+
+  it "returns the pattern in an array if it is a file" do
+    File.should_receive(:expand_path).with("file").and_return("file")
+    File.should_receive(:file?).with("file").and_return(true)
+    @script.entries("file").should == ["file"]
+  end
+
+  it "returns Dir['pattern/**/*_spec.rb'] if pattern is a directory" do
+    File.should_receive(:expand_path).with("dir").and_return("dir")
+    File.should_receive(:file?).with("dir").and_return(false)
+    File.should_receive(:directory?).with("dir").and_return(true)
+    Dir.should_receive(:[]).with("dir/**/*_spec.rb").and_return(["dir1", "dir2"])
+    @script.entries("dir").should == ["dir1", "dir2"]
+  end
+
+  it "returns Dir[pattern] if pattern is neither a file nor a directory" do
+    File.should_receive(:expand_path).with("pattern").and_return("pattern")
+    File.should_receive(:file?).with("pattern").and_return(false)
+    File.should_receive(:directory?).with("pattern").and_return(false)
+    Dir.should_receive(:[]).with("pattern").and_return(["file1", "file2"])
+    @script.entries("pattern").should == ["file1", "file2"]
+  end
+end
+
 describe MSpecScript, "#files" do
   before :each do
     @script = MSpecScript.new
   end
 
-  it "returns entries unchanged if they are files" do
-    stat = mock("Stat")
-    stat.stub!(:file?).and_return(true)
-    stat.stub!(:directory?).and_return(false)
-    File.stub!(:stat).and_return(stat)
-    @script.files(["a", "b"]).should == ["a", "b"]
+  it "accumlates the values returned by #entries" do
+    @script.should_receive(:entries).and_return(["file1"], ["file2"])
+    @script.files(["a", "b"]).should == ["file1", "file2"]
   end
 
-  it "searches for _spec.rb files if the entry is a directory" do
-    File.should_receive(:expand_path).with("some/dir").and_return("some/dir")
-    stat = mock("Stat")
-    stat.should_receive(:file?).and_return(false)
-    stat.should_receive(:directory?).and_return(true)
-    File.stub!(:stat).and_return(stat)
+  it "strips a leading '^' and removes the values returned by #entries" do
+    @script.should_receive(:entries).and_return(["file1"], ["file2"], ["file1"])
+    @script.files(["a", "b", "^a"]).should == ["file2"]
+  end
 
-    Dir.should_receive(:[]).with("some/dir/**/*_spec.rb").and_return(
-      ["some/dir/file_spec.rb", "some/dir/other_spec.rb"])
-    @script.files(["some/dir"]).should ==
-      ["some/dir/file_spec.rb", "some/dir/other_spec.rb"]
+  it "processes the array elements in order" do
+    @script.should_receive(:entries).and_return(["file1"], ["file1"], ["file2"])
+    @script.files(["^a", "a", "b"]).should == ["file1", "file2"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 -07:00
+date: 2008-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -75,6 +75,7 @@ files:
 - lib/mspec/matchers/output.rb
 - lib/mspec/matchers/output_to_fd.rb
 - lib/mspec/matchers/raise_error.rb
+- lib/mspec/matchers/respond_to.rb
 - lib/mspec/matchers.rb
 - lib/mspec/mocks/mock.rb
 - lib/mspec/mocks/object.rb
@@ -98,7 +99,9 @@ files:
 - lib/mspec/runner/filters/tag.rb
 - lib/mspec/runner/filters.rb
 - lib/mspec/runner/formatters/dotted.rb
+- lib/mspec/runner/formatters/file.rb
 - lib/mspec/runner/formatters/html.rb
+- lib/mspec/runner/formatters/method.rb
 - lib/mspec/runner/formatters/specdoc.rb
 - lib/mspec/runner/formatters/spinner.rb
 - lib/mspec/runner/formatters/summary.rb
@@ -117,7 +120,12 @@ files:
 - lib/mspec.rb
 - spec/runner/filters/a.yaml
 - spec/runner/filters/b.yaml
+- spec/commands/fixtures/four.txt
 - spec/runner/tags.txt
+- spec/commands/fixtures/level2/three_spec.rb
+- spec/commands/fixtures/one_spec.rb
+- spec/commands/fixtures/three.rb
+- spec/commands/fixtures/two_spec.rb
 - spec/commands/mkspec_spec.rb
 - spec/commands/mspec_ci_spec.rb
 - spec/commands/mspec_run_spec.rb
@@ -163,6 +171,7 @@ files:
 - spec/matchers/output_spec.rb
 - spec/matchers/output_to_fd_spec.rb
 - spec/matchers/raise_error_spec.rb
+- spec/matchers/respond_to_spec.rb
 - spec/mocks/mock_spec.rb
 - spec/mocks/proxy_spec.rb
 - spec/runner/actions/debug_spec.rb
@@ -180,7 +189,9 @@ files:
 - spec/runner/filters/regexp_spec.rb
 - spec/runner/filters/tag_spec.rb
 - spec/runner/formatters/dotted_spec.rb
+- spec/runner/formatters/file_spec.rb
 - spec/runner/formatters/html_spec.rb
+- spec/runner/formatters/method_spec.rb
 - spec/runner/formatters/specdoc_spec.rb
 - spec/runner/formatters/spinner_spec.rb
 - spec/runner/formatters/summary_spec.rb
@@ -222,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://rubyforge.org/projects/mspec
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: MSpec is a specialized framework that is syntax-compatible with RSpec for basic things like describe, it blocks and before, after actions.  MSpec contains additional features that assist in writing the RubySpecs used by multiple Ruby implementations. Also, MSpec attempts to use the simplest Ruby language features so that beginning Ruby implementations can run it.