rspec-core 3.0.4 → 3.1.0

data/lib/rspec/core/ordering.rb

@@ -123,29 +123,29 @@ module RSpec
 
         def order=(type)
           order, seed = type.to_s.split(':')
-          @seed = seed = seed.to_i if seed
+          @seed = seed.to_i if seed
 
           ordering_name = if order.include?('rand')
-            :random
-          elsif order == 'defined'
-            :defined
-          end
+                            :random
+                          elsif order == 'defined'
+                            :defined
+                          end
 
           register_ordering(:global, ordering_registry.fetch(ordering_name)) if ordering_name
         end
 
         def force(hash)
-          if hash.has_key?(:seed)
+          if hash.key?(:seed)
             self.seed = hash[:seed]
             @seed_forced  = true
             @order_forced = true
-          elsif hash.has_key?(:order)
+          elsif hash.key?(:order)
             self.order = hash[:order]
             @order_forced = true
           end
         end
 
-        def register_ordering(name, strategy = Custom.new(Proc.new { |l| yield l }))
+        def register_ordering(name, strategy=Custom.new(Proc.new { |l| yield l }))
           return if @order_forced && name == :global
           ordering_registry.register(name, strategy)
         end
@@ -153,4 +153,3 @@ module RSpec
     end
   end
 end
-

data/lib/rspec/core/pending.rb

@@ -89,7 +89,7 @@ module RSpec
         elsif current_example
           Pending.mark_pending! current_example, message
         else
-          raise "`pending` may not be used outside of examples, such as in " +
+          raise "`pending` may not be used outside of examples, such as in " \
                 "before(:context). Maybe you want `skip`?"
         end
       end
@@ -116,9 +116,7 @@ module RSpec
       def skip(message=nil)
         current_example = RSpec.current_example
 
-        if current_example
-          Pending.mark_skipped! current_example, message
-        end
+        Pending.mark_skipped!(current_example, message) if current_example
 
         raise SkipDeclaredInExample.new(message)
       end
@@ -142,10 +140,10 @@ module RSpec
       # @param message_or_bool [Boolean, String] the message to use, or true
       def self.mark_pending!(example, message_or_bool)
         message = if !message_or_bool || !(String === message_or_bool)
-          NO_REASON_GIVEN
-        else
-          message_or_bool
-        end
+                    NO_REASON_GIVEN
+                  else
+                    message_or_bool
+                  end
 
         example.metadata[:pending] = true
         example.execution_result.pending_message = message

data/lib/rspec/core/project_initializer.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support "directory_maker"
+
 module RSpec
   module Core
     # @private
@@ -8,7 +10,7 @@ module RSpec
       DOT_RSPEC_FILE = '.rspec'
       SPEC_HELPER_FILE =  'spec/spec_helper.rb'
 
-      def initialize(opts = {})
+      def initialize(opts={})
         @destination = opts.fetch(:destination, Dir.getwd)
         @stream = opts.fetch(:report_stream, $stdout)
         @template_path = opts.fetch(:template_path) do
@@ -28,7 +30,7 @@ module RSpec
         return report_exists(file) if File.exist?(destination_file)
 
         report_creating(file)
-        FileUtils.mkdir_p(File.dirname(destination_file))
+        RSpec::Support::DirectoryMaker.mkdir_p(File.dirname(destination_file))
         File.open(destination_file, 'w') do |f|
           f.write File.read(File.join(template_path, file))
         end

data/lib/rspec/core/project_initializer/.rspec

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

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

@@ -6,15 +6,38 @@
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
 # 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. Instead, make a
-# separate helper file that requires this one and then use it only in the specs
-# that actually need it.
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
 #
 # 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|
+  # 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|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  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|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin
@@ -25,6 +48,17 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = 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.
@@ -51,28 +85,5 @@ RSpec.configure do |config|
   # 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

@@ -1,7 +1,3 @@
-require 'rspec/support'
-require 'rspec/core/version'
-RSpec::Support.require_rspec_support "warnings"
-
 require 'rake'
 require 'rake/tasklib'
 require 'shellwords'
@@ -18,7 +14,7 @@ module RSpec
       DEFAULT_RSPEC_PATH = File.expand_path('../../../../exe/rspec', __FILE__)
 
       # Default pattern for spec files.
-      DEFAULT_PATTERN = './spec{,/*/**}/*_spec.rb'
+      DEFAULT_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
 
       # Name of task.
       #
@@ -26,12 +22,18 @@ module RSpec
       #   :spec
       attr_accessor :name
 
-      # Glob pattern to match files.
+      # Files matching this pattern will be loaded.
       #
       # default:
-      #   'spec/**/*_spec.rb'
+      #   'spec/**{,/*/**}/*_spec.rb'
       attr_accessor :pattern
 
+      # Files matching this pattern will be excluded.
+      #
+      # default:
+      #   'spec/**/*_spec.rb'
+      attr_accessor :exclude_pattern
+
       # Whether or not to fail Rake when an error occurs (typically when examples fail).
       #
       # default:
@@ -88,10 +90,11 @@ module RSpec
         rescue
           puts failure_message if failure_message
         end
-        if fail_on_error && !success
-          $stderr.puts "#{command} failed"
-          exit $?.exitstatus
-        end
+
+        return unless fail_on_error && !success
+
+        $stderr.puts "#{command} failed"
+        exit $?.exitstatus
       end
 
     private
@@ -108,33 +111,48 @@ module RSpec
         end
       end
 
-      def files_to_run
+      def file_inclusion_specification
         if ENV['SPEC']
-          FileList[ ENV['SPEC'] ].sort
+          FileList[ ENV['SPEC']].sort
+        elsif File.exist?(pattern)
+          # The provided pattern is a directory or a file, not a file glob. Historically, this
+          # worked because `FileList[some_dir]` would return `[some_dir]` which would
+          # get passed to `rspec` and cause it to load files under that dir that match
+          # the default pattern. To continue working, we need to pass it on to `rspec`
+          # directly rather than treating it as a `--pattern` option.
+          #
+          # TODO: consider deprecating support for this and removing it in RSpec 4.
+          pattern.shellescape
         else
-          FileList[ pattern ].sort.map(&:shellescape)
+          "--pattern #{pattern.shellescape}"
         end
       end
 
+      def file_exclusion_specification
+        " --exclude-pattern #{exclude_pattern.shellescape}" if exclude_pattern
+      end
+
       def spec_command
         cmd_parts = []
         cmd_parts << RUBY
         cmd_parts << ruby_opts
         cmd_parts << rspec_load_path
-        cmd_parts << "-S" << rspec_path
-        cmd_parts << files_to_run
+        cmd_parts << rspec_path
+        cmd_parts << file_inclusion_specification
+        cmd_parts << file_exclusion_specification
         cmd_parts << rspec_opts
         cmd_parts.flatten.reject(&blank).join(" ")
       end
 
       def blank
-        lambda {|s| s.nil? || s == ""}
+        lambda { |s| s.nil? || s == "" }
       end
 
       def rspec_load_path
         @rspec_load_path ||= begin
-          core_and_support = $LOAD_PATH.grep \
-            %r{#{File::SEPARATOR}rspec-(core|support)[^#{File::SEPARATOR}]*#{File::SEPARATOR}lib}
+          core_and_support = $LOAD_PATH.grep(
+            /#{File::SEPARATOR}rspec-(core|support)[^#{File::SEPARATOR}]*#{File::SEPARATOR}lib/
+          )
 
           "-I#{core_and_support.map(&:shellescape).join(File::PATH_SEPARATOR)}"
         end

data/lib/rspec/core/reporter.rb

@@ -2,10 +2,9 @@ module RSpec::Core
   # A reporter will send notifications to listeners, usually formatters for the
   # spec suite run.
   class Reporter
-
     def initialize(configuration)
       @configuration = configuration
-      @listeners = Hash.new { |h,k| h[k] = Set.new }
+      @listeners = Hash.new { |h, k| h[k] = Set.new }
       @examples = []
       @failed_examples = []
       @pending_examples = []
@@ -58,7 +57,7 @@ module RSpec::Core
     end
 
     # @private
-    def start(expected_example_count, time = RSpec::Core::Time.now)
+    def start(expected_example_count, time=RSpec::Core::Time.now)
       @start = time
       @load_time = (@start - @configuration.start_time).to_f
       notify :start, Notifications::StartNotification.new(expected_example_count, @load_time)
@@ -109,20 +108,18 @@ module RSpec::Core
 
     # @private
     def finish
-      begin
-        stop
-        notify :start_dump,    Notifications::NullNotification
-        notify :dump_pending,  Notifications::ExamplesNotification.new(self)
-        notify :dump_failures, Notifications::ExamplesNotification.new(self)
-        notify :deprecation_summary, Notifications::NullNotification
-        notify :dump_summary, Notifications::SummaryNotification.new(@duration, @examples, @failed_examples, @pending_examples, @load_time)
-        unless mute_profile_output?
-          notify :dump_profile, Notifications::ProfileNotification.new(@duration, @examples, @configuration.profile_examples)
-        end
-        notify :seed, Notifications::SeedNotification.new(@configuration.seed, seed_used?)
-      ensure
-        notify :close, Notifications::NullNotification
+      stop
+      notify :start_dump,    Notifications::NullNotification
+      notify :dump_pending,  Notifications::ExamplesNotification.new(self)
+      notify :dump_failures, Notifications::ExamplesNotification.new(self)
+      notify :deprecation_summary, Notifications::NullNotification
+      notify :dump_summary, Notifications::SummaryNotification.new(@duration, @examples, @failed_examples, @pending_examples, @load_time)
+      unless mute_profile_output?
+        notify :dump_profile, Notifications::ProfileNotification.new(@duration, @examples, @configuration.profile_examples)
       end
+      notify :seed, Notifications::SeedNotification.new(@configuration.seed, seed_used?)
+    ensure
+      notify :close, Notifications::NullNotification
     end
 
     # @private

data/lib/rspec/core/ruby_project.rb

@@ -9,7 +9,7 @@ module RSpec
     # @private
     module RubyProject
       def add_to_load_path(*dirs)
-        dirs.map {|dir| add_dir_to_load_path(File.join(root, dir))}
+        dirs.map { |dir| add_dir_to_load_path(File.join(root, dir)) }
       end
 
       def add_dir_to_load_path(dir)
@@ -25,7 +25,7 @@ module RSpec
       end
 
       def find_first_parent_containing(dir)
-        ascend_until {|path| File.exist?(File.join(path, dir))}
+        ascend_until { |path| File.exist?(File.join(path, dir)) }
       end
 
       def ascend_until

data/lib/rspec/core/runner.rb

@@ -2,7 +2,6 @@ module RSpec
   module Core
     # Provides the main entry point to run a suite of RSpec examples.
     class Runner
-
       # Register an `at_exit` hook that runs the suite when the process exits.
       #
       # @note This is not generally needed. The `rspec` command takes care
@@ -22,7 +21,7 @@ module RSpec
           # Don't bother running any specs and just let the program terminate
           # if we got here due to an unrescued exception (anything other than
           # SystemExit, which is raised when somebody calls Kernel#exit).
-          next unless $!.nil? || $!.kind_of?(SystemExit)
+          next unless $!.nil? || $!.is_a?(SystemExit)
 
           # We got here because either the end of the program was reached or
           # somebody called Kernel#exit.  Run the specs and then override any
@@ -132,21 +131,19 @@ module RSpec
       end
 
       # @private
+      # rubocop:disable Lint/EnsureReturn
       def self.running_in_drb?
-        begin
-          if defined?(DRb) && DRb.current_server
-            require 'socket'
-            require 'uri'
-
-            local_ipv4 = IPSocket.getaddress(Socket.gethostname)
-
-            local_drb = ["127.0.0.1", "localhost", local_ipv4].any? { |addr| addr == URI(DRb.current_server.uri).host }
-          end
-        rescue DRb::DRbServerNotFound
-        ensure
-          return local_drb || false
+        if defined?(DRb) && DRb.current_server
+          require 'socket'
+          require 'uri'
+          local_ipv4 = IPSocket.getaddress(Socket.gethostname)
+          local_drb = ["127.0.0.1", "localhost", local_ipv4].any? { |addr| addr == URI(DRb.current_server.uri).host }
         end
+      rescue DRb::DRbServerNotFound
+      ensure
+        return local_drb || false
       end
+      # rubocop:enable Lint/EnsureReturn
 
       # @private
       def self.trap_interrupt

data/lib/rspec/core/shared_example_group.rb

@@ -50,8 +50,8 @@ module RSpec
       def shared_examples(name, *args, &block)
         top_level = self == ExampleGroup
         if top_level && RSpec.thread_local_metadata[:in_example_group]
-          raise "Creating isolated shared examples from within a context is " +
-                "not allowed. Remove `RSpec.` prefix or move this to a " +
+          raise "Creating isolated shared examples from within a context is " \
+                "not allowed. Remove `RSpec.` prefix or move this to a " \
                 "top-level scope."
         end
 
@@ -103,7 +103,6 @@ module RSpec
 
           @exposed_globally = false
         end
-
       end
 
       # @private
@@ -118,13 +117,13 @@ module RSpec
             metadata_args.unshift name
           end
 
-          unless metadata_args.empty?
-            mod = Module.new
-            (class << mod; self; end).__send__(:define_method, :included) do |host|
-              host.class_exec(&block)
-            end
-            RSpec.configuration.include mod, *metadata_args
+          return if metadata_args.empty?
+
+          mod = Module.new
+          (class << mod; self; end).__send__(:define_method, :included) do |host|
+            host.class_exec(&block)
           end
+          RSpec.configuration.include mod, *metadata_args
         end
 
         def find(lookup_contexts, name)
@@ -144,13 +143,15 @@ module RSpec
 
         def valid_name?(candidate)
           case candidate
-            when String, Symbol, Module then true
-            else false
+          when String, Symbol, Module then true
+          else false
           end
         end
 
         def warn_if_key_taken(context, key, new_block)
-          return unless existing_block = shared_example_groups[context][key]
+          existing_block = shared_example_groups[context][key]
+
+          return unless existing_block
 
           RSpec.warn_with <<-WARNING.gsub(/^ +\|/, ''), :call_site => nil
             |WARNING: Shared example group '#{key}' has been previously defined at:
@@ -166,7 +167,7 @@ module RSpec
         end
 
         if Proc.method_defined?(:source_location)
-          def ensure_block_has_source_location(block); end
+          def ensure_block_has_source_location(_block); end
         else # for 1.8.7
           def ensure_block_has_source_location(block)
             source_location = yield.split(':')