rspec 0.5.15 → 0.5.16

data/CHANGES

@@ -1,5 +1,14 @@
 = RSpec Changelog
 
+== Version 0.5.16
+This release improves Rails support and test2spec translation.
+
+* Fixed underscore problems that occurred when RSpec was used in Rails
+* Simplified the Rails support by packaging it as a plugin instead of a generator gem.
+* Added pre_commit rake task to reduce risk of regressions. Useful for rspec developers and patchers.
+* Added failure_message to RSpec Rake task
+* test2spec now defines converted helper methods outside of the setup block (bug #5057).
+
 == Version 0.5.15
 This release removes a prematurely added feature that shouldn't have been added.
 

data/Rakefile

@@ -54,6 +54,7 @@ task :test2spec => :create_test2spec_dir do
   # Remove the spec translations that we don't care about.
   rm 'spec/translated/spec/test_to_spec/sexp_transformer_assertion_spec.rb'
   rm 'spec/translated/spec/test_to_spec/sexp_transformer_spec.rb'
+  rm 'spec/translated/r2_r_spec.rb'
 end
 task :create_test2spec_dir do
   mkdir_p 'doc/output/tools' unless File.exist? 'doc/output/tools'
@@ -64,6 +65,7 @@ Spec::Rake::SpecTask.new('test2spec_test' => :test2spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = ["--format", "html", "--diff"]
   t.out = 'doc/output/tools/rspec_specs.html'
+  t.failure_message = "**** Translated specs failed. See doc/output/tools/rspec_specs.html ****"
 end
 
 desc 'Generate HTML documentation for website'
@@ -162,6 +164,20 @@ task :tag do
   puts "Done!"
 end
 
+desc "Run this task before you commit. You should see 'OK TO COMMIT'"
+task :pre_commit => [:website, :examples, :failing_examples_with_html, :rails_pre_commit, :commit_ok]
+
+task :rails_pre_commit do
+  Dir.chdir 'vendor/rspec_on_rails' do    
+    `rake pre_commit`
+    raise "RSpec on Rails pre_commit failed\ncd to vendor/rspec_on_rails and run rake pre_commit for more details" if $? != 0
+  end
+end
+
+task :commit_ok do |t|
+  puts "OK TO COMMIT"
+end
+
 desc "Build the website with rdoc and rcov, but do not publish it"
 task :website => [:clobber, :rcov_verify, :webgen, :failing_examples_with_html, :test2spec_test, :examples_specdoc, :rdoc]
 
@@ -184,23 +200,14 @@ task :publish_website => [:verify_user, :website] do
   publisher.upload
 end
 
-desc "Build the Rails extension gem"
-task :package_rails do
-  Dir.chdir 'vendor/rspec_on_rails/vendor/generators/rspec' do    
-    `rake clobber gem`
-    raise "Failed to package RSpec on Rails" if $? != 0
-  end
-end
-
 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, :package_rails] do
+task :publish_packages => [:verify_user, :verify_password, :package] do
   require 'meta_project'
   require 'rake/contrib/xforge'
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
     "pkg/#{PKG_FILE_NAME}.tgz",
-    "pkg/#{PKG_FILE_NAME}.zip",
-    "vendor/rspec_on_rails/vendor/generators/rspec/pkg/rspec_generator-#{Spec::VERSION::STRING}.gem"
+    "pkg/#{PKG_FILE_NAME}.zip"
   ]
 
   Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf|

data/lib/spec/api/sugar.rb

@@ -2,23 +2,33 @@ module Spec
   module Api
     # This module adds syntactic sugar that allows usage of should_* instead of should.*
     module Sugar
-      alias_method :__orig_method_missing, :method_missing
-      def method_missing(sym, *args, &block)
-        if __is_sweetened? sym
-          object = self
-          calls = sym.to_s.split("_")
-          while calls.length > 1
-            call = calls.shift
-            object = object.__send__(call)
-            break if call == "be" unless ["an","a"].include? calls[0]
+      module SugarizeForRspec; end
+
+      def sugarize_for_rspec!
+        original_method_missing = instance_method(:method_missing)
+        class_eval do
+          include SugarizeForRspec # This is meant to add a signiture to the object that sugarization occurred.
+          def method_missing(sym, *args, &block)
+            _method_missing(sym, args, block)
+          end
+
+          define_method :_method_missing do |sym, args, block|
+            return original_method_missing.bind(self).call(sym, *args, &block) unless __is_sweetened?(sym)
+
+            object = self
+            calls = sym.to_s.split("_")
+            while calls.length > 1
+              call = calls.shift
+              object = object.__send__(call)
+              break if call == "be" unless ["an","a"].include? calls[0]
+            end
+            return object.__send__(calls.join("_"), *args, &block)
+          end
+
+          def __is_sweetened?(sym) #:nodoc:
+            return true if sym.to_s =~ /^should_/
           end
-          return object.__send__(calls.join("_"), *args, &block)
         end
-        __orig_method_missing(sym, *args, &block)
-      end
-      
-      def __is_sweetened?(sym) #:nodoc:
-        return true if sym.to_s =~ /^should_/
       end
     end
     
@@ -30,10 +40,12 @@ module Spec
   end
 end
 
-class Object #:nodoc:
+class Module
   include Spec::Api::Sugar
 end
 
+Object.sugarize_for_rspec!
+
 class Spec::Api::Mock #:nodoc:
   # NOTE: this resolves a bug caused by a conflict between Sugar#method_missing and Mock#method_missing, specifically
   # when the mock is set null_object=>true. It would be nice to get rid of this.

data/lib/spec/rake/spectask.rb

@@ -4,7 +4,6 @@
 
 require 'rake'
 require 'rake/tasklib'
-require File.dirname(__FILE__) + '/../../spec'
 
 module Spec
 module Rake
@@ -56,6 +55,9 @@ module Rake
     # Default is true
     attr_accessor :fail_on_error
 
+    # A message to print to stdout when there are failures. Useful if +out+ is used.
+    attr_accessor :failure_message
+
     # Explicitly define the list of spec files to be included in a
     # spec.  +list+ is expected to be an array of file names (a
     # FileList is acceptable).  If both +pattern+ and +spec_files+ are
@@ -105,7 +107,10 @@ module Rake
             file_prefix +
             specs.collect { |fn| "\"#{fn}\"" }.join(' ') +
             redirect
+          
+          puts @failure_message if @failure_message && ($? != 0)
         rescue => e
+          puts @failure_message if @failure_message
           raise e if @fail_on_error
         end
       end

data/lib/spec/runner/context.rb

@@ -7,9 +7,14 @@ module Spec
 
           @context_eval_module = Module.new
           @context_eval_module.extend ContextEval::ModuleMethods
+          @context_eval_module.include ContextEval::InstanceMethods
+          before_context_eval
           @context_eval_module.class_eval &context_block
         end
 
+        def before_context_eval
+        end
+
         def inherit(klass)
           @context_eval_module.inherit klass
         end
@@ -68,8 +73,8 @@ module Spec
 
         protected
 
-        def method_missing(method_name, *args)
-          @context_eval_module.send(method_name, *args)
+        def method_missing(*args)
+          @context_eval_module.method_missing(*args)
         end
 
         def specifications
@@ -79,21 +84,21 @@ module Spec
         def setup_block
           @context_eval_module.send :setup_block
         end
-        def setup_block=(value)
-          @context_eval_module.send :setup_block=, value
-        end
 
         def teardown_block
           @context_eval_module.send :teardown_block
         end
-        def teardown_block=(value)
-          @context_eval_module.send :teardown_block=, value
+
+        def setup_parts
+          @context_eval_module.send :setup_parts
+        end
+
+        def teardown_parts
+          @context_eval_module.send :teardown_parts
         end
 
         def prepare_execution_context_class
           weave_in_context_modules
-          weave_in_setup_method
-          weave_in_teardown_method
           execution_context_class
         end
 
@@ -108,30 +113,6 @@ module Spec
           end
         end
 
-        def weave_in_setup_method
-          if context_superclass.method_defined?(:setup)
-            super_setup = context_superclass.instance_method(:setup)
-            context_setup = setup_block if setup_block
-
-            self.setup_block = proc do
-              super_setup.bind(self).call
-              instance_exec(&context_setup) if context_setup
-            end
-          end
-        end
-
-        def weave_in_teardown_method
-          if context_superclass.method_defined?(:teardown)
-            super_teardown = context_superclass.instance_method(:teardown)
-            context_teardown = teardown_block if teardown_block
-
-            self.teardown_block = proc do
-              super_teardown.bind(self).call
-              instance_exec(&context_teardown) if context_teardown
-            end
-          end
-        end
-
         def context_modules
           @context_eval_module.send :context_modules
         end

data/lib/spec/runner/context_eval.rb

@@ -1,14 +1,10 @@
-# Is this file really needed?
-# If I make this an empty file all tests are still passing.
-# But it seems to be used from other files.
-# Can we delete this file?
 module Spec
   module Runner
     module ContextEval
       module ModuleMethods
         def inherit(klass)
           @context_superclass = klass
-          derive_execution_context_class_from context_superclass
+          derive_execution_context_class_from_context_superclass
         end
 
         def include(mod)
@@ -16,11 +12,11 @@ module Spec
         end
 
         def setup(&block)
-          @setup_block = block
+          setup_parts << block
         end
 
         def teardown(&block)
-          @teardown_block = block
+          teardown_parts << block
         end
 
         def specify(spec_name, &block)
@@ -35,8 +31,8 @@ module Spec
         protected
 
         def method_missing(method_name, *args)
-          if context_superclass
-            return context_superclass.send(method_name, *args)
+          if context_superclass.respond_to?(method_name)
+            return execution_context_class.send(method_name, *args)
           end
           super
         end
@@ -45,21 +41,63 @@ module Spec
           @specifications ||= []
         end
 
-        attr_accessor :setup_block
-        attr_accessor :teardown_block
+        def setup_parts
+          @setup_parts ||= []
+        end
 
-        def derive_execution_context_class_from(context_superclass)
-          @execution_context_class = Class.new(context_superclass)
-          @execution_context_class.class_eval do
-            include ::Spec::Runner::ExecutionContext::InstanceMethods
+        def teardown_parts
+          @teardown_parts ||= []
+        end
+
+        def setup_block
+          parts = setup_parts.dup
+
+          setup_method = begin
+            context_superclass.instance_method(:setup)
+          rescue
+            nil
+          end
+          parts.unshift setup_method if setup_method
+          create_block_from_parts(parts)
+        end
+
+        def teardown_block
+          parts = teardown_parts.dup
+
+          teardown_method = begin
+            context_superclass.instance_method(:teardown)
+          rescue
+            nil
+          end
+          parts.unshift teardown_method if teardown_method
+          create_block_from_parts(parts)
+        end
+
+        def create_block_from_parts(parts)
+          proc do
+            parts.each do |part|
+              if part.is_a?(UnboundMethod)
+                part.bind(self).call
+              else
+                instance_exec(&part)
+              end
+            end
           end
         end
 
         def execution_context_class
-          @execution_context_class ||= begin
-            derive_execution_context_class_from context_superclass
+          return @execution_context_class if @execution_context_class
+          derive_execution_context_class_from_context_superclass
+          @execution_context_class
+        end
+
+        def derive_execution_context_class_from_context_superclass
+          @execution_context_class = Class.new(context_superclass)
+          @execution_context_class.class_eval do
+            include ::Spec::Runner::ExecutionContext::InstanceMethods
           end
         end
+
         def context_superclass
           @context_superclass ||= Object
         end
@@ -68,6 +106,8 @@ module Spec
           @context_modules ||= []
         end
       end
+      module InstanceMethods
+      end
     end
   end
 end

data/lib/spec/runner/specification.rb

@@ -10,32 +10,29 @@ module Spec
 
       def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false, execution_context=nil)
         reporter.spec_started(@name)
-        if dry_run
-          reporter.spec_finished(@name)
-        else
-          execution_context = ::Spec::Runner::ExecutionContext.new(self) unless execution_context
-          errors = []
-          begin
-            execution_context.instance_exec(&setup_block) unless setup_block.nil?
-            setup_ok = true
-            execution_context.instance_exec(&@block)
-            spec_ok = true
-          rescue => e
-            errors << e
-          end
+        return reporter.spec_finished(@name) if dry_run
+        execution_context = execution_context || ::Spec::Runner::ExecutionContext.new(self)
+        errors = []
+        begin
+          execution_context.instance_exec(&setup_block) unless setup_block.nil?
+          setup_ok = true
+          execution_context.instance_exec(&@block)
+          spec_ok = true
+        rescue => e
+          errors << e
+        end
 
-          begin
-            execution_context.instance_exec(&teardown_block) unless teardown_block.nil?
-            teardown_ok = true
-            @mocks.each do |mock|
-              mock.__verify
-            end
-          rescue => e
-            errors << e
+        begin
+          execution_context.instance_exec(&teardown_block) unless teardown_block.nil?
+          teardown_ok = true
+          @mocks.each do |mock|
+            mock.__verify
           end
-
-          reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
+        rescue => e
+          errors << e
         end
+
+        reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
       end
 
       def add_mock(mock)

data/lib/spec/test_to_spec/sexp_transformer.rb

@@ -4,7 +4,7 @@ require 'sexp_processor'
 module Spec
   module TestToSpec
     # Transforms a Sexp tree (produced by ParseTree) for a Test::Unit class
-    # to an Sexp tree representing an RSpec context
+    # to a Sexp tree representing an RSpec context
     class SexpTransformer < SexpProcessor
       TRANSLATIONS = {
         :assert_equal          => :should_equal,
@@ -57,22 +57,19 @@ module Spec
         context_body = []
         unless setup.empty?
           setup_block = process(setup.shift)
-          unless methods.empty?
-            translated_methods = []
-            # At this stage we don't want to translate :lvar to :dvar
-            @regular_method = true
-            translated_methods << process(methods.shift) until methods.empty?
-            @regular_method = false
-            if setup_block.length == 3
-              setup_block += translated_methods
-            else
-              setup_block[3] += translated_methods
-            end
-          end
           context_body << setup_block
         end
         context_body << process(teardown.shift) until teardown.empty?
         context_body << process(tests.shift)    until tests.empty?
+
+        # At this stage we don't want to translate :lvar to :dvar
+        begin
+          @regular_method = true
+          context_body << process(methods.shift)  until methods.empty?
+        ensure
+          @regular_method = false
+        end
+
         context_body << process(rest.shift)     until rest.empty?
         exp.clear
 

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 15
+      TINY   = 16
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/test/spec/test_to_spec/sexp_transformer_test.rb

@@ -92,9 +92,9 @@ module Spec
         context "Fifth" do
           setup do
             one = 1
-            def foo
-              two = 2
-            end
+          end
+          def foo
+            two = 2
           end
         end
       end
@@ -111,9 +111,10 @@ module Spec
       def wrapper
         context "Sixth" do
           setup do
-            def foo
-              two = 2
-            end
+          end
+
+          def foo
+            two = 2
           end
         end
       end
@@ -128,9 +129,9 @@ module Spec
       def wrapper
         context "Seventh" do
           setup do
-            def foo
-              two = 2
-            end
+          end
+          def foo
+            two = 2
           end
         end
       end
@@ -154,9 +155,6 @@ module Spec
       def wrapper
         context "Eighth" do
           setup do
-            def foo
-              two = 2
-            end
           end
           teardown do
             torn = true
@@ -165,6 +163,9 @@ module Spec
             bar = foo
             bar.should_equal 2
           end
+          def foo
+            two = 2
+          end
         end
       end
     end
@@ -183,14 +184,14 @@ module Spec
       def wrapper
         context "Ninth" do
           setup do
-            def assert_pair(n)
-              (n%2).should_equal 0
-            end
           end
           specify "2 should be pair" do
             foo = 1
             assert_pair(2)
           end
+          def assert_pair(n)
+            (n%2).should_equal 0
+          end
         end
       end
     end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.5.15
-date: 2006-07-14 00:00:00 -05:00
-summary: RSpec-0.5.15 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.5.16
+date: 2006-07-31 00:00:00 -05:00
+summary: RSpec-0.5.16 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org