mspec 1.5.4 → 1.5.5

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'spec/rake/spectask'
 require 'rake/gempackagetask'
+
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
 require 'lib/mspec/version'
 
 Spec::Rake::SpecTask.new
@@ -10,13 +12,13 @@ task :default => :spec
 
 spec = Gem::Specification.new do |s|
   s.name                      = %q{mspec}
-  s.version                   = MSpec::VERSION
+  s.version                   = MSpec::VERSION.to_s
 
   s.specification_version     = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2008-12-1}
+  s.date                      = %q{2008-12-29}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

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

@@ -21,6 +21,7 @@ class MSpecCI < MSpecScript
     options.configure { |f| load f }
     options.name
     options.pretend
+    options.unguarded
     options.interrupt
 
     options.doc "\n How to display their output"

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

@@ -32,6 +32,7 @@ class MSpecRun < MSpecScript
     options.name
     options.randomize
     options.pretend
+    options.unguarded
     options.interrupt
 
     options.doc "\n How to display their output"

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

@@ -32,6 +32,7 @@ class MSpecTag < MSpecScript
     options.configure { |f| load f }
     options.name
     options.pretend
+    options.unguarded
     options.interrupt
 
     options.doc "\n How to display their output"
@@ -105,6 +106,7 @@ class MSpecTag < MSpecScript
     when :purge
       tagger = TagPurgeAction.new
       MSpec.register_mode :pretend
+      MSpec.register_mode :unguarded
       config[:formatter] = false
     else
       raise ArgumentError, "No recognized action given"

data/lib/mspec/commands/mspec.rb

@@ -53,7 +53,7 @@ class MSpecMain < MSpecScript
       if config[:command]
         config[:options] << "-v"
       else
-        puts options
+        puts "#{File.basename $0} #{MSpec::VERSION}"
         exit
       end
     end

data/lib/mspec/guards.rb

@@ -1,6 +1,8 @@
-require 'mspec/ruby_name'
+require 'mspec/utils/ruby_name'
 require 'mspec/guards/bug'
 require 'mspec/guards/compliance'
+require 'mspec/guards/conflict'
+require 'mspec/guards/endian'
 require 'mspec/guards/extensions'
 require 'mspec/guards/guard'
 require 'mspec/guards/noncompliance'
@@ -8,7 +10,6 @@ require 'mspec/guards/platform'
 require 'mspec/guards/quarantine'
 require 'mspec/guards/runner'
 require 'mspec/guards/support'
-require 'mspec/guards/endian'
 require 'mspec/guards/superuser'
-require 'mspec/guards/conflict'
+require 'mspec/guards/tty'
 require 'mspec/guards/version'

data/lib/mspec/guards/bug.rb

@@ -3,14 +3,7 @@ require 'mspec/guards/version'
 class BugGuard < VersionGuard
   def initialize(bug, version)
     @bug = bug
-    @version = to_v version
-  end
-
-  def to_v(str)
-    major, minor, tiny, patch = str.split "."
-    tiny = 99 unless tiny
-    patch = 9999 unless patch
-    ("1%02d%02d%02d%04d" % [major, minor, tiny, patch].map { |x| x.to_i }).to_i
+    @version = SpecVersion.new version, true
   end
 
   def match?

data/lib/mspec/guards/guard.rb

@@ -19,16 +19,47 @@ class SpecGuard
     print "\n#{self.class}\n#{@tally.format}\n"
   end
 
+  # Returns a partial Ruby version string based on +which+. For example,
+  # if RUBY_VERSION = 8.2.3 and RUBY_PATCHLEVEL = 71:
+  #
+  #  :major  => "8"
+  #  :minor  => "8.2"
+  #  :tiny   => "8.2.3"
+  #  :teeny  => "8.2.3"
+  #  :full   => "8.2.3.71"
+  def self.ruby_version(which = :minor)
+    case which
+    when :major
+      n = 1
+    when :minor
+      n = 2
+    when :tiny, :teeny
+      n = 3
+    else
+      n = 4
+    end
+
+    version = "#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
+    version.split('.')[0,n].join('.')
+  end
+
+  def self.windows?(key = RUBY_PLATFORM)
+    !!key.match(/(mswin|mingw)/)
+  end
+
+
   def initialize(*args)
     @args = args
   end
 
   def yield?(invert=false)
-    if MSpec.report_mode?
+    if MSpec.mode? :unguarded
+      return true
+    elsif MSpec.mode? :report
       self.class.register
       MSpec.register :before, self
       return true
-    elsif MSpec.verify_mode?
+    elsif MSpec.mode? :verify
       self.class.register
       MSpec.register :after, self
       return true
@@ -75,7 +106,7 @@ class SpecGuard
   end
 
   def windows?(sym, key)
-    sym == :windows && !!key.match(/(mswin|mingw)/)
+    sym == :windows && SpecGuard.windows?(key)
   end
 
   def platform?(*args)

data/lib/mspec/guards/tty.rb

@@ -0,0 +1,20 @@
+require 'mspec/guards/guard'
+
+# Some specs will block if run under as subprocess where STDOUT is not a TTY.
+# For most specs, there is probably a way to provide an IOStub that could
+# pretend to be a TTY. See the IOStub helper. That helper needs combined with
+# the output_to_fd helper.
+
+class TTYGuard < SpecGuard
+  def match?
+    STDOUT.tty?
+  end
+end
+
+class Object
+  def with_tty
+    g = TTYGuard.new
+    yield if g.yield?
+    g.unregister
+  end
+end

data/lib/mspec/guards/version.rb

@@ -1,32 +1,27 @@
+require 'mspec/utils/version'
 require 'mspec/guards/guard'
 
 class VersionGuard < SpecGuard
   def initialize(version)
     case version
     when String
-      @version = to_v version
+      @version = SpecVersion.new version
     when Range
-      a = to_v version.first
-      b = to_v version.last
+      a = SpecVersion.new version.first
+      b = SpecVersion.new version.last
       @version = version.exclude_end? ? a...b : a..b
     end
   end
 
-  def to_v(str)
-    major, minor, tiny, patch = str.split "."
-    ("1%02d%02d%02d%04d" % [major, minor, tiny, patch].map { |x| x.to_i }).to_i
-  end
-
   def ruby_version
-    to_v("#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}")
+    @ruby_version ||= SpecVersion.new self.class.ruby_version(:full)
   end
 
   def match?
-    case @version
-    when Integer
-      ruby_version >= @version
-    when Range
+    if Range === @version
       @version.include? ruby_version
+    else
+      ruby_version >= @version
     end
   end
 end

data/lib/mspec/helpers.rb

@@ -1,9 +1,11 @@
+require 'mspec/helpers/argv'
 require 'mspec/helpers/bignum'
+require 'mspec/helpers/const_lookup'
+require 'mspec/helpers/environment'
+require 'mspec/helpers/fixture'
 require 'mspec/helpers/flunk'
 require 'mspec/helpers/io'
+require 'mspec/helpers/language_version'
+require 'mspec/helpers/ruby_exe'
 require 'mspec/helpers/scratch'
 require 'mspec/helpers/tmp'
-require 'mspec/helpers/const_lookup'
-require 'mspec/helpers/ruby_exe'
-require 'mspec/helpers/fixture'
-require 'mspec/helpers/argv'

data/lib/mspec/helpers/environment.rb

@@ -0,0 +1,23 @@
+require 'mspec/guards/guard'
+
+class Object
+  def env
+    env = ""
+    if SpecGuard.windows?
+      env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
+    else
+      env = Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
+    end
+    env
+  end
+
+  def username
+    user = ""
+    if SpecGuard.windows?
+      user = `cmd.exe /C ECHO %USERNAME%`.strip
+    else
+      user = `whoami`.strip
+    end
+    user
+  end
+end

data/lib/mspec/helpers/language_version.rb

@@ -0,0 +1,20 @@
+require 'mspec/guards/guard'
+
+class Object
+  # Helper for syntax-sensitive specs. The specs should be placed in a file in
+  # the +versions+ subdirectory. For example, suppose language/method_spec.rb
+  # contains specs whose syntax depends on the Ruby version. In the
+  # language/method_spec.rb use the helper as follows:
+  #
+  #   language_version __FILE__, "method"
+  #
+  # Then add a file "language/versions/method_1.8.rb" for the specs that are
+  # syntax-compatible with Ruby 1.8.x.
+  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
+  end
+end

data/lib/mspec/helpers/ruby_exe.rb

@@ -1,4 +1,5 @@
-require 'mspec/ruby_name'
+require 'mspec/utils/ruby_name'
+require 'mspec/guards/guard'
 
 # The ruby_exe helper provides a wrapper for invoking the
 # same Ruby interpreter as the one running the specs and
@@ -92,13 +93,11 @@ class Object
     [:env, :engine, :name, :install_name].each do |option|
       exe = ruby_exe_options option
 
-      # TODO: It has been reported that File.executable is not reliable
+      # 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.
+      # platform. 
       if exe and File.exists?(exe) and
-          (RUBY_PLATFORM.match(/(mswin|mingw)/) || File.executable?(exe))
+          (SpecGuard.windows? || File.executable?(exe))
         return exe
       end
     end

data/lib/mspec/runner/context.rb

@@ -124,10 +124,10 @@ class ContextState
 
   # Evaluates each block in +blocks+ using the +MSpec.protect+ method
   # so that exceptions are handled and tallied. Returns true and does
-  # NOT evaluate any blocks if +check+ is true and +MSpec.pretend_mode?+
-  # is true.
+  # NOT evaluate any blocks if +check+ is true and
+  # <tt>MSpec.mode?(:pretend)</tt> is true.
   def protect(what, blocks, check=true)
-    return true if check and MSpec.pretend_mode?
+    return true if check and MSpec.mode? :pretend
     Array(blocks).all? { |block| MSpec.protect what, &block }
   end
 

data/lib/mspec/runner/mspec.rb

@@ -15,10 +15,10 @@ module MSpec
   @exclude = nil
   @include = nil
   @leave   = nil
-  @mode    = nil
   @load    = nil
   @unload  = nil
   @current = nil
+  @modes   = []
   @shared  = {}
   @exception    = nil
   @randomize    = nil
@@ -125,8 +125,26 @@ module MSpec
     store :tags_patterns, patterns
   end
 
+  # Registers an operating mode. Modes recognized by MSpec:
+  #
+  #   :pretend - actions execute but specs are not run
+  #   :verify - specs are run despite guards and the result is
+  #             verified to match the expectation of the guard
+  #   :report - specs that are guarded are reported
+  #   :unguarded - all guards are forced off
   def self.register_mode(mode)
-    store :mode, mode
+    modes = retrieve :modes
+    modes << mode unless modes.include? mode
+  end
+
+  # Clears all registered modes.
+  def self.clear_modes
+    store :modes, []
+  end
+
+  # Returns +true+ if +mode+ is registered.
+  def self.mode?(mode)
+    retrieve(:modes).include? mode
   end
 
   def self.retrieve(symbol)
@@ -174,18 +192,6 @@ module MSpec
     end
   end
 
-  def self.verify_mode?
-    @mode == :verify
-  end
-
-  def self.report_mode?
-    @mode == :report
-  end
-
-  def self.pretend_mode?
-    @mode == :pretend
-  end
-
   def self.randomize(flag=true)
     @randomize = flag
   end

data/lib/mspec/utils/options.rb

@@ -334,6 +334,12 @@ class MSpecOptions
     end
   end
 
+  def unguarded
+    on("--unguarded", "Turn off all guards") do
+      MSpec.register_mode :unguarded
+    end
+  end
+
   def randomize
     on("-H", "--random",
        "Randomize the list of spec files") do

data/lib/mspec/utils/script.rb

@@ -1,3 +1,4 @@
+require 'mspec/guards/guard'
 require 'mspec/runner/formatters/dotted'
 
 # MSpecScript provides a skeleton for all the MSpec runner scripts.
@@ -80,9 +81,7 @@ class MSpecScript
     else
       engine = 'ruby'
     end
-    version = RUBY_VERSION.split('.')[0,2].join('.')
-
-    load "#{engine}.#{version}.mspec"
+    load "#{engine}.#{SpecGuard.ruby_version}.mspec"
   end
 
   # Registers all filters and actions.

data/lib/mspec/utils/version.rb

@@ -0,0 +1,53 @@
+class SpecVersion
+  # If beginning implementations have a problem with this include, we can
+  # manually implement the relational operators that are needed.
+  include Comparable
+
+  # SpecVersion handles comparison correctly for the context by filling in
+  # missing version parts according to the value of +ceil+. If +ceil+ is
+  # +false+, 0 digits fill in missing version parts. If +ceil+ is +true+, 9
+  # digits fill in missing parts. (See e.g. VersionGuard and BugGuard.)
+  def initialize(version, ceil = false)
+    @version = version
+    @ceil    = ceil
+    @integer = nil
+  end
+
+  def to_s
+    @version
+  end
+
+  def to_str
+    to_s
+  end
+
+  # Converts a string representation of a version major.minor.tiny.patchlevel
+  # to an integer representation so that comparisons can be made. For example,
+  # "1.8.6.77" < "1.8.6.123" would be false if compared as strings.
+  def to_i
+    unless @integer
+      major, minor, tiny, patch = @version.split "."
+      if @ceil
+        tiny = 99 unless tiny
+        patch = 9999 unless patch
+      end
+      parts = [major, minor, tiny, patch].map { |x| x.to_i }
+      @integer = ("1%02d%02d%02d%04d" % parts).to_i
+    end
+    @integer
+  end
+
+  def to_int
+    to_i
+  end
+
+  def <=>(other)
+    if other.respond_to? :to_int
+      other = Integer other
+    else
+      other = SpecVersion.new(String(other)).to_i
+    end
+
+    self.to_i <=> other
+  end
+end

data/lib/mspec/version.rb

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

data/spec/commands/mspec_ci_spec.rb

@@ -33,6 +33,11 @@ describe MSpecCI, "#options" do
     @script.options
   end
 
+  it "enables the unguarded option" do
+    @options.should_receive(:unguarded)
+    @script.options
+  end
+
   it "enables the interrupt single specs option" do
     @options.should_receive(:interrupt)
     @script.options

data/spec/commands/mspec_run_spec.rb

@@ -58,6 +58,11 @@ describe MSpecRun, "#options" do
     @script.options @argv
   end
 
+  it "enables the unguarded option" do
+    @options.should_receive(:unguarded)
+    @script.options @argv
+  end
+
   it "enables the interrupt single specs option" do
     @options.should_receive(:interrupt)
     @script.options @argv

data/spec/commands/mspec_spec.rb

@@ -32,32 +32,11 @@ describe MSpecMain, "#options" do
     @script.options
   end
 
-  it "enables the version option" do
-    @options.should_receive(:version)
-    @script.options
-  end
-
   it "sets config[:options] to all argv entries that are not registered options" do
     @options.on "-X", "--exclude", "ARG", "description"
     @script.options [".", "-G", "fail", "-X", "ARG", "--list", "unstable", "some/file.rb"]
     @config[:options].should == [".", "-G", "fail", "--list", "unstable", "some/file.rb"]
   end
-
-  it "passes -h, --help to the subscript" do
-    ["-h", "--help"].each do |opt|
-      @config[:options] = []
-      @script.options ["ci", opt]
-      @config[:options].sort.should == ["-h"]
-    end
-  end
-
-  it "passes -v, --version to the subscript" do
-    ["-v", "--version"].each do |opt|
-      @config[:options] = []
-      @script.options ["ci", opt]
-      @config[:options].sort.should == ["-v"]
-    end
-  end
 end
 
 describe MSpecMain, "#parallel" do
@@ -390,6 +369,14 @@ describe "The -h, --help option" do
     @script.options
   end
 
+  it "passes the option to the subscript" do
+    ["-h", "--help"].each do |opt|
+      @config[:options] = []
+      @script.options ["ci", opt]
+      @config[:options].sort.should == ["-h"]
+    end
+  end
+
   it "prints help and exits" do
     @script.should_receive(:puts).twice
     @script.should_receive(:exit).twice
@@ -398,3 +385,36 @@ describe "The -h, --help option" do
     end
   end
 end
+
+describe "The -v, --version option" do
+  before :each do
+    @options, @config = new_option
+    MSpecOptions.stub!(:new).and_return(@options)
+    @script = MSpecMain.new
+    @script.stub!(:config).and_return(@config)
+  end
+
+  it "is enabled by #options" do
+    @options.stub!(:on)
+    @options.should_receive(:on).with("-v", "--version", an_instance_of(String))
+    @script.options
+  end
+
+  it "passes the option to the subscripts" do
+    ["-v", "--version"].each do |opt|
+      @config[:options] = []
+      @script.options ["ci", opt]
+      @config[:options].sort.should == ["-v"]
+    end
+  end
+
+  it "prints the version and exits if no subscript is invoked" do
+    @config[:command] = nil
+    File.stub!(:basename).and_return("mspec")
+    @script.should_receive(:puts).twice.with("mspec #{MSpec::VERSION}")
+    @script.should_receive(:exit).twice
+    ["-v", "--version"].each do |opt|
+      @script.options [opt]
+    end
+  end
+end

data/spec/commands/mspec_tag_spec.rb

@@ -68,6 +68,11 @@ describe MSpecTag, "#options" do
     @script.options @argv
   end
 
+  it "enables the unguarded option" do
+    @options.should_receive(:unguarded)
+    @script.options @argv
+  end
+
   it "enables the interrupt single specs option" do
     @options.should_receive(:interrupt)
     @script.options @argv
@@ -372,6 +377,7 @@ describe MSpecTag, "#register" do
 
   describe "when config[:tagger] is :purge" do
     before :each do
+      MSpec.stub!(:register_mode)
       @config[:tagger] = :purge
     end
 
@@ -386,6 +392,11 @@ describe MSpecTag, "#register" do
       @script.register
     end
 
+    it "registers MSpec in unguarded mode" do
+      MSpec.should_receive(:register_mode).with(:unguarded)
+      @script.register
+    end
+
     it "sets config[:formatter] to false" do
       @script.register
       @config[:formatter].should be_false

data/spec/guards/bug_spec.rb

@@ -1,22 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/guards/bug'
 
-describe BugGuard, "#to_v" do
-  before :each do
-    @guard = BugGuard.new "#1", "x.x.x.x"
-  end
-
-  it "returns a version string containing only digits" do
-    @guard.to_v("1.8.6.22").should == 10108060022
-  end
-
-  it "replaces missing version parts with zeros" do
-    @guard.to_v("1.8").should == 10108999999
-    @guard.to_v("1.8.6").should == 10108069999
-    @guard.to_v("1.8.7.333").should == 10108070333
-  end
-end
-
 describe BugGuard, "#match? when #implementation? is 'ruby'" do
   before :all do
     @verbose = $VERBOSE

data/spec/guards/guard_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/utils/ruby_name'
 require 'mspec/guards/guard'
 require 'rbconfig'
 
@@ -38,29 +39,100 @@ describe SpecGuard, ".unregister" do
   end
 end
 
+describe SpecGuard, ".ruby_version" do
+  before :all do
+    @ruby_version = Object.const_get :RUBY_VERSION
+    @ruby_patchlevel = Object.const_get :RUBY_PATCHLEVEL
+
+    Object.const_set :RUBY_VERSION, "8.2.3"
+    Object.const_set :RUBY_PATCHLEVEL, 71
+  end
+
+  after :all do
+    Object.const_set :RUBY_VERSION, @ruby_version
+    Object.const_set :RUBY_PATCHLEVEL, @ruby_patchlevel
+  end
+
+  it "returns the version and patchlevel for :full" do
+    SpecGuard.ruby_version(:full).should == "8.2.3.71"
+  end
+
+  it "returns major.minor.tiny for :tiny" do
+    SpecGuard.ruby_version(:tiny).should == "8.2.3"
+  end
+
+  it "returns major.minor.tiny for :teeny" do
+    SpecGuard.ruby_version(:tiny).should == "8.2.3"
+  end
+
+  it "returns major.minor for :minor" do
+    SpecGuard.ruby_version(:minor).should == "8.2"
+  end
+
+  it "defaults to :minor" do
+    SpecGuard.ruby_version.should == "8.2"
+  end
+
+  it "returns major for :major" do
+    SpecGuard.ruby_version(:major).should == "8"
+  end
+end
+
+describe SpecGuard, ".windows?" do
+  before :all do
+    @ruby_platform = Object.const_get :RUBY_PLATFORM
+  end
+
+  after :all do
+    Object.const_set :RUBY_PLATFORM, @ruby_platform
+  end
+
+  it "returns true if key is mswin32" do
+    SpecGuard.windows?("mswin32").should be_true
+  end
+
+  it "returns true if key is mingw" do
+    SpecGuard.windows?("mingw").should be_true
+  end
+
+  it "returns false for non-windows" do
+    SpecGuard.windows?("notwindows").should be_false
+  end
+
+  it "uses RUBY_PLATFORM by default" do
+    Object.const_set :RUBY_PLATFORM, "mswin32"
+    SpecGuard.windows?.should be_true
+  end
+end
+
 describe SpecGuard, "#yield?" do
   before :each do
-    MSpec.store :mode, nil
+    MSpec.clear_modes
     @guard = SpecGuard.new
   end
 
-  it "returns true if MSpec.verify_mode? is true" do
-    MSpec.should_receive(:verify_mode?).and_return(true)
+  it "returns true if MSpec.mode?(:unguarded) is true" do
+    MSpec.register_mode :unguarded
+    @guard.yield?.should == true
+  end
+
+  it "returns true if MSpec.mode?(:verify) is true" do
+    MSpec.register_mode :verify
     @guard.yield?.should == true
   end
 
-  it "returns true if MSpec.verify_mode? is true regardless of invert being true" do
-    MSpec.should_receive(:verify_mode?).and_return(true)
+  it "returns true if MSpec.mode?(:verify) is true regardless of invert being true" do
+    MSpec.register_mode :verify
     @guard.yield?(true).should == true
   end
 
-  it "returns true if MSpec.report_mode? is true" do
-    MSpec.should_receive(:report_mode?).and_return(true)
+  it "returns true if MSpec.mode?(:report) is true" do
+    MSpec.register_mode :report
     @guard.yield?.should == true
   end
 
-  it "returns true if MSpec.report_mode? is true regardless of invert being true" do
-    MSpec.should_receive(:report_mode?).and_return(true)
+  it "returns true if MSpec.mode?(:report) is true regardless of invert being true" do
+    MSpec.register_mode :report
     @guard.yield?(true).should == true
   end
 

data/spec/guards/tty_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/guards/tty'
+
+describe Object, "#with_tty" do
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "yields if STDOUT is a TTY" do
+    STDOUT.should_receive(:tty?).and_return(true)
+    with_tty { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
+
+  it "does not yield if STDOUT is not a TTY" do
+    STDOUT.should_receive(:tty?).and_return(false)
+    with_tty { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
+  end
+end

data/spec/guards/version_spec.rb

@@ -41,22 +41,6 @@ describe VersionGuard, "#ruby_version" do
   end
 end
 
-describe VersionGuard, "#to_v" do
-  before :each do
-    @guard = VersionGuard.new 'x.x.x.x'
-  end
-
-  it "returns a version string containing only digits" do
-    @guard.to_v("1.8.6.22").should == 10108060022
-  end
-
-  it "replaces missing version parts with zeros" do
-    @guard.to_v("1.8").should == 10108000000
-    @guard.to_v("1.8.6").should == 10108060000
-    @guard.to_v("1.8.7.333").should == 10108070333
-  end
-end
-
 describe VersionGuard, "#match?" do
   before :all do
     @verbose = $VERBOSE

data/spec/helpers/environment_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/environment'
+
+describe "#env" do
+  before(:all) do
+    @ruby_platform = Object.const_get :RUBY_PLATFORM
+  end
+
+  after(:all) do
+    Object.const_set :RUBY_PLATFORM, @ruby_platform
+  end
+
+  it "returns a hash of variables" do
+    env.class.should == Hash
+  end
+  
+  it "calls `env` on non-Windows" do
+    Object.const_set :RUBY_PLATFORM, "notwindows"
+    should_receive(:`).with("env").and_return("one=two\nthree=four")
+    env
+  end
+
+  it "calls `cmd.exe /C set` on Windows (mswin32)" do
+    Object.const_set :RUBY_PLATFORM, "mswin32"
+    should_receive(:`).with("cmd.exe /C set").and_return("one=two\nthree=four")
+    env
+  end
+
+  it "calls `cmd.exe /C set` on Windows (mingw)" do
+    Object.const_set :RUBY_PLATFORM, "mingw"
+    should_receive(:`).with("cmd.exe /C set").and_return("one=two\nthree=four")
+    env
+  end
+
+  it "returns the current user's environment variables" do
+    Object.const_set :RUBY_PLATFORM, "notwindows"
+    should_receive(:`).with("env").and_return("one=two\nthree=four")
+    env.should == {"one" => "two", "three" => "four"}
+
+    Object.const_set :RUBY_PLATFORM, "mswin32"
+    should_receive(:`).with("cmd.exe /C set").and_return("five=six\nseven=eight")
+    env.should == {"five" => "six", "seven" => "eight"}
+  end
+end
+
+describe "#username" do
+  before(:all) do
+    @ruby_platform = Object.const_get :RUBY_PLATFORM
+  end
+
+  after(:all) do
+    Object.const_set :RUBY_PLATFORM, @ruby_platform
+  end
+
+  it "calls `cmd.exe /C ECHO %USERNAME%` on Windows (mswin32)" do
+    Object.const_set :RUBY_PLATFORM, "mswin32"
+    should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("john")
+    username
+  end
+
+  it "calls `cmd.exe /C ECHO %USERNAME%` on Windows (mingw)" do
+    Object.const_set :RUBY_PLATFORM, "mingw"
+    should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("john")
+    username
+  end
+
+  it "calls `env` on non-Windows" do
+    Object.const_set :RUBY_PLATFORM, "notwindows"
+    should_receive(:`).with("whoami").and_return("john")
+    username
+  end
+
+  it "returns the user's username" do
+    Object.const_set :RUBY_PLATFORM, "mswin32"
+    should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("johnonwin")
+    username.should == "johnonwin"
+
+    Object.const_set :RUBY_PLATFORM, "notwindows"
+    should_receive(:`).with("whoami").and_return("john")
+    username.should == "john"
+  end
+end

data/spec/helpers/fixture_spec.rb

@@ -11,7 +11,7 @@ describe Object, "#fixture" do
     name.should == "#{@dir}/some/path/fixtures/dir/file.txt"
   end
 
-  it "omits '/shared' if it the suffix of the directory string" do
+  it "omits '/shared' if it is 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

data/spec/helpers/language_version_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/language_version'
+
+describe Object, "#language_version" do
+  before :all do
+    @ruby_version = Object.const_get :RUBY_VERSION
+
+    Object.const_set :RUBY_VERSION, "8.2.3"
+
+    dir = File.dirname(File.expand_path(__FILE__))
+    @name = "#{dir}/versions/method_8.2.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)
+    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)
+    language_version __FILE__, "method"
+  end
+end

data/spec/runner/context_spec.rb

@@ -208,14 +208,14 @@ describe ContextState, "#protect" do
     @c = lambda { raise Exception, "Fail!" }
   end
 
-  it "returns true and does execute any blocks if check is true and MSpec.pretend_mode? is true" do
-    MSpec.stub!(:pretend_mode?).and_return(true)
+  it "returns true and does execute any blocks if check and MSpec.mode?(:pretend) are true" do
+    MSpec.should_receive(:mode?).with(:pretend).and_return(true)
     ContextState.new("").protect("message", [@a, @b]).should be_true
     ScratchPad.recorded.should == []
   end
 
-  it "executes the blocks if MSpec.pretend_mode? is false" do
-    MSpec.stub!(:pretend_mode?).and_return(false)
+  it "executes the blocks if MSpec.mode?(:pretend) is false" do
+    MSpec.should_receive(:mode?).with(:pretend).and_return(false)
     ContextState.new("").protect("message", [@a, @b])
     ScratchPad.recorded.should == [:a, :b]
   end

data/spec/runner/mspec_spec.rb

@@ -11,9 +11,13 @@ describe MSpec, ".register_files" do
 end
 
 describe MSpec, ".register_mode" do
+  before :each do
+    MSpec.clear_modes
+  end
+
   it "sets execution mode flags" do
     MSpec.register_mode :verify
-    MSpec.retrieve(:mode).should == :verify
+    MSpec.retrieve(:modes).should == [:verify]
   end
 end
 
@@ -196,27 +200,30 @@ describe MSpec, ".actions" do
   end
 end
 
-describe MSpec, ".verify_mode?" do
+describe MSpec, ".mode?" do
   before :each do
-    MSpec.store :mode, nil
+    MSpec.clear_modes
   end
 
-  it "returns true if register_mode(:verify) is called" do
-    MSpec.verify_mode?.should == false
+  it "returns true if the mode has been set" do
+    MSpec.mode?(:verify).should == false
     MSpec.register_mode :verify
-    MSpec.verify_mode?.should == true
+    MSpec.mode?(:verify).should == true
   end
 end
 
-describe MSpec, ".report_mode?" do
-  before :each do
-    MSpec.store :mode, nil
-  end
+describe MSpec, ".clear_modes" do
+  it "clears all registered modes" do
+    MSpec.register_mode(:pretend)
+    MSpec.register_mode(:verify)
+
+    MSpec.mode?(:pretend).should == true
+    MSpec.mode?(:verify).should == true
+
+    MSpec.clear_modes
 
-  it "returns true if register_mode(:report) is called" do
-    MSpec.report_mode?.should == false
-    MSpec.register_mode :report
-    MSpec.report_mode?.should == true
+    MSpec.mode?(:pretend).should == false
+    MSpec.mode?(:verify).should == false
   end
 end
 

data/spec/utils/options_spec.rb

@@ -923,7 +923,7 @@ describe "The -W, --excl-profile FILE option" do
   end
 end
 
-describe "The -Z", "--dry-run option" do
+describe "The -Z, --dry-run option" do
   before :each do
     @options, @config = new_option
     @options.pretend
@@ -942,6 +942,23 @@ describe "The -Z", "--dry-run option" do
   end
 end
 
+describe "The --unguarded option" do
+  before :each do
+    @options, @config = new_option
+    @options.unguarded
+  end
+
+  it "is enabled with #unguarded" do
+    @options.should_receive(:on).with("--unguarded", an_instance_of(String))
+    @options.unguarded
+  end
+
+  it "registers the MSpec unguarded mode" do
+    MSpec.should_receive(:register_mode).with(:unguarded)
+    @options.parse "--unguarded"
+  end
+end
+
 describe "The -H, --random option" do
   before :each do
     @options, @config = new_option

data/spec/utils/version_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/utils/version'
+
+describe SpecVersion, "#to_s" do
+  it "returns the string with which it was initialized" do
+    SpecVersion.new("1.8").to_s.should == "1.8"
+    SpecVersion.new("2.118.9.2").to_s.should == "2.118.9.2"
+  end
+end
+
+describe SpecVersion, "#to_str" do
+  it "returns the same string as #to_s" do
+    version = SpecVersion.new("2.118.9.2")
+    version.to_str.should == version.to_s
+  end
+end
+
+describe SpecVersion, "#to_i with ceil = false" do
+  it "returns an integer representation of the version string" do
+    SpecVersion.new("1.8.6.22").to_i.should == 10108060022
+  end
+
+  it "replaces missing version parts with zeros" do
+    SpecVersion.new("1.8").to_i.should == 10108000000
+    SpecVersion.new("1.8.6").to_i.should == 10108060000
+    SpecVersion.new("1.8.7.333").to_i.should == 10108070333
+  end
+end
+
+describe SpecVersion, "#to_i with ceil = true" do
+  it "returns an integer representation of the version string" do
+    SpecVersion.new("1.8.6.22", true).to_i.should == 10108060022
+  end
+
+  it "fills in 9s for missing tiny and patchlevel values" do
+    SpecVersion.new("1.8", true).to_i.should == 10108999999
+    SpecVersion.new("1.8.6", true).to_i.should == 10108069999
+    SpecVersion.new("1.8.7.333", true).to_i.should == 10108070333
+  end
+end
+
+describe SpecVersion, "#to_int" do
+  it "returns the same value as #to_i" do
+    version = SpecVersion.new("4.16.87.333")
+    version.to_int.should == version.to_i
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-01 00:00:00 -08:00
+date: 2008-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -47,14 +47,17 @@ files:
 - lib/mspec/guards/runner.rb
 - lib/mspec/guards/superuser.rb
 - lib/mspec/guards/support.rb
+- lib/mspec/guards/tty.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/environment.rb
 - lib/mspec/helpers/fixture.rb
 - lib/mspec/helpers/flunk.rb
 - lib/mspec/helpers/io.rb
+- lib/mspec/helpers/language_version.rb
 - lib/mspec/helpers/ruby_exe.rb
 - lib/mspec/helpers/scratch.rb
 - lib/mspec/helpers/tmp.rb
@@ -83,7 +86,6 @@ files:
 - lib/mspec/mocks/object.rb
 - lib/mspec/mocks/proxy.rb
 - lib/mspec/mocks.rb
-- lib/mspec/ruby_name.rb
 - lib/mspec/runner/actions/debug.rb
 - lib/mspec/runner/actions/filter.rb
 - lib/mspec/runner/actions/gdb.rb
@@ -118,7 +120,9 @@ files:
 - lib/mspec/runner.rb
 - lib/mspec/utils/name_map.rb
 - lib/mspec/utils/options.rb
+- lib/mspec/utils/ruby_name.rb
 - lib/mspec/utils/script.rb
+- lib/mspec/utils/version.rb
 - lib/mspec/version.rb
 - lib/mspec.rb
 - spec/runner/filters/a.yaml
@@ -148,13 +152,16 @@ files:
 - spec/guards/runner_spec.rb
 - spec/guards/superuser_spec.rb
 - spec/guards/support_spec.rb
+- spec/guards/tty_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/environment_spec.rb
 - spec/helpers/fixture_spec.rb
 - spec/helpers/flunk_spec.rb
 - spec/helpers/io_spec.rb
+- spec/helpers/language_version_spec.rb
 - spec/helpers/ruby_exe_spec.rb
 - spec/helpers/scratch_spec.rb
 - spec/helpers/tmp_spec.rb
@@ -210,6 +217,7 @@ files:
 - spec/utils/name_map_spec.rb
 - spec/utils/options_spec.rb
 - spec/utils/script_spec.rb
+- spec/utils/version_spec.rb
 - Rakefile
 - README
 - LICENSE