[DRE-commits] [yard] 01/03: Add force_file_order.patch to force sorting filenames when compiling list of files. This should help with reproducibility issues for packaging using yard to generate documentation.

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository yard.

commit 63f45f8367b57996d7d9c85892aa02481e3aca06
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Mar 16 11:09:30 2016 +0100

    Add force_file_order.patch to force sorting filenames when compiling list of files. This should help with reproducibility issues for packaging using yard to generate documentation.
---
 debian/changelog                      |  8 ++++++++
 debian/patches/force_file_order.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 87c5ac5..f17ea5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+yard (0.8.7.6+git20160220-4) UNRELEASED; urgency=medium
+
+  * Add force_file_order.patch to force sorting filenames when compiling list
+    of files. This should help with reproducibility issues for packaging using
+    yard to generate documentation.
+
+ -- Cédric Boutillier <boutil at debian.org>  Wed, 16 Mar 2016 11:07:58 +0100
+
 yard (0.8.7.6+git20160220-3) unstable; urgency=medium
 
   * Copy content of rubygems_plugin.rb in specs as this file is removed from
diff --git a/debian/patches/force_file_order.patch b/debian/patches/force_file_order.patch
new file mode 100644
index 0000000..0289397
--- /dev/null
+++ b/debian/patches/force_file_order.patch
@@ -0,0 +1,27 @@
+Description: force sorting filenames when compiling list of files
+ This should help with reproducibility issues for packaging using yard to
+ generate documentation.
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2016-03-16
+
+--- a/lib/yard/cli/yardoc.rb
++++ b/lib/yard/cli/yardoc.rb
+@@ -278,8 +278,8 @@
+         # Last minute modifications
+         self.files = Parser::SourceParser::DEFAULT_PATH_GLOB if self.files.empty?
+         self.files.delete_if {|x| x =~ /\A\s*\Z/ } # remove empty ones
+-        readme = Dir.glob('README{,*[^~]}').first
+-        readme ||= Dir.glob(files.first).first if options.onefile
++        readme = Dir.glob('README{,*[^~]}').sort.first
++        readme ||= Dir.glob(files.first).sort.first if options.onefile
+         options.readme ||= CodeObjects::ExtraFileObject.new(readme) if readme
+         options.files.unshift(options.readme).uniq! if options.readme
+ 
+@@ -393,6 +393,7 @@
+       # @param [Array<String>] files the set of documentation files
+       def add_extra_files(*files)
+         files.map! {|f| f.include?("*") ? Dir.glob(f) : f }.flatten!
++        files.sort!
+         files.each do |file|
+           if File.file?(file)
+             options.files << CodeObjects::ExtraFileObject.new(file)
diff --git a/debian/patches/series b/debian/patches/series
index 4c6f8a3..40f6915 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ no-timestamps.patch
 privacy-breach.patch
 skip_failing_test_ruby230.patch
 rubygems_plugin_specs.patch
+force_file_order.patch

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