rspec-core 3.0.0.beta1 → 3.0.0.beta2

data/lib/rspec/core/project_initializer.rb

@@ -1,18 +1,9 @@
 module RSpec
   module Core
     class ProjectInitializer
-      def initialize(arg=nil)
-        @arg = arg
-      end
-
       def run
         create_spec_helper_file
         create_dot_rspec_file
-
-        delete_if_confirmed("lib/tasks/rspec.rake", <<-MESSAGE)
-  If the file in lib/tasks/rspec.rake is the one generated by rspec-rails-1x,
-  you can get rid of it, as it is no longer needed with rspec-2.
-        MESSAGE
       end
 
       def create_dot_rspec_file
@@ -21,10 +12,7 @@ module RSpec
         else
           report_creating('.rspec')
           File.open('.rspec','w') do |f|
-            f.write <<-CONTENT
---color
---format progress
-CONTENT
+            f.write File.read(File.expand_path("../project_initializer/dot_rspec", __FILE__))
           end
         end
       end
@@ -36,45 +24,11 @@ CONTENT
           report_creating('spec/spec_helper.rb')
           FileUtils.mkdir_p('spec')
           File.open('spec/spec_helper.rb','w') do |f|
-            f.write <<-CONTENT
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # Limit the spec run to only specs with the focus metadata. If no specs have
-  # the filtering metadata and `run_all_when_everything_filtered = true` then
-  # all specs will run.
-  #config.filter_run :focus
-
-  # Run all specs when none match the provided filter. This works well in
-  # conjunction with `config.filter_run :focus`, as it will run the entire
-  # suite when no specs have `:filter` metadata.
-  #config.run_all_when_everything_filtered = true
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  #config.order = 'random'
-end
-CONTENT
+            f.write File.read(File.expand_path("../project_initializer/spec_helper.rb", __FILE__))
           end
         end
       end
 
-      def delete_if_confirmed(path, message)
-        if File.exist?(path)
-          puts
-          puts message
-          puts
-          puts "  delete   #{path}? [y/n]"
-          FileUtils.rm_rf(path) if gets =~ /y/i
-        end
-      end
-
       def report_exists(file)
         puts "   exist   #{file}"
       end
@@ -82,7 +36,6 @@ CONTENT
       def report_creating(file)
         puts "  create   #{file}"
       end
-
     end
   end
 end

data/lib/rspec/core/project_initializer/dot_rspec

@@ -0,0 +1,3 @@
+--color
+--warnings
+--require spec_helper

data/lib/rspec/core/project_initializer/spec_helper.rb

@@ -0,0 +1,82 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# (such as loading up an entire rails app) will add to the boot time of your
+# test suite on EVERY test run, even for an individual file that may not need
+# all of that loaded.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # RSpec filters the backtrace by default so as not to be so noisy.
+    # This causes the full backtrace to be printed when running a single
+    # spec file (e.g. to troubleshoot a particular spec failure).
+    config.full_backtrace = true
+
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.formatter = 'doc' if config.formatters.none?
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+=end
+end

data/lib/rspec/core/rake_task.rb

@@ -54,25 +54,13 @@ module RSpec
       #   nil
       attr_accessor :rspec_opts
 
-      # @deprecated
-      # Use rspec_opts instead.
-      #
-      # Command line options to pass to rspec.
-      #
-      # default:
-      #   nil
-      def spec_opts=(opts)
-        RSpec.deprecate('RSpec::Core::RakeTask#spec_opts=', :replacement => 'rspec_opts=')
-        @rspec_opts = opts
-      end
-
       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
+          RakeFileUtils.__send__(:verbose, verbose) do
             task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
             run_task verbose
           end
@@ -97,7 +85,10 @@ module RSpec
         rescue
           puts failure_message if failure_message
         end
-        abort("#{command} failed") if fail_on_error unless success
+        if fail_on_error && !success
+          $stderr.puts "#{command} failed"
+          exit $?.exitstatus
+        end
       end
 
     private

data/lib/rspec/core/reporter.rb

@@ -1,15 +1,9 @@
 module RSpec::Core
   class Reporter
-    NOTIFICATIONS = %W[start message example_group_started example_group_finished example_started
-                       example_passed example_failed example_pending start_dump dump_pending
-                       dump_failures dump_summary seed close stop deprecation deprecation_summary].map(&:to_sym)
 
-    def initialize(configuration, *formatters)
+    def initialize(configuration)
       @configuration = configuration
-      @listeners = Hash.new { |h,k| h[k] = [] }
-      formatters.each do |formatter|
-        register_listener(formatter, *NOTIFICATIONS)
-      end
+      @listeners = Hash.new { |h,k| h[k] = Set.new }
       @example_count = @failure_count = @pending_count = 0
       @duration = @start = nil
     end
@@ -22,13 +16,13 @@ module RSpec::Core
     # events to all registered listeners
     def register_listener(listener, *notifications)
       notifications.each do |notification|
-        @listeners[notification.to_sym] << listener if listener.respond_to?(notification)
+        @listeners[notification.to_sym] << listener
       end
       true
     end
 
     def registered_listeners(notification)
-      @listeners[notification]
+      @listeners[notification].to_a
     end
 
     # @api
@@ -58,68 +52,66 @@ module RSpec::Core
 
     def start(expected_example_count)
       @start = RSpec::Core::Time.now
-      notify :start, expected_example_count
+      notify :start, Notifications::CountNotification.new(expected_example_count)
     end
 
     def message(message)
-      notify :message, message
+      notify :message, Notifications::MessageNotification.new(message)
     end
 
     def example_group_started(group)
-      notify :example_group_started, group unless group.descendant_filtered_examples.empty?
+      notify :example_group_started, Notifications::GroupNotification.new(group) unless group.descendant_filtered_examples.empty?
     end
 
     def example_group_finished(group)
-      notify :example_group_finished, group unless group.descendant_filtered_examples.empty?
+      notify :example_group_finished, Notifications::GroupNotification.new(group) unless group.descendant_filtered_examples.empty?
     end
 
     def example_started(example)
       @example_count += 1
-      notify :example_started, example
+      notify :example_started, Notifications::ExampleNotification.new(example)
     end
 
     def example_passed(example)
-      notify :example_passed, example
+      notify :example_passed, Notifications::ExampleNotification.new(example)
     end
 
     def example_failed(example)
       @failure_count += 1
-      notify :example_failed, example
+      notify :example_failed, Notifications::ExampleNotification.new(example)
     end
 
     def example_pending(example)
       @pending_count += 1
-      notify :example_pending, example
+      notify :example_pending, Notifications::ExampleNotification.new(example)
     end
 
-    def deprecation(message)
-      notify :deprecation, message
+    def deprecation(hash)
+      notify :deprecation, Notifications::DeprecationNotification.from_hash(hash)
     end
 
     def finish
       begin
         stop
-        notify :start_dump
-        notify :dump_pending
-        notify :dump_failures
-        notify :dump_summary, @duration, @example_count, @failure_count, @pending_count
-        notify :deprecation_summary
-        notify :seed, @configuration.seed if seed_used?
+        notify :start_dump,    Notifications::NullNotification
+        notify :dump_pending,  Notifications::NullNotification
+        notify :dump_failures, Notifications::NullNotification
+        notify :dump_summary, Notifications::SummaryNotification.new(@duration, @example_count, @failure_count, @pending_count)
+        notify :deprecation_summary, Notifications::NullNotification
+        notify :seed, Notifications::SeedNotification.new(@configuration.seed, seed_used?)
       ensure
-        notify :close
+        notify :close, Notifications::NullNotification
       end
     end
 
-    alias_method :abort, :finish
-
     def stop
       @duration = (RSpec::Core::Time.now - @start).to_f if @start
-      notify :stop
+      notify :stop, Notifications::NullNotification
     end
 
-    def notify(event, *args, &block)
+    def notify(event, notification)
       registered_listeners(event).each do |formatter|
-        formatter.send(event, *args, &block)
+        formatter.__send__(event, notification)
       end
     end
 

data/lib/rspec/core/ruby_project.rb

@@ -24,7 +24,7 @@ module RSpec
       end
 
       def find_first_parent_containing(dir)
-        ascend_until {|path| File.exists?(File.join(path, dir))}
+        ascend_until {|path| File.exist?(File.join(path, dir))}
       end
 
       def ascend_until

data/lib/rspec/core/runner.rb

@@ -4,7 +4,13 @@ module RSpec
 
       # Register an at_exit hook that runs the suite.
       def self.autorun
-        return if autorun_disabled? || installed_at_exit? || running_in_drb?
+        if autorun_disabled?
+          RSpec.deprecate("Requiring `rspec/autorun` when running RSpec via the `rspec` command")
+          return
+        elsif installed_at_exit? || running_in_drb?
+          return
+        end
+
         at_exit do
           # Don't bother running any specs and just let the program terminate
           # if we got here due to an unrescued exception (anything other than
@@ -14,13 +20,18 @@ module RSpec
           # We got here because either the end of the program was reached or
           # somebody called Kernel#exit.  Run the specs and then override any
           # existing exit status with RSpec's exit status if any specs failed.
-          status = run(ARGV, $stderr, $stdout).to_i
-          exit status if status != 0
+          invoke
         end
         @installed_at_exit = true
       end
       AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
 
+      def self.invoke
+        disable_autorun!
+        status = run(ARGV, $stderr, $stdout).to_i
+        exit(status) if status != 0
+      end
+
       def self.disable_autorun!
         @autorun_disabled = true
       end
@@ -76,7 +87,6 @@ module RSpec
       def self.run(args, err=$stderr, out=$stdout)
         trap_interrupt
         options = ConfigurationOptions.new(args)
-        options.parse_options
 
         if options.options[:drb]
           require 'rspec/core/drb_command_line'

data/lib/rspec/core/shared_example_group.rb

@@ -41,17 +41,45 @@ module RSpec
       end
 
       module TopLevelDSL
-        def shared_examples(*args, &block)
-          SharedExampleGroup.registry.add_group('main', *args, &block)
+        def self.definitions
+          proc do
+            def shared_examples(*args, &block)
+              SharedExampleGroup.registry.add_group('main', *args, &block)
+            end
+            alias :shared_context      :shared_examples
+            alias :share_examples_for  :shared_examples
+            alias :shared_examples_for :shared_examples
+            def shared_example_groups
+              SharedExampleGroup.registry.shared_example_groups_for('main')
+            end
+          end
         end
 
-        alias_method :shared_context,      :shared_examples
-        alias_method :share_examples_for,  :shared_examples
-        alias_method :shared_examples_for, :shared_examples
+        # @private
+        def self.exposed_globally?
+          @exposed_globally ||= false
+        end
 
-        def shared_example_groups
-          SharedExampleGroup.registry.shared_example_groups_for('main')
+        def self.expose_globally!
+          return if exposed_globally?
+          Core::DSL.change_global_dsl(&definitions)
+          @exposed_globally = true
         end
+
+        def self.remove_globally!
+          return unless exposed_globally?
+
+          Core::DSL.change_global_dsl do
+            undef shared_examples
+            undef shared_context
+            undef share_examples_for
+            undef shared_examples_for
+            undef shared_example_groups
+          end
+
+          @exposed_globally = false
+        end
+
       end
 
       def self.registry
@@ -77,10 +105,10 @@ module RSpec
 
           unless args.empty?
             mod = Module.new
-            (class << mod; self; end).send :define_method, :extended  do |host|
+            (class << mod; self; end).__send__(:define_method, :included) do |host|
               host.class_eval(&block)
             end
-            RSpec.configuration.extend mod, *args
+            RSpec.configuration.include mod, *args
           end
         end
 
@@ -89,7 +117,7 @@ module RSpec
         end
 
         def shared_example_groups
-          @shared_example_groups ||= Hash.new { |hash,key| hash[key] = Hash.new }
+          @shared_example_groups ||= Hash.new { |hash, key| hash[key] = Hash.new }
         end
 
         def clear
@@ -140,7 +168,6 @@ module RSpec
       end
     end
   end
-end
 
-extend RSpec::Core::SharedExampleGroup::TopLevelDSL
-Module.send(:include, RSpec::Core::SharedExampleGroup::TopLevelDSL)
+  instance_eval(&Core::SharedExampleGroup::TopLevelDSL.definitions)
+end