rspec-core 3.5.0.beta2 → 3.5.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae10092df64000bc49a31c63ea1e6fb90f8bed34
-  data.tar.gz: 34f6ffdfff90d32dbb96fde2fd9a45e1280bfaeb
+  metadata.gz: eb7575d0b8b74488fe65c38a1309ed0e81fb553b
+  data.tar.gz: bd6fccb0c6652936a44cd8159e328f581af3c72e
 SHA512:
-  metadata.gz: d58b487bff47a2a7d54c86a91e50ec8dadd2f4c5a5a842557cdaa6a2a575dd1409f612a41161ef1862eb15a71b8d9c60bfb3acfc5aec471e0a7fec14467b53d9
-  data.tar.gz: 7e6f624e87c70244933bc521d67d6bed2b3b455556a57aaca8bda715d07a738920414ae179bf432054222507323f002fc2e30a344c999125606672c6dbdccd4f
+  metadata.gz: e036ab4dc99141921ab013f94cc58434b5e16ec3e58a0675cfbaa44a7236b676f16eb81f6e7b02ed211f229298350170ca5c97903c8d84046a548280cae4f926
+  data.tar.gz: f55ba181425dd3c264d4a16983718140e43469a28c25300a077858a528d3403d39fad355fde0ca7a8c4156f1a7be41cd846bd4b3c9efc664873bc72dbd25ddc3

data/Changelog.md

@@ -11,6 +11,17 @@ Enhancements:
   (Jon Rowe, #2193)
 * Add new `config.when_first_matching_example_defined` hook. (Myron
   Marston, #2175)
+* Add new `config.filter_run_when_matching` API, intended to replace
+  the combination of `config.filter_run` and
+  `config.run_all_when_everything_filtered` (Myron Marston, #2206)
+
+Bug Fixes:
+
+* Use the encoded string logic for source extraction. (Jon Rowe, #2183)
+* Fix rounding issue in duration formatting helper. (Fabersky, Jon Rowe, #2208)
+* Fix failure snippet extraction so that `def-end` snippets
+  ending with `end`-only line can be extracted properly.
+  (Yuji Nakayama, #2215)
 
 ### 3.5.0.beta1 / 2016-02-06
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.4.3...v3.5.0.beta1)

data/lib/rspec/core/configuration.rb

@@ -264,6 +264,8 @@ module RSpec
       # @macro add_setting
       # Run all examples if none match the configured filters
       # (default: `false`).
+      # @deprecated Use {#filter_run_when_matching} instead for the specific
+      #   filters that you want to be ignored if none match.
       add_setting :run_all_when_everything_filtered
 
       # @macro add_setting
@@ -1039,9 +1041,23 @@ module RSpec
         filter_manager.include_with_low_priority meta
         static_config_filter_manager.include_with_low_priority Metadata.deep_hash_dup(meta)
       end
-
       alias_method :filter_run, :filter_run_including
 
+      # Applies the provided filter only if any of examples match, in constrast
+      # to {#filter_run}, which always applies even if no examples match, in
+      # which case no examples will be run. This allows you to leave configured
+      # filters in place that are intended only for temporary use. The most common
+      # example is focus filtering: `config.filter_run_when_matching :focus`.
+      # With that configured, you can temporarily focus an example or group
+      # by tagging it with `:focus` metadata, or prefixing it with an `f`
+      # (as in `fdescribe`, `fcontext` and `fit`) since those are aliases for
+      # `describe`/`context`/`it` with `:focus` metadata.
+      def filter_run_when_matching(*args)
+        when_first_matching_example_defined(*args) do
+          filter_run(*args)
+        end
+      end
+
       # Clears and reassigns the `inclusion_filter`. Set to `nil` if you don't
       # want any inclusion filter at all.
       #

data/lib/rspec/core/formatters/helpers.rb

@@ -30,8 +30,8 @@ module RSpec
                       end
 
           if duration > 60
-            minutes = (duration.to_i / 60).to_i
-            seconds = duration - minutes * 60
+            minutes = (duration.round / 60).to_i
+            seconds = (duration - minutes * 60)
 
             "#{pluralize(minutes, 'minute')} #{pluralize(format_seconds(seconds, precision), 'second')}"
           else
@@ -58,6 +58,7 @@ module RSpec
         #
         # @see #strip_trailing_zeroes
         def self.format_seconds(float, precision=nil)
+          return '0' if float < 0
           precision ||= (float < 1) ? SUB_SECOND_PRECISION : DEFAULT_PRECISION
           formatted = "%.#{precision}f" % float
           strip_trailing_zeroes(formatted)

data/lib/rspec/core/notifications.rb

@@ -202,7 +202,7 @@ module RSpec::Core
 
     private
 
-      def initialize(example, exception_presenter=Formatters::ExceptionPresenter.new(example.execution_result.exception, example))
+      def initialize(example, exception_presenter)
         @exception_presenter = exception_presenter
         super(example)
       end

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

@@ -43,12 +43,12 @@ 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
+  # This allows 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. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
 
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options. We recommend

data/lib/rspec/core/source.rb

@@ -1,3 +1,4 @@
+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'
@@ -14,9 +15,18 @@ module RSpec
         new(source, path)
       end
 
-      def initialize(source_string, path=nil)
-        @source = source_string
-        @path = path ? File.expand_path(path) : '(string)'
+      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

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

@@ -14,7 +14,8 @@ module RSpec
         }.freeze
 
         CLOSING_KEYWORDS_BY_OPENING_KEYWORD = {
-          'do' => 'end'
+          'def' => 'end',
+          'do'  => 'end',
         }.freeze
 
         attr_reader :token

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.0.beta2'
+      STRING = '3.5.0.beta3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta2
+  version: 3.5.0.beta3
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-02 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.beta2
+        version: 3.5.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta2
+        version: 3.5.0.beta3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ files:
 - lib/rspec/core/version.rb
 - lib/rspec/core/warnings.rb
 - lib/rspec/core/world.rb
-homepage: http://github.com/rspec/rspec-core
+homepage: https://github.com/rspec/rspec-core
 licenses:
 - MIT
 metadata: {}
@@ -279,9 +279,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.5.0.beta2
+summary: rspec-core-3.5.0.beta3
 test_files: []
 has_rdoc: