must_be 1.0.2 → 1.0.3

data/ChangeLog.md

@@ -1,4 +1,9 @@
-# dynamic_variable 1.0.2 2010-09-29
+# must_be 1.0.3 2010-11-01
+
+* Update to use RSpec-2.
+* Add development dependencies.
+
+# must_be 1.0.2 2010-09-29
 
 * Update for compatibility with Ruby 1.8.6.
 

data/Rakefile

@@ -1,4 +1,4 @@
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 begin
   require 'jeweler'
@@ -9,6 +9,9 @@ begin
     gemspec.email = "wtaysom@gmail.com"
     gemspec.homepage = "http://github.com/wtaysom/must_be"
     gemspec.authors = ["William Taysom"]
+    
+    gemspec.add_development_dependency('jeweler', '~> 1.4')
+    gemspec.add_development_dependency('rspec', '~> 2.0')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -16,9 +19,9 @@ rescue LoadError
 end
 
 desc "Run the spec suite against rcov"
-Spec::Rake::SpecTask.new(:rcov_helper) do |t|
+RSpec::Core::RakeTask.new(:rcov_helper) do |t|
   t.rcov = true
-  t.rcov_opts = ['--exclude', '/Library/Ruby/Gems/']
+  t.rcov_opts = %q{--exclude "gems/,spec/"}
 end
 
 desc "Run the spec suite against rcov and open coverage results"

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/must_be/attr_typed.rb

@@ -54,12 +54,12 @@ class Module
       end
     ))
     
-    module_eval %Q{
+    module_eval(<<-END, __FILE__, __LINE__ + 1)
       def #{name}=(value)
         #{check_method_name}(value)
         @#{name} = value
       end
-    }
+    END
   end
   
   MustBe.register_disabled_handler do |enabled|

data/lib/must_be/containers.rb

@@ -152,7 +152,7 @@ module MustBe
       module ClassMethods
         def must_check_contents_after(*methods)
           methods.each do |method|
-            module_eval %Q{
+            module_eval(<<-END, __FILE__, __LINE__ + 1)
               def #{method}(*args)
                 begin
                   super
@@ -160,7 +160,7 @@ module MustBe
                   must_check_contents
                 end
               end
-            }
+            END
           end
         end
       end
@@ -229,11 +229,11 @@ module MustBe
       
       REGISTERED_CLASSES[klass] = mod = Module.new
       mod.send(:include, Base)
-      mod.class_eval &body
+      mod.class_eval(&body)
       
       mutator_advice = Module.new
       mod.instance_methods(false).each do |method_name|
-        mutator_advice.module_eval %Q{
+        mutator_advice.module_eval(<<-END, __FILE__, __LINE__ + 1)
           def #{method_name}(*args, &block)
             must_check(lambda { super(*args, &block) }) do |note|
               note.prefix = nil
@@ -244,7 +244,7 @@ module MustBe
               note
             end
           end
-        }
+        END
       end
       mod.const_set(:MutatorAdvice, mutator_advice)
       mod.instance_eval do

data/must_be.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{must_be}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Taysom"]
-  s.date = %q{2010-09-29}
+  s.date = %q{2010-11-01}
   s.description = %q{must_be provides runtime assertions which can easily be disabled in production environments.  Likewise, the notifier can be customized to raise errors, log failure, enter the debugger, or anything else.}
   s.email = %q{wtaysom@gmail.com}
   s.extra_rdoc_files = [
@@ -65,9 +65,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
     else
+      s.add_dependency(%q<jeweler>, ["~> 1.4"])
+      s.add_dependency(%q<rspec>, ["~> 2.0"])
     end
   else
+    s.add_dependency(%q<jeweler>, ["~> 1.4"])
+    s.add_dependency(%q<rspec>, ["~> 2.0"])
   end
 end
 

data/spec/must_be/containers_spec.rb

@@ -719,10 +719,8 @@ describe MustBe do
         end
       end
     end
-        
-    describe "custom" do
-      it_should_behave_like "custom MustOnlyEverContain"
-      
+    
+    it_should_behave_like "custom MustOnlyEverContain" do
       context "without MustOnlyEverContain.registered_class" do
         describe '#must_only_contain' do
           it "should use each to check the contents" do
@@ -881,9 +879,7 @@ describe MustBe do
       end
     end
     
-    describe "custom" do
-      it_should_behave_like "custom MustOnlyEverContain"
-      
+    it_should_behave_like "custom MustOnlyEverContain" do
       describe "without MustOnlyEverContain.registered_class" do
         describe '#must_not_contain' do
           it "should use each to check the contents" do

data/spec/must_be/core_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'stringio'
 
 describe MustBe do
   include MustBeExampleHelper

data/spec/must_be/nonstandard_control_flow_spec.rb

@@ -634,13 +634,13 @@ describe MustBe do
                     throw :ball, :gently
                   end
                 ensure
-                  note = @note
-                  @note = nil
+                  note = $note
+                  $note = nil
                 end
               end
             ensure
-              outer_note = @note
-              @note = nil
+              outer_note = $note
+              $note = nil
             end
           end
         end.should throw_symbol(:ball)
@@ -825,13 +825,13 @@ describe MustBe do
                     throw :ball, :gently
                   end
                 ensure
-                  note = @note
-                  @note = nil
+                  note = $note
+                  $note = nil
                 end
               end
             ensure
-              outer_note = @note
-              @note = nil
+              outer_note = $note
+              $note = nil
             end
           end
         end.should throw_symbol(:ball)

data/spec/must_be/proxy_spec.rb

@@ -29,14 +29,14 @@ describe MustBe do
   module ItShouldNotifyExpectations
     def it_should_notify(message, &implementation)
       example "#{message} should notify" do
-        instance_eval &implementation
+        instance_eval(&implementation)
         should notify(message)
       end
     end
   
     def it_should_not_notify(message, &implementation)
       example "#{message} should not notify" do
-        instance_eval &implementation
+        instance_eval(&implementation)
         should_not notify
       end
     end

data/spec/notify_matcher_spec.rb

@@ -29,10 +29,19 @@ describe "Notify Matcher" do
         end
       
         pattern_notify.send(result ? :should : :should_not, raise_error(
-          Spec::Expectations::ExpectationNotMetError, result))
+          RSpec::Expectations::ExpectationNotMetError, result))
       end
     end
   end
+  
+  context "when called with more than one argument" do
+    it "should raise ArgumentError" do
+      expect do
+        :it.should notify("one", "two")
+      end.should raise_error(ArgumentError,
+        "wrong number of arguments (2 for 1)")
+    end
+  end
 
   it_should_follow_pattern :note, :should, nil, nil
   it_should_follow_pattern :note, :should, 'same', nil

data/spec/spec_helper.rb

@@ -55,6 +55,8 @@ end
 
 ### MustBeExampleHelper ###
 
+require 'rspec'
+
 module MustBeExampleHelper
   
   $default_must_be_notifier = MustBe.notifier
@@ -62,10 +64,14 @@ module MustBeExampleHelper
   def self.included(example_group)
     example_group.before do
       MustBe.notifier = lambda do |note|
-        @note = note
+        $note = note
         false
       end
     end
+    
+    example_group.after do
+      $note = nil
+    end
 
     class <<example_group
       
@@ -141,40 +147,54 @@ module MustBeExampleHelper
   
   ### Notify Matcher ###
   
-  def notify(message = nil)
-    simple_matcher do |given, matcher|
-      result, message =
-        if @note
-          if message
-            if message === @note.message
-              [true,
-                "did NOT expect note with message: #{message.inspect}\n"\
-                "           got note with message: #{@note.message.inspect}"]
-            else
-              [false,
-                "expected note with message: #{message.inspect}\n"\
-                "     got note with message: #{@note.message.inspect}"]
-            end
+  RSpec::Matchers.define :notify do |*message|
+    if (count = message.size) > 1
+      raise ArgumentError, "wrong number of arguments (#{count} for 1)"
+    end
+    message = message[0]
+    
+    def does(message)
+      @message = message
+      true
+    end
+    
+    def does_not(message)
+      @message = message
+      false
+    end
+        
+    match do |given|
+      if $note
+        if message
+          if message === $note.message
+            does(
+              "did NOT expect note with message: #{message.inspect}\n"\
+              "           got note with message: #{$note.message.inspect}")
           else
-            [true,
-              "expected no note\n"\
-              "got note with message: #{@note.message.inspect}"]
+            does_not(
+              "expected note with message: #{message.inspect}\n"\
+              "     got note with message: #{$note.message.inspect}")
           end
         else
-          [false, if message
-            "expected a note with message: #{message.inspect}"
-          else
-            "expected a note"
-          end]
+          does(
+            "expected no note\n"\
+            "got note with message: #{$note.message.inspect}")
         end
-    
-      if result
-        matcher.negative_failure_message = message
       else
-        matcher.failure_message = message
+        does_not(if message
+          "expected a note with message: #{message.inspect}"
+        else
+          "expected a note"
+        end)
       end
+    end
+    
+    failure_message_for_should do |given|
+      @message
+    end
     
-      result
+    failure_message_for_should_not do |given|
+      @message
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: must_be
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - William Taysom
@@ -15,10 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +08:00
+date: 2010-11-01 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id002
 description: must_be provides runtime assertions which can easily be disabled in production environments.  Likewise, the notifier can be customized to raise errors, log failure, enter the debugger, or anything else.
 email: wtaysom@gmail.com
 executables: []