rspec-core 2.11.1 → 2.12.0

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

@@ -4,7 +4,7 @@ module RSpec
       # This class extracts code snippets by looking at the backtrace of the passed error
       class SnippetExtractor
         class NullConverter; def convert(code, pre); code; end; end
-        
+
         begin
           require 'syntax/convertors/html'
           @@converter = Syntax::Convertors::HTML.for_syntax "ruby"
@@ -40,6 +40,8 @@ module RSpec
           else
             "# Couldn't get snippet for #{file}"
           end
+        rescue SecurityError
+          "# Couldn't get snippet for #{file}"
         end
 
         def post_process(highlighted, offending_line)

data/lib/rspec/core/hooks.rb

@@ -119,7 +119,7 @@ module RSpec
         private
         def process host, globals, position, scope
           globals[position][scope].each do |hook|
-            unless host.ancestors.any? { |a| a.hooks[position][scope].include? hook }
+            unless host.parent_groups.any? { |a| a.hooks[position][scope].include? hook }
               self[position][scope] << hook if scope == :each || hook.options_apply?(host)
             end
           end
@@ -426,7 +426,7 @@ module RSpec
 
       # @private
       def around_each_hooks_for(example, initial_procsy=nil)
-        AroundHookCollection.new(ancestors.map {|a| a.hooks[:around][:each]}.flatten).for(example, initial_procsy)
+        AroundHookCollection.new(parent_groups.map {|a| a.hooks[:around][:each]}.flatten).for(example, initial_procsy)
       end
 
     private
@@ -448,11 +448,11 @@ module RSpec
       end
 
       def before_each_hooks_for(example)
-        HookCollection.new(ancestors.reverse.map {|a| a.hooks[:before][:each]}.flatten).for(example)
+        HookCollection.new(parent_groups.reverse.map {|a| a.hooks[:before][:each]}.flatten).for(example)
       end
 
       def after_each_hooks_for(example)
-        HookCollection.new(ancestors.map {|a| a.hooks[:after][:each]}.flatten).for(example)
+        HookCollection.new(parent_groups.map {|a| a.hooks[:after][:each]}.flatten).for(example)
       end
 
       def register_hook prepend_or_append, hook, *args, &block

data/lib/rspec/core/metadata.rb

@@ -31,6 +31,8 @@ module RSpec
         line = line.sub(/\A([^:]+:\d+)$/, '\\1')
         return nil if line == '-e:1'
         line
+      rescue SecurityError
+        nil
       end
 
       # @private
@@ -41,7 +43,18 @@ module RSpec
         # ExampleMetadataHash and GroupMetadataHash, which get mixed in to
         # Metadata for ExampleGroups and Examples (respectively).
         def [](key)
-          return super if has_key?(key)
+          store_computed(key) unless has_key?(key)
+          super
+        end
+
+        def fetch(key, *args)
+          store_computed(key) unless has_key?(key)
+          super
+        end
+
+        private
+
+        def store_computed(key)
           case key
           when :location
             store(:location, location)
@@ -49,7 +62,6 @@ module RSpec
             file_path, line_number = file_and_line_number
             store(:file_path, file_path)
             store(:line_number, line_number)
-            super
           when :execution_result
             store(:execution_result, {})
           when :describes, :described_class
@@ -61,13 +73,9 @@ module RSpec
             store(:full_description, full_description)
           when :description
             store(:description, build_description_from(*self[:description_args]))
-          else
-            super
           end
         end
 
-        private
-
         def location
           "#{self[:file_path]}:#{self[:line_number]}"
         end

data/lib/rspec/core/mocking/with_mocha.rb

@@ -1,5 +1,28 @@
-require 'mocha/standalone'
-require 'mocha/object'
+# In order to support all versions of mocha, we have to jump through some
+# hoops here.
+#
+# mocha >= '0.13.0':
+#   require 'mocha/api' is required
+#   require 'mocha/object' raises a LoadError b/c the file no longer exists
+# mocha < '0.13.0', >= '0.9.7'
+#   require 'mocha/api' is required
+#   require 'mocha/object' is required
+# mocha < '0.9.7':
+#   require 'mocha/api' raises a LoadError b/c the file does not yet exist
+#   require 'mocha/standalone' is required
+#   require 'mocha/object' is required
+begin
+  require 'mocha/api'
+
+  begin
+    require 'mocha/object'
+  rescue LoadError
+    # Mocha >= 0.13.0 no longer contains this file nor needs it to be loaded
+  end
+rescue LoadError
+  require 'mocha/standalone'
+  require 'mocha/object'
+end
 
 module RSpec
   module Core

data/lib/rspec/core/mocking/with_rspec.rb

@@ -3,9 +3,13 @@ require 'rspec/mocks'
 module RSpec
   module Core
     module MockFrameworkAdapter
-      
+
       def self.framework_name; :rspec end
-      
+
+      def self.configuration
+        RSpec::Mocks.configuration
+      end
+
       def setup_mocks_for_rspec
         RSpec::Mocks::setup(self)
       end

data/lib/rspec/core/option_parser.rb

@@ -13,15 +13,35 @@ module RSpec::Core
 
     def parse!(args)
       return {} if args.empty?
-      if args.include?("--formatter")
-        RSpec.deprecate("the --formatter option", "-f or --format")
-        args[args.index("--formatter")] = "--format"
-      end
+
+      convert_deprecated_args(args)
+
       options = args.delete('--tty') ? {:tty => true} : {}
-      parser(options).parse!(args)
+      begin
+        parser(options).parse!(args)
+      rescue OptionParser::InvalidOption => e
+        abort "#{e.message}\n\nPlease use --help for a listing of valid options"
+      end
+
       options
     end
 
+    def convert_deprecated_args(args)
+      args.map! { |arg|
+        case arg
+        when "--formatter"
+          RSpec.deprecate("the --formatter option", "-f or --format")
+          "--format"
+        when "--default_path"
+          "--default-path"
+        when "--line_number"
+          "--line-number"
+        else
+          arg
+        end
+      }
+    end
+
     alias_method :parse, :parse!
 
     def parser(options)
@@ -92,6 +112,7 @@ module RSpec::Core
                 '  [d]ocumentation (group and example names)',
                 '  [h]tml',
                 '  [t]extmate',
+                '  [j]son',
                 '  custom formatter class name') do |o|
           options[:formatters] ||= []
           options[:formatters] << [o]
@@ -139,7 +160,7 @@ FILTERING
           (options[:full_description] ||= []) << Regexp.compile(Regexp.escape(o))
         end
 
-        parser.on('-l', '--line_number LINE', 'Specify line number of an example or group (may be',
+        parser.on('-l', '--line-number LINE', 'Specify line number of an example or group (may be',
                                               '  used more than once).') do |o|
           (options[:line_numbers] ||= []) << o
         end
@@ -158,7 +179,7 @@ FILTERING
           options[filter_type][name] = value.nil? ? true : eval(value) rescue value
         end
 
-        parser.on('--default_path PATH', 'Set the default path where RSpec looks for examples (can',
+        parser.on('--default-path PATH', 'Set the default path where RSpec looks for examples (can',
                                          '  be a path to a file or a directory).') do |path|
           options[:default_path] = path
         end

data/lib/rspec/core/project_initializer.rb

@@ -6,7 +6,6 @@ module RSpec
       end
 
       def run
-        warn "The --configure option no longer needs any arguments, so #{@arg} was ignored." if @arg
         create_spec_helper_file
         create_dot_rspec_file
         delete_if_confirmed("autotest/discover.rb", <<-MESSAGE)

data/lib/rspec/core/rake_task.rb

@@ -1,4 +1,3 @@
-require 'rspec/core'
 require 'rspec/core/deprecation'
 require 'rake'
 require 'rake/tasklib'
@@ -63,6 +62,9 @@ module RSpec
 
       # Use rcov for code coverage?
       #
+      # Due to the many ways `rcov` can run, if this option is enabled, it is
+      # required that `require 'rspec/autorun'` appears in `spec_helper`.rb
+      #
       # default:
       #   false
       attr_accessor :rcov
@@ -109,34 +111,47 @@ module RSpec
         @rspec_opts = opts
       end
 
-      def initialize(*args)
+      def initialize(*args, &task_block)
+        setup_ivars(args)
+
+        desc "Run RSpec code examples" unless ::Rake.application.last_comment
+
+        task name, *args do |_, task_args|
+          RakeFileUtils.send(:verbose, verbose) do
+            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            run_task verbose
+          end
+        end
+      end
+
+      def setup_ivars(args)
         @name = args.shift || :spec
-        @pattern, @rcov_path, @rcov_opts, @ruby_opts, @rspec_opts = nil, nil, nil, nil, nil
+        @rcov_opts, @ruby_opts, @rspec_opts = nil, nil, nil
         @warning, @rcov = false, false
         @verbose, @fail_on_error = true, true
 
-        yield self if block_given?
-
-        @rcov_path  ||= 'rcov'
-        @rspec_path ||= 'rspec'
-        @pattern    ||= './spec{,/*/**}/*_spec.rb'
+        @rcov_path  = 'rcov'
+        @rspec_path = 'rspec'
+        @pattern    = './spec{,/*/**}/*_spec.rb'
+      end
 
-        desc("Run RSpec code examples") unless ::Rake.application.last_comment
+      def has_files?
+        empty = files_to_run.empty?
+        puts "No examples matching #{pattern} could be found" if empty
+        not empty
+      end
 
-        task name do
-          RakeFileUtils.send(:verbose, verbose) do
-            if files_to_run.empty?
-              puts "No examples matching #{pattern} could be found"
-            else
-              begin
-                puts spec_command if verbose
-                success = system(spec_command)
-              rescue
-                puts failure_message if failure_message
-              end
-              raise("#{spec_command} failed") if fail_on_error unless success
-            end
+      def run_task(verbose)
+        files = has_files?
+        if files
+          command = spec_command
+          begin
+            puts command if verbose
+            success = system(command)
+          rescue
+            puts failure_message if failure_message
           end
+          raise("#{command} failed") if fail_on_error unless success
         end
       end
 
@@ -144,29 +159,25 @@ module RSpec
 
       def files_to_run
         if ENV['SPEC']
-          FileList[ ENV['SPEC'] ]
+          FileList[ ENV['SPEC'] ].sort
         else
-          FileList[ pattern ].map { |f| f.gsub(/"/, '\"').gsub(/'/, "\\\\'") }
+          FileList[ pattern ].sort.map { |f| f.shellescape }
         end
       end
 
       def spec_command
-        @spec_command ||= begin
-                            cmd_parts = []
-                            cmd_parts << RUBY
-                            cmd_parts << ruby_opts
-                            cmd_parts << "-w" if @warning
-                            cmd_parts << "-S" << runner
-                            cmd_parts << "-Ispec:lib" << rcov_opts if rcov
-                            cmd_parts << files_to_run
-                            cmd_parts << "--" if rcov && rspec_opts
-                            cmd_parts << rspec_opts
-                            cmd_parts.flatten.reject(&blank).join(" ")
-                          end
+        cmd_parts = []
+        cmd_parts << RUBY
+        cmd_parts << ruby_opts
+        cmd_parts << "-w" if @warning
+        cmd_parts << "-S" << runner
+        cmd_parts << "-Ispec:lib" << rcov_opts if rcov
+        cmd_parts << files_to_run
+        cmd_parts << "--" if rcov && rspec_opts
+        cmd_parts << rspec_opts
+        cmd_parts.flatten.reject(&blank).join(" ")
       end
 
-    private
-
       def runner
         rcov ? rcov_path : rspec_path
       end

data/lib/rspec/core/reporter.rb

@@ -38,7 +38,7 @@ module RSpec::Core
     end
 
     def start(expected_example_count)
-      @start = Time.now
+      @start = RSpec::Core::Time.now
       notify :start, expected_example_count
     end
 
@@ -89,7 +89,7 @@ module RSpec::Core
     alias_method :abort, :finish
 
     def stop
-      @duration = Time.now - @start if @start
+      @duration = (RSpec::Core::Time.now - @start).to_f if @start
       notify :stop
     end
 

data/lib/rspec/core/shared_example_group.rb

@@ -29,68 +29,116 @@ module RSpec
       # @see ExampleGroup.include_examples
       # @see ExampleGroup.include_context
       def shared_examples *args, &block
-        if key? args.first
-          key = args.shift
-          raise_key_taken key if key_taken? key
-          RSpec.world.shared_example_groups[key] = block
-        end
-
-        unless args.empty?
-          mod = Module.new
-          (class << mod; self; end).send :define_method, :extended  do |host|
-            host.class_eval(&block)
-          end
-          RSpec.configuration.extend mod, *args
-        end
+        Registry.add_group(*args, &block)
       end
 
       alias_method :shared_context,      :shared_examples
       alias_method :share_examples_for,  :shared_examples
       alias_method :shared_examples_for, :shared_examples
 
+      # @deprecated
       def share_as(name, &block)
-        if Object.const_defined?(name)
-          mod = Object.const_get(name)
-          raise_name_error unless mod.created_from_caller(caller)
-        end
+        RSpec.deprecate("Rspec::Core::SharedExampleGroup#share_as",
+                        "RSpec::SharedContext or shared_examples")
+        Registry.add_const(name, &block)
+      end
+
+      # @private
+      #
+      # Used internally to manage the shared example groups and
+      # constants. We want to limit the number of methods we add
+      # to objects we don't own (main and Module) so this allows
+      # us to have helper methods that don't get added to those
+      # objects.
+      module Registry
+        extend self
 
-        mod = Module.new do
-          @shared_block = block
-          @caller_line = caller.last
+        def add_group(*args, &block)
+          ensure_block_has_source_location(block, caller[1])
 
-          def self.created_from_caller(other_caller)
-            @caller_line == other_caller.last
+          if key? args.first
+            key = args.shift
+            warn_if_key_taken key, block
+            RSpec.world.shared_example_groups[key] = block
           end
 
-          def self.included(kls)
-            kls.describe(&@shared_block)
-            kls.children.first.metadata[:shared_group_name] = name
+          unless args.empty?
+            mod = Module.new
+            (class << mod; self; end).send :define_method, :extended  do |host|
+              host.class_eval(&block)
+            end
+            RSpec.configuration.extend mod, *args
           end
         end
 
-        shared_const = Object.const_set(name, mod)
-        RSpec.world.shared_example_groups[shared_const] = block
-      end
+        def add_const(name, &block)
+          if Object.const_defined?(name)
+            mod = Object.const_get(name)
+            raise_name_error unless mod.created_from_caller(caller)
+          end
 
-    private
+          mod = Module.new do
+            @shared_block = block
+            @caller_line = caller.last
 
-      def key? candidate
-        [String, Symbol, Module].any? { |cls| cls === candidate }
-      end
+            def self.created_from_caller(other_caller)
+              @caller_line == other_caller.last
+            end
 
-      def raise_name_error
-        raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
-      end
+            def self.included(kls)
+              kls.describe(&@shared_block)
+              kls.children.first.metadata[:shared_group_name] = name
+            end
+          end
 
-      def raise_key_taken key
-        raise ArgumentError, "Shared example group '#{key}' already exists"
-      end
+          shared_const = Object.const_set(name, mod)
+          RSpec.world.shared_example_groups[shared_const] = block
+        end
 
-      def key_taken? key
-        RSpec.world.shared_example_groups.has_key?(key)
+      private
+
+        def key? candidate
+          [String, Symbol, Module].any? { |cls| cls === candidate }
+        end
+
+        def raise_name_error
+          raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
+        end
+
+        def warn_if_key_taken key, new_block
+          return unless existing_block = example_block_for(key)
+
+          Kernel.warn <<-WARNING.gsub(/^ +\|/, '')
+            |WARNING: Shared example group '#{key}' has been previously defined at:
+            |  #{formatted_location existing_block}
+            |...and you are now defining it at:
+            |  #{formatted_location new_block}
+            |The new definition will overwrite the original one.
+          WARNING
+        end
+
+        def formatted_location block
+          block.source_location.join ":"
+        end
+
+        def example_block_for key
+          RSpec.world.shared_example_groups[key]
+        end
+
+        def ensure_block_has_source_location(block, caller_line)
+          return if block.respond_to?(:source_location)
+
+          block.extend Module.new {
+            define_method :source_location do
+              caller_line.split(':')
+            end
+          }
+        end
       end
     end
   end
 end
 
-include RSpec::Core::SharedExampleGroup
+extend RSpec::Core::SharedExampleGroup
+Module.send(:include, RSpec::Core::SharedExampleGroup)
+