rspec-core 2.99.0 → 3.0.0

data/lib/rspec/core/world.rb

@@ -1,67 +1,116 @@
 module RSpec
   module Core
+    # @api private
+    #
+    # Internal container for global non-configuration data
     class World
 
       include RSpec::Core::Hooks
 
+      # @private
       attr_reader :example_groups, :filtered_examples
+
+      # Used internally to determine what to do when a SIGINT is received
       attr_accessor :wants_to_quit
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
-        @example_groups = [].extend(Extensions::Ordered::ExampleGroups)
+        @example_groups = []
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
             examples = filter_manager.prune(examples)
-            examples.uniq
-            examples.extend(Extensions::Ordered::Examples)
+            examples.uniq!
+            examples
           end
         }
       end
 
+      # @private
+      # Used internally to clear remaining groups when fail_fast is set
+      def clear_remaining_example_groups
+        example_groups.clear
+      end
+
+      # @private
+      def windows_os?
+        RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+      end
+
+      # @api private
+      #
+      # Apply ordering strategy from configuration to example groups
+      def ordered_example_groups
+        ordering_strategy = @configuration.ordering_registry.fetch(:global)
+        ordering_strategy.order(@example_groups)
+      end
+
+      # @api private
+      #
+      # Reset world to 'scratch' before running suite
       def reset
         example_groups.clear
-        SharedExampleGroup.registry.clear
+        @shared_example_group_registry = nil
       end
 
+      # @private
       def filter_manager
         @configuration.filter_manager
       end
 
+      # @api private
+      #
+      # Register an example group
       def register(example_group)
         example_groups << example_group
         example_group
       end
 
+      # @private
+      def shared_example_group_registry
+        @shared_example_group_registry ||= SharedExampleGroup::Registry.new
+      end
+
+      # @private
       def inclusion_filter
         @configuration.inclusion_filter
       end
 
+      # @private
       def exclusion_filter
         @configuration.exclusion_filter
       end
 
+      # @private
       def configure_group(group)
         @configuration.configure_group(group)
       end
 
-      def example_count
-        example_groups.collect {|g| g.descendants}.flatten.inject(0) do |sum, g|
-          sum += g.filtered_examples.size
-        end
+      # @api private
+      #
+      # Get count of examples to be run
+      def example_count(groups=example_groups)
+        FlatMap.flat_map(groups) {|g| g.descendants}.
+          inject(0) {|sum, g| sum + g.filtered_examples.size}
       end
 
+      # @api private
+      #
+      # Find line number of previous declaration
       def preceding_declaration_line(filter_line)
         declaration_line_numbers.sort.inject(nil) do |highest_prior_declaration_line, line|
           line <= filter_line ? line : highest_prior_declaration_line
         end
       end
 
+      # @private
       def reporter
         @configuration.reporter
       end
 
+      # @api private
+      #
+      # Notify reporter of filters
       def announce_filters
         filter_announcements = []
 
@@ -86,7 +135,7 @@ module RSpec
           example_groups.clear
           if filter_manager.empty?
             reporter.message("No examples found.")
-          elsif exclusion_filter.rules_empty?
+          elsif exclusion_filter.empty?
             message = everything_filtered_message
             if @configuration.run_all_when_everything_filtered?
               message << "; ignoring #{inclusion_filter.description}"
@@ -98,18 +147,25 @@ module RSpec
         end
       end
 
+      # @private
       def everything_filtered_message
         "\nAll examples were filtered out"
       end
 
+      # @api private
+      #
+      # Add inclusion filters to announcement message
       def announce_inclusion_filter(announcements)
         unless inclusion_filter.empty?
           announcements << "include #{inclusion_filter.description}"
         end
       end
 
+      # @api private
+      #
+      # Add exclusion filters to announcement message
       def announce_exclusion_filter(announcements)
-        unless exclusion_filter.rules_empty?
+        unless exclusion_filter.empty?
           announcements << "exclude #{exclusion_filter.description}"
         end
       end

data/lib/rspec/core.rb

@@ -1,77 +1,50 @@
-require_rspec = if defined?(require_relative)
-  lambda do |path|
-    require_relative path
-  end
-else # for 1.8.7
-  lambda do |path|
-    require "rspec/#{path}"
-  end
-end
-
-require 'set'
-require 'time'
+$_rspec_core_load_started_at = Time.now
 require 'rbconfig'
-require_rspec['core/caller_filter']
-require_rspec['core/filter_manager']
-require_rspec['core/dsl']
-require_rspec['core/extensions/kernel']
-require_rspec['core/extensions/instance_eval_with_args']
-require_rspec['core/extensions/module_eval_with_args']
-require_rspec['core/extensions/ordered']
-require_rspec['core/deprecation']
-require_rspec['core/backward_compatibility']
-require_rspec['core/reporter']
-
-require_rspec['core/metadata_hash_builder']
-require_rspec['core/hooks']
-require_rspec['core/memoized_helpers']
-require_rspec['core/metadata']
-require_rspec['core/pending']
-require_rspec['core/formatters']
-
-require_rspec['core/world']
-require_rspec['core/configuration']
-require_rspec['core/project_initializer']
-require_rspec['core/option_parser']
-require_rspec['core/configuration_options']
-require_rspec['core/command_line']
-require_rspec['core/runner']
-require_rspec['core/example']
-require_rspec['core/shared_example_group/collection']
-require_rspec['core/shared_example_group']
-require_rspec['core/example_group']
-require_rspec['core/version']
 
+require "rspec/support"
+RSpec::Support.require_rspec_support "caller_filter"
+
+RSpec::Support.define_optimized_require_for_rspec(:core) { |f| require_relative f }
+
+%w[
+  version
+  warnings
+
+  flat_map
+  filter_manager
+  dsl
+  notifications
+  reporter
+
+  hooks
+  memoized_helpers
+  metadata
+  metadata_filter
+  pending
+  formatters
+  ordering
+
+  world
+  configuration
+  option_parser
+  configuration_options
+  runner
+  example
+  shared_example_group
+  example_group
+].each { |name| RSpec::Support.require_rspec_core name }
+
+# Namespace for all core RSpec code.
 module RSpec
   autoload :SharedContext, 'rspec/core/shared_context'
 
-  # @private
-  def self.wants_to_quit
-  # Used internally to determine what to do when a SIGINT is received
-    world.wants_to_quit
-  end
-
-  # @private
-  # Used internally to determine what to do when a SIGINT is received
-  def self.wants_to_quit=(maybe)
-    world.wants_to_quit=(maybe)
-  end
-
-  # @private
-  # Internal container for global non-configuration data
-  def self.world
-    @world ||= RSpec::Core::World.new
-  end
+  extend RSpec::Core::Warnings
 
-  # @private
-  # Used internally to set the global object
-  def self.world=(new_world)
-    @world = new_world
-  end
-
-  # @private
-  # Used internally to ensure examples get reloaded between multiple runs in
+  # Used to ensure examples get reloaded between multiple runs in
   # the same process.
+  #
+  # Users must invoke this if they want to have the configuration reset when
+  # they use runner multiple times within the same process.
   def self.reset
     @world = nil
     @configuration = nil
@@ -86,27 +59,12 @@ module RSpec
   # @see RSpec.configure
   # @see Core::Configuration
   def self.configuration
-    if block_given?
-      RSpec.warn_deprecation <<-WARNING
+    @configuration ||= begin
+                         config = RSpec::Core::Configuration.new
+                         config.expose_dsl_globally = true
+                         config
+                       end
 
-*****************************************************************
-DEPRECATION WARNING
-
-* RSpec.configuration with a block is deprecated and has no effect.
-* please use RSpec.configure with a block instead.
-
-Called from #{CallerFilter.first_non_rspec_line}
-*****************************************************************
-
-WARNING
-    end
-    @configuration ||= RSpec::Core::Configuration.new
-  end
-
-  # @private
-  # Used internally to set the global object
-  def self.configuration=(new_configuration)
-    @configuration = new_configuration
   end
 
   # Yields the global configuration to a block.
@@ -121,12 +79,6 @@ WARNING
     yield configuration if block_given?
   end
 
-  # @private
-  # Used internally to clear remaining groups when fail_fast is set
-  def self.clear_remaining_example_groups
-    world.example_groups.clear
-  end
-
   # The example being executed.
   #
   # The primary audience for this method is library authors who need access
@@ -141,7 +93,7 @@ WARNING
   #       fetch_current_example = RSpec.respond_to?(:current_example) ?
   #         proc { RSpec.current_example } : proc { |context| context.example }
   #
-  #       c.before(:each) do
+  #       c.before(:example) do
   #         example = fetch_current_example.call(self)
   #
   #         # ...
@@ -149,20 +101,29 @@ WARNING
   #     end
   #
   def self.current_example
-    Thread.current[:_rspec_current_example]
+    thread_local_metadata[:current_example]
   end
 
   # Set the current example being executed.
   # @api private
   def self.current_example=(example)
-    Thread.current[:_rspec_current_example] = example
+    thread_local_metadata[:current_example] = example
   end
 
   # @private
-  def self.windows_os?
-    RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+  # A single thread local variable so we don't excessively pollute that
+  # namespace.
+  def self.thread_local_metadata
+    Thread.current[:_rspec] ||= {}
   end
 
+  # @private
+  # Internal container for global non-configuration data
+  def self.world
+    @world ||= RSpec::Core::World.new
+  end
+
+  # Namespace for the rspec-core code.
   module Core
     # @private
     # This avoids issues with reporting time caused by examples that
@@ -170,23 +131,24 @@ WARNING
     # it.
     class Time
       class << self
-        define_method(:now,&::Time.method(:now))
+        define_method(:now, &::Time.method(:now))
       end
     end
 
     # @private path to executable file
     def self.path_to_executable
-      File.expand_path('../../../exe/rspec', __FILE__)
+      @path_to_executable ||= File.expand_path('../../../exe/rspec', __FILE__)
     end
-
   end
 
+  # @private
   MODULES_TO_AUTOLOAD = {
     :Matchers     => "rspec/expectations",
     :Expectations => "rspec/expectations",
     :Mocks        => "rspec/mocks"
   }
 
+  # @private
   def self.const_missing(name)
     # Load rspec-expectations when RSpec::Matchers is referenced. This allows
     # people to define custom matchers (using `RSpec::Matchers.define`) before
@@ -198,10 +160,8 @@ WARNING
     #
     # As of rspec 2.14.1, we no longer require `rspec/mocks` and
     # `rspec/expectations` when `rspec` is required, so we want
-    # to make them available as an autoload. For more info, see:
+    # to make them available as an autoload.
     require MODULES_TO_AUTOLOAD.fetch(name) { return super }
     ::RSpec.const_get(name)
   end
 end
-
-require_rspec['core/backward_compatibility']

data.tar.gz.sig

@@ -0,0 +1,3 @@
+O:'k���G�
�@C�({k���$���z� P6�c��-hԟ�5�����!�iͥ]'ڬ,n��E����Ed����0�i��>�9pX�J��d����%5��!`����L��dYÃfJUǻ�-a+Jm�=I���L���l�ޙ�hE'�"Q
+A������c���
+�;�Z˵�4�a�_��"�^ѦW���[R����\��rk���x�E>�-�я��z�f��)y֑q^c_��)!�4l5.�{�