mspec 1.5.1 → 1.5.2

data/Rakefile

@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2008-11-12}
+  s.date                      = %q{2008-12-1}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

data/lib/mspec/helpers.rb

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

data/lib/mspec/helpers/metaclass.rb

@@ -0,0 +1,12 @@
+# 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/lib/mspec/helpers/ruby_exe.rb

@@ -85,7 +85,7 @@ class Object
   end
 
   def ruby_exe(code)
-    if File.exists?(code) and File.executable?(code)
+    if File.exists?(code)
       `#{RUBY_EXE} #{ENV['RUBY_FLAGS']} #{code}`
     else
       `#{RUBY_EXE} #{ENV['RUBY_FLAGS']} -e #{code.inspect}`

data/lib/mspec/utils/script.rb

@@ -15,7 +15,6 @@ class MSpecScript
   end
 
   def initialize
-    config[:tags_dir]  = 'spec/tags'
     config[:formatter] = nil
     config[:includes]  = []
     config[:excludes]  = []
@@ -35,10 +34,10 @@ class MSpecScript
     MSpecScript.config
   end
 
-  def load(name)
-    names = [name]
-    unless name[-6..-1] == config[:config_ext]
-      names << name + config[:config_ext]
+  def load(target)
+    names = [target]
+    unless target[-6..-1] == config[:config_ext]
+      names << target + config[:config_ext]
     end
 
     names.each do |name|
@@ -51,6 +50,17 @@ class MSpecScript
     end
   end
 
+  def load_default
+    if Object.const_defined?(:RUBY_ENGINE)
+      engine = RUBY_ENGINE
+    else
+      engine = 'ruby'
+    end
+    version = RUBY_VERSION.split('.')[0,2].join('.')
+
+    load "#{engine}.#{version}.mspec"
+  end
+
   def register
     if config[:formatter].nil?
       config[:formatter] = @files.size < 50 ? DottedFormatter : FileFormatter
@@ -100,8 +110,7 @@ class MSpecScript
   def self.main
     $VERBOSE = nil unless ENV['OUTPUT_WARNINGS']
     script = new
-    script.load 'default.mspec'
-    script.load RUBY_VERSION.split('.')[0,2].join('.') + ".mspec"
+    script.load_default
     script.load '~/.mspecrc'
     script.options
     script.signals

data/lib/mspec/version.rb

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

data/spec/helpers/metaclass_spec.rb

@@ -0,0 +1,14 @@
+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

data/spec/helpers/ruby_exe_spec.rb

@@ -98,10 +98,9 @@ describe Object, "#ruby_exe" do
     $VERBOSE = @verbose
   end
 
-  it "executes the argument if it is a file that exists and is executable" do
+  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(:executable?).with(code).and_return(true)
     @script.should_receive(:`).with("ruby_spec_exe -w -Q some/ruby/file.rb")
     @script.ruby_exe code
   end

data/spec/utils/script_spec.rb

@@ -32,7 +32,7 @@ describe MSpecScript, "#config" do
   end
 end
 
-describe MSpecScript, ".main" do
+describe MSpecScript, "#load_default" do
   before :all do
     @verbose = $VERBOSE
     $VERBOSE = nil
@@ -44,19 +44,24 @@ describe MSpecScript, ".main" do
 
   before :each do
     @version = RUBY_VERSION
-    @script = mock("MSpecScript", :null_object => true)
+    if Object.const_defined? :RUBY_ENGINE
+      @engine = Object.const_get :RUBY_ENGINE
+    end
+    @script = MSpecScript.new
     MSpecScript.stub!(:new).and_return(@script)
   end
 
   after :each do
     Object.const_set :RUBY_VERSION, @version
+    Object.const_set :RUBY_ENGINE, @engine if @engine
   end
 
-  it "attempts to load a config file based on RUBY_VERSION" do
+  it "attempts to load a config file based on RUBY_ENGINE and RUBY_VERSION" do
+    Object.const_set :RUBY_ENGINE, "ybur"
     Object.const_set :RUBY_VERSION, "1.8.9"
-    version = "1.8.mspec"
-    @script.should_receive(:load).with(version)
-    MSpecScript.main
+    default = "ybur.1.8.mspec"
+    @script.should_receive(:load).with(default)
+    @script.load_default
   end
 end
 
@@ -71,8 +76,8 @@ describe MSpecScript, ".main" do
     MSpecScript.main
   end
 
-  it "attempts to load the 'default.mspec' script" do
-    @script.should_receive(:load).with('default.mspec')
+  it "attempts to load the default config" do
+    @script.should_receive(:load_default)
     MSpecScript.main
   end
 
@@ -108,7 +113,6 @@ describe MSpecScript, "#initialize" do
   end
 
   it "sets the default config values" do
-    @config[:tags_dir].should   == 'spec/tags'
     @config[:formatter].should  == nil
     @config[:includes].should   == []
     @config[:excludes].should   == []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-12 00:00:00 -08:00
+date: 2008-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -53,6 +53,7 @@ files:
 - lib/mspec/helpers/const_lookup.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
@@ -150,6 +151,7 @@ files:
 - spec/helpers/const_lookup_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
@@ -233,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://rubyforge.org/projects/mspec
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 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.