rspec-core 3.5.2 → 3.6.0

data/lib/rspec/core/option_parser.rb

@@ -39,6 +39,8 @@ module RSpec::Core
     # rubocop:disable PerceivedComplexity
     def parser(options)
       OptionParser.new do |parser|
+        parser.summary_width = 34
+
         parser.banner = "Usage: rspec [options] [files or directories]\n\n"
 
         parser.on('-I PATH', 'Specify PATH to add to $LOAD_PATH (may be used more than once).') do |dirs|
@@ -93,11 +95,6 @@ module RSpec::Core
           options[:failure_exit_code] = code
         end
 
-        parser.on('--dry-run', 'Print the formatter output of your suite without',
-                  '  running any examples or hooks') do |_o|
-          options[:dry_run] = true
-        end
-
         parser.on('-X', '--[no-]drb', 'Run examples via DRb.') do |use_drb|
           options[:drb] = use_drb
           options[:runner] = RSpec::Core::Invocations::DRbWithFallback.new if use_drb
@@ -107,10 +104,6 @@ module RSpec::Core
           options[:drb_port] = o.to_i
         end
 
-        parser.on('--init', 'Initialize your project with RSpec.') do |_cmd|
-          options[:runner] = RSpec::Core::Invocations::InitializeProject.new
-        end
-
         parser.separator("\n  **** Output ****\n\n")
 
         parser.on('-f', '--format FORMATTER', 'Choose a formatter.',
@@ -140,8 +133,24 @@ module RSpec::Core
           options[:full_backtrace] = true
         end
 
-        parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output.') do |o|
-          options[:color] = o
+        parser.on('-c', '--color', '--colour', '') do |_o|
+          # flag will be excluded from `--help` output because it is deprecated
+          options[:color] = true
+          options[:color_mode] = :automatic
+        end
+
+        parser.on('--force-color', '--force-colour', 'Force the output to be in color, even if the output is not a TTY') do |_o|
+          if options[:color_mode] == :off
+            abort "Please only use one of `--force-color` and `--no-color`"
+          end
+          options[:color_mode] = :on
+        end
+
+        parser.on('--no-color', '--no-colour', 'Force the output to not be in color, even if the output is a TTY') do |_o|
+          if options[:color_mode] == :on
+            abort "Please only use one of --force-color and --no-color"
+          end
+          options[:color_mode] = :off
         end
 
         parser.on('-p', '--[no-]profile [COUNT]',
@@ -163,6 +172,11 @@ module RSpec::Core
                                        end
         end
 
+        parser.on('--dry-run', 'Print the formatter output of your suite without',
+                  '  running any examples or hooks') do |_o|
+          options[:dry_run] = true
+        end
+
         parser.on('-w', '--warnings', 'Enable ruby warnings') do
           $VERBOSE = true
         end
@@ -244,6 +258,10 @@ FILTERING
 
         parser.separator("\n  **** Utility ****\n\n")
 
+        parser.on('--init', 'Initialize your project with RSpec.') do |_cmd|
+          options[:runner] = RSpec::Core::Invocations::InitializeProject.new
+        end
+
         parser.on('-v', '--version', 'Display the version.') do
           options[:runner] = RSpec::Core::Invocations::PrintVersion.new
         end
@@ -256,8 +274,10 @@ FILTERING
         #     trigger --default-path.
         invalid_options = %w[-d --I]
 
+        hidden_options = invalid_options + %w[-c]
+
         parser.on_tail('-h', '--help', "You're looking at it.") do
-          options[:runner] = RSpec::Core::Invocations::PrintHelp.new(parser, invalid_options)
+          options[:runner] = RSpec::Core::Invocations::PrintHelp.new(parser, hidden_options)
         end
 
         # This prevents usage of the invalid_options.

data/lib/rspec/core/output_wrapper.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Core
+    # @private
+    class OutputWrapper
+      # @private
+      attr_accessor :output
+
+      # @private
+      def initialize(output)
+        @output = output
+      end
+
+      def respond_to?(name, priv=false)
+        output.respond_to?(name, priv)
+      end
+
+      def method_missing(name, *args, &block)
+        output.send(name, *args, &block)
+      end
+
+      # Redirect calls for IO interface methods
+      IO.instance_methods(false).each do |method|
+        define_method(method) do |*args, &block|
+          output.send(method, *args, &block)
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -12,9 +12,6 @@
 # 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
@@ -80,7 +77,7 @@ RSpec.configure do |config|
     # Use the documentation formatter for detailed output,
     # unless a formatter has already been configured
     # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
+    config.default_formatter = "doc"
   end
 
   # Print the 10 slowest examples and example groups at the

data/lib/rspec/core/reporter.rb

@@ -18,19 +18,14 @@ module RSpec::Core
       @failed_examples = []
       @pending_examples = []
       @duration = @start = @load_time = nil
+      @non_example_exception_count = 0
+      @setup_default = lambda {}
+      @setup = false
     end
 
     # @private
     attr_reader :examples, :failed_examples, :pending_examples
 
-    # @private
-    def reset
-      @examples = []
-      @failed_examples = []
-      @pending_examples = []
-      @profiler = Profiler.new if defined?(@profiler)
-    end
-
     # @private
     def setup_profiler
       @profiler = Profiler.new
@@ -51,6 +46,13 @@ module RSpec::Core
       true
     end
 
+    # @private
+    def prepare_default(loader, output_stream, deprecation_stream)
+      @setup_default = lambda do
+        loader.setup_default output_stream, deprecation_stream
+      end
+    end
+
     # @private
     def registered_listeners(notification)
       @listeners[notification].to_a
@@ -151,6 +153,19 @@ module RSpec::Core
       notify :deprecation, Notifications::DeprecationNotification.from_hash(hash)
     end
 
+    # @private
+    # Provides a way to notify of an exception that is not tied to any
+    # particular example (such as an exception encountered in a :suite hook).
+    # Exceptions will be formatted the same way they normally are.
+    def notify_non_example_exception(exception, context_description)
+      @configuration.world.non_example_failure = true
+      @non_example_exception_count += 1
+
+      example = Example.new(AnonymousExampleGroup, context_description, {})
+      presenter = Formatters::ExceptionPresenter.new(exception, example, :indentation => 0)
+      message presenter.fully_formatted(nil)
+    end
+
     # @private
     def finish
       close_after do
@@ -165,7 +180,8 @@ module RSpec::Core
                                                                        @profiler.example_groups)
         end
         notify :dump_summary, Notifications::SummaryNotification.new(@duration, @examples, @failed_examples,
-                                                                     @pending_examples, @load_time)
+                                                                     @pending_examples, @load_time,
+                                                                     @non_example_exception_count)
         notify :seed, Notifications::SeedNotification.new(@configuration.seed, seed_used?)
       end
     end
@@ -185,6 +201,7 @@ module RSpec::Core
 
     # @private
     def notify(event, notification)
+      ensure_listeners_ready
       registered_listeners(event).each do |formatter|
         formatter.__send__(event, notification)
       end
@@ -210,6 +227,13 @@ module RSpec::Core
 
   private
 
+    def ensure_listeners_ready
+      return if @setup
+
+      @setup_default.call
+      @setup = true
+    end
+
     def close
       notify :close, Notifications::NullNotification
     end

data/lib/rspec/core/runner.rb

@@ -108,11 +108,18 @@ module RSpec
       #   or the configured failure exit code (1 by default) if specs
       #   failed.
       def run_specs(example_groups)
-        @configuration.reporter.report(@world.example_count(example_groups)) do |reporter|
+        examples_count = @world.example_count(example_groups)
+        success = @configuration.reporter.report(examples_count) do |reporter|
           @configuration.with_suite_hooks do
-            example_groups.map { |g| g.run(reporter) }.all? ? 0 : @configuration.failure_exit_code
+            if examples_count == 0 && @configuration.fail_if_no_examples
+              return @configuration.failure_exit_code
+            end
+
+            example_groups.map { |g| g.run(reporter) }.all?
           end
-        end
+        end && !@world.non_example_failure
+
+        success ? 0 : @configuration.failure_exit_code
       end
 
     private

data/lib/rspec/core/set.rb

@@ -44,6 +44,11 @@ module RSpec
         end
         self
       end
+
+      def clear
+        @values.clear
+        self
+      end
     end
   end
 end

data/lib/rspec/core/shared_example_group.rb

@@ -64,11 +64,6 @@ module RSpec
       #     group; any example group or example with matching metadata will
       #     automatically include this shared example group.
       #   @param block The block to be eval'd
-      # @overload shared_examples(metadata, &block)
-      #   @param metadata [Array<Symbol>, Hash] metadata to attach to this
-      #     group; any example group or example with matching metadata will
-      #     automatically include this shared example group.
-      #   @param block The block to be eval'd
       #
       # Stores the block for later use. The block will be evaluated
       # in the context of an example group via `include_examples`,
@@ -153,6 +148,12 @@ module RSpec
       # @private
       class Registry
         def add(context, name, *metadata_args, &block)
+          unless block
+            RSpec.warning "Shared example group #{name} was defined without a "\
+                          "block and will have no effect. Please define a "\
+                          "block or remove the definition."
+          end
+
           if RSpec.configuration.shared_context_metadata_behavior == :trigger_inclusion
             return legacy_add(context, name, *metadata_args, &block)
           end
@@ -213,20 +214,43 @@ module RSpec
 
         def warn_if_key_taken(context, key, new_block)
           existing_module = shared_example_groups[context][key]
-
           return unless existing_module
 
-          RSpec.warn_with <<-WARNING.gsub(/^ +\|/, ''), :call_site => nil
-            |WARNING: Shared example group '#{key}' has been previously defined at:
-            |  #{formatted_location existing_module.definition}
-            |...and you are now defining it at:
-            |  #{formatted_location new_block}
-            |The new definition will overwrite the original one.
-          WARNING
+          old_definition_location = formatted_location existing_module.definition
+          new_definition_location = formatted_location new_block
+          loaded_spec_files = RSpec.configuration.loaded_spec_files
+
+          if loaded_spec_files.include?(new_definition_location) && old_definition_location == new_definition_location
+            RSpec.warn_with <<-WARNING.gsub(/^ +\|/, ''), :call_site => nil
+              |WARNING: Your shared example group, '#{key}', defined at:
+              | #{old_definition_location}
+              |was automatically loaded by RSpec because the file name
+              |matches the configured autoloading pattern (#{RSpec.configuration.pattern}),
+              |and is also being required from somewhere else. To fix this
+              |warning, either rename the file to not match the pattern, or
+              |do not explicitly require the file.
+            WARNING
+          else
+            RSpec.warn_with <<-WARNING.gsub(/^ +\|/, ''), :call_site => nil
+              |WARNING: Shared example group '#{key}' has been previously defined at:
+              |  #{old_definition_location}
+              |...and you are now defining it at:
+              |  #{new_definition_location}
+              |The new definition will overwrite the original one.
+            WARNING
+          end
         end
 
-        def formatted_location(block)
-          block.source_location.join ":"
+        if RUBY_VERSION.to_f >= 1.9
+          def formatted_location(block)
+            block.source_location.join(":")
+          end
+        else # 1.8.7
+          # :nocov:
+          def formatted_location(block)
+            block.source_location.join(":").gsub(/:in.*$/, '')
+          end
+          # :nocov:
         end
 
         if Proc.method_defined?(:source_location)

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.5.2'
+      STRING = '3.6.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -10,6 +10,12 @@ module RSpec
       # Used internally to determine what to do when a SIGINT is received.
       attr_accessor :wants_to_quit
 
+      # Used internally to signal that a failure outside of an example
+      # has occurred, and that therefore the exit status should indicate
+      # the run failed.
+      # @private
+      attr_accessor :non_example_failure
+
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
         configuration.world = self
@@ -32,8 +38,10 @@ module RSpec
       #
       # Reset world to 'scratch' before running suite.
       def reset
+        RSpec::ExampleGroups.remove_all_constants
         example_groups.clear
-        @shared_example_group_registry = nil
+        @sources_by_path.clear if defined?(@sources_by_path)
+        @syntax_highlighter = nil
       end
 
       # @private
@@ -122,11 +130,18 @@ module RSpec
       end
 
       # @private
-      def source_cache
-        @source_cache ||= begin
-          RSpec::Support.require_rspec_core "source"
-          Source::Cache.new(@configuration)
+      def source_from_file(path)
+        unless defined?(@sources_by_path)
+          RSpec::Support.require_rspec_support 'source'
+          @sources_by_path = {}
         end
+
+        @sources_by_path[path] ||= Support::Source.from_file(path)
+      end
+
+      # @private
+      def syntax_highlighter
+        @syntax_highlighter ||= Formatters::SyntaxHighlighter.new(@configuration)
       end
 
       # @api private
@@ -224,6 +239,9 @@ module RSpec
       # @private
       # Provides a null implementation for initial use by configuration.
       module Null
+        def self.non_example_failure; end
+        def self.non_example_failure=(_); end
+
         def self.registered_example_group_files
           []
         end

data/lib/rspec/core.rb

@@ -56,6 +56,7 @@ module RSpec
   # they use the runner multiple times within the same process. Users must deal
   # themselves with re-configuration of RSpec before run.
   def self.reset
+    RSpec::ExampleGroups.remove_all_constants
     @world = nil
     @configuration = nil
   end
@@ -68,7 +69,7 @@ module RSpec
   # same process.
   def self.clear_examples
     world.reset
-    configuration.reporter.reset
+    configuration.reset_reporter
     configuration.start_time = ::RSpec::Core::Time.now
     configuration.reset_filters
   end

data.tar.gz.sig

@@ -1,4 +1,3 @@
-��pW�0���0�z!��k�E.��-JX���,�}��2��)U���W����7b��`���g�"MN!.C����(�r�Q���1�l���n���x�L�/#�X�g���nr�'N���}Z�����o	����
-�^9yF�s�QP�zW`l?���5�i{+ZɕQTuY�|TDSsn�fY��j�L���7��w�1y���4V:�^���!
-�~���}P�t�=kJ��Q�[��Fm���B�9*8�3�$ ��J��BN���s�0�A���jP�v�5��d*
-K��H��J�s�C2�\&��r �C>����i�THO)FD�VƼ�:DLS�m𣽪���Ӎ$�C�Wq�?u.ʬ��7p����ε����V����{�H���3M81�.�L*H.�J�s�]�Xtu8�"T6^����h�d>�/�3��R.��53WU�hK٧օ��GwK�~uo�t&�f��x@��{�-/芌Ġ�F�;�@>Y�؏��m�td�0KaBD�C_�l��
+�}�
+!�՟���L|c"_�(��_�'���,V���u�'S�W����줓a+�qo�S�,uؿK�6�y���$��i��/T*z�DT�+�d���'��� ��KN{�d��}	�
N���3y��OI
+�l,�ȂƍZ��(X�Y���u��O>�AcP��	�=j�2
�>�]F�p���/�E�<w,&ʣG�s�ˏ4�l9����_[_�:�ga��K���4B�0���EtY�p��M]X��n�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -54,14 +54,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/rspec/core/formatters/progress_formatter.rb
 - lib/rspec/core/formatters/protocol.rb
 - lib/rspec/core/formatters/snippet_extractor.rb
+- lib/rspec/core/formatters/syntax_highlighter.rb
 - lib/rspec/core/hooks.rb
 - lib/rspec/core/invocations.rb
 - lib/rspec/core/memoized_helpers.rb
@@ -236,6 +237,7 @@ files:
 - lib/rspec/core/notifications.rb
 - lib/rspec/core/option_parser.rb
 - lib/rspec/core/ordering.rb
+- lib/rspec/core/output_wrapper.rb
 - lib/rspec/core/pending.rb
 - lib/rspec/core/profiler.rb
 - lib/rspec/core/project_initializer.rb
@@ -250,11 +252,6 @@ files:
 - lib/rspec/core/shared_context.rb
 - lib/rspec/core/shared_example_group.rb
 - lib/rspec/core/shell_escape.rb
-- lib/rspec/core/source.rb
-- lib/rspec/core/source/location.rb
-- lib/rspec/core/source/node.rb
-- lib/rspec/core/source/syntax_highlighter.rb
-- lib/rspec/core/source/token.rb
 - lib/rspec/core/test_unit_assertions_adapter.rb
 - lib/rspec/core/version.rb
 - lib/rspec/core/warnings.rb
@@ -280,9 +277,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.5.2
+summary: rspec-core-3.6.0
 test_files: []
 has_rdoc: 

data/lib/rspec/core/source/location.rb

@@ -1,13 +0,0 @@
-module RSpec
-  module Core
-    class Source
-      # @private
-      # Represents a source location of node or token.
-      Location = Struct.new(:line, :column) do
-        def self.location?(array)
-          array.is_a?(Array) && array.size == 2 && array.all? { |e| e.is_a?(Integer) }
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/source/node.rb

@@ -1,93 +0,0 @@
-RSpec::Support.require_rspec_core "source/location"
-
-module RSpec
-  module Core
-    class Source
-      # @private
-      # A wrapper for Ripper AST node which is generated with `Ripper.sexp`.
-      class Node
-        include Enumerable
-
-        attr_reader :sexp, :parent
-
-        def self.sexp?(array)
-          array.is_a?(Array) && array.first.is_a?(Symbol)
-        end
-
-        def initialize(ripper_sexp, parent=nil)
-          @sexp = ripper_sexp.freeze
-          @parent = parent
-        end
-
-        def type
-          sexp[0]
-        end
-
-        def args
-          @args ||= raw_args.map do |raw_arg|
-            if Node.sexp?(raw_arg)
-              Node.new(raw_arg, self)
-            elsif Location.location?(raw_arg)
-              Location.new(*raw_arg)
-            elsif raw_arg.is_a?(Array)
-              GroupNode.new(raw_arg, self)
-            else
-              raw_arg
-            end
-          end.freeze
-        end
-
-        def children
-          @children ||= args.select { |arg| arg.is_a?(Node) }.freeze
-        end
-
-        def location
-          @location ||= args.find { |arg| arg.is_a?(Location) }
-        end
-
-        def each(&block)
-          return to_enum(__method__) unless block_given?
-
-          yield self
-
-          children.each do |child|
-            child.each(&block)
-          end
-        end
-
-        def each_ancestor
-          return to_enum(__method__) unless block_given?
-
-          current_node = self
-
-          while (current_node = current_node.parent)
-            yield current_node
-          end
-        end
-
-        def inspect
-          "#<#{self.class} #{type}>"
-        end
-
-      private
-
-        def raw_args
-          sexp[1..-1] || []
-        end
-      end
-
-      # @private
-      class GroupNode < Node
-        def type
-          :group
-        end
-
-      private
-
-        def raw_args
-          sexp
-        end
-      end
-    end
-  end
-end