PR-1947 finalizations

lib/fpm/package/cpan.rb

@@ -22,7 +22,7 @@ class FPM::Package::CPAN < FPM::Package
   option "--package-name-prefix", "NAME_PREFIX",
     "Name to prefix the package name with.", :default => "perl"
 
-  option "--package-reject-from-depends", "MODULE",
+  option "--disable-dependency", "MODULE",
     "Filter modules matching MODULE from those generated by " \
     "the auto-depends for CPAN modules. This flag can be specified " \
     "multiple times. Use the perl module name, IE: URI::Escape.",

lib/fpm/package/deb.rb

@@ -826,6 +826,7 @@ def converted_from(origin)
       end
       self.dependencies = self.dependencies.reject do |dep|
         # Reject non-module Perl dependencies like 'vars' and 'warnings'
+        dep, _ = dep.split(' ') # strip potential version component
         rejects.include?(dep)
       end.collect(&perldepfix).collect(&method(:fix_dependency))
 

spec/fpm/package/deb_spec.rb

@@ -3,6 +3,7 @@
 require "fpm" # local
 require "fpm/package/deb" # local
 require "fpm/package/dir" # local
+require "fpm/package/cpan" # local
 require "stud/temporary"
 require "English" # for $CHILD_STATUS
 
@@ -353,6 +354,37 @@ def dpkg_field(field)
     end
   end # #output with no dependencies
 
+  describe "#output converted from CPAN" do
+    skip("Missing cpanm program") unless program_exists?("cpanm")
+
+    let(:input) { FPM::Package::CPAN.new }
+    let(:input_name) { "Digest::MD5" }
+
+    before :each do
+      input.instance_variable_set(:@version, "2.58");
+      input.attributes[:cpan_test?] = false
+      input.attributes[:rejects] = ['vars','warnings','strict','Config']
+    end
+
+    after :each do
+      input.cleanup
+    end
+
+    it "should ignore dependencies in attributes[:rejects]" do
+      input.attributes[:rejects] += ["Digest::base", "XSLoader"]
+      input.input(input_name)
+      package = input.convert(FPM::Package::Deb)
+      insist { package.dependencies.sort } == ["perl (>= 5.006)"]
+    end
+
+    it "should name package and deps according to Debians Perl packaging standard" do
+      input.input(input_name)
+      package = input.convert(FPM::Package::Deb)
+      insist { package.name } == "libdigest-md5-perl"
+      insist { package.dependencies.sort.first } == "libdigest-base-perl (>= 1.00)"
+    end
+  end # #output converted from CPAN
+
   describe "#tar_flags" do
     let(:package) { FPM::Package::Deb.new }