rspec-core 3.5.4 → 3.6.0

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.4'
+      STRING = '3.6.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -40,7 +40,8 @@ module RSpec
       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
@@ -129,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

data/lib/rspec/core.rb

@@ -69,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.6.0
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-10-01 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.4
+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

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

@@ -1,87 +0,0 @@
-RSpec::Support.require_rspec_core "source/location"
-
-module RSpec
-  module Core
-    class Source
-      # @private
-      # A wrapper for Ripper token which is generated with `Ripper.lex`.
-      class Token
-        CLOSING_TYPES_BY_OPENING_TYPE = {
-          :on_lbracket    => :on_rbracket,
-          :on_lparen      => :on_rparen,
-          :on_lbrace      => :on_rbrace,
-          :on_heredoc_beg => :on_heredoc_end
-        }.freeze
-
-        CLOSING_KEYWORDS_BY_OPENING_KEYWORD = {
-          'def' => 'end',
-          'do'  => 'end',
-        }.freeze
-
-        attr_reader :token
-
-        def self.tokens_from_ripper_tokens(ripper_tokens)
-          ripper_tokens.map { |ripper_token| new(ripper_token) }.freeze
-        end
-
-        def initialize(ripper_token)
-          @token = ripper_token.freeze
-        end
-
-        def location
-          @location ||= Location.new(*token[0])
-        end
-
-        def type
-          token[1]
-        end
-
-        def string
-          token[2]
-        end
-
-        def ==(other)
-          token == other.token
-        end
-
-        alias_method :eql?, :==
-
-        def inspect
-          "#<#{self.class} #{type} #{string.inspect}>"
-        end
-
-        def keyword?
-          type == :on_kw
-        end
-
-        def opening?
-          opening_delimiter? || opening_keyword?
-        end
-
-        def closed_by?(other)
-          closed_by_delimiter?(other) || closed_by_keyword?(other)
-        end
-
-        private
-
-        def opening_delimiter?
-          CLOSING_TYPES_BY_OPENING_TYPE.key?(type)
-        end
-
-        def opening_keyword?
-          return false unless keyword?
-          CLOSING_KEYWORDS_BY_OPENING_KEYWORD.key?(string)
-        end
-
-        def closed_by_delimiter?(other)
-          other.type == CLOSING_TYPES_BY_OPENING_TYPE[type]
-        end
-
-        def closed_by_keyword?(other)
-          return false unless other.keyword?
-          other.string == CLOSING_KEYWORDS_BY_OPENING_KEYWORD[string]
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/source.rb

@@ -1,86 +0,0 @@
-RSpec::Support.require_rspec_support "encoded_string"
-RSpec::Support.require_rspec_core 'source/node'
-RSpec::Support.require_rspec_core 'source/syntax_highlighter'
-RSpec::Support.require_rspec_core 'source/token'
-
-module RSpec
-  module Core
-    # @private
-    # Represents a Ruby source file and provides access to AST and tokens.
-    class Source
-      attr_reader :source, :path
-
-      def self.from_file(path)
-        source = File.read(path)
-        new(source, path)
-      end
-
-      if String.method_defined?(:encoding)
-        def initialize(source_string, path=nil)
-          @source = RSpec::Support::EncodedString.new(source_string, Encoding.default_external)
-          @path = path ? File.expand_path(path) : '(string)'
-        end
-      else # for 1.8.7
-        # :nocov:
-        def initialize(source_string, path=nil)
-          @source = RSpec::Support::EncodedString.new(source_string)
-          @path = path ? File.expand_path(path) : '(string)'
-        end
-        # :nocov:
-      end
-
-      def lines
-        @lines ||= source.split("\n")
-      end
-
-      def ast
-        @ast ||= begin
-          require 'ripper'
-          sexp = Ripper.sexp(source)
-          raise SyntaxError unless sexp
-          Node.new(sexp)
-        end
-      end
-
-      def tokens
-        @tokens ||= begin
-          require 'ripper'
-          tokens = Ripper.lex(source)
-          Token.tokens_from_ripper_tokens(tokens)
-        end
-      end
-
-      def nodes_by_line_number
-        @nodes_by_line_number ||= begin
-          nodes_by_line_number = ast.select(&:location).group_by { |node| node.location.line }
-          Hash.new { |hash, key| hash[key] = [] }.merge(nodes_by_line_number)
-        end
-      end
-
-      def tokens_by_line_number
-        @tokens_by_line_number ||= begin
-          nodes_by_line_number = tokens.group_by { |token| token.location.line }
-          Hash.new { |hash, key| hash[key] = [] }.merge(nodes_by_line_number)
-        end
-      end
-
-      def inspect
-        "#<#{self.class} #{path}>"
-      end
-
-      # @private
-      class Cache
-        attr_reader :syntax_highlighter
-
-        def initialize(configuration)
-          @sources_by_path = {}
-          @syntax_highlighter = SyntaxHighlighter.new(configuration)
-        end
-
-        def source_from_file(path)
-          @sources_by_path[path] ||= Source.from_file(path)
-        end
-      end
-    end
-  end
-end