rspec-core 2.13.1 → 2.14.0.rc1

data/features/mock_framework_integration/use_rspec.feature

@@ -19,7 +19,7 @@ Feature: mock with rspec
       end
       """
     When I run `rspec example_spec.rb`
-    Then the examples should all pass 
+    Then the examples should all pass
 
   Scenario: failing message expecation
     Given a file named "example_spec.rb" with:
@@ -80,7 +80,7 @@ Feature: mock with rspec
     Then the output should contain "1 example, 1 failure"
     And the exit status should be 1
 
-  Scenario: accessing RSpec.configuration.mock_framework.framework_name 
+  Scenario: accessing RSpec.configuration.mock_framework.framework_name
     Given a file named "example_spec.rb" with:
       """ruby
       RSpec.configure do |config|
@@ -94,4 +94,4 @@ Feature: mock with rspec
       end
       """
     When I run `rspec example_spec.rb`
-    Then the examples should all pass 
+    Then the examples should all pass

data/features/subject/implicit_subject.feature

@@ -6,7 +6,7 @@ Feature: implicitly defined subject
   While the examples below demonstrate how `subject` can be used as a
   user-facing concept, we recommend that you reserve it for support of custom
   matchers and/or extension libraries that hide its use from examples.
-  
+
   Scenario: subject exposed in top level group
     Given a file named "top_level_subject_spec.rb" with:
       """ruby

data/lib/rspec/core.rb

@@ -9,6 +9,7 @@ else
 end
 
 require 'set'
+require 'time'
 require 'rbconfig'
 require_rspec['core/filter_manager']
 require_rspec['core/dsl']
@@ -16,7 +17,6 @@ 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/load_path']
 require_rspec['core/deprecation']
 require_rspec['core/backward_compatibility']
 require_rspec['core/reporter']
@@ -36,6 +36,7 @@ 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']
@@ -61,6 +62,12 @@ module RSpec
     @world ||= RSpec::Core::World.new
   end
 
+  # @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
   # the same process.
@@ -95,6 +102,12 @@ WARNING
     @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.
   # @yield [Configuration] global configuration
   #
@@ -115,7 +128,7 @@ WARNING
 
   # @private
   def self.windows_os?
-    /mswin|mingw/ === ::RbConfig::CONFIG['host_os']
+    RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
   end
 
   module Core
@@ -123,7 +136,11 @@ WARNING
     # This avoids issues with reporting time caused by examples that
     # change the value/meaning of Time.now without properly restoring
     # it.
-    Time = ::Time.dup
+    class Time
+      class << self
+        define_method(:now,&::Time.method(:now))
+      end
+    end
   end
 
   def self.const_missing(name)

data/lib/rspec/core/backtrace_cleaner.rb

@@ -0,0 +1,46 @@
+module RSpec
+  module Core
+    class BacktraceCleaner
+
+      DEFAULT_EXCLUSION_PATTERNS = [
+        /\/lib\d*\/ruby\//,
+        /org\/jruby\//,
+        /bin\//,
+        %r|/gems/|,
+        /spec\/spec_helper\.rb/,
+        /lib\/rspec\/(core|expectations|matchers|mocks)/
+      ]
+
+      attr_accessor :inclusion_patterns
+      attr_accessor :exclusion_patterns
+
+      def initialize(inclusion_patterns=nil, exclusion_patterns=DEFAULT_EXCLUSION_PATTERNS.dup)
+        @exclusion_patterns = exclusion_patterns
+
+        if inclusion_patterns.nil?
+          @inclusion_patterns = (matches_an_exclusion_pattern? Dir.getwd) ? [Regexp.new(Dir.getwd)] : []
+        else
+          @inclusion_patterns = inclusion_patterns
+        end
+      end
+
+      def exclude?(line)
+        @inclusion_patterns.none? {|p| line =~ p} and matches_an_exclusion_pattern?(line)
+      end
+
+      def full_backtrace=(true_or_false)
+        @exclusion_patterns = true_or_false ? [] : DEFAULT_EXCLUSION_PATTERNS.dup
+      end
+
+      def full_backtrace?
+        @exclusion_patterns.empty?
+      end
+
+      private
+
+      def matches_an_exclusion_pattern?(line)
+        @exclusion_patterns.any? {|p| line =~ p}
+      end
+    end
+  end
+end

data/lib/rspec/core/backward_compatibility.rb

@@ -7,17 +7,7 @@ module RSpec
       def const_missing(name)
         case name
         when :Rspec, :Spec
-          RSpec.warn_deprecation <<-WARNING
-*****************************************************************
-DEPRECATION WARNING: you are using a deprecated constant that will
-be removed from a future version of RSpec.
-
-#{caller(0)[2]}
-
-* #{name} is deprecated.
-* RSpec is the new top-level module in RSpec-2
-*****************************************************************
-WARNING
+          RSpec.deprecate(name.to_s, :replacement => "RSpec")
           RSpec
         else
           begin
@@ -34,7 +24,7 @@ WARNING
   module Runner
     # @deprecated use RSpec.configure instead.
     def self.configure(&block)
-      RSpec.deprecate("Spec::Runner.configure", "RSpec.configure")
+      RSpec.deprecate("Spec::Runner.configure", :replacement => "RSpec.configure")
       RSpec.configure(&block)
     end
   end
@@ -46,7 +36,7 @@ WARNING
     def self.const_missing(name)
       case name
       when :SpecTask
-        RSpec.deprecate("Spec::Rake::SpecTask", "RSpec::Core::RakeTask")
+        RSpec.deprecate("Spec::Rake::SpecTask", :replacement => "RSpec::Core::RakeTask")
         require 'rspec/core/rake_task'
         RSpec::Core::RakeTask
       else

data/lib/rspec/core/configuration.rb

@@ -1,4 +1,7 @@
 require 'fileutils'
+require 'rspec/core/backtrace_cleaner'
+require 'rspec/core/ruby_project'
+require 'rspec/core/formatters/deprecation_formatter.rb'
 
 module RSpec
   module Core
@@ -32,19 +35,15 @@ module RSpec
 
       # @private
       def self.define_reader(name)
-        eval <<-CODE
-          def #{name}
-            value_for(#{name.inspect}, defined?(@#{name}) ? @#{name} : nil)
-          end
-        CODE
+        define_method(name) do
+          variable = instance_variable_defined?("@#{name}") ? instance_variable_get("@#{name}") : nil
+          value_for(name, variable)
+        end
       end
 
       # @private
       def self.deprecate_alias_key
-        RSpec.warn_deprecation <<-MESSAGE
-The :alias option to add_setting is deprecated. Use :alias_with on the original setting instead.
-Called from #{caller(0)[5]}
-MESSAGE
+        RSpec.deprecate("add_setting with :alias option", :replacement => ":alias_with")
       end
 
       # @private
@@ -80,15 +79,6 @@ MESSAGE
 
       # @macro [attach] add_setting
       #   @attribute $1
-      # Patterns to match against lines in backtraces presented in failure
-      # messages in order to filter them out (default:
-      # DEFAULT_BACKTRACE_PATTERNS).  You can either replace this list using
-      # the setter or modify it using the getter.
-      #
-      # To override this behavior and display a full backtrace, use
-      # `--backtrace` on the command line, in a `.rspec` file, or in the
-      # `rspec_options` attribute of RSpec's rake task.
-      add_setting :backtrace_clean_patterns
 
       # Path to use if no path is provided to the `rspec` command (default:
       # `"spec"`). Allows you to just type `rspec` instead of `rspec spec` to
@@ -105,6 +95,9 @@ MESSAGE
       # Default: `$stderr`.
       add_setting :error_stream
 
+      # Default: `$stderr`.
+      add_setting :deprecation_stream
+
       # Clean up and exit after the first failure (default: `false`).
       add_setting :fail_fast
 
@@ -115,6 +108,12 @@ MESSAGE
       # load order for files, declaration order for groups and examples).
       define_reader :order
 
+      # Indicates files configured to be required
+      define_reader :requires
+
+      # Returns dirs that have been prepended to the load path by #lib=
+      define_reader :libs
+
       # Default: `$stdout`.
       # Also known as `output` and `out`
       add_setting :output_stream, :alias_with => [:output, :out]
@@ -182,14 +181,7 @@ MESSAGE
       # @private
       attr_accessor :filter_manager
 
-      DEFAULT_BACKTRACE_PATTERNS = [
-        /\/lib\d*\/ruby\//,
-        /org\/jruby\//,
-        /bin\//,
-        %r|/gems/|,
-        /spec\/spec_helper\.rb/,
-        /lib\/rspec\/(core|expectations|matchers|mocks)/
-      ]
+      attr_reader :backtrace_cleaner
 
       def initialize
         @expectation_frameworks = []
@@ -200,8 +192,11 @@ MESSAGE
         @color = false
         @pattern = '**/*_spec.rb'
         @failure_exit_code = 1
-        @backtrace_clean_patterns = DEFAULT_BACKTRACE_PATTERNS.dup
+
+        @backtrace_cleaner = BacktraceCleaner.new
+
         @default_path = 'spec'
+        @deprecation_stream = $stderr
         @filter_manager = FilterManager.new
         @preferred_options = {}
         @seed = srand % 0xFFFF
@@ -212,6 +207,8 @@ MESSAGE
         @fixed_color = :blue
         @detail_color = :cyan
         @profile_examples = false
+        @requires = []
+        @libs = []
       end
 
       # @private
@@ -224,6 +221,7 @@ MESSAGE
           set_order_and_seed(hash)
         end
         @preferred_options.merge!(hash)
+        self.warnings = value_for :warnings, nil
       end
 
       # @private
@@ -275,15 +273,6 @@ MESSAGE
         send("#{name}=", default) if default
       end
 
-      # Used by formatters to ask whether a backtrace line should be displayed
-      # or not, based on the line matching any `backtrace_clean_patterns`.
-      def cleaned_from_backtrace?(line)
-        # TODO (David 2011-12-25) why are we asking the configuration to do
-        # stuff? Either use the patterns directly or enapsulate the filtering
-        # in a BacktraceCleaner object.
-        backtrace_clean_patterns.any? { |regex| line =~ regex }
-      end
-
       # Returns the configured mock framework adapter module
       def mock_framework
         mock_with :rspec unless @mock_framework
@@ -295,6 +284,62 @@ MESSAGE
         mock_with framework
       end
 
+      # The patterns to discard from backtraces. Deprecated, use
+      # Configuration#backtrace_exclusion_patterns instead
+      #
+      # Defaults to RSpec::Core::BacktraceCleaner::DEFAULT_EXCLUSION_PATTERNS
+      #
+      # One can replace the list by using the setter or modify it through the
+      # getter
+      #
+      # To override this behaviour and display a full backtrace, use
+      # `--backtrace`on the command line, in a `.rspec` file, or in the
+      # `rspec_options` attribute of RSpec's rake task.
+      def backtrace_clean_patterns
+        RSpec.deprecate("RSpec::Core::Configuration#backtrace_clean_patterns",
+                        :replacement => "RSpec::Core::Configuration#backtrace_exclusion_patterns")
+        @backtrace_cleaner.exclusion_patterns
+      end
+
+      def backtrace_clean_patterns=(patterns)
+        RSpec.deprecate("RSpec::Core::Configuration#backtrace_clean_patterns",
+                        :replacement => "RSpec::Core::Configuration#backtrace_exclusion_patterns")
+        @backtrace_cleaner.exclusion_patterns = patterns
+      end
+
+      # The patterns to always include to backtraces.
+      #
+      # Defaults to [Regexp.new Dir.getwd] if the current working directory
+      # matches any of the exclusion patterns. Otherwise it defaults to empty.
+      #
+      # One can replace the list by using the setter or modify it through the
+      # getter
+      def backtrace_inclusion_patterns
+        @backtrace_cleaner.inclusion_patterns
+      end
+
+      def backtrace_inclusion_patterns=(patterns)
+        @backtrace_cleaner.inclusion_patterns = patterns
+      end
+
+      # The patterns to discard from backtraces.
+      #
+      # Defaults to RSpec::Core::BacktraceCleaner::DEFAULT_EXCLUSION_PATTERNS
+      #
+      # One can replace the list by using the setter or modify it through the
+      # getter
+      #
+      # To override this behaviour and display a full backtrace, use
+      # `--backtrace`on the command line, in a `.rspec` file, or in the
+      # `rspec_options` attribute of RSpec's rake task.
+      def backtrace_exclusion_patterns
+        @backtrace_cleaner.exclusion_patterns
+      end
+
+      def backtrace_exclusion_patterns=(patterns)
+        @backtrace_cleaner.exclusion_patterns = patterns
+      end
+
       # Sets the mock framework adapter module.
       #
       # `framework` can be a Symbol or a Module.
@@ -423,8 +468,12 @@ MESSAGE
         @expectation_frameworks.push(*modules)
       end
 
+      def full_backtrace?
+        @backtrace_cleaner.full_backtrace?
+      end
+
       def full_backtrace=(true_or_false)
-        @backtrace_clean_patterns = true_or_false ? [] : DEFAULT_BACKTRACE_PATTERNS
+        @backtrace_cleaner.full_backtrace = true_or_false
       end
 
       def color(output=output_stream)
@@ -453,11 +502,17 @@ MESSAGE
       define_predicate_for :color_enabled, :color
 
       def libs=(libs)
-        libs.map {|lib| $LOAD_PATH.unshift lib}
+        libs.map do |lib|
+          @libs.unshift lib
+          $LOAD_PATH.unshift lib
+        end
       end
 
       def requires=(paths)
+        RSpec.deprecate("RSpec::Core::Configuration#requires=(paths)",
+                        :replacement => "paths.each {|path| require path}")
         paths.map {|path| require path}
+        @requires += paths
       end
 
       def debug=(bool)
@@ -481,15 +536,27 @@ EOM
         end
       end
 
+      def debug?
+        !!defined?(Debugger)
+      end
+
       # Run examples defined on `line_numbers` in all files to run.
       def line_numbers=(line_numbers)
         filter_run :line_numbers => line_numbers.map{|l| l.to_i}
       end
 
+      def line_numbers
+        filter.fetch(:line_numbers,[])
+      end
+
       def full_description=(description)
         filter_run :full_description => Regexp.union(*Array(description).map {|d| Regexp.new(d) })
       end
 
+      def full_description
+        filter.fetch :full_description, nil
+      end
+
       # @overload add_formatter(formatter)
       #
       # Adds a formatter to the formatters collection. `formatter` can be a
@@ -499,15 +566,16 @@ EOM
       # ### Note
       #
       # For internal purposes, `add_formatter` also accepts the name of a class
-      # and path to a file that contains that class definition, but you should
-      # consider that a private api that may change at any time without notice.
-      def add_formatter(formatter_to_use, path=nil)
+      # and paths to use for output streams, but you should consider that a
+      # private api that may change at any time without notice.
+      def add_formatter(formatter_to_use, *paths)
         formatter_class =
           built_in_formatter(formatter_to_use) ||
           custom_formatter(formatter_to_use) ||
           (raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?.")
 
-        formatters << formatter_class.new(path ? file_at(path) : output)
+        paths << output if paths.empty?
+        formatters << formatter_class.new(*paths.map {|p| String === p ? file_at(p) : p})
       end
 
       alias_method :formatter=, :add_formatter
@@ -519,6 +587,7 @@ EOM
       def reporter
         @reporter ||= begin
                         add_formatter('progress') if formatters.empty?
+                        add_formatter(RSpec::Core::Formatters::DeprecationFormatter, deprecation_stream, output_stream)
                         Reporter.new(*formatters)
                       end
       end
@@ -791,6 +860,14 @@ EOM
         host.send(:include,mod) unless host < mod
       end
 
+      # @private
+      def setup_load_path_and_require(paths)
+        directories = ['lib', default_path].select { |p| File.directory? p }
+        RSpec::Core::RubyProject.add_to_load_path(*directories)
+        paths.each {|path| require path}
+        @requires += paths
+      end
+
       # @private
       if RUBY_VERSION.to_f >= 1.9
         def safe_extend(mod, host)
@@ -863,7 +940,9 @@ EOM
       # @private
       RANDOM_ORDERING = lambda do |list|
         Kernel.srand RSpec.configuration.seed
-        list.sort_by { Kernel.rand(list.size) }
+        ordering = list.sort_by { Kernel.rand(list.size) }
+        Kernel.srand # reset random generation
+        ordering
       end
 
       # Sets a strategy by which to order examples.
@@ -930,20 +1009,28 @@ EOM
         order_examples(&block)
       end
 
+      # Set Ruby warnings on or off
+      def warnings= value
+        $VERBOSE = !!value
+      end
+
+      def warnings
+        $VERBOSE
+      end
+
     private
 
       def get_files_to_run(paths)
-        patterns = pattern.split(",")
         paths.map do |path|
           path = path.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-          File.directory?(path) ? gather_directories(path, patterns) : extract_location(path)
+          File.directory?(path) ? gather_directories(path) : extract_location(path)
         end.flatten.sort
       end
 
-      def gather_directories(path, patterns)
-        patterns.map do |pattern|
-          pattern =~ /^#{path}/ ? Dir[pattern.strip].sort : Dir["#{path}/{#{pattern.strip}}"].sort
-        end
+      def gather_directories(path)
+        stripped = "{#{pattern.gsub(/\s*,\s*/, ',')}}"
+        files    = pattern =~ /^#{Regexp.escape path}/ ? Dir[stripped] : Dir["#{path}/#{stripped}"]
+        files.sort
       end
 
       def extract_location(path)