[DRE-commits] [cucumber] 07/11: include code of the multi_test gem

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository cucumber.

commit 9adf122eb893ed03ae2f101bf9e86371a152d5ce
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 13 22:35:28 2013 +0200

    include code of the multi_test gem
---
 debian/copyright                                   |    7 +++++
 .../patches/0005-Integrate-multi_test-code.patch   |   30 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 944ac81..242e007 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,13 @@ License: Expat or GPL-2
 Comment: the two first files contain a minified version of the javascript library jquery.
  The source (a non-minified version of it) is shipped in debian/jquery-1.4.2.js.
 
+Files: debian/patches/0005-Integrate-multi_test-code.patch
+Copyright: 2013 The Cucumber Organisation
+License: Expat
+Comment: the code added by this patch is released as the multi_test gem
+ It is a subproject of cucumber and very small.
+ https://github.com/cucumber/multi_test/blob/master/LICENSE
+
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
diff --git a/debian/patches/0005-Integrate-multi_test-code.patch b/debian/patches/0005-Integrate-multi_test-code.patch
new file mode 100644
index 0000000..7a3a6d0
--- /dev/null
+++ b/debian/patches/0005-Integrate-multi_test-code.patch
@@ -0,0 +1,30 @@
+Description: include code of multi_test gem
+ Cucumber upstream released these 16 lines of code as an independent gem
+ (multi_test). Instead of packaging them, we just include them here.
+ https://github.com/cucumber/multi_test
+Origin: vendor
+Last-Update: 2013-08-13
+
+--- a/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb
++++ b/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb
+@@ -1,2 +1,19 @@
+-require 'multi_test'
++
++module MultiTest
++  def self.disable_autorun
++    if defined?(Test::Unit::Runner)
++      Test::Unit::Runner.module_eval("@@stop_auto_run = true")
++    end
++
++    if defined?(Minitest)
++      if defined?(Minitest::Unit)
++        Minitest::Unit.class_eval do
++          def run(*)
++          end
++        end
++      end
++    end
++  end
++end
++
+ MultiTest.disable_autorun
diff --git a/debian/patches/series b/debian/patches/series
index 1be4eda..3bb2ea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Remove-require-rubygems-statements.patch
 0003-Disable-tests-assuming-ordered-hashes.patch
 0004-Update_default_binary_path.patch
+0005-Integrate-multi_test-code.patch

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