fpm 0.4.35 → 0.4.36

data/CHANGELIST

@@ -1,5 +1,11 @@
-0.4.35 (May 8, 2013)
-  - Fix dependencies listed in the gem.
+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
+  - cpan: --no-cpan-test now skips tests for build/configure dependencies
+  - rpm: Add --rpm-defattrfile and --rpm-defattrdir flags (#428, patch 
+    by phrawzty)
+
+0.4.35 -- was not announced 
 
 0.4.34 (May 7, 2013)
   - Now supports CPAN - Perl mongers rejoice! For example:

data/lib/fpm/package/cpan.rb

@@ -63,7 +63,12 @@ class FPM::Package::CPAN < FPM::Package
     # Install any build/configure dependencies with cpanm.
     # We'll install to a temporary directory.
     @logger.info("Installing any build or configure dependencies")
-    safesystem(attributes[:cpan_cpanm_bin], "-L", build_path("cpan"), moduledir)
+
+    if attributes[:cpan_test?]
+      safesystem(attributes[:cpan_cpanm_bin], "-L", build_path("cpan"), moduledir)
+    else
+      safesystem(attributes[:cpan_cpanm_bin], "-nL", build_path("cpan"), moduledir)
+    end
 
     if !attributes[:no_auto_depends?] 
       if metadata.include?("requires")
@@ -99,24 +104,43 @@ class FPM::Package::CPAN < FPM::Package
  
       prefix = attributes[:prefix] || "/usr/local"
       # TODO(sissel): Set default INSTALL path?
-      # perl -e 'use Config; print "$Config{sitelib}"'
-      safesystem(attributes[:cpan_perl_bin],
-                 "-Mlocal::lib=#{build_path("cpan")}",
-                 "Makefile.PL",
-                 "PREFIX=#{prefix}",
-                 # Have to specify INSTALL_BASE as empty otherwise
-                 # Makefile.PL lies and claims we've set both PREFIX and
-                 # INSTALL_BASE.
-                 "INSTALL_BASE="
-                )
-
-      make = [ "make" ]
-
-      safesystem(*make)
-      safesystem(*(make + ["test"])) if attributes[:cpan_test?]
-      safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
+
+      # 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=")
+        make = [ "make" ]
+        safesystem(*make)
+        safesystem(*(make + ["test"])) if attributes[:cpan_test?]
+        safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
+      elsif File.exists?("Build.PL")
+        # Module::Build is in use here; different actions required.
+        safesystem(attributes[:cpan_perl_bin],
+                   "-Mlocal::lib=#{build_path("cpan")}",
+                   "Build.PL")
+        safesystem("./Build")
+
+        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", "")
+      else
+        raise FPM::InvalidPackageConfiguration, 
+          "I don't know how to build #{name}. No Makefile.PL nor " \
+          "Build.PL found"
+      end
     end
 
+
     # TODO(sissel): figure out if this perl module compiles anything
     # and set the architecture appropriately.
     self.architecture = "all"

data/lib/fpm/package/pear.rb

@@ -56,10 +56,22 @@ class FPM::Package::PEAR < FPM::Package
     @logger.info("Setting php_bin", :php_bin => php_bin)
     safesystem("pear", "-c", config, "config-set", "php_bin", php_bin)
 
-    # try channel-discover
+    # do channel-discover if required
     if !attributes[:pear_channel].nil?
       @logger.info("Custom channel specified", :channel => attributes[:pear_channel])
-      safesystem("pear", "-c", config, "channel-discover", 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])}/
+        @logger.info("Discovering new channel", :channel => attributes[:pear_channel])
+        safesystem("pear", "-c", config, "channel-discover", attributes[:pear_channel])
+      end
       input_package = "#{attributes[:pear_channel]}/#{input_package}"
       @logger.info("Prefixing package name with channel", :package => input_package)
     end

data/lib/fpm/package/rpm.rb

@@ -44,6 +44,18 @@ class FPM::Package::RPM < FPM::Package
       value
   end
 
+  option "--defattrfile", "ATTR",
+    "Set the default file mode (%defattr).",
+    :default => '-' do |value|
+      value
+  end
+
+  option "--defattrdir", "ATTR",
+    "Set the default dir mode (%defattr).",
+    :default => '-' do |value|
+      value
+  end
+
   rpmbuild_define = []
   option "--rpmbuild-define", "DEFINITION",
     "Pass a --define argument to rpmbuild." do |define|

data/lib/fpm/util.rb

@@ -1,5 +1,5 @@
 require "fpm/namespace"
-require "open4"
+require "childprocess"
 
 # Some utility functions
 module FPM::Util
@@ -19,6 +19,11 @@ module FPM::Util
 
   # Run a command safely in a way that gets reports useful errors.
   def safesystem(*args)
+    # ChildProcess isn't smart enough to run a $SHELL if there's
+    # spaces in the first arg and there's only 1 arg.
+    if args.size == 1
+      args = [ ENV["SHELL"], "-c", args[0] ]
+    end
     program = args[0]
 
     # Scan path to find the executable
@@ -28,17 +33,26 @@ module FPM::Util
     end
 
     @logger.debug("Running command", :args => args)
-    
-    status = Open4::popen4(*args) do |pid, stdin, stdout, stderr|
-      stdin.close
 
-      @logger.debug("Process is running", :pid => pid)
-      @logger.pipe(stdout => :info, stderr => :error)
-    end
-    success = (status.exitstatus == 0)
+    # Create a pair of pipes to connect the
+    # invoked process to the cabin logger
+    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)
+    @logger.pipe(stdout_r => :info, stderr_r => :error)
+
+    process.wait
+    success = (process.exit_code == 0)
 
     if !success
-      raise ProcessFailed.new("#{program} failed (exit code #{status.exitstatus})" \
+      raise ProcessFailed.new("#{program} failed (exit code #{process.exit_code})" \
                               ". Full command was:#{args.inspect}")
     end
     return success

data/lib/fpm/version.rb

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

data/templates/rpm.erb

@@ -142,7 +142,7 @@ cp <%= source_safe %> <%= target_safe %>
 <% end -%>
 
 %files
-%defattr(-,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,-)
+%defattr(<%= attributes[:rpm_defattrfile] %>,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,<%= attributes[:rpm_defattrdir] %>)
 <%# Output config files and then regular files. -%>
 <% config_files.each do |path| -%>
 %config(noreplace) <%= rpm_fix_name(path) %>

metadata

@@ -1,219 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.35
-  prerelease:
+  version: 0.4.36
+  prerelease: 
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: cabin
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: backports
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: arr-pm
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ftw
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.30
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.30
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: clamp
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.0
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: open4
-  version_requirements: !ruby/object:Gem::Requirement
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rush
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: insist
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
-description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
+        version: '0'
+description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
+  solaris packages and more. Win at package management without wasting pointless hours
+  debugging bad rpm specs!
 email: jls@semicomplete.com
 executables:
 - fpm
@@ -224,9 +216,6 @@ files:
 - lib/fpm/util.rb
 - lib/fpm/package.rb
 - lib/fpm/errors.rb
-- lib/fpm/version.rb
-- lib/fpm/command.rb
-- lib/fpm/namespace.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/gem.rb
 - lib/fpm/package/dir.rb
@@ -244,43 +233,44 @@ files:
 - lib/fpm/package/pyfpm/get_metadata.py
 - lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/pyfpm/__init__.py
+- lib/fpm/version.rb
+- lib/fpm/command.rb
+- lib/fpm/namespace.rb
 - bin/fpm
 - templates/rpm.erb
-- templates/solaris.erb
-- templates/osxpkg.erb
-- templates/deb.erb
 - templates/puppet/package.pp.erb
 - templates/puppet/package/remove.pp.erb
 - templates/rpm/filesystem_list
+- templates/solaris.erb
 - templates/deb/ldconfig.sh.erb
+- templates/osxpkg.erb
+- templates/deb.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []