[DRE-commits] [ruby-rspec] 05/15: refresh patches
Cédric Boutillier
boutil at moszumanska.debian.org
Mon Jun 15 07:48:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-rspec.
commit d1e115213d87e6f1f01e9dbd8f8753e572739fc2
Author: Cédric Boutillier <boutil at debian.org>
Date: Sat Jun 13 15:30:30 2015 +0200
refresh patches
---
...able_specs_assuming_they_are_first_caller.patch | 16 +-
debian/patches/escape-path-in-match.patch | 29 +---
debian/patches/fix-rake-task.patch | 16 +-
debian/patches/fix_encoding.patch | 7 +-
debian/patches/gemspecs.patch | 191 ++++++++++-----------
debian/patches/path_to_executable.patch | 4 +-
debian/patches/series | 2 +-
debian/patches/skip_coverage.patch | 10 +-
8 files changed, 129 insertions(+), 146 deletions(-)
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 eabd9f8..b860d57 100644
--- a/debian/patches/disable_specs_assuming_they_are_first_caller.patch
+++ b/debian/patches/disable_specs_assuming_they_are_first_caller.patch
@@ -2,16 +2,16 @@ 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-03-24
+Last-Update: 2015-06-13
--- a/rspec-core/spec/rspec/core/formatters/documentation_formatter_spec.rb
+++ b/rspec-core/spec/rspec/core/formatters/documentation_formatter_spec.rb
-@@ -78,7 +78,7 @@
+@@ -80,7 +80,7 @@
end
- # The backrace is slightly different on JRuby so we skip there.
-- it 'produces the expected full output', :unless => RUBY_PLATFORM == 'java' do
-+ xit 'produces the expected full output', :unless => RUBY_PLATFORM == 'java' do
+ # The backtrace is slightly different on JRuby/Rubinius so we skip there.
+- it 'produces the expected full output', :if => RSpec::Support::Ruby.mri? do
++ xit 'produces the expected full output', :if => RSpec::Support::Ruby.mri? do
output = run_example_specs_with_formatter("doc")
output.gsub!(/ +$/, '') # strip trailing whitespace
@@ -20,9 +20,9 @@ Last-Update: 2015-03-24
@@ -41,7 +41,7 @@
end
- # The backrace is slightly different on JRuby so we skip there.
-- it 'produces the expected full output', :unless => RUBY_PLATFORM == 'java' do
-+ xit 'produces the expected full output', :unless => RUBY_PLATFORM == 'java' do
+ # The backtrace is slightly different on JRuby/Rubinius so we skip there.
+- it 'produces the expected full output', :if => RSpec::Support::Ruby.mri? do
++ xit 'produces the expected full output', :if => RSpec::Support::Ruby.mri? do
output = run_example_specs_with_formatter("progress")
output.gsub!(/ +$/, '') # strip trailing whitespace
diff --git a/debian/patches/escape-path-in-match.patch b/debian/patches/escape-path-in-match.patch
index 3640496..aa07113 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-03-31
+Last-Update: 2015-06-13
--- a/rspec-core/spec/rspec/core/memoized_helpers_spec.rb
+++ b/rspec-core/spec/rspec/core/memoized_helpers_spec.rb
-@@ -185,7 +185,7 @@
+@@ -187,7 +187,7 @@
end.run
expect(result).to be_an(Exception)
@@ -15,7 +15,7 @@ Last-Update: 2015-03-31
end
end
end
-@@ -460,7 +460,7 @@
+@@ -563,7 +563,7 @@
end.run
expect(result).to be_an(Exception)
@@ -57,17 +57,6 @@ Last-Update: 2015-03-31
warning_object.send(helper, 'Message')
end
-##--- a/rspec-support/lib/rspec/support/spec/shell_out.rb
-##+++ b/rspec-support/lib/rspec/support/spec/shell_out.rb
-##@@ -39,7 +39,7 @@
-## def run_ruby_with_current_load_path(ruby_command, *flags)
-## command = [
-## FileUtils::RUBY,
-##- "-I#{$LOAD_PATH.map(&:shellescape).join(File::PATH_SEPARATOR)}",
-##+ "-I#{$LOAD_PATH.join(File::PATH_SEPARATOR)}",
-## "-e", ruby_command, *flags
-## ]
-##
--- a/rspec-core/spec/rspec/core/rake_task_spec.rb
+++ b/rspec-core/spec/rspec/core/rake_task_spec.rb
@@ -36,7 +36,7 @@
@@ -79,7 +68,7 @@ Last-Update: 2015-03-31
end
end
-@@ -50,14 +50,14 @@
+@@ -57,14 +57,14 @@
context "with ruby options" do
it "renders them before the rspec path" do
task.ruby_opts = "-w"
@@ -98,7 +87,7 @@ Last-Update: 2015-03-31
--- a/rspec-core/spec/rspec/core/example_spec.rb
+++ b/rspec-core/spec/rspec/core/example_spec.rb
-@@ -66,7 +66,7 @@
+@@ -90,7 +90,7 @@
RSpec.configuration.format_docstrings { |s| s.upcase }
example_group.example { }
example_group.run
@@ -107,7 +96,7 @@ Last-Update: 2015-03-31
expect(example_group.examples.first.description).to match(pattern)
end
end
-@@ -89,14 +89,14 @@
+@@ -113,14 +113,14 @@
it "uses the file and line number if there is no matcher-generated description" do
example = example_group.example {}
example_group.run
@@ -124,7 +113,7 @@ Last-Update: 2015-03-31
end
context "if the example is pending" do
-@@ -109,7 +109,7 @@
+@@ -133,7 +133,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
@@ -133,7 +122,7 @@ Last-Update: 2015-03-31
end
end
-@@ -175,14 +175,14 @@
+@@ -199,14 +199,14 @@
it "uses the file and line number if there is no matcher-generated description" do
example = example_group.example {}
example_group.run
@@ -150,7 +139,7 @@ Last-Update: 2015-03-31
end
end
-@@ -198,7 +198,7 @@
+@@ -238,7 +238,7 @@
it "uses the file and line number" do
example = example_group.example { assert 5 == 5 }
example_group.run
diff --git a/debian/patches/fix-rake-task.patch b/debian/patches/fix-rake-task.patch
index f4afced..7469282 100644
--- a/debian/patches/fix-rake-task.patch
+++ b/debian/patches/fix-rake-task.patch
@@ -3,12 +3,13 @@ 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
---
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
-@@ -11,7 +11,7 @@ module RSpec
- include ::Rake::DSL if defined?(::Rake::DSL)
+@@ -13,7 +13,7 @@
+ include RSpec::Core::ShellEscape
# Default path to the RSpec executable.
- DEFAULT_RSPEC_PATH = File.expand_path('../../../../exe/rspec', __FILE__)
@@ -16,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'
-@@ -146,7 +146,6 @@ module RSpec
+@@ -132,7 +132,6 @@
cmd_parts = []
cmd_parts << RUBY
cmd_parts << ruby_opts
@@ -24,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
-@@ -158,15 +157,6 @@ module RSpec
+@@ -144,15 +143,6 @@
lambda { |s| s.nil? || s == "" }
end
@@ -42,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
--- a/rspec-core/spec/rspec/core/rake_task_spec.rb
+++ b/rspec-core/spec/rspec/core/rake_task_spec.rb
-@@ -32,25 +32,23 @@ module RSpec::Core
+@@ -32,18 +32,17 @@
end
end
@@ -50,7 +51,7 @@ 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} #{default_load_path_opts} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
+ expect(spec_command).to match(/^#{ruby} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
end
end
@@ -63,6 +64,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
+@@ -57,7 +56,7 @@
context "with ruby options" do
it "renders them before the rspec path" do
task.ruby_opts = "-w"
@@ -71,7 +73,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
-@@ -218,7 +216,7 @@ module RSpec::Core
+@@ -242,7 +241,7 @@
expect(spec_command).not_to include_extra_load_path_entries
end
diff --git a/debian/patches/fix_encoding.patch b/debian/patches/fix_encoding.patch
index 9e9c221..3ffb3b6 100644
--- a/debian/patches/fix_encoding.patch
+++ b/debian/patches/fix_encoding.patch
@@ -4,11 +4,11 @@ Description: force default external encoding to UTF-8
Origin: vendor
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: not-needed
-Last-Update: 2015-04-01
+Last-Update: 2015-06-13
--- a/rspec-support/spec/spec_helper.rb
+++ b/rspec-support/spec/spec_helper.rb
-@@ -1,2 +1,7 @@
+@@ -1,5 +1,10 @@
require 'rspec/support/spec'
#RSpec::Support::Spec.setup_simplecov
+#
@@ -16,3 +16,6 @@ Last-Update: 2015-04-01
+Encoding.default_external="UTF-8" if defined? Encoding
+
+
+
+ RSpec::Matchers.define_negated_matcher :avoid_raising_errors, :raise_error
+ RSpec::Matchers.define_negated_matcher :avoid_changing, :change
diff --git a/debian/patches/gemspecs.patch b/debian/patches/gemspecs.patch
index 08db62f..23e12da 100644
--- a/debian/patches/gemspecs.patch
+++ b/debian/patches/gemspecs.patch
@@ -2,15 +2,15 @@ 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-04-01
+Last-Update: 2015-06-13
--- a/rspec-core/rspec-core.gemspec
+++ b/rspec-core/rspec-core.gemspec
-@@ -1,53 +1,63 @@
+@@ -1,52 +1,65 @@
# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "rspec/core/version"
-+# stub: rspec-core 3.2.2 ruby lib
++# stub: rspec-core 3.3.0 ruby lib
Gem::Specification.new do |s|
- s.name = "rspec-core"
@@ -23,8 +23,6 @@ Last-Update: 2015-04-01
- s.summary = "rspec-core-#{RSpec::Core::Version::STRING}"
- s.description = "BDD for Ruby. RSpec runner and example groups."
-
-- s.rubyforge_project = "rspec"
--
- s.files = `git ls-files -- lib/*`.split("\n")
- s.files += %w[README.md License.txt Changelog.md .yardopts .document]
- s.test_files = []
@@ -41,7 +39,7 @@ Last-Update: 2015-04-01
- s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
- end
+ s.name = "rspec-core"
-+ s.version = "3.2.2"
++ s.version = "3.3.0"
- if RSpec::Core::Version::STRING =~ /[a-zA-Z]+/
- # rspec-support is locked to our version when running pre,rc etc
@@ -50,24 +48,23 @@ Last-Update: 2015-04-01
+ s.require_paths = ["lib"]
+ s.authors = ["Steven Baker", "David Chelimsky", "Chad Humphries", "Myron Marston"]
+ s.bindir = "exe"
-+ s.date = "2015-03-24"
++ s.date = "2015-06-13"
+ 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.txt", "README.md", "exe/rspec", "lib/rspec/autorun.rb", "lib/rspec/core.rb", "lib/rspec/core/backport_random.rb", "lib/rspec/core/backtrace_formatter.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", "lib/rspec/core/example_group.rb", "lib/rspec/core/filter_manager.rb", "lib/rspec/core/flat_map.rb", "lib/rspec/cor [...]
++ s.files = [".document", ".yardopts", "Changelog.md", "License.txt", "README.md", "exe/rspec", "lib/rspec/autorun.rb", "lib/rspec/core.rb", "lib/rspec/core/backport_random.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/bisect/subset_enumerator.rb", "lib/rspec/core/configuration.rb", "lib/rspec/core/configuration_optio [...]
+ 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.rubyforge_project = "rspec"
+ s.rubygems_version = "2.2.2"
-+ s.summary = "rspec-core-3.2.2"
++ s.summary = "rspec-core-3.3.0"
+
+ 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.2.0"])
++ s.add_runtime_dependency(%q<rspec-support>, ["~> 3.3.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"])
@@ -77,8 +74,9 @@ Last-Update: 2015-04-01
+ 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.2.0"])
++ s.add_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_dependency(%q<cucumber>, ["~> 1.3"])
+ s.add_dependency(%q<minitest>, ["~> 5.3"])
@@ -88,11 +86,12 @@ Last-Update: 2015-04-01
+ 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.2.0"])
++ s.add_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_dependency(%q<cucumber>, ["~> 1.3"])
+ s.add_dependency(%q<minitest>, ["~> 5.3"])
@@ -102,6 +101,7 @@ Last-Update: 2015-04-01
+ 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"
@@ -112,17 +112,18 @@ Last-Update: 2015-04-01
- s.add_development_dependency "nokogiri", (RUBY_VERSION < '1.9.3' ? "1.5.2" : "~> 1.5")
- 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 "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
--- a/rspec-expectations/rspec-expectations.gemspec
+++ b/rspec-expectations/rspec-expectations.gemspec
-@@ -1,46 +1,49 @@
+@@ -1,44 +1,48 @@
# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "rspec/expectations/version"
-+# stub: rspec-expectations 3.2.0 ruby lib
++# stub: rspec-expectations 3.3.0 ruby lib
Gem::Specification.new do |s|
- s.name = "rspec-expectations"
@@ -135,16 +136,12 @@ Last-Update: 2015-04-01
- s.summary = "rspec-expectations-#{RSpec::Expectations::Version::STRING}"
- s.description = "rspec-expectations provides a simple, readable API to express expected outcomes of a code example."
-
-- s.rubyforge_project = "rspec"
--
- s.files = `git ls-files -- lib/*`.split("\n")
- s.files += %w[README.md License.txt Changelog.md .yardopts .document]
- s.test_files = []
- s.rdoc_options = ["--charset=UTF-8"]
- s.require_path = "lib"
-+ s.name = "rspec-expectations"
-+ s.version = "3.2.0"
-
+-
- s.required_ruby_version = '>= 1.8.7'
-
- private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
@@ -152,37 +149,38 @@ Last-Update: 2015-04-01
- s.signing_key = private_key
- s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
- end
--
++ s.name = "rspec-expectations"
++ s.version = "3.3.0"
+
- if RSpec::Expectations::Version::STRING =~ /[a-zA-Z]+/
- # pin to exact version for rc's and betas
- s.add_runtime_dependency "rspec-support", "= #{RSpec::Expectations::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", "Myron Marston"]
-+ s.date = "2015-03-24"
++ s.date = "2015-06-13"
+ s.description = "rspec-expectations provides a simple, readable API to express expected outcomes of a code example."
+ s.email = "rspec at googlegroups.com"
-+ s.files = [".document", ".yardopts", "Changelog.md", "License.txt", "README.md", "lib/rspec/expectations.rb", "lib/rspec/expectations/configuration.rb", "lib/rspec/expectations/expectation_target.rb", "lib/rspec/expectations/fail_with.rb", "lib/rspec/expectations/handler.rb", "lib/rspec/expectations/minitest_integration.rb", "lib/rspec/expectations/syntax.rb", "lib/rspec/expectations/version.rb", "lib/rspec/matchers.rb", "lib/rspec/matchers/aliased_matcher.rb", "lib/rspec/matchers/bui [...]
++ s.files = [".document", ".yardopts", "Changelog.md", "License.txt", "README.md", "lib/rspec/expectations.rb", "lib/rspec/expectations/configuration.rb", "lib/rspec/expectations/expectation_target.rb", "lib/rspec/expectations/fail_with.rb", "lib/rspec/expectations/failure_aggregator.rb", "lib/rspec/expectations/handler.rb", "lib/rspec/expectations/minitest_integration.rb", "lib/rspec/expectations/syntax.rb", "lib/rspec/expectations/version.rb", "lib/rspec/matchers.rb", "lib/rspec/match [...]
+ s.homepage = "http://github.com/rspec/rspec-expectations"
+ s.licenses = ["MIT"]
+ s.rdoc_options = ["--charset=UTF-8"]
+ s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-+ s.rubyforge_project = "rspec"
+ s.rubygems_version = "2.2.2"
-+ s.summary = "rspec-expectations-3.2.0"
++ s.summary = "rspec-expectations-3.3.0"
+
+ 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.2.0"])
++ s.add_runtime_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_runtime_dependency(%q<diff-lcs>, ["< 2.0", ">= 1.2.0"])
+ s.add_development_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_development_dependency(%q<cucumber>, ["~> 1.3"])
+ s.add_development_dependency(%q<aruba>, ["~> 0.6"])
+ s.add_development_dependency(%q<minitest>, ["~> 5.2"])
+ else
-+ s.add_dependency(%q<rspec-support>, ["~> 3.2.0"])
++ s.add_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_dependency(%q<diff-lcs>, ["< 2.0", ">= 1.2.0"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_dependency(%q<cucumber>, ["~> 1.3"])
@@ -192,7 +190,7 @@ Last-Update: 2015-04-01
else
- # pin to major/minor ignoring patch
- s.add_runtime_dependency "rspec-support", "~> #{RSpec::Expectations::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
-+ s.add_dependency(%q<rspec-support>, ["~> 3.2.0"])
++ s.add_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_dependency(%q<diff-lcs>, ["< 2.0", ">= 1.2.0"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_dependency(%q<cucumber>, ["~> 1.3"])
@@ -209,12 +207,12 @@ Last-Update: 2015-04-01
end
--- a/rspec/rspec.gemspec
+++ b/rspec/rspec.gemspec
-@@ -1,40 +1,40 @@
+@@ -1,38 +1,39 @@
# -*- encoding: utf-8 -*-
-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "rspec/version"
-+# stub: rspec 3.2.0 ruby lib
++# stub: rspec 3.3.0 ruby lib
Gem::Specification.new do |s|
- s.name = "rspec"
@@ -226,9 +224,9 @@ Last-Update: 2015-04-01
- s.homepage = "http://github.com/rspec"
- s.summary = "rspec-#{RSpec::Version::STRING}"
- s.description = "BDD for Ruby"
--
-- s.rubyforge_project = "rspec"
--
++ s.name = "rspec"
++ s.version = "3.3.0"
+
- s.files = `git ls-files -- lib/*`.split("\n")
- s.files += ["License.txt"]
- s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
@@ -236,22 +234,10 @@ Last-Update: 2015-04-01
- s.extra_rdoc_files = [ "README.md" ]
- s.rdoc_options = ["--charset=UTF-8"]
- s.require_path = "lib"
-+ s.name = "rspec"
-+ s.version = "3.2.0"
-
-- 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
--
-- %w[core expectations mocks].each do |name|
-- if RSpec::Version::STRING =~ /[a-zA-Z]+/
-- s.add_runtime_dependency "rspec-#{name}", "= #{RSpec::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", "Myron Marston"]
-+ s.date = "2015-03-24"
++ s.date = "2015-06-13"
+ s.description = "BDD for Ruby"
+ s.email = "rspec at googlegroups.com"
+ s.extra_rdoc_files = ["README.md"]
@@ -259,36 +245,43 @@ Last-Update: 2015-04-01
+ s.homepage = "http://github.com/rspec"
+ s.licenses = ["MIT"]
+ s.rdoc_options = ["--charset=UTF-8"]
-+ s.rubyforge_project = "rspec"
+ s.rubygems_version = "2.2.2"
-+ s.summary = "rspec-3.2.0"
-+
++ s.summary = "rspec-3.3.0"
+
+- 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
+ if s.respond_to? :specification_version then
+ s.specification_version = 4
-+
+
+- %w[core expectations mocks].each do |name|
+- if RSpec::Version::STRING =~ /[a-zA-Z]+/
+- s.add_runtime_dependency "rspec-#{name}", "= #{RSpec::Version::STRING}"
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-+ s.add_runtime_dependency(%q<rspec-core>, ["~> 3.2.0"])
-+ s.add_runtime_dependency(%q<rspec-expectations>, ["~> 3.2.0"])
-+ s.add_runtime_dependency(%q<rspec-mocks>, ["~> 3.2.0"])
++ s.add_runtime_dependency(%q<rspec-core>, ["~> 3.3.0"])
++ s.add_runtime_dependency(%q<rspec-expectations>, ["~> 3.3.0"])
++ s.add_runtime_dependency(%q<rspec-mocks>, ["~> 3.3.0"])
else
- s.add_runtime_dependency "rspec-#{name}", "~> #{RSpec::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
-+ s.add_dependency(%q<rspec-core>, ["~> 3.2.0"])
-+ s.add_dependency(%q<rspec-expectations>, ["~> 3.2.0"])
-+ s.add_dependency(%q<rspec-mocks>, ["~> 3.2.0"])
++ s.add_dependency(%q<rspec-core>, ["~> 3.3.0"])
++ s.add_dependency(%q<rspec-expectations>, ["~> 3.3.0"])
++ s.add_dependency(%q<rspec-mocks>, ["~> 3.3.0"])
end
+ else
-+ s.add_dependency(%q<rspec-core>, ["~> 3.2.0"])
-+ s.add_dependency(%q<rspec-expectations>, ["~> 3.2.0"])
-+ s.add_dependency(%q<rspec-mocks>, ["~> 3.2.0"])
++ s.add_dependency(%q<rspec-core>, ["~> 3.3.0"])
++ s.add_dependency(%q<rspec-expectations>, ["~> 3.3.0"])
++ s.add_dependency(%q<rspec-mocks>, ["~> 3.3.0"])
end
end
--- a/rspec-mocks/rspec-mocks.gemspec
+++ b/rspec-mocks/rspec-mocks.gemspec
-@@ -1,46 +1,49 @@
+@@ -1,44 +1,48 @@
# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "rspec/mocks/version"
-+# stub: rspec-mocks 3.2.1 ruby lib
++# stub: rspec-mocks 3.3.0 ruby lib
Gem::Specification.new do |s|
- s.name = "rspec-mocks"
@@ -301,16 +294,12 @@ Last-Update: 2015-04-01
- s.summary = "rspec-mocks-#{RSpec::Mocks::Version::STRING}"
- s.description = "RSpec's 'test double' framework, with support for stubbing and mocking"
-
-- s.rubyforge_project = "rspec"
--
- s.files = `git ls-files -- lib/*`.split("\n")
- s.files += %w[README.md License.txt Changelog.md .yardopts .document]
- s.test_files = []
- s.rdoc_options = ["--charset=UTF-8"]
- s.require_path = "lib"
-+ s.name = "rspec-mocks"
-+ s.version = "3.2.1"
-
+-
- s.required_ruby_version = '>= 1.8.7'
-
- private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
@@ -318,37 +307,38 @@ Last-Update: 2015-04-01
- s.signing_key = private_key
- s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
- end
--
++ s.name = "rspec-mocks"
++ s.version = "3.3.0"
+
- if RSpec::Mocks::Version::STRING =~ /[a-zA-Z]+/
- # pin to exact version for rc's and betas
- s.add_runtime_dependency "rspec-support", "= #{RSpec::Mocks::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", "Myron Marston"]
-+ s.date = "2015-03-24"
++ s.date = "2015-06-13"
+ s.description = "RSpec's 'test double' framework, with support for stubbing and mocking"
+ s.email = "rspec at googlegroups.com"
-+ s.files = [".document", ".yardopts", "Changelog.md", "License.txt", "README.md", "lib/rspec/mocks.rb", "lib/rspec/mocks/any_instance.rb", "lib/rspec/mocks/any_instance/chain.rb", "lib/rspec/mocks/any_instance/expect_chain_chain.rb", "lib/rspec/mocks/any_instance/expectation_chain.rb", "lib/rspec/mocks/any_instance/message_chains.rb", "lib/rspec/mocks/any_instance/proxy.rb", "lib/rspec/mocks/any_instance/recorder.rb", "lib/rspec/mocks/any_instance/stub_chain.rb", "lib/rspec/mocks/any_i [...]
++ s.files = [".document", ".yardopts", "Changelog.md", "License.txt", "README.md", "lib/rspec/mocks.rb", "lib/rspec/mocks/any_instance.rb", "lib/rspec/mocks/any_instance/chain.rb", "lib/rspec/mocks/any_instance/error_generator.rb", "lib/rspec/mocks/any_instance/expect_chain_chain.rb", "lib/rspec/mocks/any_instance/expectation_chain.rb", "lib/rspec/mocks/any_instance/message_chains.rb", "lib/rspec/mocks/any_instance/proxy.rb", "lib/rspec/mocks/any_instance/recorder.rb", "lib/rspec/mocks/ [...]
+ s.homepage = "http://github.com/rspec/rspec-mocks"
+ s.licenses = ["MIT"]
+ s.rdoc_options = ["--charset=UTF-8"]
+ s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-+ s.rubyforge_project = "rspec"
+ s.rubygems_version = "2.2.2"
-+ s.summary = "rspec-mocks-3.2.1"
++ s.summary = "rspec-mocks-3.3.0"
+
+ 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.2.0"])
++ s.add_runtime_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_runtime_dependency(%q<diff-lcs>, ["< 2.0", ">= 1.2.0"])
+ s.add_development_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_development_dependency(%q<cucumber>, ["~> 1.3.15"])
+ s.add_development_dependency(%q<aruba>, ["~> 0.5"])
+ s.add_development_dependency(%q<minitest>, ["~> 5.2"])
+ else
-+ s.add_dependency(%q<rspec-support>, ["~> 3.2.0"])
++ s.add_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_dependency(%q<diff-lcs>, ["< 2.0", ">= 1.2.0"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_dependency(%q<cucumber>, ["~> 1.3.15"])
@@ -358,7 +348,7 @@ Last-Update: 2015-04-01
else
- # pin to major/minor ignoring patch
- s.add_runtime_dependency "rspec-support", "~> #{RSpec::Mocks::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
-+ s.add_dependency(%q<rspec-support>, ["~> 3.2.0"])
++ s.add_dependency(%q<rspec-support>, ["~> 3.3.0"])
+ s.add_dependency(%q<diff-lcs>, ["< 2.0", ">= 1.2.0"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
+ s.add_dependency(%q<cucumber>, ["~> 1.3.15"])
@@ -375,13 +365,13 @@ Last-Update: 2015-04-01
end
--- a/rspec-support/rspec-support.gemspec
+++ b/rspec-support/rspec-support.gemspec
-@@ -1,34 +1,37 @@
+@@ -1,32 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rspec/support/version'
+# -*- encoding: utf-8 -*-
-+# stub: rspec-support 3.2.2 ruby lib
++# stub: rspec-support 3.3.0 ruby lib
-Gem::Specification.new do |spec|
- spec.name = "rspec-support"
@@ -392,41 +382,41 @@ Last-Update: 2015-04-01
- spec.summary = "rspec-support-#{RSpec::Support::Version::STRING}"
- spec.description = "Support utilities for RSpec gems"
- spec.license = "MIT"
--
-- spec.rubyforge_project = "rspec"
--
++Gem::Specification.new do |s|
++ s.name = "rspec-support"
++ s.version = "3.3.0"
+
- spec.files = `git ls-files -- lib/*`.split("\n")
- spec.files += %w[README.md LICENSE.txt Changelog.md]
- spec.test_files = []
- spec.rdoc_options = ["--charset=UTF-8"]
- spec.require_paths = ["lib"]
--
-- private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
-- if File.exist?(private_key)
-- spec.signing_key = private_key
-- spec.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
-+Gem::Specification.new do |s|
-+ s.name = "rspec-support"
-+ s.version = "3.2.2"
-+
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.require_paths = ["lib"]
+ s.authors = ["David Chelimsky", "Myron Marson", "Jon Rowe", "Sam Phippen", "Xaviery Shay", "Bradley Schaefer"]
-+ s.date = "2015-03-24"
++ s.date = "2015-06-13"
+ s.description = "Support utilities for RSpec gems"
+ s.email = "rspec-users at rubyforge.org"
-+ s.files = ["Changelog.md", "LICENSE.txt", "README.md", "lib/rspec/support.rb", "lib/rspec/support/caller_filter.rb", "lib/rspec/support/differ.rb", "lib/rspec/support/directory_maker.rb", "lib/rspec/support/encoded_string.rb", "lib/rspec/support/fuzzy_matcher.rb", "lib/rspec/support/hunk_generator.rb", "lib/rspec/support/matcher_definition.rb", "lib/rspec/support/method_signature_verifier.rb", "lib/rspec/support/recursive_const_methods.rb", "lib/rspec/support/ruby_features.rb", "lib/r [...]
++ s.files = ["Changelog.md", "LICENSE.txt", "README.md", "lib/rspec/support.rb", "lib/rspec/support/caller_filter.rb", "lib/rspec/support/differ.rb", "lib/rspec/support/directory_maker.rb", "lib/rspec/support/encoded_string.rb", "lib/rspec/support/fuzzy_matcher.rb", "lib/rspec/support/hunk_generator.rb", "lib/rspec/support/matcher_definition.rb", "lib/rspec/support/method_signature_verifier.rb", "lib/rspec/support/object_formatter.rb", "lib/rspec/support/recursive_const_methods.rb", "li [...]
+ s.homepage = "https://github.com/rspec/rspec-support"
+ s.licenses = ["MIT"]
+ s.rdoc_options = ["--charset=UTF-8"]
+ s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-+ s.rubyforge_project = "rspec"
+ s.rubygems_version = "2.2.2"
-+ s.summary = "rspec-support-3.2.2"
-+
++ s.summary = "rspec-support-3.3.0"
+
+- private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
+- if File.exist?(private_key)
+- spec.signing_key = private_key
+- spec.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
+- end
+-
+- spec.required_ruby_version = '>= 1.8.7'
+ if s.respond_to? :specification_version then
+ s.specification_version = 4
-+
+
+- spec.add_development_dependency "bundler", "~> 1.3"
+- spec.add_development_dependency "rake", "~> 10.0.0"
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_development_dependency(%q<bundler>, ["~> 1.3"])
+ s.add_development_dependency(%q<rake>, ["~> 10.0.0"])
@@ -437,10 +427,5 @@ Last-Update: 2015-04-01
+ else
+ s.add_dependency(%q<bundler>, ["~> 1.3"])
+ s.add_dependency(%q<rake>, ["~> 10.0.0"])
- end
--
-- spec.required_ruby_version = '>= 1.8.7'
--
-- spec.add_development_dependency "bundler", "~> 1.3"
-- spec.add_development_dependency "rake", "~> 10.0.0"
++ end
end
diff --git a/debian/patches/path_to_executable.patch b/debian/patches/path_to_executable.patch
index c547f86..6c46c09 100644
--- a/debian/patches/path_to_executable.patch
+++ b/debian/patches/path_to_executable.patch
@@ -2,11 +2,11 @@ Description: fix path to rspec executable
the relative path is different in the gem and in the installed version
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: not-needed
-Last-Update: 2015-03-24
+Last-Update: 2015-06-13
--- a/rspec-core/lib/rspec/core.rb
+++ b/rspec-core/lib/rspec/core.rb
-@@ -159,7 +159,8 @@
+@@ -151,7 +151,8 @@
# @private path to executable file.
def self.path_to_executable
diff --git a/debian/patches/series b/debian/patches/series
index 49b406e..a081319 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,6 @@ escape-path-in-match.patch
caller_filter_spec_for_debian.patch
fix_encoding.patch
#no-aruba.patch
-disable_no_warning_spec_rspec-support.patch
+#disable_no_warning_spec_rspec-support.patch
fix-rake-task.patch
autorun-load-configuration.patch
diff --git a/debian/patches/skip_coverage.patch b/debian/patches/skip_coverage.patch
index 852586b..510b71d 100644
--- a/debian/patches/skip_coverage.patch
+++ b/debian/patches/skip_coverage.patch
@@ -1,12 +1,13 @@
Description: disable the use of simplecov in tests
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: not-needed
-Last-Update: 2015-03-24
+Last-Update: 2015-06-13
--- a/rspec-expectations/spec/spec_helper.rb
+++ b/rspec-expectations/spec/spec_helper.rb
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,9 @@
require 'rspec/support/spec'
+ require 'rspec/support/spec/in_sub_process'
-RSpec::Support::Spec.setup_simplecov do
- minimum_coverage 97
@@ -34,7 +35,10 @@ Last-Update: 2015-03-24
begin
--- a/rspec-support/spec/spec_helper.rb
+++ b/rspec-support/spec/spec_helper.rb
-@@ -1,2 +1,2 @@
+@@ -1,5 +1,5 @@
require 'rspec/support/spec'
-RSpec::Support::Spec.setup_simplecov
+#RSpec::Support::Spec.setup_simplecov
+
+ RSpec::Matchers.define_negated_matcher :avoid_raising_errors, :raise_error
+ RSpec::Matchers.define_negated_matcher :avoid_changing, :change
--
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