[DRE-commits] [ruby-github-markup] 06/07: add patches to fix outputs in tests

Fri Mar 28 13:21:49 UTC 2014

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

boutil pushed a commit to branch master
in repository ruby-github-markup.

commit 6e801b709f2588e78398abe4398d429064ce496c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Mar 28 14:13:35 2014 +0100

    add patches to fix outputs in tests
---
 .../0001-Update-wikicloth-markup-test-output.patch |  66 +++++++++++++
 .../0002-Update-pod-markup-test-output.patch       | 102 +++++++++++++++++++++
 debian/patches/series                              |   2 +
 3 files changed, 170 insertions(+)

diff --git a/debian/patches/0001-Update-wikicloth-markup-test-output.patch b/debian/patches/0001-Update-wikicloth-markup-test-output.patch
new file mode 100644
index 0000000..3077d7e
--- /dev/null
+++ b/debian/patches/0001-Update-wikicloth-markup-test-output.patch
@@ -0,0 +1,66 @@
+Description: fix output of README.mediawiki as parsed by ruby-wikicloth 0.8.1
+ Upstream forces the use of version 0.6 in the Gemfile
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-03-27
+
+--- a/test/markups/README.mediawiki.html
++++ b/test/markups/README.mediawiki.html
+@@ -1,35 +1,35 @@
+-<p>
+-<a href="javascript:void(0)">» JRuby Project Wiki Home Page</a>
+ 
++<p><a href="Home">» JRuby Project Wiki Home Page</a>
+ <h1>Embedding JRuby</h1>
+-
+ Using Java from Ruby is JRuby's best-known feature---but you can also go in the other direction, and use Ruby from Java.  There are several different ways to do this. You can execute entire Ruby scripts, call individual Ruby methods, or even implement a Java interface in Ruby (thus allowing you to treat Ruby objects like Java ones).  We refer to all these techniques generically as "embedding."  This section will explain how to embed JRuby in your Java project.
++</p>
++
+ 
+-</p><p>
+-<table id="toc" class="toc" summary="Contents"><tr><td><div style="font-weight:bold">Table of Contents</div><ul></ul></td></tr></table>
+ 
+-</p><p>
+-<h1> <span id="Red_Bridge_JRuby_Embed" class="mw-headline">Red Bridge (JRuby Embed)</span></h1>
++<h1><a name="Red_Bridge_JRuby_Embed"></a><span class="mw-headline" id="Red_Bridge_JRuby_Embed">Red Bridge (JRuby Embed)</span></h1>
+ 
+-JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the <a href="javascript:void(0)">legacy API</a> should still work, but we strongly recommend Red Bridge for all new projects.
+ 
+-</p><p>
+-<h2> <span id="Features_of_Red_Bridge" class="mw-headline">Features of Red Bridge</span></h2>Red Bridge consists of two layers: Embed Core on the bottom, and implementations of <a href="http://www.jcp.org/en/jsr/detail?id=223">JSR223</a> and <a href="http://jakarta.apache.org/bsf/">BSF</a> on top. Embed Core is JRuby-specific, and can take advantage of much of JRuby's power. JSR223 and BSF are more general interfaces that provide a common ground across scripting languages.
+ 
+-</p><p>
+-Which API should you use? For projects where Ruby is the only scripting language involved, we recommend Embed Core for the following reasons:
++<p>JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the <a href="DirectJRubyEmbedding">legacy API</a> should still work, but we strongly recommend Red Bridge for all new projects.
++</p>
+ 
+-</p><p>
+-<ol><li> With Embed Core, you can create several Ruby environments in one JVM, and configure them individually (via <code>org.jruby.RubyInstanceConfig</code>. With the other APIs, configuration options can only be set globally, via the <code>System</code> properties.
++<h2><a name="Features_of_Red_Bridge"></a><span class="mw-headline" id="Features_of_Red_Bridge">Features of Red Bridge</span></h2>
+ 
+-</li><li> Embed Core offers several shortcuts, such as loading scripts from a <code>java.io.InputStream</code>, or returning Java-friendly objects from Ruby code. These allow you to skip a lot of boilerplate.
+ 
+-</p><p>
+-</li></ol> For projects requiring multiple scripting languages, JSR223 is a good fit. Though the API is language-independent, JRuby's implementation of it allows you to set some Ruby-specific options. In particular, you can control the threading model of the scripting engine, the lifetime of local variables, compilation mode, and how line numbers are displayed.
++<p>Red Bridge consists of two layers: Embed Core on the bottom, and implementations of <a href="http://www.jcp.org/en/jsr/detail?id=223" target="_blank">JSR223</a> and <a href="http://jakarta.apache.org/bsf/" target="_blank">BSF</a> on top. Embed Core is JRuby-specific, and can take advantage of much of JRuby's power. JSR223 and BSF are more general interfaces that provide a common ground across scripting languages.
++</p>
++<p>Which API should you use? For projects where Ruby is the only scripting language involved, we recommend Embed Core for the following reasons:
++</p>
+ 
+-</p><p>
+-The full <a href="http://jruby-embed.kenai.com/docs/">API documentation</a> has all the gory details. It's worth talking about a couple of the finer points here.
+ 
+-</p><p>
+-<h1> <span id="Previous_Embedding_JRuby_Page" class="mw-headline">Previous Embedding JRuby Page</span></h1>We recommend using Embed Core; however, if you're maintaining code that uses the old API, you can find its documentation on the <a href="javascript:void(0)">legacy embedding</a> page.
++
++<p><ol><li>With Embed Core, you can create several Ruby environments in one JVM, and configure them individually (via <code>org.jruby.RubyInstanceConfig</code>. With the other APIs, configuration options can only be set globally, via the <code>System</code> properties.</li><li>Embed Core offers several shortcuts, such as loading scripts from a <code>java.io.InputStream</code>, or returning Java-friendly objects from Ruby code. These allow you to skip a lot of boilerplate.</li></ol>
++For projects requiring multiple scripting languages, JSR223 is a good fit. Though the API is language-independent, JRuby's implementation of it allows you to set some Ruby-specific options. In particular, you can control the threading model of the scripting engine, the lifetime of local variables, compilation mode, and how line numbers are displayed.
++</p>
++<p>The full <a href="http://jruby-embed.kenai.com/docs/" target="_blank">API documentation</a> has all the gory details. It's worth talking about a couple of the finer points here.
+ </p>
++
++<h1><a name="Previous_Embedding_JRuby_Page"></a><span class="mw-headline" id="Previous_Embedding_JRuby_Page">Previous Embedding JRuby Page</span></h1>
++
++
++<p>We recommend using Embed Core; however, if you're maintaining code that uses the old API, you can find its documentation on the <a href="JavaIntegration">legacy embedding</a> page.</p>
+\ No newline at end of file
diff --git a/debian/patches/0002-Update-pod-markup-test-output.patch b/debian/patches/0002-Update-pod-markup-test-output.patch
new file mode 100644
index 0000000..e62df52
--- /dev/null
+++ b/debian/patches/0002-Update-pod-markup-test-output.patch
@@ -0,0 +1,102 @@
+Description: fix output of README.pod as parsed by perl POD::Simple::HTML
+ in order to get #___top href, the field index should be set.
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-03-28
+
+--- a/test/markups/README.pod.html
++++ b/test/markups/README.pod.html
+@@ -1,10 +1,10 @@
+ <a name='___top' class='dummyTopAnchor' ></a>
+ 
+-<h1><a class='u' href='#___top' title='click to go to top of document'
++<h1><a class='u'
+ name="Matrixy"
+ >Matrixy</a></h1>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="INTRODUCTION"
+ >INTRODUCTION</a></h2>
+ 
+@@ -12,7 +12,7 @@
+ See the ROADMAP file for more information on the status of this project,
+ and what else needs to be done.</p>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="ABOUT"
+ >ABOUT</a></h2>
+ 
+@@ -22,7 +22,7 @@
+ <p>=item* Create a working compiler that understands the majority of the MATLAB/Octave programming language.</p>
+ </blockquote>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="IMPLEMENTATION"
+ >IMPLEMENTATION</a></h2>
+ 
+@@ -51,13 +51,13 @@
+ or mostly M with some inline PIR code in <code>toolbox/</code>.</p>
+ </blockquote>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="DEPENDENCIES"
+ >DEPENDENCIES</a></h2>
+ 
+ <p>Matrixy depends on these dependencies:</p>
+ 
+-<h3><a class='u' href='#___top' title='click to go to top of document'
++<h3><a class='u'
+ name="Parrot"
+ >Parrot</a></h3>
+ 
+@@ -69,13 +69,13 @@
+     perl Configure.pl
+     make && make test && make install-dev</pre>
+ 
+-<h3><a class='u' href='#___top' title='click to go to top of document'
++<h3><a class='u'
+ name="Parrot-Linear-Algebra"
+ >Parrot-Linear-Algebra</a></h3>
+ 
+ <p>The linear algebra package for Parrot is available separately and provides functionality required by Matrixy. This includes matrix data types and matrix manipulation libraries</p>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="BUILDING"
+ >BUILDING</a></h2>
+ 
+@@ -84,7 +84,7 @@
+ <pre>    perl Configure.pl
+     nmake test</pre>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="TODO"
+ >TODO</a></h2>
+ 
+@@ -92,17 +92,16 @@
+     * Standard Builtins
+     * Test against Octave Test Suite.</pre>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="BUGS"
+ >BUGS</a></h2>
+ 
+ <p>Lots!</p>
+ 
+-<h2><a class='u' href='#___top' title='click to go to top of document'
++<h2><a class='u'
+ name="CONTACT"
+ >CONTACT</a></h2>
+ 
+ <p>If you need to contact the Matrixy team, go to the project home page at:</p>
+ 
+-<p>www.github.com\Whiteknight\matrixy</p>
+-
++<p>www.github.com\Whiteknight\matrixy</p>
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..33f5ddd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Update-wikicloth-markup-test-output.patch
+0002-Update-pod-markup-test-output.patch

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

