[DRE-commits] [SCM] ruby-debian-doc.git branch, master, updated. 49ce8dc9509263e82314b285688daf537bb4c6e8

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 84988055e26af82f5cfc90ab7ebb3195dcc1d0f4
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Dec 31 20:41:29 2011 -0200

    Skip README.Debian files

diff --git a/lib/debian-doc/package.rb b/lib/debian-doc/package.rb
index 3e45ce9..b3672ee 100644
--- a/lib/debian-doc/package.rb
+++ b/lib/debian-doc/package.rb
@@ -45,7 +45,7 @@ module Debian
 
       def readmes
         files.select do |filename|
-          File.basename(filename) =~ /^README/
+          File.basename(filename) =~ /^README/ && File.basename(filename) !~ /README.Debian/
         end.map do |readme|
           if readme =~ /\.gz$/
             uncompressed = File.join(tmpdir, File.basename(readme.gsub(/\.gz$/, '')))
diff --git a/spec/debian-doc/package_spec.rb b/spec/debian-doc/package_spec.rb
index 2e9e410..c87d1c6 100644
--- a/spec/debian-doc/package_spec.rb
+++ b/spec/debian-doc/package_spec.rb
@@ -27,6 +27,14 @@ describe Debian::Doc::Package do
     end
   end
 
+  %w[ README.Debian README.Debian-sources ].each do |debian_readme|
+    it "skips #{debian_readme} files" do
+      readme_file = '/path/to/' + debian_readme
+      @package.stub(:files) { [readme_file ] }
+      @package.readmes.should_not include(readme_file)
+    end
+  end
+
   it 'knows its version' do
     @package.version.should =~ /[0-9.-]/
     @package.version.should_not =~ /\n/

-- 
ruby-debian-doc.git