mspec 1.5.12 → 1.5.13

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2009-6-8}
+  s.date                      = %q{2009-12-25}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]
@@ -27,7 +27,7 @@ spec = Gem::Specification.new do |s|
   s.homepage                  = %q{http://rubyspec.org}
   s.rubyforge_project         = 'http://rubyforge.org/projects/mspec'
   s.require_paths             = ["lib"]
-  s.rubygems_version          = %q{1.1.1}
+  s.rubygems_version          = %q{1.3.5}
   s.summary                   = <<EOS
 MSpec is a specialized framework that is syntax-compatible
 with RSpec for basic things like describe, it blocks and

data/lib/mspec/commands/mspec.rb

@@ -36,7 +36,7 @@ class MSpecMain < MSpecScript
     options.targets
 
     options.on("-D", "--gdb", "Run under gdb") do
-      config[:flags] << '--gdb'
+      config[:use_gdb] = true
     end
     options.on("-A", "--valgrind", "Run under valgrind") do
       config[:flags] << '--valgrind'
@@ -150,7 +150,12 @@ class MSpecMain < MSpecScript
     if config[:multi] and config[:command] == "ci"
       multi_exec argv
     else
-      exec config[:target], *argv
+      if config[:use_gdb]
+        more = ["--args", config[:target]] + argv
+        exec "gdb", *more
+      else
+        exec config[:target], *argv
+      end
     end
   end
 end

data/lib/mspec/expectations/should.rb

@@ -1,8 +1,9 @@
 class Object
-  def should(matcher=nil)
+  NO_MATCHER_GIVEN = Object.new
+  def should(matcher=NO_MATCHER_GIVEN)
     MSpec.expectation
     MSpec.actions :expectation, MSpec.current.state
-    if matcher
+    unless matcher.equal?(NO_MATCHER_GIVEN)
       unless matcher.matches?(self)
         SpecExpectation.fail_with(*matcher.failure_message)
       end
@@ -11,10 +12,10 @@ class Object
     end
   end
 
-  def should_not(matcher=nil)
+  def should_not(matcher=NO_MATCHER_GIVEN)
     MSpec.expectation
     MSpec.actions :expectation, MSpec.current.state
-    if matcher
+    unless matcher.equal?(NO_MATCHER_GIVEN)
       if matcher.matches?(self)
         SpecExpectation.fail_with(*matcher.negative_failure_message)
       end

data/lib/mspec/guards.rb

@@ -13,4 +13,5 @@ require 'mspec/guards/runner'
 require 'mspec/guards/support'
 require 'mspec/guards/superuser'
 require 'mspec/guards/tty'
+require 'mspec/guards/user'
 require 'mspec/guards/version'

data/lib/mspec/guards/guard.rb

@@ -123,6 +123,8 @@ class SpecGuard
         RUBY_NAME =~ /^ironruby/
       when :macruby
         RUBY_NAME =~ /^macruby/
+      when :maglev
+        RUBY_NAME =~ /^maglev/
       else
         false
       end

data/lib/mspec/guards/user.rb

@@ -0,0 +1,17 @@
+require 'mspec/guards/guard'
+
+class UserGuard < SpecGuard
+  def match?
+    Process.euid != 0
+  end
+end
+
+class Object
+  def as_user
+    g = UserGuard.new
+    g.name = :as_user
+    yield if g.yield?
+  ensure
+    g.unregister
+  end
+end

data/lib/mspec/helpers.rb

@@ -6,10 +6,14 @@ require 'mspec/helpers/enumerator_class'
 require 'mspec/helpers/environment'
 require 'mspec/helpers/fixture'
 require 'mspec/helpers/flunk'
+require 'mspec/helpers/fs'
 require 'mspec/helpers/hash'
+require 'mspec/helpers/infinity'
 require 'mspec/helpers/io'
 require 'mspec/helpers/language_version'
 require 'mspec/helpers/metaclass'
+require 'mspec/helpers/mock_to_path'
+require 'mspec/helpers/nan'
 require 'mspec/helpers/ruby_exe'
 require 'mspec/helpers/scratch'
 require 'mspec/helpers/tmp'

data/lib/mspec/helpers/fs.rb

@@ -0,0 +1,58 @@
+class Object
+  # Copies a file
+  def cp(source, dest)
+    File.open(dest, "w") do |d|
+      File.open(source, "r") do |s|
+        while data = s.read(1024)
+          d.write data
+        end
+      end
+    end
+  end
+
+  # Creates each directory in path that does not exist.
+  def mkdir_p(path)
+    parts = File.expand_path(path).split %r[/|\\]
+    name = parts.shift
+    parts.each do |part|
+      name = File.join name, part
+
+      if File.file? name
+        raise ArgumentError, "path component of #{path} is a file"
+      end
+
+      Dir.mkdir name unless File.directory? name
+    end
+  end
+
+  # Recursively removes all files and directories in +path+
+  # if +path+ is a directory. Removes the file if +path+ is
+  # a file.
+  def rm_r(*paths)
+    paths.each do |path|
+      path = File.expand_path path
+
+      prefix = SPEC_TEMP_DIR
+      unless path[0, prefix.size] == prefix
+        raise ArgumentError, "#{path} is not prefixed by #{prefix}"
+      end
+
+      if File.directory? path
+        Dir.entries(path).each { |x| rm_r "#{path}/#{x}" unless x =~ /^\.\.?$/ }
+        Dir.rmdir path
+      elsif File.exists? path
+        File.delete path
+      end
+    end
+  end
+
+  # Creates a file +name+. Creates the directory for +name+
+  # if it does not exist.
+  def touch(name)
+    mkdir_p File.dirname(name)
+
+    File.open(name, "w") do |f|
+      yield f if block_given?
+    end
+  end
+end

data/lib/mspec/helpers/infinity.rb

@@ -0,0 +1,5 @@
+class Object
+  def infinity_value
+    1/0.0
+  end
+end

data/lib/mspec/helpers/language_version.rb

@@ -10,11 +10,21 @@ class Object
   #
   # Then add a file "language/versions/method_1.8.rb" for the specs that are
   # syntax-compatible with Ruby 1.8.x.
+  #
+  # The most version-specific file will be loaded. If the version is 1.8.6,
+  # "method_1.8.6.rb" will be loaded if it exists, otherwise "method_1.8.rb"
+  # will be loaded if it exists.
   def language_version(dir, name)
     path = File.dirname(File.expand_path(dir))
-    name = "#{name}_#{SpecGuard.ruby_version}.rb"
-    file = File.join path, "versions", name
 
-    require file if File.exists? file
+    [SpecGuard.ruby_version(:tiny), SpecGuard.ruby_version].each do |version|
+      file = File.join path, "versions", "#{name}_#{version}.rb"
+      if File.exists? file
+        require file
+        break
+      end
+    end
+
+    nil
   end
 end

data/lib/mspec/helpers/mock_to_path.rb

@@ -0,0 +1,7 @@
+class Object
+  def mock_to_path(path)
+    obj = mock('path')
+    obj.should_receive(:to_path).and_return(path)
+    obj
+  end
+end

data/lib/mspec/helpers/nan.rb

@@ -0,0 +1,5 @@
+class Object
+  def nan_value
+    0/0.0
+  end
+end

data/lib/mspec/helpers/ruby_exe.rb

@@ -76,6 +76,8 @@ class Object
         "bin/rbx"
       when 'jruby'
         "bin/jruby"
+      when 'maglev'
+        "maglev-ruby"
       when 'ironruby'
         "ir"
       end

data/lib/mspec/helpers/tmp.rb

@@ -1,32 +1,32 @@
-# The #tmp method provides a similar functionality
-# to that of Dir.tmpdir. This helper can be overridden
-# by different implementations to provide a more useful
-# behavior if needed.
-#
-# Usage in a spec:
-#
-#   File.open(tmp("tags.txt"), "w") { |f| f.puts "" }
-#
-# The order of directories below with "/private/tmp"
-# preceding "/tmp" is significant. On OS X, the directory
-# "/tmp" is a symlink to "private/tmp" with no leading
-# "/". Rather than futzing with what constitutes an
-# absolute path, we just look for "/private/tmp" first.
+# Creates a temporary directory in the current working directory
+# for temporary files created while running the specs. All specs
+# should clean up any temporary files created so that the temp
+# directory is empty when the process exits.
+
+SPEC_TEMP_DIR = "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
+
+at_exit do
+  begin
+    Dir.delete SPEC_TEMP_DIR if File.directory? SPEC_TEMP_DIR
+  rescue SystemCallError
+    STDERR.puts <<-EOM
+
+-----------------------------------------------------
+The rubyspec temp directory is not empty. Ensure that
+all specs are cleaning up temporary files.
+-----------------------------------------------------
+
+    EOM
+  rescue Object => e
+    STDERR.puts "failed to remove spec temp directory"
+    STDERR.puts e.message
+  end
+end
 
 class Object
   def tmp(name)
-    unless @spec_temp_directory
-      [ "/private/tmp", "/tmp", "/var/tmp", ENV["TMPDIR"], ENV["TMP"],
-        ENV["TEMP"], ENV["USERPROFILE"] ].each do |dir|
-        if dir and File.directory?(dir) and File.writable?(dir)
-          temp = File.expand_path dir
-          temp = File.readlink temp if File.symlink? temp
-          @spec_temp_directory = temp
-          break
-        end
-      end
-    end
+    Dir.mkdir SPEC_TEMP_DIR unless File.exists? SPEC_TEMP_DIR
 
-    File.join @spec_temp_directory, name
+    File.join SPEC_TEMP_DIR, name
   end
 end

data/lib/mspec/mocks/mock.rb

@@ -1,6 +1,10 @@
 require 'mspec/expectations/expectations'
 require 'mspec/helpers/metaclass'
 
+class Object
+  alias_method :__mspec_object_id__, :object_id
+end
+
 module Mock
   def self.reset
     @mocks = @stubs = @objects = nil
@@ -19,7 +23,7 @@ module Mock
   end
 
   def self.replaced_name(obj, sym)
-    :"__mspec_#{obj.__id__}_#{sym}__"
+    :"__mspec_#{obj.__mspec_object_id__}_#{sym}__"
   end
 
   def self.replaced_key(obj, sym)
@@ -166,7 +170,7 @@ module Mock
       sym = key.last
       meta = obj.metaclass
 
-      if meta.instance_methods.map { |x| x.to_sym }.include?(replaced)
+      if mock_respond_to? obj, replaced
         meta.__send__ :alias_method, sym, replaced
         meta.__send__ :remove_method, replaced
       else

data/lib/mspec/runner/context.rb

@@ -32,9 +32,9 @@ class ContextState
     @parents  = [self]
     @children = []
 
-    @mock_verify         = lambda { Mock.verify_count }
-    @mock_cleanup        = lambda { Mock.cleanup }
-    @expectation_missing = lambda { raise SpecExpectationNotFoundError }
+    @mock_verify         = Proc.new { Mock.verify_count }
+    @mock_cleanup        = Proc.new { Mock.cleanup }
+    @expectation_missing = Proc.new { raise SpecExpectationNotFoundError }
   end
 
   # Returns true if this is a shared +ContextState+. Essentially, when
@@ -57,6 +57,12 @@ class ContextState
     end
   end
 
+  def replace_parent(parent)
+    @parents[0] = parent
+
+    children.each { |child| child.replace_parent parent }
+  end
+
   # Add the ContextState instance +child+ to the list of nested
   # describe blocks.
   def child(child)
@@ -124,6 +130,14 @@ class ContextState
     state.before(:each).each { |b| before :each, &b }
     state.after(:each).each { |b| after :each, &b }
     state.after(:all).each { |b| after :all, &b }
+
+    # There is a potential race here if mspec ever implements concurrency
+    # in process. Right now, the only way to run specs concurrently is
+    # with multiple processes, so we ignore this for the sake of simplicity.
+    state.children.each do |child|
+      child.replace_parent self
+      @children << child
+    end
   end
 
   # Evaluates each block in +blocks+ using the +MSpec.protect+ method

data/lib/mspec/runner/object.rb

@@ -19,6 +19,10 @@ class Object
     MSpec.current.it_should_behave_like desc
   end
 
+  # For ReadRuby compatiability
+  def doc(*a)
+  end
+
   alias_method :context, :describe
   alias_method :specify, :it
 end

data/lib/mspec/utils/options.rb

@@ -221,6 +221,8 @@ class MSpecOptions
         config[:target] = 'jruby'
       when 'i','ironruby'
         config[:target] = 'ir'
+      when 'm','maglev'
+        config[:target] = 'maglev-ruby'
       else
         config[:target] = t
       end
@@ -233,6 +235,7 @@ class MSpecOptions
     doc "     X or rbx               invokes rbx in PATH"
     doc "     j or jruby             invokes jruby in PATH"
     doc "     i or ironruby          invokes ir in PATH"
+    doc "     m or maglev            invokes maglev-ruby in PATH"
     doc "     full path to EXE       invokes EXE directly\n"
 
     on("-T", "--target-opt", "OPT",

data/lib/mspec/version.rb

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

data/spec/commands/mspec_spec.rb

@@ -270,11 +270,11 @@ describe "The -D, --gdb option" do
     @script.options
   end
 
-  it "sets flags to --gdb" do
+  it "sets use_gdb to true" do
     ["-D", "--gdb"].each do |opt|
-      @config[:flags] = []
+      @config[:use_gdb] = false
       @script.options [opt]
-      @config[:flags].should include("--gdb")
+      @config[:use_gdb].should be_true
     end
   end
 end

data/spec/guards/guard_spec.rb

@@ -180,6 +180,11 @@ describe SpecGuard, "#implementation?" do
     @guard.implementation?(:ironruby).should == true
   end
 
+  it "returns true if passed :maglev and RUBY_NAME == 'maglev'" do
+    Object.const_set :RUBY_NAME, 'maglev'
+    @guard.implementation?(:maglev).should == true
+  end
+
   it "returns true if passed :ruby and RUBY_NAME matches /^ruby/" do
     Object.const_set :RUBY_NAME, 'ruby'
     @guard.implementation?(:ruby).should == true
@@ -238,7 +243,7 @@ describe SpecGuard, "#platform?" do
   end
 
   it "returns false when no arg matches RUBY_PLATFORM" do
-    @guard.platform?(:ruby, :jruby, :rubinius).should == false
+    @guard.platform?(:ruby, :jruby, :rubinius, :maglev).should == false
   end
 
   it "returns true when arg matches RUBY_PLATFORM" do
@@ -246,7 +251,7 @@ describe SpecGuard, "#platform?" do
   end
 
   it "returns true when any arg matches RUBY_PLATFORM" do
-    @guard.platform?(:ruby, :jruby, :solarce, :rubinius).should == true
+    @guard.platform?(:ruby, :jruby, :solarce, :rubinius, :maglev).should == true
   end
 
   it "returns true when arg is :windows and RUBY_PLATFORM contains 'mswin'" do

data/spec/guards/user_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/guards/user'
+
+describe Object, "#as_user" do
+  before :each do
+    @guard = UserGuard.new
+    UserGuard.stub!(:new).and_return(@guard)
+    ScratchPad.clear
+  end
+
+  it "yields when the Process.euid is not 0" do
+    Process.stub!(:euid).and_return(501)
+    as_user { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
+
+  it "does not yield when the Process.euid is 0" do
+    Process.stub!(:euid).and_return(0)
+    as_user { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
+  end
+
+  it "sets the name of the guard to :as_user" do
+    as_user { }
+    @guard.name.should == :as_user
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      as_user { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/helpers/fs_spec.rb

@@ -0,0 +1,160 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/tmp'
+require 'mspec/helpers/fs'
+
+describe Object, "#cp" do
+  before :each do
+    @source = tmp("source.txt")
+    @copy = tmp("copied.txt")
+
+    @contents = "This is a copy."
+    File.open(@source, "w") { |f| f.write @contents }
+  end
+
+  after :each do
+    File.delete @source if File.exists? @source
+    File.delete @copy if File.exists? @copy
+  end
+
+  it "copies a file" do
+    cp @source, @copy
+    data = IO.read(@copy)
+    data.should == @contents
+    data.should == IO.read(@source)
+  end
+end
+
+describe Object, "#touch" do
+  before :all do
+    @name = tmp("touched.txt")
+  end
+
+  after :each do
+    File.delete @name if File.exists? @name
+  end
+
+  it "creates a file" do
+    touch @name
+    File.exists?(@name).should be_true
+  end
+
+  it "overwrites an existing file" do
+    File.open(@name, "w") { |f| f.puts "used" }
+    File.size(@name).should > 0
+
+    touch @name
+    File.size(@name).should == 0
+  end
+
+  it "yields the open file if passed a block" do
+    touch(@name) { |f| f.write "touching" }
+    IO.read(@name).should == "touching"
+  end
+end
+
+describe Object, "#touch" do
+  before :all do
+    @dir = tmp("subdir")
+    @name = tmp("subdir/touched.txt")
+  end
+
+  after :each do
+    File.delete @name if File.exists? @name
+    Dir.rmdir @dir if File.directory? @dir
+  end
+
+  it "creates all the directories in the path to the file" do
+    touch @name
+    File.exists?(@name).should be_true
+  end
+end
+
+describe Object, "#mkdir_p" do
+  before :all do
+    @dir1 = tmp("/nested")
+    @dir2 = @dir1 + "/directory"
+    @paths = [ @dir2, @dir1 ]
+  end
+
+  after :each do
+    File.delete @dir1 if File.file? @dir1
+    @paths.each { |path| Dir.rmdir path if File.directory? path }
+  end
+
+  it "creates all the directories in a path" do
+    mkdir_p @dir2
+    File.directory?(@dir2).should be_true
+  end
+
+  it "raises an ArgumentError if a path component is a file" do
+    File.open(@dir1, "w") { |f| }
+    lambda { mkdir_p @dir2 }.should raise_error(ArgumentError)
+  end
+end
+
+describe Object, "#rm_r" do
+  before :all do
+    @topdir  = tmp("rm_r_tree")
+    @topfile = @topdir + "/file.txt"
+    @link    = @topdir + "/file.lnk"
+    @socket  = @topdir + "/socket.sck"
+    @subdir1 = @topdir + "/subdir1"
+    @subdir2 = @subdir1 + "/subdir2"
+    @subfile = @subdir1 + "/subfile.txt"
+  end
+
+  before :each do
+    mkdir_p @subdir2
+    touch @topfile
+    touch @subfile
+  end
+
+  after :each do
+    File.delete @link if File.exists? @link
+    File.delete @socket if File.exists? @socket
+    File.delete @subfile if File.exists? @subfile
+    File.delete @topfile if File.exists? @topfile
+
+    Dir.rmdir @subdir2 if File.directory? @subdir2
+    Dir.rmdir @subdir1 if File.directory? @subdir1
+    Dir.rmdir @topdir if File.directory? @topdir
+  end
+
+  it "raises an ArgumentError if the path is not prefixed by MSPEC_RM_PREFIX" do
+    lambda { rm_r "some_file.txt" }.should raise_error(ArgumentError)
+  end
+
+  it "removes a single file" do
+    rm_r @subfile
+    File.exists?(@subfile).should be_false
+  end
+
+  it "removes multiple files" do
+    rm_r @topfile, @subfile
+    File.exists?(@topfile).should be_false
+    File.exists?(@subfile).should be_false
+  end
+
+  it "removes a symlink" do
+    File.symlink @topfile, @link
+    rm_r @link
+    File.exists?(@link).should be_false
+  end
+
+  it "removes a socket" do
+    require 'socket'
+    UNIXServer.new(@socket).close
+    rm_r @socket
+    File.exists?(@socket).should be_false
+  end
+
+  it "removes a single directory" do
+    rm_r @subdir2
+    File.directory?(@subdir2).should be_false
+  end
+
+  it "recursively removes a directory tree" do
+    rm_r @topdir
+    File.directory?(@topdir).should be_false
+  end
+end

data/spec/helpers/infinity_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/infinity'
+
+describe Object, "#infinity_value" do
+  it "returns Infinity" do
+    infinity_value.infinite?.should == 1
+  end
+end

data/spec/helpers/language_version_spec.rb

@@ -7,23 +7,33 @@ describe Object, "#language_version" do
 
     Object.const_set :RUBY_VERSION, "8.2.3"
 
-    dir = File.dirname(File.expand_path(__FILE__))
-    @name = "#{dir}/versions/method_8.2.rb"
+    dir = "#{File.expand_path('../', __FILE__)}/versions"
+    @method82  = "#{dir}/method_8.2.rb"
+    @method823 = "#{dir}/method_8.2.3.rb"
   end
 
   after :all do
     Object.const_set :RUBY_VERSION, @ruby_version
   end
 
-  it "loads files conditionally based on name and RUBY_VERSION if it exists" do
-    File.should_receive(:exists?).with(@name).and_return(true)
-    should_receive(:require).with(@name)
+  it "loads the most version-specific file if it exists" do
+    File.should_receive(:exists?).with(@method823).and_return(true)
+    should_receive(:require).with(@method823)
+    language_version __FILE__, "method"
+  end
+
+  it "loads a less version-specific file if it exists" do
+    File.should_receive(:exists?).with(@method823).and_return(false)
+    File.should_receive(:exists?).with(@method82).and_return(true)
+    should_receive(:require).with(@method82)
     language_version __FILE__, "method"
   end
 
   it "does not load the file if it does not exist" do
-    File.should_receive(:exists?).with(@name).and_return(false)
-    should_not_receive(:require).with(@name)
+    File.should_receive(:exists?).with(@method82).and_return(false)
+    File.should_receive(:exists?).with(@method823).and_return(false)
+    should_not_receive(:require).with(@method82)
+    should_not_receive(:require).with(@method823)
     language_version __FILE__, "method"
   end
 end

data/spec/helpers/mock_to_path_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/mock_to_path'
+
+describe Object, "#mock_to_path" do
+  it "returns an object that responds to #to_path" do
+    obj = mock_to_path("foo")
+    obj.should respond_to(:to_path)
+    obj.to_path
+  end
+
+  it "returns the provided path when #to_path is called" do
+    obj = mock_to_path("/tmp/foo")
+    obj.to_path.should == "/tmp/foo"
+  end
+end

data/spec/helpers/nan_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/nan'
+
+describe Object, "#nan_value" do
+  it "returns NaN" do
+    nan_value.nan?.should be_true
+  end
+end

data/spec/helpers/ruby_exe_spec.rb

@@ -46,6 +46,11 @@ describe "#ruby_exe_options" do
     @script.ruby_exe_options(:engine).should == 'ir'
   end
 
+  it "returns 'maglev-ruby' when passed :engine and RUBY_NAME is 'maglev'" do
+    Object.const_set :RUBY_NAME, 'maglev'
+    @script.ruby_exe_options(:engine).should == 'maglev-ruby'
+  end
+
   it "returns RUBY_NAME + $(EXEEXT) when passed :name" do
     bin = RUBY_NAME + (Config::CONFIG['EXEEXT'] || Config::CONFIG['exeext'] || '')
     name = File.join ".", bin

data/spec/helpers/tmp_spec.rb

@@ -2,71 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/helpers/tmp'
 
 describe Object, "#tmp" do
-  before :each do
-    File.stub!(:directory?).and_return(false)
-    File.stub!(:symlink?).and_return(false)
-    ENV.stub!(:[]).and_return(nil)
-  end
-
-  it "returns /tmp/<name> if /tmp is a writable directory" do
-    dir = "/tmp"
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
-    tmp("test.txt").should == dir + "/test.txt"
-  end
-
-  it "returns /var/tmp/<name> if /var/tmp is a writable directory" do
-    dir = "/var/tmp"
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
-    tmp("test.txt").should == dir + "/test.txt"
-  end
-
-  it "returns ENV['TMPDIR']/<name> if ENV['TMPDIR'] is a writable directory" do
-    dir = "/tmpdir"
-    ENV.should_receive(:[]).with("TMPDIR").and_return(dir)
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
-    tmp("test.txt").should == dir + "/test.txt"
-  end
+  it "returns a name relative to the current working directory" do
+    dir = "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
 
-  it "returns ENV['TMP']/<name> if ENV['TMP'] is a writable directory" do
-    dir = "/tmp/tmp"
-    ENV.should_receive(:[]).with("TMP").and_return(dir)
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
     tmp("test.txt").should == dir + "/test.txt"
   end
-
-  it "returns ENV['TEMP']/<name> if ENV['TEMP'] is a writable directory" do
-    dir = "/tmp/temp"
-    ENV.should_receive(:[]).with("TEMP").and_return(dir)
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
-    tmp("test.txt").should == dir + "/test.txt"
-  end
-
-  it "returns ENV['USERPROFILE']/<name> if ENV['USERPROFILE'] is a writable directory" do
-    dir = "/tmp/temp"
-    ENV.should_receive(:[]).with("TEMP").and_return(dir)
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
-    tmp("test.txt").should == dir + "/test.txt"
-  end
-
-  it "returns the actual file name if the file is a symlink" do
-    dir = "/tmp"
-    File.should_receive(:directory?).with(dir).and_return(true)
-    File.should_receive(:writable?).with(dir).and_return(true)
-    File.should_receive(:expand_path).with(dir).and_return(dir)
-    File.should_receive(:symlink?).with(dir).and_return(true)
-    File.should_receive(:readlink).with(dir).and_return("/ponies"+dir)
-    tmp("test.txt").should == "/ponies" + dir + "/test.txt"
-  end
 end

data/spec/mocks/mock_spec.rb

@@ -22,7 +22,7 @@ end
 describe Mock, ".replaced_name" do
   it "returns the name for a method that is being replaced by a mock method" do
     m = mock('a fake id')
-    m.stub!(:__id__).and_return(42)
+    m.stub!(:__mspec_object_id__).and_return(42)
     Mock.replaced_name(m, :method_call).should == :__mspec_42_method_call__
   end
 end
@@ -30,7 +30,7 @@ end
 describe Mock, ".replaced_key" do
   it "returns a key used internally by Mock" do
     m = mock('a fake id')
-    m.stub!(:__id__).and_return(42)
+    m.stub!(:__mspec_object_id__).and_return(42)
     Mock.replaced_key(m, :method_call).should == [:__mspec_42_method_call__, :method_call]
   end
 end

data/spec/runner/context_spec.rb

@@ -910,7 +910,8 @@ end
 
 describe ContextState, "#it_should_behave_like" do
   before :each do
-    @shared = ContextState.new("", :shared => true)
+    @shared_desc = "shared context"
+    @shared = ContextState.new(@shared_desc, :shared => true)
     MSpec.stub!(:retrieve_shared).and_return(@shared)
 
     @state = ContextState.new ""
@@ -923,10 +924,30 @@ describe ContextState, "#it_should_behave_like" do
     lambda { @state.it_should_behave_like "this" }.should raise_error(Exception)
   end
 
+  describe "for nested ContextState instances" do
+    before :each do
+      @nested = ContextState.new ""
+      @nested.parents.unshift @shared
+      @shared.children << @nested
+    end
+
+    it "adds nested describe blocks to the invoking ContextState" do
+      @state.it_should_behave_like @shared_desc
+      @shared.children.should_not be_empty
+      @state.children.should include(*@shared.children)
+    end
+
+    it "changes the parent ContextState" do
+      @shared.children.first.parents.first.should equal(@shared)
+      @state.it_should_behave_like @shared_desc
+      @shared.children.first.parents.first.should equal(@state)
+    end
+  end
+
   it "adds examples from the shared ContextState" do
     @shared.it "some", &@a
     @shared.it "thing", &@b
-    @state.it_should_behave_like ""
+    @state.it_should_behave_like @shared_desc
     @state.examples.should include(*@shared.examples)
   end
 
@@ -934,34 +955,34 @@ describe ContextState, "#it_should_behave_like" do
     @shared.it "some", &@a
     @shared.it "thing", &@b
     @shared.examples.each { |ex| ex.should_receive(:context=).with(@state) }
-    @state.it_should_behave_like ""
+    @state.it_should_behave_like @shared_desc
   end
 
   it "adds before(:all) blocks from the shared ContextState" do
     @shared.before :all, &@a
     @shared.before :all, &@b
-    @state.it_should_behave_like ""
+    @state.it_should_behave_like @shared_desc
     @state.before(:all).should include(*@shared.before(:all))
   end
 
   it "adds before(:each) blocks from the shared ContextState" do
     @shared.before :each, &@a
     @shared.before :each, &@b
-    @state.it_should_behave_like ""
+    @state.it_should_behave_like @shared_desc
     @state.before(:each).should include(*@shared.before(:each))
   end
 
   it "adds after(:each) blocks from the shared ContextState" do
     @shared.after :each, &@a
     @shared.after :each, &@b
-    @state.it_should_behave_like ""
+    @state.it_should_behave_like @shared_desc
     @state.after(:each).should include(*@shared.after(:each))
   end
 
   it "adds after(:all) blocks from the shared ContextState" do
     @shared.after :all, &@a
     @shared.after :all, &@b
-    @state.it_should_behave_like ""
+    @state.it_should_behave_like @shared_desc
     @state.after(:all).should include(*@shared.after(:all))
   end
 end

data/spec/utils/options_spec.rb

@@ -587,6 +587,15 @@ describe "The -t, --target TARGET option" do
     end
   end
 
+  it "sets the target to 'maglev' with TARGET 'm' or 'maglev'" do
+    ["-t", "--target"].each do |opt|
+      ["m", "maglev"].each do |t|
+        @options.parse [opt, t]
+        @config[:target].should == "maglev-ruby"
+      end
+    end
+  end
+
   it "sets the target to TARGET" do
     ["-t", "--target"].each do |opt|
       @options.parse [opt, "whateva"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-12-25 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -49,6 +49,7 @@ files:
 - lib/mspec/guards/superuser.rb
 - lib/mspec/guards/support.rb
 - lib/mspec/guards/tty.rb
+- lib/mspec/guards/user.rb
 - lib/mspec/guards/version.rb
 - lib/mspec/guards.rb
 - lib/mspec/helpers/argv.rb
@@ -59,10 +60,14 @@ files:
 - lib/mspec/helpers/environment.rb
 - lib/mspec/helpers/fixture.rb
 - lib/mspec/helpers/flunk.rb
+- lib/mspec/helpers/fs.rb
 - lib/mspec/helpers/hash.rb
+- lib/mspec/helpers/infinity.rb
 - lib/mspec/helpers/io.rb
 - lib/mspec/helpers/language_version.rb
 - lib/mspec/helpers/metaclass.rb
+- lib/mspec/helpers/mock_to_path.rb
+- lib/mspec/helpers/nan.rb
 - lib/mspec/helpers/ruby_exe.rb
 - lib/mspec/helpers/scratch.rb
 - lib/mspec/helpers/tmp.rb
@@ -173,6 +178,7 @@ files:
 - spec/guards/superuser_spec.rb
 - spec/guards/support_spec.rb
 - spec/guards/tty_spec.rb
+- spec/guards/user_spec.rb
 - spec/guards/version_spec.rb
 - spec/helpers/argv_spec.rb
 - spec/helpers/bignum_spec.rb
@@ -182,9 +188,13 @@ files:
 - spec/helpers/environment_spec.rb
 - spec/helpers/fixture_spec.rb
 - spec/helpers/flunk_spec.rb
+- spec/helpers/fs_spec.rb
 - spec/helpers/hash_spec.rb
+- spec/helpers/infinity_spec.rb
 - spec/helpers/io_spec.rb
 - spec/helpers/language_version_spec.rb
+- spec/helpers/mock_to_path_spec.rb
+- spec/helpers/nan_spec.rb
 - spec/helpers/ruby_exe_spec.rb
 - spec/helpers/scratch_spec.rb
 - spec/helpers/tmp_spec.rb
@@ -257,6 +267,8 @@ files:
 - LICENSE
 has_rdoc: true
 homepage: http://rubyspec.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -281,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://rubyforge.org/projects/mspec
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 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.