[DRE-commits] [SCM] ruby-slim.git branch, master, updated. upstream/2.0.0_pre6-25-g36085fb

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit d51bd0a23fff934da551101a3bf105e4d0b0d410
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Mar 16 10:49:08 2013 +0000

    Add a patch to explicitly load rubygems in upstream Rakefile

diff --git a/debian/patches/0001-Explicitly-load-rubygems-in-Rakefile.patch b/debian/patches/0001-Explicitly-load-rubygems-in-Rakefile.patch
new file mode 100644
index 0000000..53c6cdc
--- /dev/null
+++ b/debian/patches/0001-Explicitly-load-rubygems-in-Rakefile.patch
@@ -0,0 +1,21 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+Date: Sat, 16 Mar 2013 10:48:35 +0000
+Subject: Explicitly load 'rubygems' in Rakefile
+
+`Gem` must be loaded before we try to use it to reach Sinatra tests.
+---
+ Rakefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Rakefile b/Rakefile
+index 753fe21..bca31c9 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -48,6 +48,7 @@ namespace 'test' do
+   end
+ 
+   begin
++    require 'rubygems'
+     require 'sinatra'
+     spec = Gem::Specification.find_by_name('sinatra')
+     Rake::TestTask.new('sinatra') do |t|
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..50ef3b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Explicitly-load-rubygems-in-Rakefile.patch

-- 
ruby-slim.git