mspec 1.5.6 → 1.5.7

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{2008-12-29}
+  s.date                      = %q{2009-2-5}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

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

@@ -41,6 +41,9 @@ class MSpecCI < MSpecScript
     options.version MSpec::VERSION
     options.help
 
+    options.doc "\n Custom options"
+    custom_options options
+
     options.doc "\n How might this work in the real world?"
     options.doc "\n   1. To simply run the known good specs"
     options.doc "\n     $ mspec ci"

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

@@ -53,6 +53,9 @@ class MSpecRun < MSpecScript
     options.version MSpec::VERSION
     options.help
 
+    options.doc "\n Custom options"
+    custom_options options
+
     options.doc "\n How might this work in the real world?"
     options.doc "\n   1. To simply run some specs"
     options.doc "\n     $ mspec path/to/the/specs"

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

@@ -75,6 +75,9 @@ class MSpecTag < MSpecScript
     options.version MSpec::VERSION
     options.help
 
+    options.doc "\n Custom options"
+    custom_options options
+
     options.doc "\n How might this work in the real world?"
     options.doc "\n   1. To add the 'fails' tag to failing specs"
     options.doc "\n     $ mspec tag path/to/the_file_spec.rb"

data/lib/mspec/commands/mspec.rb

@@ -24,9 +24,9 @@ class MSpecMain < MSpecScript
 
     options = MSpecOptions.new "mspec [COMMAND] [options] (FILE|DIRECTORY|GLOB)+", 30, config
 
-    options.doc "  The mspec command sets up and invokes the sub-commands"
-    options.doc "  (see below) to enable, for instance, running the specs"
-    options.doc "  with different implementations like ruby, jruby, rbx, etc.\n"
+    options.doc " The mspec command sets up and invokes the sub-commands"
+    options.doc " (see below) to enable, for instance, running the specs"
+    options.doc " with different implementations like ruby, jruby, rbx, etc.\n"
 
     options.configure do |f|
       load f
@@ -66,12 +66,15 @@ class MSpecMain < MSpecScript
       end
     end
 
+    options.doc "\n Custom options"
+    custom_options options
+
     # The rest of the help output
-    options.doc "\n  where COMMAND is one of:\n"
-    options.doc "    run - Run the specified specs (default)"
-    options.doc "    ci  - Run the known good specs"
-    options.doc "    tag - Add or remove tags\n"
-    options.doc "  mspec COMMAND -h for more options\n"
+    options.doc "\n where COMMAND is one of:\n"
+    options.doc "   run - Run the specified specs (default)"
+    options.doc "   ci  - Run the known good specs"
+    options.doc "   tag - Add or remove tags\n"
+    options.doc " mspec COMMAND -h for more options\n"
 
     options.on_extra { |o| config[:options] << o }
     config[:options].concat options.parse(argv)

data/lib/mspec/matchers.rb

@@ -11,6 +11,8 @@ require 'mspec/matchers/eql'
 require 'mspec/matchers/equal'
 require 'mspec/matchers/equal_element'
 require 'mspec/matchers/equal_utf16'
+require 'mspec/matchers/have_instance_method'
+require 'mspec/matchers/have_private_instance_method'
 require 'mspec/matchers/include'
 require 'mspec/matchers/match_yaml'
 require 'mspec/matchers/raise_error'

data/lib/mspec/matchers/have_instance_method.rb

@@ -0,0 +1,30 @@
+require 'mspec/utils/version'
+
+class HaveInstanceMethodMatcher
+  def initialize(method, include_super=true)
+    @include_super = include_super
+    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
+    @method = version < 0 ? method.to_s : method
+  end
+
+  def matches?(mod)
+    @mod = mod
+    mod.instance_methods(@include_super).include? @method
+  end
+
+  def failure_message
+    ["Expected #{@mod} to have private method '#{@method.to_s}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@mod} NOT to have private method '#{@method.to_s}'",
+     "but it does"]
+  end
+end
+
+class Object
+  def have_instance_method(method, include_super=true)
+    HaveInstanceMethodMatcher.new method, include_super
+  end
+end

data/lib/mspec/matchers/have_private_instance_method.rb

@@ -0,0 +1,30 @@
+require 'mspec/utils/version'
+
+class HavePrivateInstanceMethodMatcher
+  def initialize(method, include_super=true)
+    @include_super = include_super
+    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
+    @method = version < 0 ? method.to_s : method
+  end
+
+  def matches?(mod)
+    @mod = mod
+    mod.private_instance_methods(@include_super).include? @method
+  end
+
+  def failure_message
+    ["Expected #{@mod} to have private method '#{@method.to_s}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@mod} NOT to have private method '#{@method.to_s}'",
+     "but it does"]
+  end
+end
+
+class Object
+  def have_private_instance_method(method, include_super=true)
+    HavePrivateInstanceMethodMatcher.new method, include_super
+  end
+end

data/lib/mspec/runner.rb

@@ -1,5 +1,7 @@
 require 'mspec/mocks'
 require 'mspec/runner/mspec'
+require 'mspec/runner/context'
+require 'mspec/runner/example'
 require 'mspec/runner/object'
 require 'mspec/runner/formatters'
 require 'mspec/runner/actions'

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

@@ -25,15 +25,32 @@ class Tally
     @errors += add
   end
 
+  def file
+    pluralize files, "file"
+  end
+
+  def example
+    pluralize examples, "example"
+  end
+
+  def expectation
+    pluralize expectations, "expectation"
+  end
+
+  def failure
+    pluralize failures, "failure"
+  end
+
+  def error
+    pluralize errors, "error"
+  end
+
   def format
-    [ [@files, 'file'],
-      [@examples, 'example'],
-      [@expectations, 'expectation'],
-      [@failures, 'failure'],
-      [@errors, 'error']
-    ].map { |count, word| pluralize count, word }.join(", ")
+    [ file, example, expectation, failure, error ].join(", ")
   end
 
+  alias_method :to_s, :format
+
   def pluralize(count, singular)
     "#{count} #{singular}#{'s' unless count == 1}"
   end

data/lib/mspec/runner/context.rb

@@ -1,6 +1,3 @@
-require 'mspec/runner/mspec'
-require 'mspec/runner/example'
-
 # Holds the state of the +describe+ block that is being
 # evaluated. Every example (i.e. +it+ block) is evaluated
 # in a context, which may include state set up in <tt>before

data/lib/mspec/runner/formatters.rb

@@ -1,3 +1,4 @@
+require 'mspec/runner/formatters/describe'
 require 'mspec/runner/formatters/dotted'
 require 'mspec/runner/formatters/file'
 require 'mspec/runner/formatters/specdoc'

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

@@ -0,0 +1,24 @@
+require 'mspec/runner/formatters/dotted'
+require 'mspec/runner/actions/tally'
+
+class DescribeFormatter < DottedFormatter
+  # Callback for the MSpec :finish event. Prints a summary of
+  # the number of errors and failures for each +describe+ block.
+  def finish
+    describes = Hash.new { |h,k| h[k] = Tally.new }
+
+    @exceptions.each do |exc|
+      desc = describes[exc.describe]
+      exc.failure? ? desc.failures! : desc.errors!
+    end
+
+    print "\n"
+    describes.each do |d, t|
+      text = d.size > 40 ? "#{d[0,37]}..." : d.ljust(40)
+      print "\n#{text} #{t.failure}, #{t.error}"
+    end
+    print "\n" unless describes.empty?
+
+    print "\n#{@timer.format}\n\n#{@tally.format}\n"
+  end
+end

data/lib/mspec/runner/mspec.rb

@@ -293,7 +293,7 @@ module MSpec
   # file if it is empty.
   def self.delete_tag(tag)
     deleted = false
-    pattern = /#{tag.tag}.*#{Regexp.escape tag.description}/
+    pattern = /#{tag.tag}.*#{Regexp.escape(tag.escape(tag.description))}/
     file = tags_file
     if File.exist? file
       lines = IO.readlines(file)

data/lib/mspec/runner/tag.rb

@@ -6,12 +6,24 @@ class SpecTag
   end
 
   def parse(string)
-    m = /^([^()#:]+)(\(([^)]+)?\))?:(.*)/.match string
-    @tag, @comment, @description = m.values_at(1, 3, 4) if m
+    m = /^([^()#:]+)(\(([^)]+)?\))?:(.*)$/.match string
+    @tag, @comment, description = m.values_at(1, 3, 4) if m
+    @description = unescape description
+  end
+
+  def unescape(str)
+    return unless str
+    str = str[1..-2] if str[0] == ?" and str[-1] == ?"
+    str.gsub(/\\n/, "\n")
+  end
+
+  def escape(str)
+    str = %["#{str.gsub(/\n/, '\n')}"] if /\n/ =~ str
+    str
   end
 
   def to_s
-    "#{@tag}#{ "(#{@comment})" if @comment }:#{@description}"
+    "#{@tag}#{ "(#{@comment})" if @comment }:#{escape @description}"
   end
 
   def ==(o)

data/lib/mspec/utils/options.rb

@@ -210,7 +210,7 @@ class MSpecOptions
       when 'r', 'ruby'
         config[:target] = 'ruby'
       when 'r19', 'ruby19'
-        config[:target] = 'ruby19'
+        config[:target] = 'ruby1.9'
       when 'x', 'rubinius'
         config[:target] = './bin/rbx'
       when 'X', 'rbx'
@@ -225,12 +225,12 @@ class MSpecOptions
     end
 
     doc ""
-    doc "     r or ruby     invokes ruby in PATH"
-    doc "     r19 or ruby19 invokes ruby19 in PATH"
-    doc "     x or rubinius invokes ./bin/rbx"
-    doc "     X or rbx      invokes rbx in PATH"
-    doc "     j or jruby    invokes jruby in PATH"
-    doc "     i or ironruby invokes ir in PATH\n"
+    doc "     r or ruby              invokes ruby in PATH"
+    doc "     r19, ruby19 or ruby1.9 invokes ruby1.9 in PATH"
+    doc "     x or rubinius          invokes ./bin/rbx"
+    doc "     X or rbx               invokes rbx in PATH"
+    doc "     j or jruby             invokes jruby in PATH"
+    doc "     i or ironruby          invokes ir in PATH\n"
 
     on("-T", "--target-opt", "OPT",
        "Pass OPT as a flag to the target implementation") do |t|
@@ -256,6 +256,8 @@ class MSpecOptions
         config[:formatter] = HtmlFormatter
       when 'd', 'dot', 'dotted'
         config[:formatter] = DottedFormatter
+      when 'b', 'describe'
+        config[:formatter] = DescribeFormatter
       when 'f', 'file'
         config[:formatter] = FileFormatter
       when 'u', 'unit', 'unitdiff'

data/lib/mspec/utils/script.rb

@@ -96,12 +96,24 @@ class MSpecScript
     load "#{engine}.#{SpecGuard.ruby_version}.mspec"
   end
 
+  # Callback for enabling custom options. This version is a no-op.
+  # Provide an implementation specific version in a config file.
+  # Called by #options after the MSpec-provided options are added.
+  def custom_options(options)
+    options.doc "   No custom options registered"
+  end
+
   # Registers all filters and actions.
   def register
     if config[:formatter].nil?
       config[:formatter] = @files.size < 50 ? DottedFormatter : FileFormatter
     end
-    config[:formatter].new(config[:output]).register if config[:formatter]
+
+    if config[:formatter]
+      formatter = config[:formatter].new(config[:output])
+      formatter.register
+      MSpec.store :formatter, formatter
+    end
 
     MatchFilter.new(:include, *config[:includes]).register    unless config[:includes].empty?
     MatchFilter.new(:exclude, *config[:excludes]).register    unless config[:excludes].empty?
@@ -114,6 +126,14 @@ class MSpecScript
 
     DebugAction.new(config[:atags], config[:astrings]).register if config[:debugger]
     GdbAction.new(config[:atags], config[:astrings]).register   if config[:gdb]
+
+    custom_register
+  end
+
+  # Callback for enabling custom actions, etc. This version is a
+  # no-op. Provide an implementation specific version in a config
+  # file. Called by #register.
+  def custom_register
   end
 
   # Sets up signal handlers. Only a handler for SIGINT is

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.5.6"
+  VERSION = SpecVersion.new "1.5.7"
 end

data/spec/commands/mspec_ci_spec.rb

@@ -87,6 +87,11 @@ describe MSpecCI, "#options" do
     @options.should_receive(:help)
     @script.options
   end
+
+  it "calls #custom_options" do
+    @script.should_receive(:custom_options).with(@options)
+    @script.options
+  end
 end
 
 describe MSpecCI, "#run" do

data/spec/commands/mspec_run_spec.rb

@@ -124,6 +124,11 @@ describe MSpecRun, "#options" do
     @script.options
     $stdout.should =~ /No files specified/
   end
+
+  it "calls #custom_options" do
+    @script.should_receive(:custom_options).with(@options)
+    @script.options @argv
+  end
 end
 
 describe MSpecRun, "#run" do

data/spec/commands/mspec_spec.rb

@@ -37,6 +37,11 @@ describe MSpecMain, "#options" do
     @script.options [".", "-G", "fail", "-X", "ARG", "--list", "unstable", "some/file.rb"]
     @config[:options].should == [".", "-G", "fail", "--list", "unstable", "some/file.rb"]
   end
+
+  it "calls #custom_options" do
+    @script.should_receive(:custom_options).with(@options)
+    @script.options
+  end
 end
 
 describe MSpecMain, "#parallel" do

data/spec/commands/mspec_tag_spec.rb

@@ -98,6 +98,11 @@ describe MSpecTag, "#options" do
     @script.options @argv
   end
 
+  it "calls #custom_options" do
+    @script.should_receive(:custom_options).with(@options)
+    @script.options @argv
+  end
+
   it "exits if there are no files to process" do
     @options.should_receive(:parse).and_return([])
     @script.should_receive(:exit)

data/spec/expectations/should_spec.rb

@@ -110,7 +110,7 @@ describe Object, "#should_not" do
   end
 
   it "returns a NegativeOperatorMatcher instance when not passed a matcher" do
-    matcher = should_not
+    matcher = should_not nil
     class Object; alias_method :should, :rspec_should; end
     matcher.should be_instance_of(NegativeOperatorMatcher)
   end

data/spec/guards/bug_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/utils/ruby_name'
 require 'mspec/guards/bug'
 
 describe BugGuard, "#match? when #implementation? is 'ruby'" do

data/spec/matchers/have_instance_method_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_instance_method'
+
+class HIMMSpecs
+  def instance_method
+  end
+
+  class Subclass < HIMMSpecs
+    def instance_sub_method
+    end
+  end
+end
+
+describe HaveInstanceMethodMatcher do
+  it "matches when mod has the private instance method" do
+    matcher = HaveInstanceMethodMatcher.new :instance_method
+    matcher.matches?(HIMMSpecs).should be_true
+    matcher.matches?(HIMMSpecs::Subclass).should be_true
+  end
+
+  it "does not match when mod does not have the private instance method" do
+    matcher = HaveInstanceMethodMatcher.new :another_method
+    matcher.matches?(HIMMSpecs).should be_false
+  end
+
+  it "does not match if the method is in a superclass and include_super is false" do
+    matcher = HaveInstanceMethodMatcher.new :instance_method, false
+    matcher.matches?(HIMMSpecs::Subclass).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HaveInstanceMethodMatcher.new :some_method
+    matcher.matches?(HIMMSpecs)
+    matcher.failure_message.should == [
+      "Expected HIMMSpecs to have private method 'some_method'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HaveInstanceMethodMatcher.new :some_method
+    matcher.matches?(HIMMSpecs)
+    matcher.negative_failure_message.should == [
+      "Expected HIMMSpecs NOT to have private method 'some_method'",
+      "but it does"
+    ]
+  end
+end
+
+describe HaveInstanceMethodMatcher do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+  end
+
+  before :each do
+    @ruby_version = Object.const_get :RUBY_VERSION
+
+    @method = mock("method name")
+  end
+
+  after :each do
+    Object.const_set :RUBY_VERSION, @ruby_version
+  end
+
+  it "converts the method name to a string if RUBY_VERSION < 1.9" do
+    Object.const_set :RUBY_VERSION, "1.8.6"
+    @method.should_receive(:to_s).and_return("method_name")
+    HaveInstanceMethodMatcher.new @method
+  end
+
+  it "does not convert the method name to a string if RUBY_VERSION >= 1.9" do
+    Object.const_set :RUBY_VERSION, "1.9.0"
+    @method.should_not_receive(:to_s)
+    HaveInstanceMethodMatcher.new @method
+  end
+end

data/spec/matchers/have_private_instance_method_spec.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_private_instance_method'
+
+class HPIMMSpecs
+  private
+
+  def private_method
+  end
+
+  class Subclass < HPIMMSpecs
+    private
+
+    def private_sub_method
+    end
+  end
+end
+
+describe HavePrivateInstanceMethodMatcher do
+  it "matches when mod has the private instance method" do
+    matcher = HavePrivateInstanceMethodMatcher.new :private_method
+    matcher.matches?(HPIMMSpecs).should be_true
+    matcher.matches?(HPIMMSpecs::Subclass).should be_true
+  end
+
+  it "does not match when mod does not have the private instance method" do
+    matcher = HavePrivateInstanceMethodMatcher.new :another_method
+    matcher.matches?(HPIMMSpecs).should be_false
+  end
+
+  it "does not match if the method is in a superclass and include_super is false" do
+    matcher = HavePrivateInstanceMethodMatcher.new :private_method, false
+    matcher.matches?(HPIMMSpecs::Subclass).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HavePrivateInstanceMethodMatcher.new :some_method
+    matcher.matches?(HPIMMSpecs)
+    matcher.failure_message.should == [
+      "Expected HPIMMSpecs to have private method 'some_method'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HavePrivateInstanceMethodMatcher.new :some_method
+    matcher.matches?(HPIMMSpecs)
+    matcher.negative_failure_message.should == [
+      "Expected HPIMMSpecs NOT to have private method 'some_method'",
+      "but it does"
+    ]
+  end
+end
+
+describe HavePrivateInstanceMethodMatcher do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+  end
+
+  before :each do
+    @ruby_version = Object.const_get :RUBY_VERSION
+
+    @method = mock("method name")
+  end
+
+  after :each do
+    Object.const_set :RUBY_VERSION, @ruby_version
+  end
+
+  it "converts the method name to a string if RUBY_VERSION < 1.9" do
+    Object.const_set :RUBY_VERSION, "1.8.6"
+    @method.should_receive(:to_s).and_return("method_name")
+    HavePrivateInstanceMethodMatcher.new @method
+  end
+
+  it "does not convert the method name to a string if RUBY_VERSION >= 1.9" do
+    Object.const_set :RUBY_VERSION, "1.9.0"
+    @method.should_not_receive(:to_s)
+    HavePrivateInstanceMethodMatcher.new @method
+  end
+end

data/spec/runner/actions/tally_spec.rb

@@ -4,47 +4,147 @@ require 'mspec/runner/actions/tally'
 require 'mspec/runner/mspec'
 require 'mspec/runner/example'
 
-describe Tally do
+describe Tally, "#files!" do
   before :each do
     @tally = Tally.new
   end
 
-  it "responds to #files! by incrementing the count returned by #files" do
+  it "increments the count returned by #files" do
     @tally.files! 3
     @tally.files.should == 3
     @tally.files!
     @tally.files.should == 4
   end
+end
+
+describe Tally, "#examples!" do
+  before :each do
+    @tally = Tally.new
+  end
 
-  it "responds to #examples! by incrementing the count returned by #examples" do
+  it "increments the count returned by #examples" do
     @tally.examples! 2
     @tally.examples.should == 2
     @tally.examples! 2
     @tally.examples.should == 4
   end
+end
 
-  it "responds to #expectations! by incrementing the count returned by #expectations" do
+describe Tally, "#expectations!" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "increments the count returned by #expectations" do
     @tally.expectations!
     @tally.expectations.should == 1
     @tally.expectations! 3
     @tally.expectations.should == 4
   end
+end
+
+describe Tally, "#failures!" do
+  before :each do
+    @tally = Tally.new
+  end
 
-  it "responds to #failures! by incrementing the count returned by #failures" do
+  it "increments the count returned by #failures" do
     @tally.failures! 1
     @tally.failures.should == 1
     @tally.failures!
     @tally.failures.should == 2
   end
+end
 
-  it "responds to #errors! by incrementing the count returned by #errors" do
+describe Tally, "#errors!" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "increments the count returned by #errors" do
     @tally.errors!
     @tally.errors.should == 1
     @tally.errors! 2
     @tally.errors.should == 3
   end
+end
+
+describe Tally, "#file" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of the number of #files" do
+    @tally.file.should == "0 files"
+    @tally.files!
+    @tally.file.should == "1 file"
+    @tally.files!
+    @tally.file.should == "2 files"
+  end
+end
+
+describe Tally, "#example" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of the number of #examples" do
+    @tally.example.should == "0 examples"
+    @tally.examples!
+    @tally.example.should == "1 example"
+    @tally.examples!
+    @tally.example.should == "2 examples"
+  end
+end
+
+describe Tally, "#expectation" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of the number of #expectations" do
+    @tally.expectation.should == "0 expectations"
+    @tally.expectations!
+    @tally.expectation.should == "1 expectation"
+    @tally.expectations!
+    @tally.expectation.should == "2 expectations"
+  end
+end
+
+describe Tally, "#failure" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of the number of #failures" do
+    @tally.failure.should == "0 failures"
+    @tally.failures!
+    @tally.failure.should == "1 failure"
+    @tally.failures!
+    @tally.failure.should == "2 failures"
+  end
+end
+
+describe Tally, "#error" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of the number of #errors" do
+    @tally.error.should == "0 errors"
+    @tally.errors!
+    @tally.error.should == "1 error"
+    @tally.errors!
+    @tally.error.should == "2 errors"
+  end
+end
 
-  it "responds to #format by returning a formatted string of counts" do
+describe Tally, "#format" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of counts" do
     @tally.files!
     @tally.examples! 2
     @tally.expectations! 4
@@ -53,35 +153,63 @@ describe Tally do
   end
 end
 
-describe TallyAction do
+describe TallyAction, "#counter" do
   before :each do
     @tally = TallyAction.new
     @state = ExampleState.new("describe", "it")
   end
 
-  it "responds to #counter by returning the Tally object" do
+  it "returns the Tally object" do
     @tally.counter.should be_kind_of(Tally)
   end
+end
 
-  it "responds to #load by incrementing the count returned by Tally#files" do
+describe TallyAction, "#load" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
+
+  it "increments the count returned by Tally#files" do
     @tally.load
     @tally.counter.files.should == 1
   end
+end
+
+describe TallyAction, "#expectation" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
 
-  it "responds to #expectation by incrementing the count returned by Tally#expectations" do
+  it "increments the count returned by Tally#expectations" do
     @tally.expectation @state
     @tally.counter.expectations.should == 1
   end
+end
 
-  it "responds to #example by incrementing counts returned by Tally#examples" do
+describe TallyAction, "#example" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
+
+  it "increments counts returned by Tally#examples" do
     @tally.example @state, nil
     @tally.counter.examples.should == 1
     @tally.counter.expectations.should == 0
     @tally.counter.failures.should == 0
     @tally.counter.errors.should == 0
   end
+end
+
+describe TallyAction, "#exception" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
 
-  it "responds to #exception by incrementing counts returned by Tally#failures" do
+  it "increments counts returned by Tally#failures" do
     exc = ExceptionState.new nil, nil, ExpectationNotMetError.new("Failed!")
     @tally.exception exc
     @tally.counter.examples.should == 0
@@ -89,8 +217,15 @@ describe TallyAction do
     @tally.counter.failures.should == 1
     @tally.counter.errors.should == 0
   end
+end
 
-  it "responds to #exception by incrementing counts returned by Tally#errors" do
+describe TallyAction, "#exception" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
+
+  it "increments counts returned by Tally#errors" do
     exc = ExceptionState.new nil, nil, Exception.new("Error!")
     @tally.exception exc
     @tally.counter.examples.should == 0
@@ -98,8 +233,15 @@ describe TallyAction do
     @tally.counter.failures.should == 0
     @tally.counter.errors.should == 1
   end
+end
 
-  it "responds to #format by returning a readable string of counts" do
+describe TallyAction, "#format" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
+
+  it "returns a readable string of counts" do
     @tally.load
     @tally.example @state, nil
     @tally.expectation @state
@@ -108,16 +250,30 @@ describe TallyAction do
     @tally.exception exc
     @tally.format.should == "1 file, 1 example, 2 expectations, 1 failure, 0 errors"
   end
+end
+
+describe TallyAction, "#register" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
 
-  it "responds to #register by registering itself with MSpec for appropriate actions" do
+  it "registers itself with MSpec for appropriate actions" do
     MSpec.should_receive(:register).with(:load, @tally)
     MSpec.should_receive(:register).with(:example, @tally)
     MSpec.should_receive(:register).with(:exception, @tally)
     MSpec.should_receive(:register).with(:expectation, @tally)
     @tally.register
   end
+end
+
+describe TallyAction, "#unregister" do
+  before :each do
+    @tally = TallyAction.new
+    @state = ExampleState.new("describe", "it")
+  end
 
-  it "responds to #unregister by unregistering itself with MSpec for appropriate actions" do
+  it "unregisters itself with MSpec for appropriate actions" do
     MSpec.should_receive(:unregister).with(:load, @tally)
     MSpec.should_receive(:unregister).with(:exception, @tally)
     MSpec.should_receive(:unregister).with(:example, @tally)

data/spec/runner/context_spec.rb

@@ -4,6 +4,7 @@ require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
 require 'mspec/mocks/mock'
 require 'mspec/runner/context'
+require 'mspec/runner/example'
 
 describe ContextState, "#describe" do
   before :each do

data/spec/runner/formatters/describe_spec.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mspec/runner/formatters/describe'
+require 'mspec/runner/example'
+
+describe DescribeFormatter, "#finish" do
+  before :each do
+    MSpec.stub!(:register)
+    MSpec.stub!(:unregister)
+
+    @timer = mock("timer", :null_object => true)
+    TimerAction.stub!(:new).and_return(@timer)
+    @timer.stub!(:format).and_return("Finished in 2.0 seconds")
+
+    $stdout = @out = IOStub.new
+    context = ContextState.new "Class#method"
+    @state = ExampleState.new(context, "runs")
+
+    @formatter = DescribeFormatter.new
+    @formatter.register
+
+    @tally = @formatter.tally
+    @counter = @tally.counter
+
+    @counter.files!
+    @counter.examples!
+    @counter.expectations! 2
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "prints a summary of elapsed time" do
+    @formatter.finish
+    @out.should =~ /^Finished in 2.0 seconds$/
+  end
+
+  it "prints a tally of counts" do
+    @formatter.finish
+    @out.should =~ /^1 file, 1 example, 2 expectations, 0 failures, 0 errors$/
+  end
+
+  it "does not print exceptions" do
+    @formatter.finish
+    @out.should == %[
+
+Finished in 2.0 seconds
+
+1 file, 1 example, 2 expectations, 0 failures, 0 errors
+]
+  end
+
+  it "prints a summary of failures and errors for each describe block" do
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
+    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    @formatter.exception exc
+    @formatter.finish
+    @out.should == %[
+
+Class#method                             0 failures, 1 error
+
+Finished in 2.0 seconds
+
+1 file, 1 example, 2 expectations, 0 failures, 0 errors
+]
+  end
+end

data/spec/runner/mspec_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/helpers/tmp'
 require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
+require 'mspec/runner/example'
 
 describe MSpec, ".register_files" do
   it "records which spec files to run" do
@@ -415,6 +416,7 @@ describe MSpec, ".write_tags" do
     IO.read(tmp("tags.txt")).should == %[fail(broken):Some#method? works
 incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
+extended():\"Multi-line\\ntext\\ntag\"
 ]
     MSpec.write_tags [@tag1, @tag2]
     IO.read(tmp("tags.txt")).should == %[check(broken):Tag#rewrite works
@@ -461,6 +463,15 @@ describe MSpec, ".delete_tag" do
     MSpec.delete_tag(@tag).should == true
     IO.read(tmp("tags.txt")).should == %[incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
+extended():\"Multi-line\\ntext\\ntag\"
+]
+  end
+
+  it "deletes a tag with escaped newlines" do
+    MSpec.delete_tag(SpecTag.new('extended:"Multi-line\ntext\ntag"')).should == true
+    IO.read(tmp("tags.txt")).should == %[fail(broken):Some#method? works
+incomplete(20%):The#best method ever
+benchmark(0.01825):The#fastest method today
 ]
   end
 
@@ -470,6 +481,7 @@ benchmark(0.01825):The#fastest method today
     IO.read(tmp("tags.txt")).should == %[fail(broken):Some#method? works
 incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
+extended():\"Multi-line\\ntext\\ntag\"
 ]
   end
 
@@ -477,6 +489,7 @@ benchmark(0.01825):The#fastest method today
     MSpec.delete_tag(@tag).should == true
     MSpec.delete_tag(SpecTag.new("incomplete:The#best method ever")).should == true
     MSpec.delete_tag(SpecTag.new("benchmark:The#fastest method today")).should == true
+    MSpec.delete_tag(SpecTag.new("extended:\"Multi-line\ntext\ntag\"")).should == true
     File.exist?(tmp("tags.txt")).should == false
   end
 end

data/spec/runner/tag_spec.rb

@@ -57,6 +57,13 @@ describe SpecTag, "#parse" do
     @tag.description.should == "Another#method"
   end
 
+  it "accepts 'tag(comment):\"Multi-line\\ntext\"'" do
+    @tag.parse 'tag(comment):"Multi-line\ntext"'
+    @tag.tag.should == "tag"
+    @tag.comment.should == "comment"
+    @tag.description.should == "Multi-line\ntext"
+  end
+
   it "ignores '#anything'" do
     @tag.parse "# this could be a comment"
     @tag.tag.should == nil
@@ -67,19 +74,30 @@ end
 
 describe SpecTag, "#to_s" do
   it "formats itself as 'tag(comment):description'" do
-    tag = SpecTag.new("tag(comment):description")
+    txt = "tag(comment):description"
+    tag = SpecTag.new txt
     tag.tag.should == "tag"
     tag.comment.should == "comment"
     tag.description.should == "description"
-    tag.to_s.should == "tag(comment):description"
+    tag.to_s.should == txt
   end
 
   it "formats itself as 'tag:description" do
-    tag = SpecTag.new("tag:description")
+    txt = "tag:description"
+    tag = SpecTag.new txt
     tag.tag.should == "tag"
     tag.comment.should == nil
     tag.description.should == "description"
-    tag.to_s.should == "tag:description"
+    tag.to_s.should == txt
+  end
+
+  it "formats itself as 'tag(comment):\"multi-line\\ntext\\ntag\"'" do
+    txt = 'tag(comment):"multi-line\ntext\ntag"'
+    tag = SpecTag.new txt
+    tag.tag.should == "tag"
+    tag.comment.should == "comment"
+    tag.description.should == "multi-line\ntext\ntag"
+    tag.to_s.should == txt
   end
 end
 

data/spec/runner/tags.txt

@@ -1,3 +1,4 @@
 fail(broken):Some#method? works
 incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
+extended():"Multi-line\ntext\ntag"

data/spec/utils/options_spec.rb

@@ -549,11 +549,11 @@ describe "The -t, --target TARGET option" do
     end
   end
 
-  it "sets the target to 'ruby19' with TARGET 'r19' or 'ruby19'" do
+  it "sets the target to 'ruby1.9' with TARGET 'r19', 'ruby19' or 'ruby1.9'" do
     ["-t", "--target"].each do |opt|
-      ["r19", "ruby19"].each do |t|
+      ["r19", "ruby19", "ruby1.9"].each do |t|
         @options.parse [opt, t]
-        @config[:target].should == "ruby19"
+        @config[:target].should == "ruby1.9"
       end
     end
   end
@@ -702,6 +702,16 @@ describe "The -f, --format FORMAT option" do
     end
   end
 
+  it "sets the DescribeFormatter with FORMAT 'b' or 'describe'" do
+    ["-f", "--format"].each do |opt|
+      ["b", "describe"].each do |f|
+        @config[:formatter] = nil
+        @options.parse [opt, f]
+        @config[:formatter].should == DescribeFormatter
+      end
+    end
+  end
+
   it "sets the FileFormatter with FORMAT 'f', 'file'" do
     ["-f", "--format"].each do |opt|
       ["f", "file"].each do |f|

data/spec/utils/script_spec.rb

@@ -193,6 +193,21 @@ describe MSpecScript, "#load" do
   end
 end
 
+describe MSpecScript, "#custom_options" do
+  before :each do
+    @script = MSpecScript.new
+  end
+
+  after :each do
+  end
+
+  it "prints 'None'" do
+    options = mock("options")
+    options.should_receive(:doc).with("   No custom options registered")
+    @script.custom_options options
+  end
+end
+
 describe MSpecScript, "#register" do
   before :each do
     @script = MSpecScript.new
@@ -211,6 +226,23 @@ describe MSpecScript, "#register" do
     @script.config[:formatter] = false
     @script.register
   end
+
+  it "calls #custom_register" do
+    @script.should_receive(:custom_register)
+    @script.register
+  end
+
+  it "registers :formatter with the formatter instance" do
+    @formatter.stub!(:new).and_return(@formatter)
+    MSpec.should_receive(:store).with(:formatter, @formatter)
+    @script.register
+  end
+
+  it "does not register :formatter if config[:formatter] is false" do
+    @script.config[:formatter] = false
+    MSpec.should_not_receive(:store)
+    @script.register
+  end
 end
 
 describe MSpecScript, "#register" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -76,6 +76,8 @@ files:
 - lib/mspec/matchers/equal.rb
 - lib/mspec/matchers/equal_element.rb
 - lib/mspec/matchers/equal_utf16.rb
+- lib/mspec/matchers/have_instance_method.rb
+- lib/mspec/matchers/have_private_instance_method.rb
 - lib/mspec/matchers/include.rb
 - lib/mspec/matchers/match_yaml.rb
 - lib/mspec/matchers/output.rb
@@ -104,6 +106,7 @@ files:
 - lib/mspec/runner/filters/regexp.rb
 - lib/mspec/runner/filters/tag.rb
 - lib/mspec/runner/filters.rb
+- lib/mspec/runner/formatters/describe.rb
 - lib/mspec/runner/formatters/dotted.rb
 - lib/mspec/runner/formatters/file.rb
 - lib/mspec/runner/formatters/html.rb
@@ -180,6 +183,8 @@ files:
 - spec/matchers/equal_element_spec.rb
 - spec/matchers/equal_spec.rb
 - spec/matchers/equal_utf16_spec.rb
+- spec/matchers/have_instance_method_spec.rb
+- spec/matchers/have_private_instance_method_spec.rb
 - spec/matchers/include_spec.rb
 - spec/matchers/match_yaml_spec.rb
 - spec/matchers/output_spec.rb
@@ -203,6 +208,7 @@ files:
 - spec/runner/filters/profile_spec.rb
 - spec/runner/filters/regexp_spec.rb
 - spec/runner/filters/tag_spec.rb
+- spec/runner/formatters/describe_spec.rb
 - spec/runner/formatters/dotted_spec.rb
 - spec/runner/formatters/file_spec.rb
 - spec/runner/formatters/html_spec.rb