[DRE-commits] [ruby-pdf-core] 02/04: extend no_bundler.patch to load correctly pdf/core in specs, and rename to clean_spec_helper.patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-pdf-core.

commit d74ca0e1bf5ac6d145f009f67fc4da20b33fc154
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Sep 28 22:01:47 2014 +0200

    extend no_bundler.patch to load correctly pdf/core in specs, and rename to clean_spec_helper.patch
---
 debian/patches/clean_spec_helper.patch | 27 +++++++++++++++++++++++++++
 debian/patches/no_bundler.patch        | 17 -----------------
 debian/patches/series                  |  2 +-
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/debian/patches/clean_spec_helper.patch b/debian/patches/clean_spec_helper.patch
new file mode 100644
index 0000000..4b78cd1
--- /dev/null
+++ b/debian/patches/clean_spec_helper.patch
@@ -0,0 +1,27 @@
+Description: clean spec helper file
+  - do not use bundler in specs
+  - use require with abstract path instead of require_relative to load pdf/core
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2014-09-28
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -2,15 +2,7 @@
+ 
+ puts "PDF::Core specs: Running on Ruby Version: #{RUBY_VERSION}"
+ 
+-require "bundler"
+-Bundler.setup
+-
+-if ENV["COVERAGE"]
+-  require "simplecov"
+-  SimpleCov.start 
+-end
+-
+-require_relative "../lib/pdf/core"
++require "pdf/core"
+ 
+ 
+ require "rspec"
diff --git a/debian/patches/no_bundler.patch b/debian/patches/no_bundler.patch
deleted file mode 100644
index 88096e9..0000000
--- a/debian/patches/no_bundler.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: do not use bundler in specs
-Origin: vendor
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: no
-Last-Update: 2014-03-21
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -2,8 +2,6 @@
- 
- puts "PDF::Core specs: Running on Ruby Version: #{RUBY_VERSION}"
- 
--require "bundler"
--Bundler.setup
- 
- if ENV["COVERAGE"]
-   require "simplecov"
diff --git a/debian/patches/series b/debian/patches/series
index e7364da..48e2598 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-no_bundler.patch
+clean_spec_helper.patch

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