mspec 1.5.3 → 1.5.4

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

@@ -66,6 +66,9 @@ class MSpecTag < MSpecScript
     options.on("--list-all", "Display descriptions of any tagged specs") do
       config[:tagger] = :list_all
     end
+    options.on("--purge", "Remove all tags not matching any specs") do
+      config[:tagger] = :purge
+    end
 
     options.doc "\n Help!"
     options.version MSpec::VERSION
@@ -99,6 +102,10 @@ class MSpecTag < MSpecScript
       tagger = TagListAction.new config[:tagger] == :list_all ? nil : config[:ltags]
       MSpec.register_mode :pretend
       config[:formatter] = false
+    when :purge
+      tagger = TagPurgeAction.new
+      MSpec.register_mode :pretend
+      config[:formatter] = false
     else
       raise ArgumentError, "No recognized action given"
     end

data/lib/mspec/guards/endian.rb

@@ -10,7 +10,7 @@ class BigEndianGuard < SpecGuard
   private :pattern
 
   def match?
-    pattern[-1] == 1
+    pattern[-1] == ?\001
   end
 end
 
@@ -21,7 +21,7 @@ class LittleEndianGuard < SpecGuard
   private :pattern
 
   def match?
-    pattern[-1] == 0
+    pattern[-1] == ?\000
   end
 end
 

data/lib/mspec/helpers.rb

@@ -5,4 +5,5 @@ require 'mspec/helpers/scratch'
 require 'mspec/helpers/tmp'
 require 'mspec/helpers/const_lookup'
 require 'mspec/helpers/ruby_exe'
-require 'mspec/helpers/metaclass'
+require 'mspec/helpers/fixture'
+require 'mspec/helpers/argv'

data/lib/mspec/helpers/argv.rb

@@ -0,0 +1,43 @@
+class Object
+  # Convenience helper for altering ARGV. Saves the
+  # value of ARGV and sets it to +args+. If a block
+  # is given, yields to the block and then restores
+  # the value of ARGV. The previously saved value of
+  # ARGV can be restored by passing +:restore+. The
+  # former is useful in a single spec. The latter is
+  # useful in before/after actions. For example:
+  #
+  #   describe "This" do
+  #     before do
+  #       argv ['a', 'b']
+  #     end
+  #
+  #     after do
+  #       argv :restore
+  #     end
+  #
+  #     it "does something" do
+  #       # do something
+  #     end
+  #   end
+  #
+  #   describe "That" do
+  #     it "does something" do
+  #       argv ['a', 'b'] do
+  #         # do something
+  #       end
+  #     end
+  #   end
+  def argv(args)
+    if args == :restore
+      ARGV.replace(@__mspec_saved_argv__ || [])
+    else
+      @__mspec_saved_argv__ = ARGV
+      ARGV.replace args
+      if block_given?
+        yield
+        argv :restore
+      end
+    end
+  end
+end

data/lib/mspec/helpers/fixture.rb

@@ -0,0 +1,20 @@
+class Object
+  # Returns the name of a fixture file by adjoining the directory
+  # of the +dir+ argument with "fixtures" and the contents of the
+  # +args+ array. For example,
+  #
+  #   +dir+ == "some/path"
+  #
+  # and
+  #
+  #   +args+ == ["dir", "file.txt"]
+  #
+  # then the result is the expanded path of
+  #
+  #   "some/fixtures/dir/file.txt".
+  def fixture(dir, *args)
+    path = File.dirname(dir)
+    path = path[0..-7] if path[-7..-1] == "/shared"
+    File.expand_path(File.join(path, "fixtures", args))
+  end
+end

data/lib/mspec/helpers/flunk.rb

@@ -1,5 +1,5 @@
 class Object
-  def flunk
-    Expectation.fail_with "This example", "is a failure"
+  def flunk(msg="This example is a failure")
+    Expectation.fail_with "Failed:", msg
   end
 end

data/lib/mspec/helpers/ruby_exe.rb

@@ -21,6 +21,18 @@ require 'mspec/ruby_name'
 #
 #   `#{RUBY_EXE} -e #{'puts "hello, world."'}`
 #
+# The ruby_exe helper also accepts an options hash with two
+# keys: :options and :args. For example:
+#
+#   ruby_exe('file.rb', :options => "-w", :args => "> file.txt")
+#
+# will be executed as
+#
+#   `#{RUBY_EXE} -w #{'file.rb'} > file.txt`
+#
+# If +nil+ is passed for the first argument, the command line
+# will be built only from the options hash.
+#
 # The RUBY_EXE constant can be set explicitly since the value
 # is used each time ruby_exe is invoked. The mspec runner script
 # will set ENV['RUBY_EXE'] to the name of the executable used
@@ -79,17 +91,25 @@ class Object
   def resolve_ruby_exe
     [:env, :engine, :name, :install_name].each do |option|
       exe = ruby_exe_options option
-      return exe if exe and File.exists?(exe) and File.executable?(exe)
+
+      # TODO: It has been reported that File.executable is not reliable
+      # on Windows platforms (see commit 56bc555c). So, we check the
+      # platform. This check is the same as the one used by the guards.
+      # This test should be abstracted so it is available in general to
+      # MSpec code.
+      if exe and File.exists?(exe) and
+          (RUBY_PLATFORM.match(/(mswin|mingw)/) || File.executable?(exe))
+        return exe
+      end
     end
     nil
   end
 
-  def ruby_exe(code)
-    if File.exists?(code)
-      `#{RUBY_EXE} #{ENV['RUBY_FLAGS']} #{code}`
-    else
-      `#{RUBY_EXE} #{ENV['RUBY_FLAGS']} -e #{code.inspect}`
-    end
+  def ruby_exe(code, opts = {})
+    body = code
+    body = "-e #{code.inspect}" if code and not File.exists?(code)
+    cmd = [RUBY_EXE, ENV['RUBY_FLAGS'], opts[:options], body, opts[:args]]
+    `#{cmd.compact.join(' ')}`
   end
 
   unless Object.const_defined?(:RUBY_EXE) and RUBY_EXE

data/lib/mspec/runner/actions.rb

@@ -3,5 +3,6 @@ require 'mspec/runner/actions/timer'
 require 'mspec/runner/actions/filter'
 require 'mspec/runner/actions/tag'
 require 'mspec/runner/actions/taglist'
+require 'mspec/runner/actions/tagpurge'
 require 'mspec/runner/actions/debug'
 require 'mspec/runner/actions/gdb'

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

@@ -0,0 +1,56 @@
+require 'mspec/runner/actions/filter'
+require 'mspec/runner/actions/taglist'
+
+# TagPurgeAction - removes all tags not matching any spec
+# descriptions.
+class TagPurgeAction < TagListAction
+  attr_reader :matching
+
+  def initialize
+    @matching = []
+    @filter   = nil
+    @tags     = nil
+  end
+
+  # Prints a banner about purging tags.
+  def start
+    print "\nRemoving tags not matching any specs\n\n"
+  end
+
+  # Creates a MatchFilter for all tags.
+  def load
+    @filter = nil
+    @tags = MSpec.read_tags self
+    desc = @tags.map { |t| t.description }
+    @filter = MatchFilter.new(nil, *desc) unless desc.empty?
+  end
+
+  # Saves any matching tags
+  def after(state)
+    @matching << state.description if self === state.description
+  end
+
+  # Rewrites any matching tags. Prints non-matching tags.
+  # Deletes the tag file if there were no tags (this cleans
+  # up empty or malformed tag files).
+  def unload
+    if @filter
+      matched = @tags.select { |t| @matching.any? { |s| s == t.description } }
+      MSpec.write_tags matched
+
+      (@tags - matched).each { |t| print t.description, "\n" }
+    else
+      MSpec.delete_tags
+    end
+  end
+
+  def register
+    super
+    MSpec.register :unload, self
+  end
+
+  def unregister
+    super
+    MSpec.unregister :unload, self
+  end
+end

data/lib/mspec/runner/mspec.rb

@@ -245,6 +245,8 @@ module MSpec
     if File.exist? file
       File.open(file, "r") do |f|
         f.each_line do |line|
+          line.chomp!
+          next if line.empty?
           tag = SpecTag.new line.chomp
           tags << tag if keys.include? tag.tag
         end
@@ -253,11 +255,24 @@ module MSpec
     tags
   end
 
+  # Writes each tag in +tags+ to the tag file. Overwrites the
+  # tag file if it exists.
+  def self.write_tags(tags)
+    file = tags_file
+    path = File.dirname file
+    FileUtils.mkdir_p path unless File.exist? path
+    File.open(file, "w") do |f|
+      tags.each { |t| f.puts t }
+    end
+  end
+
+  # Writes +tag+ to the tag file if it does not already exist.
+  # Returns +true+ if the tag is written, +false+ otherwise.
   def self.write_tag(tag)
     string = tag.to_s
     file = tags_file
     path = File.dirname file
-    FileUtils.mkdir_p(path) unless File.exist?(path)
+    FileUtils.mkdir_p path unless File.exist? path
     if File.exist? file
       File.open(file, "r") do |f|
         f.each_line { |line| return false if line.chomp == string }
@@ -267,6 +282,9 @@ module MSpec
     return true
   end
 
+  # Deletes +tag+ from the tag file if it exists. Returns +true+
+  # if the tag is deleted, +false+ otherwise. Deletes the tag
+  # file if it is empty.
   def self.delete_tag(tag)
     deleted = false
     pattern = /#{tag.tag}.*#{Regexp.escape tag.description}/
@@ -286,4 +304,10 @@ module MSpec
     end
     return deleted
   end
+
+  # Removes the tag file associated with a spec file.
+  def self.delete_tags
+    file = tags_file
+    File.delete file if File.exists? file
+  end
 end

data/lib/mspec/utils/script.rb

@@ -116,15 +116,35 @@ class MSpecScript
     end
   end
 
-  # Resolves +pattern+ as a file name, directory name or pattern.
+  # Attempts to resolve +partial+ as a file or directory name in the
+  # following order:
+  #
+  #   1. +partial+
+  #   2. +partial+ + "_spec.rb"
+  #   3. <tt>File.join(config[:prefix], partial)</tt>
+  #   4. <tt>File.join(config[:prefix], partial + "_spec.rb")</tt>
+  #
   # If it is a file name, returns the name as an entry in an array.
   # If it is a directory, returns all *_spec.rb files in the
-  # directory and subdirectory. Otherwise, passes +pattern+ to +Dir[]+.
-  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]
+  # directory and subdirectories.
+  #
+  # If unable to resolve +partial+, returns <tt>Dir[partial]</tt>.
+  def entries(partial)
+    file = partial + "_spec.rb"
+    patterns = [partial]
+    patterns << file
+    if config[:prefix]
+      patterns << File.join(config[:prefix], partial)
+      patterns << File.join(config[:prefix], file)
+    end
+
+    patterns.each do |pattern|
+      expanded = File.expand_path(pattern)
+      return [pattern] if File.file?(expanded)
+      return Dir[pattern+"/**/*_spec.rb"].sort if File.directory?(expanded)
+    end
+
+    Dir[partial]
   end
 
   # Resolves each entry in +list+ to a set of files. If the entry

data/lib/mspec/version.rb

@@ -1,3 +1,3 @@
 module MSpec
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 end

data/spec/commands/mspec_spec.rb

@@ -256,7 +256,7 @@ describe MSpecMain, "#run" do
 
   it "uses exec to invoke the runner script" do
     @script.should_receive(:exec).with("ruby", "-v", %r"mspec/bin/mspec-run$")
-    @script.options
+    @script.options []
     @script.run
   end
 

data/spec/commands/mspec_tag_spec.rb

@@ -3,6 +3,7 @@ require 'mspec/runner/mspec'
 require 'mspec/commands/mspec-tag'
 require 'mspec/runner/actions/tag'
 require 'mspec/runner/actions/taglist'
+require 'mspec/runner/actions/tagpurge'
 
 describe MSpecTag, ".new" do
   before :each do
@@ -228,6 +229,20 @@ describe MSpecTag, "options" do
       @config[:tagger].should == :list_all
     end
   end
+
+  describe "--purge" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("--purge", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the mode to :purge" do
+      @config[:tagger] = nil
+      @script.options ["--purge", "file.rb"]
+      @config[:tagger].should == :purge
+    end
+  end
 end
 
 describe MSpecTag, "#run" do
@@ -354,4 +369,26 @@ describe MSpecTag, "#register" do
       @config[:formatter].should be_false
     end
   end
+
+  describe "when config[:tagger] is :purge" do
+    before :each do
+      @config[:tagger] = :purge
+    end
+
+    it "creates a TagPurgeAction" do
+      TagPurgeAction.should_receive(:new).and_return(@tl)
+      @tl.should_receive(:register)
+      @script.register
+    end
+
+    it "registers MSpec in pretend mode" do
+      MSpec.should_receive(:register_mode).with(:pretend)
+      @script.register
+    end
+
+    it "sets config[:formatter] to false" do
+      @script.register
+      @config[:formatter].should be_false
+    end
+  end
 end

data/spec/helpers/argv_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/argv'
+
+describe Object, "#argv" do
+  before :each do
+    ScratchPad.clear
+
+    @saved_argv = ARGV
+    @argv = ["a", "b"]
+  end
+
+  it "replaces and restores the value of ARGV" do
+    argv @argv
+    ARGV.should == @argv
+    argv :restore
+    ARGV.should == @saved_argv
+  end
+
+  it "yields to the block after setting ARGV" do
+    argv @argv do
+      ScratchPad.record ARGV
+    end
+    ScratchPad.recorded.should == @argv
+    ARGV.should == @saved_argv
+  end
+end

data/spec/helpers/fixture_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/fixture'
+
+describe Object, "#fixture" do
+  before :each do
+    @dir = File.expand_path(Dir.pwd)
+  end
+
+  it "returns the expanded path to a fixture file" do
+    name = fixture("some/path/file.rb", "dir", "file.txt")
+    name.should == "#{@dir}/some/path/fixtures/dir/file.txt"
+  end
+
+  it "omits '/shared' if it the suffix of the directory string" do
+    name = fixture("some/path/shared/file.rb", "dir", "file.txt")
+    name.should == "#{@dir}/some/path/fixtures/dir/file.txt"
+  end
+end

data/spec/helpers/flunk_spec.rb

@@ -12,4 +12,8 @@ describe Object, "#flunk" do
   it "raises an ExpectationNotMetError unconditionally" do
     lambda { flunk }.should raise_error(ExpectationNotMetError)
   end
+
+  it "accepts on argument for an optional message" do
+    lambda {flunk "test"}.should raise_error(ExpectationNotMetError)
+  end
 end

data/spec/helpers/ruby_exe_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/ruby_exe' 
+require 'mspec/helpers/ruby_exe'
 require 'rbconfig'
 
 class RubyExeSpecs
@@ -61,15 +61,40 @@ end
 
 describe "#resolve_ruby_exe" do
   before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+
+    @name = "ruby_spec_exe"
+  end
+
+  before :each do
+    @ruby_platform = Object.const_get :RUBY_PLATFORM
+
     @script = RubyExeSpecs.new
   end
 
+  after :each do
+    Object.const_set :RUBY_PLATFORM, @ruby_platform
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+  end
+
   it "returns the value returned by #ruby_exe_options if it exists and is executable" do
-    name = "ruby_spec_exe"
-    @script.should_receive(:ruby_exe_options).and_return(name)
-    File.should_receive(:exists?).with(name).and_return(true)
-    File.should_receive(:executable?).with(name).and_return(true)
-    @script.resolve_ruby_exe.should == name
+    Object.const_set :RUBY_PLATFORM, "notwindows"
+    @script.should_receive(:ruby_exe_options).and_return(@name)
+    File.should_receive(:exists?).with(@name).and_return(true)
+    File.should_receive(:executable?).with(@name).and_return(true)
+    @script.resolve_ruby_exe.should == @name
+  end
+
+  it "returns the value returned by #ruby_exe_options if it exists on Windows platforms" do
+    Object.const_set :RUBY_PLATFORM, "mswin"
+    @script.should_receive(:ruby_exe_options).and_return(@name)
+    File.should_receive(:exists?).with(@name).and_return(true)
+    File.should_not_receive(:executable?)
+    @script.resolve_ruby_exe.should == @name
   end
 
   it "returns nil if no exe is found" do
@@ -89,6 +114,9 @@ describe Object, "#ruby_exe" do
     @ruby_exe = Object.const_get :RUBY_EXE
     Object.const_set :RUBY_EXE, 'ruby_spec_exe'
 
+    @file = "some/ruby/file.rb"
+    @code = %(some "real" 'ruby' code)
+
     @script = RubyExeSpecs.new
   end
 
@@ -99,16 +127,34 @@ describe Object, "#ruby_exe" do
   end
 
   it "executes the argument if it is a file that exists" do
-    code = "some/ruby/file.rb"
-    File.should_receive(:exists?).with(code).and_return(true)
+    File.should_receive(:exists?).with(@file).and_return(true)
     @script.should_receive(:`).with("ruby_spec_exe -w -Q some/ruby/file.rb")
-    @script.ruby_exe code
+    @script.ruby_exe @file
+  end
+
+  it "executes the file with options and arguments" do
+    File.should_receive(:exists?).with(@file).and_return(true)
+    @script.should_receive(:`).with(
+      "ruby_spec_exe -w -Q -w -Cdir some/ruby/file.rb < file.txt")
+    @script.ruby_exe @file, :options => "-w -Cdir", :args => "< file.txt"
   end
 
   it "executes the argument with -e" do
-    code = %(some "real" 'ruby' code)
-    File.should_receive(:exists?).with(code).and_return(false)
-    @script.should_receive(:`).with(%(ruby_spec_exe -w -Q -e "some \\"real\\" 'ruby' code"))
-    @script.ruby_exe code
+    File.should_receive(:exists?).with(@code).and_return(false)
+    @script.should_receive(:`).with(
+      %(ruby_spec_exe -w -Q -e "some \\"real\\" 'ruby' code"))
+    @script.ruby_exe @code
+  end
+
+  it "executes the code with options and arguments" do
+    File.should_receive(:exists?).with(@code).and_return(false)
+    @script.should_receive(:`).with(
+      %(ruby_spec_exe -w -Q -W0 -Cdir -e "some \\"real\\" 'ruby' code" < file.txt))
+    @script.ruby_exe @code, :options => "-W0 -Cdir", :args => "< file.txt"
+  end
+
+  it "executes with options and arguments but without code or file" do
+    @script.should_receive(:`).with("ruby_spec_exe -w -Q -c > file.txt")
+    @script.ruby_exe nil, :options => "-c", :args => "> file.txt"
   end
 end

data/spec/runner/actions/taglist_spec.rb

@@ -54,7 +54,7 @@ describe TagListAction, "#start" do
   end
 end
 
-describe TagListAction, "#laod" do
+describe TagListAction, "#load" do
   before :each do
     @t1 = SpecTag.new "fails:I fail"
     @t2 = SpecTag.new "unstable:I'm unstable"

data/spec/runner/actions/tagpurge_spec.rb

@@ -0,0 +1,153 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mspec/runner/actions/tagpurge'
+require 'mspec/runner/mspec'
+require 'mspec/runner/example'
+require 'mspec/runner/tag'
+
+describe TagPurgeAction, "#start" do
+  before :each do
+    @stdout = $stdout
+    $stdout = IOStub.new
+  end
+
+  after :each do
+    $stdout = @stdout
+  end
+
+  it "prints a banner" do
+    action = TagPurgeAction.new
+    action.start
+    $stdout.should == "\nRemoving tags not matching any specs\n\n"
+  end
+end
+
+describe TagPurgeAction, "#load" do
+  before :each do
+    @t1 = SpecTag.new "fails:I fail"
+    @t2 = SpecTag.new "unstable:I'm unstable"
+  end
+
+  it "creates a MatchFilter for all tags" do
+    MSpec.should_receive(:read_tags).and_return([@t1, @t2])
+    MatchFilter.should_receive(:new).with(nil, "I fail", "I'm unstable")
+    TagPurgeAction.new.load
+  end
+end
+
+describe TagPurgeAction, "#after" do
+  before :each do
+    @state = mock("ExampleState")
+    @state.stub!(:description).and_return("str")
+
+    @action = TagPurgeAction.new
+  end
+
+  it "does not save the description if the filter does not match" do
+    @action.should_receive(:===).with("str").and_return(false)
+    @action.after @state
+    @action.matching.should == []
+  end
+
+  it "saves the description if the filter matches" do
+    @action.should_receive(:===).with("str").and_return(true)
+    @action.after @state
+    @action.matching.should == ["str"]
+  end
+end
+
+describe TagPurgeAction, "#unload" do
+  before :each do
+    @stdout = $stdout
+    $stdout = IOStub.new
+
+    @t1 = SpecTag.new "fails:I fail"
+    @t2 = SpecTag.new "unstable:I'm unstable"
+    @t3 = SpecTag.new "fails:I'm unstable"
+
+    MSpec.stub!(:read_tags).and_return([@t1, @t2, @t3])
+    MSpec.stub!(:write_tags)
+
+    @state = mock("ExampleState")
+    @state.stub!(:description).and_return("I'm unstable")
+
+    @action = TagPurgeAction.new
+    @action.load
+    @action.after @state
+  end
+
+  after :each do
+    $stdout = @stdout
+  end
+
+  it "does not rewrite any tags if there were no tags for the specs" do
+    MSpec.should_receive(:read_tags).and_return([])
+    MSpec.should_not_receive(:write_tags)
+
+    @action.load
+    @action.after @state
+    @action.unload
+
+    $stdout.should == ""
+  end
+
+  it "rewrites tags that were matched" do
+    MSpec.should_receive(:write_tags).with([@t2, @t3])
+    @action.unload
+  end
+
+  it "prints tags that were not matched" do
+    @action.unload
+    $stdout.should == "I fail\n"
+  end
+end
+
+describe TagPurgeAction, "#unload" do
+  before :each do
+    @stdout = $stdout
+    $stdout = IOStub.new
+
+    MSpec.stub!(:read_tags).and_return([])
+
+    @state = mock("ExampleState")
+    @state.stub!(:description).and_return("I'm unstable")
+
+    @action = TagPurgeAction.new
+    @action.load
+    @action.after @state
+  end
+
+  after :each do
+    $stdout = @stdout
+  end
+
+  it "deletes the tag file if no tags were found" do
+    MSpec.should_not_receive(:write_tags)
+    MSpec.should_receive(:delete_tags)
+    @action.unload
+    $stdout.should == ""
+  end
+end
+
+describe TagPurgeAction, "#register" do
+  before :each do
+    MSpec.stub!(:register)
+    @action = TagPurgeAction.new
+  end
+
+  it "registers itself with MSpec for the :unload event" do
+    MSpec.should_receive(:register).with(:unload, @action)
+    @action.register
+  end
+end
+
+describe TagPurgeAction, "#unregister" do
+  before :each do
+    MSpec.stub!(:unregister)
+    @action = TagPurgeAction.new
+  end
+
+  it "unregisters itself with MSpec for the :unload event" do
+    MSpec.should_receive(:unregister).with(:unload, @action)
+    @action.unregister
+  end
+end

data/spec/runner/mspec_spec.rb

@@ -376,6 +376,46 @@ describe MSpec, ".read_tags" do
   end
 end
 
+describe MSpec, ".read_tags" do
+  before :each do
+    @tag = SpecTag.new "fails:Some#method"
+    File.open(tmp("tags.txt"), "w") do |f|
+      f.puts ""
+      f.puts @tag
+      f.puts ""
+    end
+    MSpec.stub!(:tags_file).and_return(tmp("tags.txt"))
+  end
+
+  it "does not return a tag object for empty lines" do
+    MSpec.read_tags(["fails"]).should == [@tag]
+  end
+end
+
+describe MSpec, ".write_tags" do
+  before :each do
+    FileUtils.cp File.dirname(__FILE__) + "/tags.txt", tmp("tags.txt")
+    MSpec.stub!(:tags_file).and_return(tmp("tags.txt"))
+    @tag1 = SpecTag.new "check(broken):Tag#rewrite works"
+    @tag2 = SpecTag.new "broken:Tag#write_tags fails"
+  end
+
+  after :all do
+    File.delete tmp("tags.txt") rescue nil
+  end
+
+  it "overwrites the tags in the tag file" 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
+]
+    MSpec.write_tags [@tag1, @tag2]
+    IO.read(tmp("tags.txt")).should == %[check(broken):Tag#rewrite works
+broken:Tag#write_tags fails
+]
+  end
+end
+
 describe MSpec, ".write_tag" do
   before :each do
     FileUtils.stub!(:mkdir_p)
@@ -434,6 +474,19 @@ benchmark(0.01825):The#fastest method today
   end
 end
 
+describe MSpec, ".delete_tags" do
+  before :each do
+    @tags = tmp("tags.txt")
+    FileUtils.cp File.dirname(__FILE__) + "/tags.txt", @tags
+    MSpec.stub!(:tags_file).and_return(@tags)
+  end
+
+  it "deletes the tag file" do
+    MSpec.delete_tags
+    File.exists?(@tags).should be_false
+  end
+end
+
 describe MSpec, ".expectation" do
   it "sets the flag that an expectation has been reported" do
     MSpec.clear_expectations

data/spec/utils/script_spec.rb

@@ -310,6 +310,10 @@ end
 describe MSpecScript, "#entries" do
   before :each do
     @script = MSpecScript.new
+
+    File.stub!(:expand_path).and_return("name")
+    File.stub!(:file?).and_return(false)
+    File.stub!(:directory?).and_return(false)
   end
 
   it "returns the pattern in an array if it is a file" do
@@ -319,20 +323,41 @@ describe MSpecScript, "#entries" do
   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"]
+    File.should_receive(:directory?).with("name").and_return(true)
+    Dir.should_receive(:[]).with("name/**/*_spec.rb").and_return(["dir1", "dir2"])
+    @script.entries("name").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
+
+  describe "with config[:prefix] set" do
+    before :each do
+      prefix = "prefix/dir"
+      @script.config[:prefix] = prefix
+      @name = prefix + "/name"
+    end
+
+    it "returns the pattern in an array if it is a file" do
+      File.should_receive(:expand_path).with(@name).and_return(@name)
+      File.should_receive(:file?).with(@name).and_return(true)
+      @script.entries("name").should == [@name]
+    end
+
+    it "returns Dir['pattern/**/*_spec.rb'] if pattern is a directory" do
+      File.should_receive(:expand_path).with(@name).and_return(@name)
+      File.should_receive(:directory?).with(@name).and_return(true)
+      Dir.should_receive(:[]).with(@name + "/**/*_spec.rb").and_return(["dir1", "dir2"])
+      @script.entries("name").should == ["dir1", "dir2"]
+    end
+
+    it "returns Dir[pattern] if pattern is neither a file nor a directory" do
+      Dir.should_receive(:[]).with("pattern").and_return(["file1", "file2"])
+      @script.entries("pattern").should == ["file1", "file2"]
+    end
+  end
 end
 
 describe MSpecScript, "#files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors: 
 - Brian Ford
@@ -49,11 +49,12 @@ files:
 - lib/mspec/guards/support.rb
 - lib/mspec/guards/version.rb
 - lib/mspec/guards.rb
+- lib/mspec/helpers/argv.rb
 - lib/mspec/helpers/bignum.rb
 - lib/mspec/helpers/const_lookup.rb
+- lib/mspec/helpers/fixture.rb
 - lib/mspec/helpers/flunk.rb
 - lib/mspec/helpers/io.rb
-- lib/mspec/helpers/metaclass.rb
 - lib/mspec/helpers/ruby_exe.rb
 - lib/mspec/helpers/scratch.rb
 - lib/mspec/helpers/tmp.rb
@@ -88,6 +89,7 @@ files:
 - lib/mspec/runner/actions/gdb.rb
 - lib/mspec/runner/actions/tag.rb
 - lib/mspec/runner/actions/taglist.rb
+- lib/mspec/runner/actions/tagpurge.rb
 - lib/mspec/runner/actions/tally.rb
 - lib/mspec/runner/actions/timer.rb
 - lib/mspec/runner/actions.rb
@@ -147,11 +149,12 @@ files:
 - spec/guards/superuser_spec.rb
 - spec/guards/support_spec.rb
 - spec/guards/version_spec.rb
+- spec/helpers/argv_spec.rb
 - spec/helpers/bignum_spec.rb
 - spec/helpers/const_lookup_spec.rb
+- spec/helpers/fixture_spec.rb
 - spec/helpers/flunk_spec.rb
 - spec/helpers/io_spec.rb
-- spec/helpers/metaclass_spec.rb
 - spec/helpers/ruby_exe_spec.rb
 - spec/helpers/scratch_spec.rb
 - spec/helpers/tmp_spec.rb
@@ -181,6 +184,7 @@ files:
 - spec/runner/actions/gdb_spec.rb
 - spec/runner/actions/tag_spec.rb
 - spec/runner/actions/taglist_spec.rb
+- spec/runner/actions/tagpurge_spec.rb
 - spec/runner/actions/tally_spec.rb
 - spec/runner/actions/timer_spec.rb
 - spec/runner/context_spec.rb

data/lib/mspec/helpers/metaclass.rb

@@ -1,12 +0,0 @@
-# Provides a convenience method for accessing the metaclass
-# of any object without overriding the method if it already
-# exists in an implementation.
-unless respond_to? :metaclass
-  class Object
-    def metaclass
-      class << self
-        self
-      end
-    end
-  end
-end

data/spec/helpers/metaclass_spec.rb

@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/metaclass'
-
-describe Object, "#metaclass" do
-  it "returns the singleton class for an object" do
-    obj = Object.new
-    def obj.metaclass_test; end
-    meta = obj.metaclass
-
-    meta.instance_methods(false).should include("metaclass_test")
-    obj.should_not be_instance_of(meta)
-    obj.should be_kind_of(meta)
-  end
-end