rspec-core 2.5.2 → 2.6.0.rc2

data/lib/rspec/core/configuration_options.rb

@@ -1,6 +1,3 @@
-# http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
-require 'optparse'
-
 module RSpec
   module Core
 
@@ -60,35 +57,21 @@ module RSpec
       end
 
       def parse_options
-        @options = begin
-                     options_to_merge = []
-                     if custom_options_file
-                       options_to_merge << custom_options
-                     else
-                       options_to_merge << global_options
-                       options_to_merge << local_options
-                     end
-                     options_to_merge << command_line_options
-                     options_to_merge << env_options
-
-                     options_to_merge.inject do |merged, options|
-                       merged.merge(options)
-                     end
-                   end
+        @options ||= [file_options, command_line_options, env_options].inject {|merged, o| merged.merge o}
       end
 
     private
 
+      def file_options
+        custom_options_file ? custom_options : global_options.merge(local_options)
+      end
+
       def env_options
         ENV["SPEC_OPTS"] ? Parser.parse!(ENV["SPEC_OPTS"].split) : {}
       end
 
       def command_line_options
-        @command_line_options ||= begin
-                                    options = Parser.parse!(@args)
-                                    options[:files_or_directories_to_run] = @args
-                                    options
-                                  end
+        @command_line_options ||= Parser.parse!(@args).merge :files_or_directories_to_run => @args
       end
 
       def custom_options

data/lib/rspec/core/drb_command_line.rb

@@ -11,18 +11,12 @@ module RSpec
 
       def run(err, out)
         begin
-          begin
-            DRb.start_service("druby://localhost:0")
-          rescue SocketError, Errno::EADDRNOTAVAIL
-            DRb.start_service("druby://:0")
-          end
-          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{drb_port}")
-          spec_server.run(@options.drb_argv, err, out)
-          true
-        rescue DRb::DRbConnError
-          err.puts "No DRb server is running. Running in local process instead ..."
-          false
+          DRb.start_service("druby://localhost:0")
+        rescue SocketError, Errno::EADDRNOTAVAIL
+          DRb.start_service("druby://:0")
         end
+        spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{drb_port}")
+        spec_server.run(@options.drb_argv, err, out)
       end
     end
   end

data/lib/rspec/core/example.rb

@@ -42,24 +42,32 @@ module RSpec
 
         begin
           unless pending
-            with_pending_capture do
-              with_around_hooks do
-                begin
-                  run_before_each
-                  @example_group_instance.instance_eval(&@example_block)
-                rescue Exception => e
-                  set_exception(e)
-                ensure
-                  run_after_each
-                end
+            with_around_hooks do
+              begin
+                run_before_each
+                @example_group_instance.instance_eval(&@example_block)
+              rescue Pending::PendingDeclaredInExample => e
+                @pending_declared_in_example = e.message
+              rescue Exception => e
+                set_exception(e)
+              ensure
+                run_after_each
               end
             end
           end
         rescue Exception => e
           set_exception(e)
         ensure
-          @example_group_instance.example = nil
-          assign_auto_description
+          @example_group_instance.instance_variables.each do |ivar|
+            @example_group_instance.instance_variable_set(ivar, nil)
+          end
+          @example_group_instance = nil
+
+          begin
+            assign_auto_description
+          rescue Exception => e
+            set_exception(e)
+          end
         end
 
         finish(reporter)
@@ -94,13 +102,6 @@ module RSpec
 
     private
 
-      def with_pending_capture
-        @pending_declared_in_example = catch(:pending_declared_in_example) do
-          yield
-          throw :pending_declared_in_example, false
-        end
-      end
-
       def with_around_hooks(&block)
         if around_hooks.empty?
           yield
@@ -153,8 +154,15 @@ module RSpec
 
       def assign_auto_description
         if description.empty? and !pending?
-          metadata[:description] = RSpec::Matchers.generated_description
-          RSpec::Matchers.clear_generated_description
+          if RSpec.configuration.expecting_with_rspec?
+            metadata[:description] = RSpec::Matchers.generated_description
+            RSpec::Matchers.clear_generated_description
+          else
+            raise NotImplementedError.new(
+              "Generated descriptions are only supported when you use rspec-expectations.  " +
+              "You must give every example an explicit description."
+            )
+          end
         end
       end
 

data/lib/rspec/core/example_group.rb

@@ -8,6 +8,7 @@ module RSpec
       include Subject::InstanceMethods
       include Let
       include Pending
+      extend MetadataHashBuilder::WithDeprecationWarning
 
       attr_accessor :example
 
@@ -41,7 +42,8 @@ module RSpec
 
       def self.define_example_method(name, extra_options={})
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
-          def self.#{name}(desc=nil, options={}, &block)
+          def self.#{name}(desc=nil, *args, &block)
+            options = build_metadata_hash_from(args)
             options.update(:pending => true) unless block
             options.update(#{extra_options.inspect})
             examples << RSpec::Core::Example.new(self, desc, options, block)
@@ -63,7 +65,7 @@ module RSpec
       alias_example_to :pending, :pending => true
       alias_example_to :xit,     :pending => true
 
-      def self.define_shared_group_method(new_name, report_label=nil)
+      def self.define_nested_shared_group_method(new_name, report_label=nil)
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
           def self.#{new_name}(name, *args, &customization_block)
             shared_block = world.shared_example_groups[name]
@@ -79,14 +81,22 @@ module RSpec
         END_RUBY
       end
 
-      define_shared_group_method :it_should_behave_like
+      define_nested_shared_group_method :it_should_behave_like
 
       class << self
-        alias_method :alias_it_should_behave_like_to, :define_shared_group_method
+        alias_method :alias_it_should_behave_like_to, :define_nested_shared_group_method
       end
 
       alias_it_should_behave_like_to :it_behaves_like, "behaves like"
 
+      def self.include_context(name)
+        module_eval(&world.shared_example_groups[name])
+      end
+
+      class << self
+        alias_method :include_examples, :include_context
+      end
+
       def self.examples
         @examples ||= []
       end
@@ -149,7 +159,27 @@ module RSpec
         @top_level ||= superclass == ExampleGroup
       end
 
+      def self.ensure_example_groups_are_configured
+        unless defined?(@@example_groups_configured)
+          RSpec.configuration.configure_mock_framework
+          RSpec.configuration.configure_expectation_framework
+          @@example_groups_configured = true
+        end
+      end
+
       def self.set_it_up(*args)
+        # Ruby 1.9 has a bug that can lead to infinite recursion and a
+        # SystemStackError if you include a module in a superclass after
+        # including it in a subclass: https://gist.github.com/845896
+        # To prevent this, we must include any modules in RSpec::Core::ExampleGroup
+        # before users create example groups and have a chance to include
+        # the same module in a subclass of RSpec::Core::ExampleGroup.
+        # So we need to configure example groups here.
+        ensure_example_groups_are_configured
+
+        symbol_description = args.shift if args.first.is_a?(Symbol)
+        args << build_metadata_hash_from(args)
+        args.unshift(symbol_description) if symbol_description
         @metadata = RSpec::Core::Metadata.new(superclass_metadata).process(*args)
         world.configure_group(self)
       end
@@ -236,6 +266,7 @@ An error occurred in an after(:all) hook.
           fail_filtered_examples(ex, reporter)
         ensure
           eval_after_alls(new)
+          before_all_ivars.clear
           reporter.example_group_finished(self)
         end
       end
@@ -248,6 +279,7 @@ An error occurred in an after(:all) hook.
           child.fail_filtered_examples(exception, reporter)
           reporter.example_group_finished(child)
         end
+        false
       end
 
       def self.fail_fast?

data/lib/rspec/core/formatters/base_formatter.rb

@@ -1,4 +1,5 @@
 require 'rspec/core/formatters/helpers'
+require 'stringio'
 
 module RSpec
   module Core
@@ -95,6 +96,11 @@ module RSpec
         def format_backtrace(backtrace, example)
           return "" unless backtrace
           return backtrace if example.metadata[:full_backtrace] == true
+
+          if at_exit_index = backtrace.index(RSpec::Core::Runner::AT_EXIT_HOOK_BACKTRACE_LINE)
+            backtrace = backtrace[0, at_exit_index]
+          end
+
           cleansed = backtrace.map { |line| backtrace_line(line) }.compact
           cleansed.empty? ? backtrace : cleansed
         end

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -148,7 +148,7 @@ module RSpec
           output.puts "#{short_padding}#{index.next}) #{example.full_description}"
           output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
           output.puts "#{long_padding}#{red(exception.class.name << ":")}" unless exception.class.name =~ /RSpec/
-          exception.message.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}" }
+          exception.message.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}" } if exception.message
 
           example.example_group.ancestors.push(example.example_group).each do |group|
             if group.metadata[:shared_group_name]

data/lib/rspec/core/formatters/helpers.rb

@@ -1,7 +1,5 @@
 module RSpec
-
   module Core
-
     module Formatters
 
       module Helpers
@@ -22,7 +20,5 @@ module RSpec
       end
 
     end
-
   end
-
 end

data/lib/rspec/core/hooks.rb

@@ -1,12 +1,14 @@
 module RSpec
   module Core
     module Hooks
+      include MetadataHashBuilder::WithConfigWarning
 
       class Hook
         attr_reader :options
 
         def initialize(options, &block)
           @options = options
+          raise "no block given for #{self.class::TYPE} hook" unless block
           @block = block
         end
 
@@ -24,6 +26,7 @@ module RSpec
       end
 
       class BeforeHook < Hook
+        TYPE = 'before'
         def run_in(example_group_instance)
           if example_group_instance
             example_group_instance.instance_eval(&self)
@@ -34,6 +37,7 @@ module RSpec
       end
 
       class AfterHook < Hook
+        TYPE = 'after'
         def run_in(example_group_instance)
           if example_group_instance
             example_group_instance.instance_eval_with_rescue(&self)
@@ -44,6 +48,7 @@ module RSpec
       end
 
       class AroundHook < Hook
+        TYPE = 'around'
         def call(wrapped_example)
           @block.call(wrapped_example)
         end
@@ -137,11 +142,16 @@ module RSpec
 
     private
 
-      def scope_and_options_from(scope=:each, options={})
-        if Hash === scope
-          options = scope
-          scope = :each
+      def scope_and_options_from(*args)
+        scope = if [:each, :all, :suite].include?(args.first)
+          args.shift
+        elsif args.any? { |a| a.is_a?(Symbol) }
+          raise ArgumentError.new("You must explicitly give a scope (:each, :all, or :suite) when using symbols as metadata for a hook.")
+        else
+          :each
         end
+
+        options = build_metadata_hash_from(args)
         return scope, options
       end
     end

data/lib/rspec/core/metadata.rb

@@ -142,7 +142,7 @@ EOM
             metadata[key] == value
           end
         else
-          metadata[key] == value
+          metadata[key].to_s == value.to_s
         end
       end
 

data/lib/rspec/core/metadata_hash_builder.rb

@@ -0,0 +1,93 @@
+module RSpec
+  module Core
+    module MetadataHashBuilder
+      module Common
+        def build_metadata_hash_from(args)
+          metadata = args.last.is_a?(Hash) ? args.pop : {}
+
+          if RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values?
+            add_symbols_to_hash(metadata, args)
+          else
+            warn_about_symbol_usage(args)
+          end
+
+          metadata
+        end
+
+        private
+
+          def add_symbols_to_hash(hash, args)
+            while args.last.is_a?(Symbol)
+              hash[args.pop] = true
+            end
+          end
+
+          def warn_about_symbol_usage(args)
+            symbols = args.select { |a| a.is_a?(Symbol) }
+            return if symbols.empty?
+            Kernel.warn symbol_metadata_warning(symbols)
+          end
+      end
+
+      module WithConfigWarning
+        include Common
+
+        private
+
+          def symbol_metadata_warning(symbols)
+            <<-NOTICE
+
+*****************************************************************
+WARNING: You have passed symbols (#{symbols.inspect}) as metadata
+arguments to a configuration option.
+
+In RSpec 3, these symbols will be treated as metadata keys with
+a value of `true`.  To get this behavior now (and prevent this
+warning), you can set a configuration option:
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
+Note that this config setting should go before your other config
+settings so that they can use symbols as metadata.
+*****************************************************************
+
+NOTICE
+          end
+      end
+
+      module WithDeprecationWarning
+        include Common
+
+        private
+
+          def symbol_metadata_warning(symbols)
+            <<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from RSpec 3.
+
+You have passed symbols (#{symbols.inspect}) as additional
+arguments for a doc string.
+
+In RSpec 3, these symbols will be treated as metadata keys with
+a value of `true`.  To get this behavior now (and prevent this
+warning), you can set a configuration option:
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
+Alternately, if your intention is to use the symbol as part of the
+doc string (i.e. to specify a method name), you can change it to
+a string such as "#method_name" to remove this warning.
+*****************************************************************
+
+NOTICE
+          end
+        end
+      end
+  end
+end