Hello community, here is the log from the commit of package rubygem-rspec-core for openSUSE:Factory checked in at 2015-03-25 21:03:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-rspec-core (Old) and /work/SRC/openSUSE:Factory/.rubygem-rspec-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-rspec-core" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-rspec-core/rubygem-rspec-core.changes 2015-03-01 14:57:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-rspec-core.new/rubygem-rspec-core.changes 2015-03-25 21:03:30.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 20 20:48:34 UTC 2015 - coolo@suse.com + +- updated to version 3.2.2 + Bug Fixes: + + * Fix regression in 3.2.0 that allowed tag-filtered examples to + run even if there was a location filter applied to the spec + file that was intended to limit the file to other examples. + (#1894, Myron Marston) + +------------------------------------------------------------------- Old: ---- rspec-core-3.2.1.gem New: ---- rspec-core-3.2.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-rspec-core.spec ++++++ --- /var/tmp/diff_new_pack.tQU6sC/_old 2015-03-25 21:03:30.000000000 +0100 +++ /var/tmp/diff_new_pack.tQU6sC/_new 2015-03-25 21:03:30.000000000 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-rspec-core -Version: 3.2.1 +Version: 3.2.2 Release: 0 %define mod_name rspec-core %define mod_full_name %{mod_name}-%{version} ++++++ rspec-core-3.2.1.gem -> rspec-core-3.2.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog.md new/Changelog.md --- old/Changelog.md 2015-02-24 04:19:27.000000000 +0100 +++ new/Changelog.md 2015-03-12 05:37:40.000000000 +0100 @@ -1,3 +1,13 @@ +### 3.2.2 / 2015-03-11 +[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.2.1...v3.2.2) + +Bug Fixes: + +* Fix regression in 3.2.0 that allowed tag-filtered examples to + run even if there was a location filter applied to the spec + file that was intended to limit the file to other examples. + (#1894, Myron Marston) + ### 3.2.1 / 2015-02-23 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.2.0...v3.2.1) Files old/checksums.yaml.gz and new/checksums.yaml.gz differ Files old/checksums.yaml.gz.sig and new/checksums.yaml.gz.sig differ Files old/data.tar.gz.sig and new/data.tar.gz.sig differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/core/filter_manager.rb new/lib/rspec/core/filter_manager.rb --- old/lib/rspec/core/filter_manager.rb 2015-02-24 04:19:27.000000000 +0100 +++ new/lib/rspec/core/filter_manager.rb 2015-03-12 05:37:40.000000000 +0100 @@ -31,8 +31,13 @@ if inclusions.standalone? examples.select { |e| include?(e) } else - locations = inclusions.fetch(:locations) { Hash.new([]) } - examples.select { |e| priority_include?(e, locations) || (!exclude?(e) && include?(e)) } + locations, other_inclusions = inclusions.partition_locations + + examples.select do |e| + priority_include?(e, locations) do + !exclude?(e) && other_inclusions.include_example?(e) + end + end end end @@ -83,7 +88,7 @@ # defined in the same file as the location filters. Excluded specs in # other files should still be excluded. def priority_include?(example, locations) - return false if locations[example.metadata[:absolute_file_path]].empty? + return yield if locations[example.metadata[:absolute_file_path]].empty? MetadataFilter.filter_applies?(:locations, locations, example.metadata) end end @@ -104,8 +109,8 @@ [exclusions, inclusions] end - def initialize(*args, &block) - @rules = Hash.new(*args, &block) + def initialize(rules={}) + @rules = rules end def add(updated) @@ -173,6 +178,13 @@ apply_standalone_filter(*args) || super end + def partition_locations + locations = @rules.fetch(:locations) { Hash.new([]) } + other_inclusions = self.class.new(@rules.dup.tap { |r| r.delete(:locations) }) + + return locations, other_inclusions + end + def include_example?(example) @rules.empty? || super end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/core/version.rb new/lib/rspec/core/version.rb --- old/lib/rspec/core/version.rb 2015-02-24 04:19:27.000000000 +0100 +++ new/lib/rspec/core/version.rb 2015-03-12 05:37:40.000000000 +0100 @@ -3,7 +3,7 @@ # Version information for RSpec Core. module Version # Current version of RSpec Core, in semantic versioning format. - STRING = '3.2.1' + STRING = '3.2.2' end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-02-24 04:19:27.000000000 +0100 +++ new/metadata 2015-03-12 05:37:40.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: rspec-core version: !ruby/object:Gem::Version - version: 3.2.1 + version: 3.2.2 platform: ruby authors: - Steven Baker @@ -46,7 +46,7 @@ ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ F3MdtaDehhjC -----END CERTIFICATE----- -date: 2015-02-24 00:00:00.000000000 Z +date: 2015-03-12 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rspec-support @@ -276,9 +276,9 @@ version: '0' requirements: [] rubyforge_project: rspec -rubygems_version: 2.4.5 +rubygems_version: 2.2.2 signing_key: specification_version: 4 -summary: rspec-core-3.2.1 +summary: rspec-core-3.2.2 test_files: [] has_rdoc: Files old/metadata.gz.sig and new/metadata.gz.sig differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org