[DRE-commits] [ruby-rspec] 02/19: Fixup

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/multideb
in repository ruby-rspec.

commit 85477eaa10a65c38bf076cd8e9a6b5298c539b8c
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Oct 19 19:29:21 2013 +0200

    Fixup
---
 debian/control                      |    2 +-
 debian/ruby-rspec-core.docs         |    4 ++--
 debian/ruby-rspec-core.install      |    2 +-
 debian/ruby-rspec-expectations.docs |    2 ++
 debian/ruby-rspec-mocks.docs        |    2 ++
 debian/ruby-tests.rb                |   23 ++++++++++++++++++-----
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index dc899c2..7b5a446 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Cédric Boutillier <boutil at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.0~), rake, ruby-childprocess, ruby-fakefs, ruby-nokogiri, ruby-json, ruby-diff-lcs
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.0~), ruby-childprocess, ruby-fakefs, ruby-nokogiri, ruby-json, ruby-diff-lcs
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rspec.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-rspec.git
diff --git a/debian/ruby-rspec-core.docs b/debian/ruby-rspec-core.docs
index 101b170..6ad870e 100644
--- a/debian/ruby-rspec-core.docs
+++ b/debian/ruby-rspec-core.docs
@@ -1,2 +1,2 @@
-README.md
-features
+rspec-core/README.md
+rspec-core/features
diff --git a/debian/ruby-rspec-core.install b/debian/ruby-rspec-core.install
index c3dad3c..c67a7d1 100644
--- a/debian/ruby-rspec-core.install
+++ b/debian/ruby-rspec-core.install
@@ -1 +1 @@
-exe/rspec usr/bin/
+rspec-core/exe/rspec usr/bin/
diff --git a/debian/ruby-rspec-expectations.docs b/debian/ruby-rspec-expectations.docs
new file mode 100644
index 0000000..6d9ef29
--- /dev/null
+++ b/debian/ruby-rspec-expectations.docs
@@ -0,0 +1,2 @@
+rspec-expectations/README.md
+rspec-expectations/features
diff --git a/debian/ruby-rspec-mocks.docs b/debian/ruby-rspec-mocks.docs
new file mode 100644
index 0000000..f25fba1
--- /dev/null
+++ b/debian/ruby-rspec-mocks.docs
@@ -0,0 +1,2 @@
+rspec-mocks/README.md
+rspec-mocks/features
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 7cfc3a4..73d5022 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,9 +1,22 @@
-$:.unshift 'spec'
-$:.unshift 'lib'
+$: << 'rspec-core/spec'
+$: << 'rspec-core/lib'
 require "rspec/core"
 EXC_TESTS = [
   # require 'syntax' gem
-  'spec/rspec/core/formatters/text_mate_formatter_spec.rb',
-  'spec/rspec/core/formatters/html_formatter_spec.rb'
+  'rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb',
+  'rspec-core/spec/rspec/core/formatters/html_formatter_spec.rb'
 ]
-exit(RSpec::Core::Runner.run(Dir["spec/rspec/**/*_spec.rb"] - EXC_TESTS, $stderr, $stdout))
+RSpec::Core::Runner.run(Dir["rspec-core/spec/rspec/**/*_spec.rb"] - EXC_TESTS, $stderr, $stdout) || exit 1
+
+with_core = $:
+$: << 'rspec-expectations/spec'
+$: << 'rspec-expectations/lib'
+RSpec::Core::Runner.run(Dir["rspec-expectations/spec/rspec/**/*_spec.rb"], $stderr, $stdout) || exit 1
+
+$: = with_core
+$: << 'rspec-mocks/spec'
+$: << 'rspec-mocks/lib'
+#The specs need yaml to be loaded before spec_helper
+#https://github.com/rspec/rspec-mocks/issues/107
+require "yaml"
+RSpec::Core::Runner.run(Dir["rspec-mocks/spec/rspec/**/*_spec.rb"], $stderr, $stdout) || exit 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec.git