rspec 0.7.2 → 0.7.3

data/CHANGES

@@ -1,6 +1,27 @@
 = RSpec Changelog
 
-== Version 0.7.2 (in SVN)
+== Version 0.7.3 (In SVN)
+
+Almost normal bug fix/new feature release.
+
+A couple of things you need to change in your rails specs:
+# spec_helper.rb is a little different (see http://rspec.rubyforge.org/upgrade.html)
+# use controller.should_render before OR after the action (controller.should_have_rendered is deprecated)
+
+* Applied [#6577] messy mock backtrace when frozen to edge rails (patch from Jay Levitt)
+* Fixed [#6674] rspec_on_rails fails on @session deprecation warning
+* Fixed [#6780] routing() was failing...fix included - works for 1.1.6 and edge (1.2)
+* Fixed [#6835] bad message with arbitrary predicate
+* Added [#6731] Partial templates rendered
+* Fixed [#6713] helper methods not rendered in view tests?
+* Fixed [#6707] cannot run controller / helper tests via rails_spec or spec only works with rake
+* Applied [#6417] lambda {...}.should_change(receiver, :message) (patch from Wilson Bilkovich)
+* Eliminated dependency on ZenTest
+* Fixed [#6650] Reserved characters in the TextMate bundle break svn on Win32
+* Fixed [#6643] script/generate rspec_controller: invalid symbol generation for 'controller_name' for *modularized* controllers
+* The script/rails_spec command has been moved to bin/drbspec in RSpec core (installed by the gem)
+
+== Version 0.7.2
 
 This release introduces a brand new RSpec bundle for TextMate, plus some small bugfixes.
 

data/Rakefile

@@ -36,7 +36,7 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--diff','--color','--backtrace']
   t.rcov = true
   t.rcov_dir = 'doc/output/coverage'
-  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples']
+  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,bin\/drbspec,examples']
 end
 
 desc "Run all failing examples"
@@ -48,7 +48,7 @@ desc 'Verify that no warnings occur'
 task :verify_warnings do
   `ruby -w #{File.dirname(__FILE__) + '/bin/spec'} --help 2> warnings.txt`
   warnings = File.open('warnings.txt').read
-  File.rm 'warnings.txt'
+  File.rm 'warnings.txt' rescue nil
   raise "There were warnings:\n#{warnings}" if warnings =~ /warning/n
 end
 
@@ -92,9 +92,9 @@ spec = Gem::Specification.new do |s|
   s.test_files = Dir.glob('test/*_test.rb')
   s.require_path = 'lib'
   s.autorequire = 'spec'
-  s.bindir = "bin"
-  s.executables = ["spec"]
-  s.default_executable = "spec"
+  s.bindir = 'bin'
+  s.executables = ['spec', 'drbspec']
+  s.default_executable = 'spec'
   s.author = ["Steven Baker", "Aslak Hellesoy", "Dave Astels", "David Chelimsky", "Brian Takita"]
   s.email = "rspec-devel@rubyforge.org"
   s.homepage = "http://rspec.rubyforge.org"
@@ -159,7 +159,7 @@ task :touch_revision_storing_files do
   end
 end
 
-task :release => [:clobber, :verify_committed, :verify_user, :verify_password, :spec, :publish_packages, :tag, :publish_website, :publish_news]
+task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news]
 
 desc "Verifies that there is no uncommitted code"
 task :verify_committed do
@@ -209,10 +209,6 @@ task :verify_user do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
 end
 
-task :verify_password do
-  raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
-end
-
 desc "Upload Website to RubyForge"
 task :publish_website => [:verify_user, :website] do
   publisher = Rake::SshDirPublisher.new(
@@ -235,7 +231,7 @@ end
 task :package => :package_tmbundle
 
 desc "Publish gem+tgz+zip on RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
-task :publish_packages => [:verify_user, :verify_password, :package] do
+task :publish_packages => [:verify_user, :package] do
   require 'meta_project'
   require 'rake/contrib/xforge'
   release_files = FileList[
@@ -255,7 +251,7 @@ task :publish_packages => [:verify_user, :verify_password, :package] do
 end
 
 desc "Publish news on RubyForge"
-task :publish_news => [:verify_user, :verify_password] do
+task :publish_news => [:verify_user] do
   require 'meta_project'
   require 'rake/contrib/xforge'
   Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|

data/bin/drbspec

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.expand_path(File.dirname(__FILE__) + "/../lib/spec")
+::Spec::Runner::DrbCommandLine.run(ARGV, STDERR, STDOUT)

data/bin/spec

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.push File.dirname(__FILE__) + "/../lib"
-require File.expand_path(File.dirname(__FILE__) + "/../lib/spec") # better stack traces this way
+# require File.expand_path(File.dirname(__FILE__) + "/../lib/spec")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'spec'
 ::Spec::Runner::CommandLine.run(ARGV, STDERR, STDOUT, true, true)
-

data/lib/spec/expectations/extensions/inspect_for_expectation_not_met_error.rb

@@ -11,4 +11,5 @@ class Class; def inspect_for_expectation_not_met_error; "<#{name}>" end end
 class Proc; def inspect_for_expectation_not_met_error; "<Proc>" end end
 class Array; def inspect_for_expectation_not_met_error; inspect end end
 class String; def inspect_for_expectation_not_met_error; inspect end end
-class Numeric; def inspect_for_expectation_not_met_error; inspect end end
+class Numeric; def inspect_for_expectation_not_met_error; inspect end end
+class Hash; def inspect_for_expectation_not_met_error; inspect end end

data/lib/spec/expectations/extensions/object.rb

@@ -4,6 +4,121 @@ module Spec
       def should
         Should::Should.new self
       end
+
+      def should_not
+        should.not
+      end
+
+      def should_equal(arg)
+        should.equal(arg)
+      end
+
+      def should_not_equal(arg)
+        should.not.equal(arg)
+      end
+
+      def should_eql(arg)
+        should.eql(arg)
+      end
+
+      def should_not_eql(arg)
+        should.not.eql(arg)
+      end
+
+      def should_have(arg)
+        should.have(arg)
+      end
+      alias_method :should_have_exactly, :should_have
+
+      def should_have_at_least(arg)
+        should.have.at_least(arg)
+      end
+
+      def should_have_at_most(arg)
+        should.have.at_most(arg)
+      end
+
+      def should_include(arg)
+        should.include(arg)
+      end
+
+      def should_not_include(arg)
+        should.not.include(arg)
+      end
+      
+      def should_change(receiver, message)
+        should.change(receiver, message)
+      end
+      
+      def should_not_change(receiver, message)
+        should.not.change(receiver, message)
+      end
+      
+      def should_be(expected = :___no_arg)
+        should.be(expected)
+      end
+      
+      def should_not_be(expected = :___no_arg)
+        should.not.be(expected)
+      end
+      
+      def should_satisfy(&block)
+        should.satisfy(&block)
+      end
+      
+      def should_not_satisfy(&block)
+        should.not.satisfy(&block)
+      end
+      
+      def should_be_an_instance_of(expected_class)
+        should.be.an_instance_of(expected_class)
+      end
+      alias_method :should_be_instance_of, :should_be_an_instance_of
+      
+      def should_not_be_an_instance_of(expected_class)
+        should.not.be.an_instance_of(expected_class)
+      end
+      
+      def should_be_a_kind_of(expected_class)
+        should.be.a_kind_of(expected_class)
+      end
+      alias_method :should_be_kind_of, :should_be_a_kind_of
+      
+      def should_not_be_a_kind_of(expected_class)
+        should.not.be.a_kind_of(expected_class)
+      end
+      
+      def should_respond_to(message)
+        should.respond_to(message)
+      end
+      
+      def should_not_respond_to(message)
+        should.not.respond_to(message)
+      end
+      
+      def should_match(expression)
+        should.match(expression)
+      end
+      
+      def should_not_match(expression)
+        should.not.match(expression)
+      end
+      
+      def should_raise(exception=Exception, message=nil)
+        should.raise(exception, message)
+      end
+      
+      def should_not_raise(exception=Exception, message=nil)
+        should.not.raise(exception, message)
+      end
+      
+      def should_throw(symbol)
+        should.throw(symbol)
+      end
+      
+      def should_not_throw(symbol=:___this_is_a_symbol_that_will_likely_never_occur___)
+        should.not.throw(symbol)
+      end
     end
   end
 end

data/lib/spec/expectations/should.rb

@@ -2,3 +2,4 @@ require 'spec/expectations/should/base'
 require 'spec/expectations/should/have'
 require 'spec/expectations/should/not'
 require 'spec/expectations/should/should'
+require 'spec/expectations/should/change'

data/lib/spec/expectations/should/base.rb

@@ -29,6 +29,7 @@ module Spec
             return Not.new(@target).__send__(original_sym.to_s[4..-1].to_sym, *args, &block)
           end
           if original_sym.to_s =~ /^be_/
+            @be_seen = true
             return __send__(original_sym.to_s[3..-1].to_sym, *args, &block)
           end
           if original_sym.to_s =~ /^have_/

data/lib/spec/expectations/should/change.rb

@@ -0,0 +1,64 @@
+module Spec
+  module Expectations
+    module Should
+      class Change < Base
+
+        def initialize(target, receiver, message)
+          @target = target
+          @receiver = receiver
+          @message = message
+          execute_change
+          evaluate_change
+        end
+
+        def execute_change
+          @before_change = @receiver.send(@message)
+          @target.call
+          @after_change = @receiver.send(@message)
+        end
+
+        def evaluate_change
+          if @before_change == @after_change
+            fail_with_message "#{@message} should have changed, but is still #{@after_change.inspect}"
+          end
+        end
+
+        def from(value)
+          if @before_change != value
+            fail_with_message "#{@message} should have initially been #{value.inspect}, but was #{@before_change.inspect}"
+          end
+          self
+        end
+
+        def to(value)
+          if @after_change != value
+            fail_with_message "#{@message} should have been changed to #{value.inspect}, but is now #{@after_change.inspect}"
+          end
+          self
+        end
+
+        def by(expected_delta)
+          if actual_delta != expected_delta
+            fail_with_message "#{@message} should have been changed by #{expected_delta}, but was changed by #{actual_delta}"
+          end
+          self
+        end
+        
+        private
+          def actual_delta
+            @after_change - @before_change
+          end
+      end
+      
+      class NotChange < Change
+        def evaluate_change
+          if @before_change != @after_change
+            fail_with_message "#{@message} should not have changed, but is now #{@after_change.inspect}"
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/spec/expectations/should/have.rb

@@ -3,21 +3,13 @@ module Spec
     module Should
       class Have < Base
 
-        def initialize(target, relativity=:exactly, expected=nil, negate=false)
+        def initialize(target, relativity=:exactly, expected=nil)
           @target = target
           @expected = expected == :no ? 0 : expected
           @at_least = (relativity == :at_least)
           @at_most = (relativity == :at_most)
-          @negate = negate
         end
     
-        def exactly(expected_number=nil)
-          @at_least = false
-          @at_most = false
-          @expected = expected_number == :no ? 0 : expected_number
-          self
-        end
-
         def at_least(expected_number=nil)
           @at_least = true
           @at_most = false
@@ -36,17 +28,16 @@ module Spec
           if @target.respond_to?(sym)
             fail_with_message(build_message(sym, args)) unless as_specified?(sym, args)
           elsif @target.respond_to?("has_#{sym}?")
-            if @negate
-              return unless @target.send("has_#{sym}?", *args)
-              fail_with_message msg(sym, args, "should not have")
-            else
-              return if @target.send("has_#{sym}?", *args)
-              fail_with_message msg(sym, args, "should have")
-            end
+            check_has_sym(sym, *args)
           else
             raise NoMethodError.new("#{@target.inspect} does not respond to `#{sym}' or `has_#{sym}?'")
           end
         end
+        
+        def check_has_sym(sym, *args)
+          return if @target.send("has_#{sym}?", *args)
+          fail_with_message msg(sym, args, "should have")
+        end
       
         def msg(sym, args, text)
           "#{@target.inspect_for_expectation_not_met_error} #{text} #{sym}: #{args.collect{|arg| arg.inspect_for_expectation_not_met_error}.join(', ')}"
@@ -74,6 +65,13 @@ module Spec
           @target.send(sym, *args)
         end
       end
+      
+      class NotHave < Have
+        def check_has_sym(sym, *args)
+          return unless @target.send("has_#{sym}?", *args)
+          fail_with_message msg(sym, args, "should not have")
+        end
+      end
     end
   end
 end

data/lib/spec/expectations/should/not.rb

@@ -9,7 +9,11 @@ module Spec
         end
 
         def have(expected_number=nil)
-          Have.new(@target, :exactly, expected_number, true)
+          NotHave.new(@target, :exactly, expected_number)
+        end
+
+        def change(receiver, message)
+          NotChange.new(@target, receiver, message)
         end
   
         def satisfy
@@ -64,7 +68,7 @@ module Spec
 
         def __delegate_method_missing_to_target original_sym, actual_sym, *args
           return unless @target.__send__(actual_sym, *args)
-          fail_with_message(default_message("should not#{@be_seen ? ' be' : ''} #{original_sym}" + (args.empty? ? '' : (' ' + args.join(', ')))))
+          fail_with_message(default_message("should not#{@be_seen ? ' be' : ''} #{original_sym}" + (args.empty? ? '' : ' ' + args[0].inspect)))
         end
       end
     end

data/lib/spec/expectations/should/should.rb

@@ -12,6 +12,10 @@ module Spec
           Have.new(@target, :exactly, expected_number)
         end
 
+        def change(receiver, message)
+          Change.new(@target, receiver, message)
+        end
+
         def not
           Not.new(@target)
         end
@@ -41,8 +45,7 @@ module Spec
   
         def __delegate_method_missing_to_target(original_sym, actual_sym, *args)
           return if @target.send(actual_sym, *args)
-          message = default_message("should#{@be_seen ? ' be' : ''} #{original_sym}", args[0])
-          fail_with_message(message)
+          fail_with_message(default_message("should#{@be_seen ? ' be' : ''} #{original_sym}" + (args.empty? ? '' : ' ' + args[0].inspect)))
         end
 
         def match(expected)
@@ -80,4 +83,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/rake/spectask.rb

@@ -63,6 +63,11 @@ module Spec
 
       # A message to print to stdout when there are failures.
       attr_accessor :failure_message
+      
+      # Whether or not to run specs via DRb. Setting this to true may
+      # run specs faster, especially in a Rails environment.
+      # Defaults to false
+      attr_accessor :drb
 
       # Explicitly define the list of spec files to be included in a
       # spec.  +list+ is expected to be an array of file names (a
@@ -93,7 +98,7 @@ module Spec
       end
 
       def define
-        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
+        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/' + (drb ? 'drbspec' : 'spec'))
 
         lib_path = @libs.join(File::PATH_SEPARATOR)
         actual_name = Hash === name ? name.keys.first : name

data/lib/spec/runner.rb

@@ -6,6 +6,7 @@ require 'spec/runner/execution_context'
 require 'spec/runner/context_runner'
 require 'spec/runner/option_parser'
 require 'spec/runner/command_line'
+require 'spec/runner/drb_command_line'
 require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
 require 'spec/runner/spec_matcher'

data/lib/spec/runner/backtrace_tweaker.rb

@@ -32,6 +32,7 @@ module Spec
           line = nil if line =~ /bin\/spec:/
           line = nil if line =~ /bin\/rcov:/
           line = nil if line =~ /lib\/rspec_on_rails/
+          line = nil if line =~ /vendor\/rails/
           line = nil if line =~ /script\/rails_spec/
           # TextMate's Ruby and RSpec plugins
           line = nil if line =~ /Ruby\.tmbundle\/Support\/tmruby.rb:/

data/lib/spec/runner/context_eval.rb

@@ -28,7 +28,8 @@ module Spec
           my_methods |= context_superclass.methods
           my_methods
         end
-        protected
+      
+      protected
 
         def method_missing(method_name, *args)
           if context_superclass.respond_to?(method_name)
@@ -37,7 +38,8 @@ module Spec
           super
         end
 
-        private
+      private
+
         def setup_block
           parts = setup_parts.dup
           add_context_superclass_method(:setup, parts)

data/lib/spec/runner/drb_command_line.rb

@@ -0,0 +1,21 @@
+require "drb/drb"
+
+module Spec
+  module Runner
+    # Facade to run specs by connecting to a DRB server
+    class DrbCommandLine
+      # Runs specs on a DRB server. Note that this API is similar to that of
+      # CommandLine - making it possible for clients to use both interchangeably.
+      def self.run(argv, stderr, stdout, exit=false, warn_if_no_files=true)
+        begin
+          DRb.start_service
+          rails_spec_server = DRbObject.new_with_uri("druby://localhost:8989")
+          rails_spec_server.run(argv, stderr, stdout)
+        rescue DRb::DRbConnError
+          stderr.puts "No server is running"
+          exit 1 if exit
+        end
+      end
+    end
+  end
+end

data/lib/spec/runner/execution_context.rb

@@ -17,6 +17,7 @@ module Spec
         def violated(message="")
           raise Spec::Expectations::ExpectationNotMetError.new(message)
         end
+
       end
       include InstanceMethods
     end

data/lib/spec/runner/specification.rb

@@ -16,11 +16,10 @@ module Spec
         @listeners = []
       end
 
-      def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false, execution_context=nil)
+      def run(reporter, setup_block, teardown_block, dry_run, execution_context)
         reporter.spec_started(@name) unless reporter.nil?
         return reporter.spec_finished(@name) if dry_run
         @@current_spec = self
-        execution_context = execution_context || ::Spec::Runner::ExecutionContext.new(self)
         errors = []
         begin
           execution_context.instance_exec(&setup_block) unless setup_block.nil?
@@ -40,9 +39,8 @@ module Spec
           notify_after_teardown errors
           @@current_spec = nil
         end
-        
-        SpecShouldRaiseHandler.new(@from, @options).handle(errors)
 
+        SpecShouldRaiseHandler.new(@from, @options).handle(errors)
         reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
       end
 

data/lib/spec/version.rb

@@ -3,9 +3,9 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 7
-      TINY   = 2
-      # RANDOM_TOKEN: 0.868668446220024
-      REV    = "$LastChangedRevision: 1095 $".match(/LastChangedRevision: (\d+)/)[1]
+      TINY   = 3
+      # RANDOM_TOKEN: 0.690694587701409
+      REV    = "$LastChangedRevision: 1137 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       FULL_VERSION = "#{STRING} (r#{REV})"

data/vendor/watir/find_rspecs_home_page.txt

@@ -1,6 +1,6 @@
 = Find RSpec's home page =
 
-As an agile customer
+As an agile coach
 I want to easily find RSpec's home page
 So that I can learn about this fantastic tool
 

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
-date: 2006-11-12 00:00:00 +01:00
-summary: RSpec-0.7.2 (r1095) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.7.3
+date: 2006-11-25 00:00:00 +00:00
+summary: RSpec-0.7.3 (r1137) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -54,6 +54,7 @@ files:
 - lib/spec/expectations/extensions/object.rb
 - lib/spec/expectations/extensions/symbol.rb
 - lib/spec/expectations/should/base.rb
+- lib/spec/expectations/should/change.rb
 - lib/spec/expectations/should/have.rb
 - lib/spec/expectations/should/not.rb
 - lib/spec/expectations/should/should.rb
@@ -73,6 +74,7 @@ files:
 - lib/spec/runner/context.rb
 - lib/spec/runner/context_eval.rb
 - lib/spec/runner/context_runner.rb
+- lib/spec/runner/drb_command_line.rb
 - lib/spec/runner/execution_context.rb
 - lib/spec/runner/formatter.rb
 - lib/spec/runner/option_parser.rb
@@ -123,6 +125,7 @@ extra_rdoc_files:
 - CHANGES
 executables: 
 - spec
+- drbspec
 extensions: []
 
 requirements: []