[DRE-commits] [SCM] rake.git branch, master, updated. debian/0.9.2.2-1-4-gbc12ce9

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit d9558b0cc4fb436352c5b9d106e91e444a772f97
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Nov 25 10:13:38 2011 -0200

    Fix patch that requires Rubygems
    
    There was a missing Gem::LoadError in lib/rake/rdoctask.rb
    
    Also, added a DEP8-style test for rdoctask

diff --git a/debian/patches/0001-remove_rubygems.patch b/debian/patches/0001-remove_rubygems.patch
index bc8adf1..a63366e 100644
--- a/debian/patches/0001-remove_rubygems.patch
+++ b/debian/patches/0001-remove_rubygems.patch
@@ -1,13 +1,13 @@
-From 718c1549773bb188919a70da8167c9675236b58a Mon Sep 17 00:00:00 2001
+From c6408410db046a22f0a8157e04cb5cb76ac5e32d Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro at debian.org>
 Date: Sat, 19 Nov 2011 18:06:57 -0200
 Subject: [PATCH] Remove `require 'rubygems'`
 
 ---
  bin/rake             |    6 ------
- lib/rake/rdoctask.rb |    3 ---
+ lib/rake/rdoctask.rb |    5 +----
  test/helper.rb       |    5 -----
- 3 files changed, 0 insertions(+), 14 deletions(-)
+ 3 files changed, 1 insertions(+), 15 deletions(-)
 
 diff --git a/bin/rake b/bin/rake
 index 4e0bbb7..f1ac568 100755
@@ -27,10 +27,10 @@ index 4e0bbb7..f1ac568 100755
  
  Rake.application.run
 diff --git a/lib/rake/rdoctask.rb b/lib/rake/rdoctask.rb
-index b6ae224..09de272 100644
+index b6ae224..f8d30a9 100644
 --- a/lib/rake/rdoctask.rb
 +++ b/lib/rake/rdoctask.rb
-@@ -4,10 +4,7 @@ if Rake.application
+@@ -4,13 +4,10 @@ if Rake.application
    Rake.application.deprecate('require \'rake/rdoctask\'', 'require \'rdoc/task\' (in RDoc 2.4.2+)', __FILE__)
  end
  
@@ -40,7 +40,11 @@ index b6ae224..09de272 100644
 -  gem 'rdoc'
    require 'rdoc'
    require 'rdoc/task'
- rescue LoadError, Gem::LoadError
+-rescue LoadError, Gem::LoadError
++rescue LoadError
+ end
+ 
+ # :stopdoc:
 diff --git a/test/helper.rb b/test/helper.rb
 index 65443fc..0828739 100644
 --- a/test/helper.rb
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..dfa5a97
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: rdoctask
+Depends: @, ruby1.8
diff --git a/debian/tests/rdoctask b/debian/tests/rdoctask
new file mode 100755
index 0000000..fde48ca
--- /dev/null
+++ b/debian/tests/rdoctask
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+testdir="${TMPDIR:-/tmp}/rdoctask"
+mkdir -p "$testdir"
+rakefile="$testdir/Rakefile"
+
+cat > $rakefile  <<EOF
+require 'rake/rdoctask'
+
+task :default do
+  puts "Hello, world"
+end
+EOF
+
+cd "$testdir" && ruby1.8 -S rake

-- 
rake.git