[DRE-commits] [ruby-rspec] 05/18: refresh patches
Cédric Boutillier
boutil at moszumanska.debian.org
Wed Mar 2 17:58:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-rspec.
commit dd99b878065d4e3bba57fad36d0146dd95a4cb70
Author: Cédric Boutillier <boutil at debian.org>
Date: Wed Mar 2 15:40:06 2016 +0100
refresh patches
---
debian/patches/autorun-load-configuration.patch | 4 +-
...able_specs_assuming_they_are_first_caller.patch | 6 +-
debian/patches/escape-path-in-match.patch | 60 +++++++----
debian/patches/failed_specs.patch | 6 +-
debian/patches/fix-rake-task.patch | 16 +--
debian/patches/gemspecs.patch | 111 ++++++++++++++++++++-
6 files changed, 164 insertions(+), 39 deletions(-)
diff --git a/debian/patches/autorun-load-configuration.patch b/debian/patches/autorun-load-configuration.patch
index 0cb2224..71f04cd 100644
--- a/debian/patches/autorun-load-configuration.patch
+++ b/debian/patches/autorun-load-configuration.patch
@@ -8,11 +8,9 @@ rspec/autorun itself apparently never touches the configuration, thus
the default of expose_dsl_globally isn't applied. This makes RSpec 3
backwards incompatible with 2.x.
-diff --git a/rspec-core/lib/rspec/core/runner.rb b/rspec-core/lib/rspec/core/runner.rb
-index af5612b..1b9b2ae 100644
--- a/rspec-core/lib/rspec/core/runner.rb
+++ b/rspec-core/lib/rspec/core/runner.rb
-@@ -10,6 +10,7 @@ module RSpec
+@@ -14,6 +14,7 @@
# the `ruby` command, and even then, the normal way to invoke
# this is by requiring `rspec/autorun`.
def self.autorun
diff --git a/debian/patches/disable_specs_assuming_they_are_first_caller.patch b/debian/patches/disable_specs_assuming_they_are_first_caller.patch
index b860d57..3cac437 100644
--- a/debian/patches/disable_specs_assuming_they_are_first_caller.patch
+++ b/debian/patches/disable_specs_assuming_they_are_first_caller.patch
@@ -2,11 +2,11 @@ Description: disable some failing specs
because the backtrace contains a reference to debian/ruby-tests.rb
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: not-needed
-Last-Update: 2015-06-13
+Last-Update: 2016-03-02
--- a/rspec-core/spec/rspec/core/formatters/documentation_formatter_spec.rb
+++ b/rspec-core/spec/rspec/core/formatters/documentation_formatter_spec.rb
-@@ -80,7 +80,7 @@
+@@ -81,7 +81,7 @@
end
# The backtrace is slightly different on JRuby/Rubinius so we skip there.
@@ -17,7 +17,7 @@ Last-Update: 2015-06-13
--- a/rspec-core/spec/rspec/core/formatters/progress_formatter_spec.rb
+++ b/rspec-core/spec/rspec/core/formatters/progress_formatter_spec.rb
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
end
# The backtrace is slightly different on JRuby/Rubinius so we skip there.
diff --git a/debian/patches/escape-path-in-match.patch b/debian/patches/escape-path-in-match.patch
index aa07113..4c5b288 100644
--- a/debian/patches/escape-path-in-match.patch
+++ b/debian/patches/escape-path-in-match.patch
@@ -2,11 +2,11 @@ Description: regexp using __FILE__ need to escape the filename if it contains
special characters like +
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: not-needed
-Last-Update: 2015-06-13
+Last-Update: 2016-03-02
--- a/rspec-core/spec/rspec/core/memoized_helpers_spec.rb
+++ b/rspec-core/spec/rspec/core/memoized_helpers_spec.rb
-@@ -187,7 +187,7 @@
+@@ -183,7 +183,7 @@
end.run
expect(result).to be_an(Exception)
@@ -15,7 +15,7 @@ Last-Update: 2015-06-13
end
end
end
-@@ -563,7 +563,7 @@
+@@ -559,7 +559,7 @@
end.run
expect(result).to be_an(Exception)
@@ -35,17 +35,6 @@ Last-Update: 2015-06-13
end
attr_writer :full_backtrace
---- a/rspec-mocks/spec/rspec/mocks/nil_expectation_warning_spec.rb
-+++ b/rspec-mocks/spec/rspec/mocks/nil_expectation_warning_spec.rb
-@@ -2,7 +2,7 @@
- module Mocks
- RSpec.describe "an expectation set on nil" do
- it "issues a warning with file and line number information" do
-- expected_warning = %r%An expectation of :foo was set on nil. Called from #{__FILE__}:#{__LINE__+3}(:in .+)?. Use allow_message_expectations_on_nil to disable warnings.%
-+ expected_warning = %r%An expectation of :foo was set on nil. Called from #{Regexp.escape(__FILE__)}:#{__LINE__+3}(:in .+)?. Use allow_message_expectations_on_nil to disable warnings.%
- expect(Kernel).to receive(:warn).with(expected_warning)
-
- expect(nil).to receive(:foo)
--- a/rspec-support/spec/rspec/support/warnings_spec.rb
+++ b/rspec-support/spec/rspec/support/warnings_spec.rb
@@ -41,7 +41,7 @@
@@ -87,7 +76,7 @@ Last-Update: 2015-06-13
--- a/rspec-core/spec/rspec/core/example_spec.rb
+++ b/rspec-core/spec/rspec/core/example_spec.rb
-@@ -90,7 +90,7 @@
+@@ -130,7 +130,7 @@
RSpec.configuration.format_docstrings { |s| s.upcase }
example_group.example { }
example_group.run
@@ -96,7 +85,7 @@ Last-Update: 2015-06-13
expect(example_group.examples.first.description).to match(pattern)
end
end
-@@ -113,14 +113,14 @@
+@@ -153,14 +153,14 @@
it "uses the file and line number if there is no matcher-generated description" do
example = example_group.example {}
example_group.run
@@ -113,7 +102,7 @@ Last-Update: 2015-06-13
end
context "if the example is pending" do
-@@ -133,7 +133,7 @@
+@@ -173,7 +173,7 @@
it "uses the file and line number of the example if no matcher ran" do
example = example_group.example { pending; fail }
example_group.run
@@ -122,7 +111,7 @@ Last-Update: 2015-06-13
end
end
-@@ -199,14 +199,14 @@
+@@ -239,14 +239,14 @@
it "uses the file and line number if there is no matcher-generated description" do
example = example_group.example {}
example_group.run
@@ -139,7 +128,7 @@ Last-Update: 2015-06-13
end
end
-@@ -238,7 +238,7 @@
+@@ -278,7 +278,7 @@
it "uses the file and line number" do
example = example_group.example { assert 5 == 5 }
example_group.run
@@ -150,7 +139,7 @@ Last-Update: 2015-06-13
end
--- a/rspec-core/spec/rspec/core/configuration_spec.rb
+++ b/rspec-core/spec/rspec/core/configuration_spec.rb
-@@ -37,7 +37,7 @@
+@@ -61,7 +61,7 @@
it 'prints a notice indicating the reconfigured output_stream will be ignored' do
config.deprecation_stream = double("IO")
@@ -159,7 +148,7 @@ Last-Update: 2015-06-13
end
it 'does not change the value of `deprecation_stream`' do
-@@ -72,7 +72,7 @@
+@@ -96,7 +96,7 @@
it 'prints a notice indicating the reconfigured output_stream will be ignored' do
config.output_stream = StringIO.new
@@ -223,3 +212,32 @@ Last-Update: 2015-06-13
allow(double).to receive(:foo).with(:arg) { :with_block }.at_least(:once) { :at_least_block }
end
+--- a/rspec-mocks/spec/rspec/mocks/nil_expectation_warning_spec.rb
++++ b/rspec-mocks/spec/rspec/mocks/nil_expectation_warning_spec.rb
+@@ -6,7 +6,7 @@
+ expect(nil).to receive(:foo)
+ }.to output(a_string_including(
+ "An expectation of `:foo` was set on `nil`",
+- "#{__FILE__}:#{__LINE__ - 3}"
++ "#{Regexp.escape(__FILE__)}:#{__LINE__ - 3}"
+ )).to_stderr
+
+ nil.foo
+@@ -17,7 +17,7 @@
+ expect(nil).not_to receive(:foo)
+ }.to output(a_string_including(
+ "An expectation of `:foo` was set on `nil`",
+- "#{__FILE__}:#{__LINE__ - 3}"
++ "#{Regexp.escape(__FILE__)}:#{__LINE__ - 3}"
+ )).to_stderr
+ end
+
+@@ -76,7 +76,7 @@
+ expect(nil).to receive(:foo)
+ }.to output(a_string_including(
+ "An expectation of `:foo` was set on `nil`",
+- "#{__FILE__}:#{__LINE__ - 3}"
++ "#{Regexp.escape(__FILE__)}:#{__LINE__ - 3}"
+ )).to_stderr
+
+ nil.foo
diff --git a/debian/patches/failed_specs.patch b/debian/patches/failed_specs.patch
index 062e071..3a43bdf 100644
--- a/debian/patches/failed_specs.patch
+++ b/debian/patches/failed_specs.patch
@@ -2,7 +2,7 @@ Description: a collection of currently failing tests
Needs more investigation
Forwarded: no
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-06-15
+Last-Update: 2016-03-02
--- a/rspec-core/spec/rspec/core/configuration/only_failures_support_spec.rb
+++ b/rspec-core/spec/rspec/core/configuration/only_failures_support_spec.rb
@@ -53,8 +53,8 @@ Last-Update: 2015-06-15
expect(diff).to be_empty
end
-- it 'copes with encoded strings' do
-+ xit 'copes with encoded strings' do
+- it 'copes with encoded strings', :skip => RSpec::Support::OS.windows? do
++ xit 'copes with encoded strings', :skip => RSpec::Support::OS.windows? do
expected = "Tu avec carte {count} item has\n".encode('UTF-16LE')
actual = "Tu avec carté {count} itém has\n".encode('UTF-16LE')
expected_diff = <<-EOD.encode('UTF-16LE')
diff --git a/debian/patches/fix-rake-task.patch b/debian/patches/fix-rake-task.patch
index 50f94b0..3903646 100644
--- a/debian/patches/fix-rake-task.patch
+++ b/debian/patches/fix-rake-task.patch
@@ -3,12 +3,12 @@ Description: Fix patch to rspec binary
Author: Antonio Terceiro <terceiro at debian.org>
Origin: vendor
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782161
-Last-Update: 2015-06-13
+Last-Update: 2016-03-02
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/rspec-core/lib/rspec/core/rake_task.rb
+++ b/rspec-core/lib/rspec/core/rake_task.rb
-@@ -13,7 +13,7 @@
+@@ -22,7 +22,7 @@
include RSpec::Core::ShellEscape
# Default path to the RSpec executable.
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Default pattern for spec files.
DEFAULT_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
-@@ -132,7 +132,6 @@
+@@ -141,7 +141,6 @@
cmd_parts = []
cmd_parts << RUBY
cmd_parts << ruby_opts
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
cmd_parts << escape(rspec_path)
cmd_parts << file_inclusion_specification
cmd_parts << file_exclusion_specification
-@@ -144,15 +143,6 @@
+@@ -153,15 +152,6 @@
lambda { |s| s.nil? || s == "" }
end
@@ -51,8 +51,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
context "default" do
it "renders rspec" do
-- expect(spec_command).to match(/^#{ruby} #{default_load_path_opts} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
-+ expect(spec_command).to match(/^#{ruby} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
+- expect(spec_command).to match(/^#{ruby} #{default_load_path_opts} '?#{task.rspec_path}'?/)
++ expect(spec_command).to match(/^#{ruby} '?#{task.rspec_path}'?/)
end
end
@@ -68,8 +68,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
context "with ruby options" do
it "renders them before the rspec path" do
task.ruby_opts = "-w"
-- expect(spec_command).to match(/^#{ruby} -w #{default_load_path_opts} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
-+ expect(spec_command).to match(/^#{ruby} -w '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
+- expect(spec_command).to match(/^#{ruby} -w #{default_load_path_opts} '?#{task.rspec_path}'?/)
++ expect(spec_command).to match(/^#{ruby} -w '?#{task.rspec_path}'?/)
end
end
diff --git a/debian/patches/gemspecs.patch b/debian/patches/gemspecs.patch
index af7a2f9..c3b4eaf 100644
--- a/debian/patches/gemspecs.patch
+++ b/debian/patches/gemspecs.patch
@@ -2,7 +2,7 @@ Description: diff between upstream source gemspecs and the ones regenerated
by ./debian/rules gen-gemspecs. To be updated at every new upstream version
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: no
-Last-Update: 2015-06-13
+Last-Update: 2016-03-02
--- a/rspec-expectations/rspec-expectations.gemspec
+++ b/rspec-expectations/rspec-expectations.gemspec
@@ -320,3 +320,112 @@ Last-Update: 2015-06-13
+ s.add_dependency(%q<thread_order>, ["~> 1.1.0"])
+ end
end
+--- a/rspec-core/rspec-core.gemspec
++++ b/rspec-core/rspec-core.gemspec
+@@ -1,51 +1,62 @@
+ # -*- encoding: utf-8 -*-
+-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+-require "rspec/core/version"
++# stub: rspec-core 3.4.3 ruby lib
+
+ Gem::Specification.new do |s|
+- s.name = "rspec-core"
+- s.version = RSpec::Core::Version::STRING
+- s.platform = Gem::Platform::RUBY
+- s.license = "MIT"
+- s.authors = ["Steven Baker", "David Chelimsky", "Chad Humphries", "Myron Marston"]
+- s.email = "rspec at googlegroups.com"
+- s.homepage = "http://github.com/rspec/rspec-core"
+- s.summary = "rspec-core-#{RSpec::Core::Version::STRING}"
+- s.description = "BDD for Ruby. RSpec runner and example groups."
+-
+- s.files = `git ls-files -- lib/*`.split("\n")
+- s.files += %w[README.md LICENSE.md Changelog.md .yardopts .document]
+- s.test_files = []
+- s.bindir = 'exe'
+- s.executables = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
+- s.rdoc_options = ["--charset=UTF-8"]
+- s.require_path = "lib"
+-
+- s.required_ruby_version = '>= 1.8.7'
+-
+- private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
+- if File.exist?(private_key)
+- s.signing_key = private_key
+- s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
+- end
++ s.name = "rspec-core"
++ s.version = "3.4.3"
+
+- if RSpec::Core::Version::STRING =~ /[a-zA-Z]+/
+- # rspec-support is locked to our version when running pre,rc etc
+- s.add_runtime_dependency "rspec-support", "= #{RSpec::Core::Version::STRING}"
++ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
++ s.require_paths = ["lib"]
++ s.authors = ["Steven Baker", "David Chelimsky", "Chad Humphries", "Myron Marston"]
++ s.bindir = "exe"
++ s.date = "2016-03-02"
++ s.description = "BDD for Ruby. RSpec runner and example groups."
++ s.email = "rspec at googlegroups.com"
++ s.executables = ["rspec"]
++ s.files = [".document", ".yardopts", "Changelog.md", "LICENSE.md", "README.md", "exe/rspec", "lib/rspec/autorun.rb", "lib/rspec/core.rb", "lib/rspec/core/backtrace_formatter.rb", "lib/rspec/core/bisect/coordinator.rb", "lib/rspec/core/bisect/example_minimizer.rb", "lib/rspec/core/bisect/runner.rb", "lib/rspec/core/bisect/server.rb", "lib/rspec/core/configuration.rb", "lib/rspec/core/configuration_options.rb", "lib/rspec/core/drb.rb", "lib/rspec/core/dsl.rb", "lib/rspec/core/example.rb [...]
++ s.homepage = "http://github.com/rspec/rspec-core"
++ s.licenses = ["MIT"]
++ s.rdoc_options = ["--charset=UTF-8"]
++ s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
++ s.rubygems_version = "2.5.1"
++ s.summary = "rspec-core-3.4.3"
++
++ if s.respond_to? :specification_version then
++ s.specification_version = 4
++
++ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
++ s.add_runtime_dependency(%q<rspec-support>, ["~> 3.4.0"])
++ s.add_development_dependency(%q<rake>, ["~> 10.0.0"])
++ s.add_development_dependency(%q<cucumber>, ["~> 1.3"])
++ s.add_development_dependency(%q<minitest>, ["~> 5.3"])
++ s.add_development_dependency(%q<aruba>, ["~> 0.6.2"])
++ s.add_development_dependency(%q<coderay>, ["~> 1.0.9"])
++ s.add_development_dependency(%q<mocha>, ["~> 0.13.0"])
++ s.add_development_dependency(%q<rr>, ["~> 1.0.4"])
++ s.add_development_dependency(%q<flexmock>, ["~> 0.9.0"])
++ s.add_development_dependency(%q<thread_order>, ["~> 1.1.0"])
++ else
++ s.add_dependency(%q<rspec-support>, ["~> 3.4.0"])
++ s.add_dependency(%q<rake>, ["~> 10.0.0"])
++ s.add_dependency(%q<cucumber>, ["~> 1.3"])
++ s.add_dependency(%q<minitest>, ["~> 5.3"])
++ s.add_dependency(%q<aruba>, ["~> 0.6.2"])
++ s.add_dependency(%q<coderay>, ["~> 1.0.9"])
++ s.add_dependency(%q<mocha>, ["~> 0.13.0"])
++ s.add_dependency(%q<rr>, ["~> 1.0.4"])
++ s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
++ s.add_dependency(%q<thread_order>, ["~> 1.1.0"])
++ end
+ else
+- # rspec-support must otherwise match our major/minor version
+- s.add_runtime_dependency "rspec-support", "~> #{RSpec::Core::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
++ s.add_dependency(%q<rspec-support>, ["~> 3.4.0"])
++ s.add_dependency(%q<rake>, ["~> 10.0.0"])
++ s.add_dependency(%q<cucumber>, ["~> 1.3"])
++ s.add_dependency(%q<minitest>, ["~> 5.3"])
++ s.add_dependency(%q<aruba>, ["~> 0.6.2"])
++ s.add_dependency(%q<coderay>, ["~> 1.0.9"])
++ s.add_dependency(%q<mocha>, ["~> 0.13.0"])
++ s.add_dependency(%q<rr>, ["~> 1.0.4"])
++ s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
++ s.add_dependency(%q<thread_order>, ["~> 1.1.0"])
+ end
+-
+- s.add_development_dependency "rake", "~> 10.0.0"
+- s.add_development_dependency "cucumber", "~> 1.3"
+- s.add_development_dependency "minitest", "~> 5.3"
+- s.add_development_dependency "aruba", "~> 0.6.2" # 0.7 is broken on ruby 1.8.7
+-
+- s.add_development_dependency "coderay", "~> 1.0.9"
+-
+- s.add_development_dependency "mocha", "~> 0.13.0"
+- s.add_development_dependency "rr", "~> 1.0.4"
+- s.add_development_dependency "flexmock", "~> 0.9.0"
+- s.add_development_dependency "thread_order", "~> 1.1.0"
+ end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec.git
More information about the Pkg-ruby-extras-commits
mailing list