fpm 0.4.36 → 0.4.37

data/CHANGELIST

@@ -1,3 +1,11 @@
+0.4.37 (May 30, 2013)
+  - deb: fix creation failures on OS X (#450, patch by Anthony Scalisi and
+    Matthew M. Boedicker)
+  - deb: you can now set --deb-build-depends. This is generally for extremely
+    rare use cases. (#451, patch by torrancew)
+  - perl: add --cpan-perl-lib-path for a custom perl library installation path
+    (#447, patch by Brett Gailey)
+
 0.4.36 (May 15, 2013)
   - pear: only do channel-discover if necessary (#438, patch by Hatt)
   - cpan: now supports cpan modules that use Module::Build

data/lib/fpm/package/cpan.rb

@@ -13,9 +13,17 @@ class FPM::Package::CPAN < FPM::Package
   option "--package-name-prefix", "NAME_PREFIX", "Name to prefix the package " \
     "name with.", :default => "perl"
   option "--test", :flag, "Run the tests before packaging?", :default => true
+  option "--perl-lib-path", "PERL_LIB_PATH", "Path of target Perl Libraries"
 
   private
   def input(package)
+    if RUBY_VERSION =~ /^1\.8/
+      raise FPM::Package::InvalidArgument,
+        "Sorry, CPAN support requires ruby 1.9 or higher. You have " \
+        "#{RUBY_VERSION}. If this negatively impacts you, please let " \
+        "me know by filing an issue: " \
+        "https://github.com/jordansissel/fpm/issues"
+    end
     require "ftw" # for http access
     require "json"
 
@@ -108,12 +116,20 @@ class FPM::Package::CPAN < FPM::Package
       # Try Makefile.PL, Build.PL
       #
       if File.exists?("Makefile.PL")
-        safesystem(attributes[:cpan_perl_bin],
-                   "-Mlocal::lib=#{build_path("cpan")}",
-                   "Makefile.PL",
-                   "PREFIX=#{prefix}",
-                   # Empty install_base to avoid local::lib being used.
-                   "INSTALL_BASE=")
+        if attributes[:cpan_perl_lib_path]
+          perl_lib_path = attributes[:cpan_perl_lib_path]
+          safesystem(attributes[:cpan_perl_bin],
+                     "-Mlocal::lib=#{build_path("cpan")}",
+                     "Makefile.PL", "PREFIX=#{prefix}", "LIB=#{perl_lib_path}",
+                     # Empty install_base to avoid local::lib being used.
+                     "INSTALL_BASE=")
+        else 
+          safesystem(attributes[:cpan_perl_bin],
+                     "-Mlocal::lib=#{build_path("cpan")}",
+                     "Makefile.PL", "PREFIX=#{prefix}",
+                     # Empty install_base to avoid local::lib being used.
+                     "INSTALL_BASE=")
+        end
         make = [ "make" ]
         safesystem(*make)
         safesystem(*(make + ["test"])) if attributes[:cpan_test?]
@@ -128,16 +144,29 @@ class FPM::Package::CPAN < FPM::Package
         if attributes[:cpan_test?]
           safesystem("./Build", "test")
         end
-
-        safesystem("./Build", "install",
-                   "--prefix", prefix, "--destdir", staging_path,
-                   # Empty install_base to avoid local::lib being used.
-                   "--install_base", "")
+        if attributes[:cpan_perl_lib_path]
+          perl_lib_path = attributes[:cpan_perl_lib_path]
+          safesystem("./Build install --install_path lib=#{perl_lib_path} \
+                     --destdir #{staging_path} --prefix #{prefix} --destdir #{staging_path}")
+        else
+           safesystem("./Build", "install",
+                     "--prefix", prefix, "--destdir", staging_path,
+                     # Empty install_base to avoid local::lib being used.
+                     "--install_base", "")
+        end
       else
         raise FPM::InvalidPackageConfiguration, 
           "I don't know how to build #{name}. No Makefile.PL nor " \
           "Build.PL found"
       end
+
+      # Fix any files likely to cause conflicts. 
+      # https://github.com/jordansissel/fpm/issues/443
+      ::Dir.glob(File.join(staging_path, prefix, "lib/perl/*/perllocal.pod")).each do |path|
+        @logger.debug("Removing useless file.",
+                      :path => path.gsub(staging_path, ""))
+        File.unlink(path)
+      end
     end
 
 
@@ -176,7 +205,8 @@ class FPM::Package::CPAN < FPM::Package
     version = metadata["version"] if version.nil?
 
     tarball = "#{distribution}-#{version}.tar.gz"
-    url = "http://search.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
+    url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
+    @logger.debug("Fetching perl module", :url => url)
     response = agent.get!(url)
     if response.error?
       @logger.error("Download failed", :error => response.status_line,

data/lib/fpm/package/deb.rb

@@ -28,6 +28,12 @@ class FPM::Package::Deb < FPM::Package
             "version. Default is to be specific. This option allows the same " \
             "version of a package but any iteration is permitted"
 
+  option "--build-depends", "DEPENDENCY",
+    "Add DEPENDENCY as a Build-Depends" do |dep|
+    @build_depends ||= []
+    @build_depends << dep
+  end
+
   option "--pre-depends", "DEPENDENCY",
     "Add DEPENDENCY as a Pre-Depends" do |dep|
     @pre_depends ||= []
@@ -316,12 +322,17 @@ class FPM::Package::Deb < FPM::Package
         raise FPM::InvalidPackageConfiguration,
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
+
     tar_flags = []
     if !attributes[:deb_user].nil?
       tar_flags += [ "--owner", attributes[:deb_user] ]
     end
     if !attributes[:deb_group].nil?
-      tar_flags += [ "--group", attributes[:deb_group] ]
+      if attributes[:deb_group] == 'root'
+        tar_flags += [ "--numeric-owner", "--group", "0" ]
+      else
+        tar_flags += [ "--group", attributes[:deb_group] ]
+      end
     end
 
     if attributes[:deb_changelog]
@@ -437,8 +448,10 @@ class FPM::Package::Deb < FPM::Package
     # Make the control.tar.gz
     with(build_path("control.tar.gz")) do |controltar|
       @logger.info("Creating", :path => controltar, :from => control_path)
-      safesystem(tar_cmd, "--owner=root", "--group=root", "-zcf",
-                 controltar, "-C", control_path, ".")
+
+      args = [ tar_cmd, "-C", control_path, "-zcf", controltar, 
+        "--owner=0", "--group=0", "--numeric-owner", "." ]
+      safesystem(*args)
     end
 
     @logger.debug("Removing no longer needed control dir", :path => control_path)

data/lib/fpm/package/npm.rb

@@ -56,15 +56,7 @@ class FPM::Package::NPM < FPM::Package
     # Query details about our now-installed package.
     # We do this by using 'npm ls' with json + long enabled to query details
     # about the installed package.
-    npm_ls_cmd = [attributes[:npm_bin], "ls", "--json", "--long", package] + npm_flags
-    npm_ls_fd = IO.popen(npm_ls_cmd)
-    npm_ls_out = npm_ls_fd.read()
-    pid, status = Process.waitpid2(npm_ls_fd.pid)
-    if !status.success?
-      raise FPM::Util::ProcessFailed.new("#{npm_ls_cmd.first} failed (exit " \
-                                         "code #{status.exitstatus}). " \
-                                         "Full command was: #{npm_ls_cmd.inspect}")
-    end
+    npm_ls_out = safesystemout(attributes[:npm_bin], "ls", "--json", "--long", package, *npm_flags)
     npm_ls = JSON.parse(npm_ls_out)
     name, info = npm_ls["dependencies"].first
 

data/lib/fpm/package/pear.rb

@@ -59,16 +59,9 @@ class FPM::Package::PEAR < FPM::Package
     # do channel-discover if required
     if !attributes[:pear_channel].nil?
       @logger.info("Custom channel specified", :channel => attributes[:pear_channel])
-      pear_lc_cmd = "pear -c #{config} list-channels"
-      pear_lc_fd = IO.popen(pear_lc_cmd)
-      pear_lc_out = pear_lc_fd.read()
-      pid, status = Process.waitpid2(pear_lc_fd.pid)
-      if !status.success?
-        raise FPM::Util::ProcessFailed.new("#{pear_ls_cmd.first} failed (exit " \
-                                         "code #{status.exitstatus}). " \
-                                         "Full command was: #{pear_ls_cmd.inspect}")
-      end
-      if !pear_lc_out =~ /#{Regexp.quote(attributes[:pear_channel])}/
+      channel_list = safesystemout("pear", "-c", config, "list-channels")
+
+      if !channel_list =~ /#{Regexp.quote(attributes[:pear_channel])}/
         @logger.info("Discovering new channel", :channel => attributes[:pear_channel])
         safesystem("pear", "-c", config, "channel-discover", attributes[:pear_channel])
       end

data/lib/fpm/util.rb

@@ -58,6 +58,41 @@ module FPM::Util
     return success
   end # def safesystem
 
+# Run a command safely in a way that captures output and status.
+  def safesystemout(*args)
+    if args.size == 1
+      args = [ ENV["SHELL"], "-c", args[0] ]
+    end
+    program = args[0]
+
+    if !program.include?("/") and !program_in_path?(program)
+      raise ExecutableNotFound.new(program)
+    end
+
+    @logger.debug("Running command", :args => args)
+
+    stdout_r, stdout_w = IO.pipe
+    stderr_r, stderr_w = IO.pipe
+
+    process           = ChildProcess.build(*args)
+    process.io.stdout = stdout_w
+    process.io.stderr = stderr_w
+
+    process.start
+    stdout_w.close; stderr_w.close
+    @logger.debug("Process is running", :pid => process.pid)
+
+    process.wait
+    success = (process.exit_code == 0)
+
+    if !success
+      raise ProcessFailed.new("#{program} failed (exit code #{process.exit_code})" \
+                              ". Full command was:#{args.inspect}")
+    end
+
+    return :stdout_r
+  end # def safesystemout
+
   # Get the recommended 'tar' command for this platform.
   def tar_cmd
     # Rely on gnu tar for solaris and OSX.

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.36"
+  VERSION = "0.4.37"
 end

data/templates/deb.erb

@@ -17,6 +17,9 @@ Breaks: <%= attributes[:deb_breaks].collect { |d| fix_dependency(d) }.flatten.jo
 <% if attributes[:deb_pre_depends_given?] -%>
 Pre-Depends: <%= attributes[:deb_pre_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
+<% if attributes[:deb_build_depends_given?] -%>
+Build-Depends: <%= attributes[:deb_build_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
+<% end -%>
 <% if !provides.empty? -%>
 <%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
 <%#  http://www.debian.org/doc/debian-policy/ch-relationships.html -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.36
+  version: 0.4.37
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement