[DRE-commits] [SCM] gem2deb.git branch, master, updated. debian/0.2.3-20-g80a639e

[Vincent Fourmond]

The following commit has been merged in the master branch:
commit 07bb33a89b56bd6b3c802fd11301fe2eb25f78e7
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Thu May 12 14:18:49 2011 +0200

    Make dh_ruby use the new DhRubySetupRb class via the --setuprb option

diff --git a/bin/dh_ruby b/bin/dh_ruby
index 1c309cd..9bb1445 100755
--- a/bin/dh_ruby
+++ b/bin/dh_ruby
@@ -17,42 +17,50 @@
 
 require 'gem2deb'
 require 'gem2deb/dh_ruby'
+require 'gem2deb/dh_ruby_setuprb'
 require 'optparse'
 include Gem2Deb
 
+cls = DhRuby
+
+
 optparse = OptionParser.new do |opts|
   opts.on('-h', '--help', 'show help') do
     puts opts
     exit
   end
 
+  opts.on('', '--setuprb', 'use setup.rb for installation') do
+    cls = DhRubySetupRb
+  end
+
   opts.on('-v', '--version', 'show dh_ruby version') do
     puts "dh_ruby version #{Gem2Deb::VERSION}"
     exit
   end
 
   opts.on('', '--clean', 'debhelper clean helper') do
-    DhRuby::new.clean
+    cls.new.clean
     exit(0)
   end
 
   opts.on('', '--configure', 'debhelper configure helper') do
-    DhRuby::new.configure
+    cls.new.configure
     exit(0)
   end
 
   opts.on('', '--build', 'debhelper build helper') do
-    DhRuby::new.build
+    cls.new.build
     exit(0)
   end
 
   opts.on('', '--test', 'debhelper test helper') do
-    DhRuby::new.test
+    cls.new.test
     exit(0)
   end
 
   opts.on('', '--install', 'debhelper install helper') do
-    DhRuby::new.install(ARGV)
+    cls.new.install(ARGV)
     exit(0)
   end
 end

-- 
gem2deb.git