rspec-core 3.3.0 → 3.4.0

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

@@ -0,0 +1,71 @@
+module RSpec
+  module Core
+    class Source
+      # @private
+      # Provides terminal syntax highlighting of code snippets
+      # when coderay is available.
+      class SyntaxHighlighter
+        def initialize(configuration)
+          @configuration = configuration
+        end
+
+        def highlight(lines)
+          implementation.highlight_syntax(lines)
+        end
+
+      private
+
+        if RSpec::Support::OS.windows?
+          # :nocov:
+          def implementation
+            WindowsImplementation
+          end
+          # :nocov:
+        else
+          def implementation
+            return color_enabled_implementation if @configuration.color_enabled?
+            NoSyntaxHighlightingImplementation
+          end
+        end
+
+        def color_enabled_implementation
+          @color_enabled_implementation ||= begin
+            ::Kernel.require 'coderay'
+            CodeRayImplementation
+          rescue LoadError
+            NoSyntaxHighlightingImplementation
+          end
+        end
+
+        # @private
+        module CodeRayImplementation
+          RESET_CODE = "\e[0m"
+
+          def self.highlight_syntax(lines)
+            highlighted = begin
+              CodeRay.encode(lines.join("\n"), :ruby, :terminal)
+            rescue Support::AllExceptionsExceptOnesWeMustNotRescue
+              return lines
+            end
+
+            highlighted.split("\n").map do |line|
+              line.sub(/\S/) { |char| char.insert(0, RESET_CODE) }
+            end
+          end
+        end
+
+        # @private
+        module NoSyntaxHighlightingImplementation
+          def self.highlight_syntax(lines)
+            lines
+          end
+        end
+
+        # @private
+        # Not sure why, but our code above (and/or coderay itself) does not work
+        # on Windows, so we disable the feature on Windows.
+        WindowsImplementation = NoSyntaxHighlightingImplementation
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+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
+        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
+      end
+    end
+  end
+end

data/lib/rspec/core/source.rb

@@ -0,0 +1,76 @@
+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
+
+      def initialize(source_string, path=nil)
+        @source = source_string
+        @path = path ? File.expand_path(path) : '(string)'
+      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

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.3.0'
+      STRING = '3.4.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -40,12 +40,18 @@ module RSpec
         @configuration.filter_manager
       end
 
+      # @private
+      def registered_example_group_files
+        @example_group_counts_by_spec_file.keys
+      end
+
       # @api private
       #
       # Register an example group.
       def register(example_group)
+        @configuration.on_example_group_definition_callbacks.each { |block| block.call(example_group) }
         example_groups << example_group
-        @example_group_counts_by_spec_file[example_group.metadata[:file_path]] += 1
+        @example_group_counts_by_spec_file[example_group.metadata[:absolute_file_path]] += 1
         example_group
       end
 
@@ -101,6 +107,14 @@ module RSpec
         @configuration.reporter
       end
 
+      # @private
+      def source_cache
+        @source_cache ||= begin
+          RSpec::Support.require_rspec_core "source"
+          Source::Cache.new(@configuration)
+        end
+      end
+
       # @api private
       #
       # Notify reporter of filters.
@@ -113,14 +127,14 @@ module RSpec
 
         unless filter_manager.empty?
           if filter_announcements.length == 1
-            reporter.message("Run options: #{filter_announcements[0]}")
+            report_filter_message("Run options: #{filter_announcements[0]}")
           else
-            reporter.message("Run options:\n  #{filter_announcements.join("\n  ")}")
+            report_filter_message("Run options:\n  #{filter_announcements.join("\n  ")}")
           end
         end
 
         if @configuration.run_all_when_everything_filtered? && example_count.zero? && !@configuration.only_failures?
-          reporter.message("#{everything_filtered_message}; ignoring #{inclusion_filter.description}")
+          report_filter_message("#{everything_filtered_message}; ignoring #{inclusion_filter.description}")
           filtered_examples.clear
           inclusion_filter.clear
         end
@@ -129,12 +143,17 @@ module RSpec
 
         example_groups.clear
         if filter_manager.empty?
-          reporter.message("No examples found.")
+          report_filter_message("No examples found.")
         elsif exclusion_filter.empty? || inclusion_filter.empty?
-          reporter.message(everything_filtered_message)
+          report_filter_message(everything_filtered_message)
         end
       end
 
+      # @private
+      def report_filter_message(message)
+        reporter.message(message) unless @configuration.silence_filter_announcements?
+      end
+
       # @private
       def everything_filtered_message
         "\nAll examples were filtered out"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-11-12 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.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ files:
 - ".document"
 - ".yardopts"
 - Changelog.md
-- License.txt
+- LICENSE.md
 - README.md
 - exe/rspec
 - lib/rspec/autorun.rb
@@ -222,7 +222,6 @@ files:
 - lib/rspec/core/bisect/example_minimizer.rb
 - lib/rspec/core/bisect/runner.rb
 - lib/rspec/core/bisect/server.rb
-- lib/rspec/core/bisect/subset_enumerator.rb
 - lib/rspec/core/configuration.rb
 - lib/rspec/core/configuration_options.rb
 - lib/rspec/core/drb.rb
@@ -245,6 +244,7 @@ files:
 - lib/rspec/core/formatters/helpers.rb
 - lib/rspec/core/formatters/html_formatter.rb
 - lib/rspec/core/formatters/html_printer.rb
+- lib/rspec/core/formatters/html_snippet_extractor.rb
 - lib/rspec/core/formatters/json_formatter.rb
 - lib/rspec/core/formatters/profile_formatter.rb
 - lib/rspec/core/formatters/progress_formatter.rb
@@ -260,7 +260,6 @@ files:
 - lib/rspec/core/mocking_adapters/null.rb
 - lib/rspec/core/mocking_adapters/rr.rb
 - lib/rspec/core/mocking_adapters/rspec.rb
-- lib/rspec/core/mutex.rb
 - lib/rspec/core/notifications.rb
 - lib/rspec/core/option_parser.rb
 - lib/rspec/core/ordering.rb
@@ -270,7 +269,6 @@ files:
 - lib/rspec/core/project_initializer/.rspec
 - lib/rspec/core/project_initializer/spec/spec_helper.rb
 - lib/rspec/core/rake_task.rb
-- lib/rspec/core/reentrant_mutex.rb
 - lib/rspec/core/reporter.rb
 - lib/rspec/core/ruby_project.rb
 - lib/rspec/core/runner.rb
@@ -279,6 +277,11 @@ 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
@@ -307,6 +310,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.3.0
+summary: rspec-core-3.4.0
 test_files: []
 has_rdoc: 

data/lib/rspec/core/bisect/subset_enumerator.rb

@@ -1,39 +0,0 @@
-module RSpec
-  module Core
-    module Bisect
-      # Enumerates each subset of the given list of ids that is half the
-      # size of the total list, so that hopefully we can discard half the
-      # list each repeatedly in order to our minimal repro case.
-      # @private
-      class SubsetEnumerator
-        include Enumerable
-
-        def initialize(ids)
-          @ids = ids
-        end
-
-        def subset_size
-          @subset_size ||= (@ids.size / 2.0).ceil
-        end
-
-        def each
-          yielded     = Set.new
-          slice_size  = subset_size
-          combo_count = 1
-
-          while slice_size > 0
-            @ids.each_slice(slice_size).to_a.combination(combo_count) do |combos|
-              subset = combos.flatten
-              next if yielded.include?(subset)
-              yield subset
-              yielded << subset
-            end
-
-            slice_size  /= 2
-            combo_count *= 2
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/mutex.rb

@@ -1,63 +0,0 @@
-module RSpec
-  module Core
-    # On 1.8.7, it's in the stdlib.
-    # We don't want to load the stdlib, b/c this is a test tool, and can affect the test environment,
-    # causing tests to pass where they should fail.
-    #
-    # So we're transcribing/modifying it from https://github.com/ruby/ruby/blob/v1_8_7_374/lib/thread.rb#L56
-    # Some methods we don't need are deleted.
-    # Anything I don't understand (there's quite a bit, actually) is left in.
-    # Some formating changes are made to appease the robot overlord:
-    #   https://travis-ci.org/rspec/rspec-core/jobs/54410874
-    # @private
-    class Mutex
-      def initialize
-        @waiting = []
-        @locked = false
-        @waiting.taint
-        taint
-      end
-
-      # @private
-      def lock
-        while Thread.critical = true && @locked
-          @waiting.push Thread.current
-          Thread.stop
-        end
-        @locked = true
-        Thread.critical = false
-        self
-      end
-
-      # @private
-      def unlock
-        return unless @locked
-        Thread.critical = true
-        @locked = false
-        begin
-          t = @waiting.shift
-          t.wakeup if t
-        rescue ThreadError
-          retry
-        end
-        Thread.critical = false
-        begin
-          t.run if t
-        rescue ThreadError
-          :noop
-        end
-        self
-      end
-
-      # @private
-      def synchronize
-        lock
-        begin
-          yield
-        ensure
-          unlock
-        end
-      end
-    end unless defined?(::RSpec::Core::Mutex) # Avoid warnings for library wide checks spec
-  end
-end

data/lib/rspec/core/reentrant_mutex.rb

@@ -1,52 +0,0 @@
-module RSpec
-  module Core
-    # Allows a thread to lock out other threads from a critical section of code,
-    # while allowing the thread with the lock to reenter that section.
-    #
-    # Based on Monitor as of 2.2 - https://github.com/ruby/ruby/blob/eb7ddaa3a47bf48045d26c72eb0f263a53524ebc/lib/monitor.rb#L9
-    #
-    # Depends on Mutex, but Mutex is only available as part of core since 1.9.1:
-    #   exists - http://ruby-doc.org/core-1.9.1/Mutex.html
-    #   dne    - http://ruby-doc.org/core-1.9.0/Mutex.html
-    #
-    # @private
-    class ReentrantMutex
-      def initialize
-        @owner = nil
-        @count = 0
-        @mutex = Mutex.new
-      end
-
-      def synchronize
-        enter
-        yield
-      ensure
-        exit
-      end
-
-    private
-
-      def enter
-        @mutex.lock if @owner != Thread.current
-        @owner = Thread.current
-        @count += 1
-      end
-
-      def exit
-        @count -= 1
-        return unless @count == 0
-        @owner = nil
-        @mutex.unlock
-      end
-    end
-
-    if defined? ::Mutex
-      # On 1.9 and up, this is in core, so we just use the real one
-      Mutex = ::Mutex
-    else # For 1.8.7
-      # :nocov:
-      RSpec::Support.require_rspec_core "mutex"
-      # :nocov:
-    end
-  end
-end