mspec 1.5.8 → 1.5.9

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

data/lib/mspec/guards/extensions.rb

@@ -2,9 +2,10 @@ require 'mspec/guards/guard'
 
 class ExtensionsGuard < SpecGuard
   def match?
-    match = implementation?(*@args)
-    raise Exception, "improper use of extended_on guard" if match and standard?
-    match
+    if @args.include? :ruby
+      raise Exception, "improper use of extended_on guard"
+    end
+    !standard? and implementation?(*@args)
   end
 end
 

data/lib/mspec/guards/noncompliance.rb

@@ -2,9 +2,10 @@ require 'mspec/guards/guard'
 
 class NonComplianceGuard < SpecGuard
   def match?
-    match = implementation?(*@args)
-    raise Exception, "improper use of deviates_on guard" if match and standard?
-    match
+    if @args.include? :ruby
+      raise Exception, "improper use of deviates_on guard"
+    end
+    !standard? and implementation?(*@args)
   end
 end
 

data/lib/mspec/guards/support.rb

@@ -2,16 +2,17 @@ require 'mspec/guards/guard'
 
 class SupportedGuard < SpecGuard
   def match?
-    match = implementation?(*@args)
-    raise Exception, "improper use of not_supported_on guard" if match and standard?
-    match
+    if @args.include? :ruby
+      raise Exception, "improper use of not_supported_on guard"
+    end
+    standard? or !implementation?(*@args)
   end
 end
 
 class Object
   def not_supported_on(*args)
     g = SupportedGuard.new(*args)
-    yield if g.yield? true
+    yield if g.yield?
     g.unregister
   end
 end

data/lib/mspec/version.rb

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

data/spec/guards/extensions_spec.rb

@@ -21,14 +21,20 @@ describe Object, "#extended_on" do
     ScratchPad.clear
   end
 
-  it "raises an Exception when #standard? returns true" do
-    Object.const_set :RUBY_NAME, "ruby"
+  it "raises an Exception when passed :ruby" do
+    Object.const_set :RUBY_NAME, "jruby"
     lambda {
       extended_on(:ruby) { ScratchPad.record :yield }
     }.should raise_error(Exception)
     ScratchPad.recorded.should_not == :yield
   end
 
+  it "does not yield when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    extended_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
+  end
+
   it "does not yield when #implementation? returns false" do
     Object.const_set :RUBY_NAME, "jruby"
     extended_on(:rubinius) { ScratchPad.record :yield }

data/spec/guards/noncompliance_spec.rb

@@ -21,14 +21,20 @@ describe Object, "#deviates_on" do
     ScratchPad.clear
   end
 
-  it "raises an Exception when when #standard? returns true" do
-    Object.const_set :RUBY_NAME, "ruby"
+  it "raises an Exception when passed :ruby" do
+    Object.const_set :RUBY_NAME, "jruby"
     lambda {
       deviates_on(:ruby) { ScratchPad.record :yield }
     }.should raise_error(Exception)
     ScratchPad.recorded.should_not == :yield
   end
 
+  it "does not yield when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    deviates_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
+  end
+
   it "does not yield when #implementation? returns false" do
     Object.const_set :RUBY_NAME, "jruby"
     deviates_on(:rubinius) { ScratchPad.record :yield }

data/spec/guards/support_spec.rb

@@ -21,8 +21,8 @@ describe Object, "#not_supported_on" do
     ScratchPad.clear
   end
 
-  it "raises an Exception when when #standard? returns true" do
-    Object.const_set :RUBY_NAME, "ruby"
+  it "raises an Exception when passed :ruby" do
+    Object.const_set :RUBY_NAME, "jruby"
     lambda {
       not_supported_on(:ruby) { ScratchPad.record :yield }
     }.should raise_error(Exception)
@@ -35,9 +35,15 @@ describe Object, "#not_supported_on" do
     ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? returns false" do
+  it "yields when #standard? returns true" do
     Object.const_set :RUBY_NAME, "ruby"
     not_supported_on(:rubinius) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
+
+  it "yields when #implementation? returns false" do
+    Object.const_set :RUBY_NAME, "jruby"
+    not_supported_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: []