fpm 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e5de1dd66653d1c114a19665ffc0878615018c
-  data.tar.gz: 159971a71bca1eb9118aca6145e1e52eaa046495
+  metadata.gz: c5242a72c4435675eabd2eb890ac8296bf77553b
+  data.tar.gz: 3aeda059fb3d5cfab49e0eaff6cb457c7a61e374
 SHA512:
-  metadata.gz: e121f7c5fdd380c0e48255b5c8751c9aa1962be84611130995afc9f46e9122247ce0dd3faa8699cc5f3c68fe6a2c0b3a31934d9b32cd6eec9233e667d13376e5
-  data.tar.gz: 0a118ebc654aba513eb091d5640865d8314103b9c44b20ea6070f6c6de7d92d8001fcf2b6fa6671855960c15f766c6ef3bc11449acc7692946b812003b41c92d
+  metadata.gz: 91d43f3e9ec89f218d08f2d05a0b2cf43c6e06ea2e617ce353bd4be58892167b7617f50f2bc1758a5946033ffc974d05bb9be01396759f79e8b532f5aa5efb93
+  data.tar.gz: 613babff93a8b1e0acf992ea46d4de82bfa0f175f20b1194f039049480f818a3d52cce267c282ec2721324a839de72da5a777c454a264f914e276b02c54ca4b4

data/CHANGELIST

@@ -1,3 +1,35 @@
+1.4.0 (???)
+  - Solaris 11 IPS packages 'p5p' now supported `-t p5p`. (Jonathan Craig)
+  - Python Virtualenv is now supported `-t virtualenv` (#930, Simone
+    Margaritelli and Daniel Haskin)
+  - deb: Files in /etc are now by default marked as config files. (#877,
+    Vincent Bernat)
+  - `fpm --help` output now includes a list of supported package types (#896,
+    Daniel Haskin)
+  - cpan: --[no-]cpan-sandbox-non-core flag to make non-core module sandboxing
+    optional during packaging (#752, Matt Sharpe)
+  - rpm: Add --rpm-dist flag for specifically setting the target distribution
+    of an rpm.  (Adam Lamar)
+  - rpm: Fix a crash if --before-upgrade or --after-upgrade were used. (#822,
+    Dave Anderson)
+  - deb: Ensure maintainer scripts have shebang lines (#836, Wesley Spikes)
+  - deb: Fix bug in maintainer scripts where sometimes we would write an empty
+    shell function. Empty functions aren't valid in shell. (Wesley Spikes)
+  - Fix symlink copying bug (#863, Pete Fritchman)
+  - python: Default to https for pypi queries (Timothy Sutton)
+  - New flag --exclude-file for providing a file containing line-delimited
+    exclusions (Jamie Lawrence)
+  - python: new flag --python-disable-dependency to disable specific python
+    dependencies (Ward Vandewege)
+  - python: ensure we avoid wheel packages for now until fpm better supports them.
+    (#885, Matt Callaway)
+  - deb: Add support for installation states "abort-remove" and "abort-install"
+    (#887, Daniel Haskin)
+  - If PATH isn't set, and we need it, tell the user (#886, Ranjib Dey)
+  - cpan: --[no-]cpan-test now works correctly (#853, Matt Schreiber)
+  - deb-to-rpm: some improved support for config file knowledge passing from
+    deb to rpm packages (Daniel Haskin)
+    
 1.3.3 (December 11, 2014)
   - The fpm project now uses Contributor Covenant. You can read more about this on
     the website: http://contributor-covenant.org/

data/CONTRIBUTORS

@@ -3,7 +3,7 @@ bug reports, code, or other to fpm:
 
 anthezium
 Curt Micol
-Jay Adkisson
+Jeanine Adkisson
 Jordan Sissel
 Marc Fournier
 Michael Blume

data/lib/fpm.rb

@@ -14,4 +14,5 @@ require "fpm/package/puppet"
 require "fpm/package/python"
 require "fpm/package/osxpkg"
 require "fpm/package/solaris"
+require "fpm/package/p5p"
 require "fpm/package/pkgin"

data/lib/fpm/command.rb

@@ -24,7 +24,7 @@ class FPM::Command < Clamp::Command
   include FPM::Util
 
   def help(*args)
-    return [
+    lines = [
       "Intro:",
       "",
       "  This is fpm version #{FPM::VERSION}",
@@ -35,10 +35,14 @@ class FPM::Command < Clamp::Command
       "  You can find support on irc (#fpm on freenode irc) or via email with",
       "  fpm-users@googlegroups.com",
       "",
-
-      # Lastly, include the default help output via Clamp.
-      super
-    ].join("\n")
+      "Loaded package types:",
+    ]
+    FPM::Package.types.each do |name, _|
+      lines.push("  - #{name}")
+    end
+    lines.push("")
+    lines.push(super)
+    return lines.join("\n")
   end # def help
 
   option "-t", "OUTPUT_TYPE",
@@ -139,6 +143,11 @@ class FPM::Command < Clamp::Command
     excludes << val
     next excludes
   end # -x / --exclude
+
+  option "--exclude-file", "EXCLUDE_PATH",
+    "The path to a file containing a newline-sparated list of "\
+    "patterns to exclude from input."
+
   option "--description", "DESCRIPTION", "Add a description for this package." \
     " You can include '\n' sequences to indicate newline breaks.",
     :default => "no description" do |val|
@@ -191,7 +200,7 @@ class FPM::Command < Clamp::Command
   option "--after-upgrade", "FILE",
     "A script to be run after package upgrade. If not specified,\n" \
         "--before-install, --after-install, --before-remove, and \n" \
-        "--after-remove wil behave in a backwards-compatible manner\n" \
+        "--after-remove will behave in a backwards-compatible manner\n" \
         "(they will not be upgrade-case aware).\n" \
         "Currently only supports deb and rpm packages." do |val|
     File.expand_path(val) # Get the full path to the script
@@ -199,7 +208,7 @@ class FPM::Command < Clamp::Command
   option "--before-upgrade", "FILE",
     "A script to be run before package upgrade. If not specified,\n" \
         "--before-install, --after-install, --before-remove, and \n" \
-        "--after-remove wil behave in a backwards-compatible manner\n" \
+        "--after-remove will behave in a backwards-compatible manner\n" \
         "(they will not be upgrade-case aware).\n" \
         "Currently only supports deb and rpm packages." do |val|
     File.expand_path(val) # Get the full path to the script
@@ -215,7 +224,7 @@ class FPM::Command < Clamp::Command
   option "--template-value", "KEY=VALUE",
     "Make 'key' available in script templates, so <%= key %> given will be " \
     "the provided value. Implies --template-scripts",
-    :multivalued => true do |kv| 
+    :multivalued => true do |kv|
     @template_scripts = true
     next kv.split("=", 2)
   end
@@ -272,7 +281,7 @@ class FPM::Command < Clamp::Command
     # fpm would assume you meant to add '.' to the end of the commandline.
     # Let's hack that. https://github.com/jordansissel/fpm/issues/187
     if input_type == "dir" and args.empty? and !chdir.nil?
-      logger.info("No args, but -s dir and -C are given, assuming '.' as input") 
+      logger.info("No args, but -s dir and -C are given, assuming '.' as input")
       args << "."
     end
 
@@ -293,7 +302,7 @@ class FPM::Command < Clamp::Command
 
     input = input_class.new
 
-    # Merge in package settings. 
+    # Merge in package settings.
     # The 'settings' stuff comes in from #apply_options, which goes through
     # all the options defined in known packages and puts them into our command.
     # Flags in packages defined as "--foo-bar" become named "--<packagetype>-foo-bar"
@@ -310,10 +319,10 @@ class FPM::Command < Clamp::Command
         # clamp makes option attributes available as accessor methods
         # --foo-bar is available as 'foo_bar'. Put these in the package
         # attributes hash. (See FPM::Package#attributes)
-        # 
+        #
         # In the case of 'flag' options, the accessor is actually 'foo_bar?'
         # instead of just 'foo_bar'
-       
+
         # If the instance variable @{attr} is defined, then
         # it means the flag was given on the command line.
         flag_given = instance_variable_defined?("@#{attr}")
@@ -328,8 +337,8 @@ class FPM::Command < Clamp::Command
     # For directories, this means paths. For things like gem and python, this
     # means package name or paths to the packages (rails, foo-1.0.gem, django,
     # bar/setup.py, etc)
-    args.each do |arg| 
-      input.input(arg) 
+    args.each do |arg|
+      input.input(arg)
     end
 
     # If --inputs was specified, read it as a file.
@@ -340,12 +349,28 @@ class FPM::Command < Clamp::Command
       end
 
       # Read each line as a path
-      File.new(inputs, "r").each_line do |line| 
+      File.new(inputs, "r").each_line do |line|
         # Handle each line as if it were an argument
         input.input(line.strip)
       end
     end
 
+    # If --exclude-file was specified, read it as a file and append to
+    # the exclude pattern list.
+    if !exclude_file.nil?
+      if !File.exists?(exclude_file)
+        logger.fatal("File given for --exclude-file does not exist (#{exclude_file})")
+        return 1
+      end
+
+      # Read each line as a path
+      File.new(exclude-file, "r").each_line do |line| 
+        # Handle each line as if it were an argument
+        # 'excludes' is defined above near the -x option.
+        excludes << line.strip
+      end
+    end
+
     # Override package settings if they are not the default flag values
     # the below proc essentially does:
     #
@@ -389,7 +414,7 @@ class FPM::Command < Clamp::Command
 
     input.attrs = h
 
-    
+
     script_errors = []
     setscript = proc do |scriptname|
       # 'self.send(scriptname) == self.before_install == --before-install
@@ -435,9 +460,9 @@ class FPM::Command < Clamp::Command
       end
     end
 
-    # Write the output somewhere, package can be nil if no --package is specified, 
+    # Write the output somewhere, package can be nil if no --package is specified,
     # and that's OK.
-    
+
     # If the package output (-p flag) is a directory, write to the default file name
     # but inside that directory.
     if ! package.nil? && File.directory?(package)

data/lib/fpm/package.rb

@@ -17,7 +17,7 @@ class FPM::Package
 
   # This class is raised if there's something wrong with a setting in the package.
   class InvalidArgument < StandardError; end
- 
+
   # This class is raised when a file already exists when trying to write.
   class FileAlreadyExists < StandardError
     # Get a human-readable error message
@@ -116,7 +116,7 @@ class FPM::Package
   private
 
   def initialize
-    # Attributes for this specific package 
+    # Attributes for this specific package
     @attributes = {}
 
     # Reference
@@ -151,7 +151,7 @@ class FPM::Package
     @category = "default"
     @license = "unknown"
     @vendor = "none"
-   
+
     # Iterate over all the options and set defaults
     if self.class.respond_to?(:declared_options)
       self.class.declared_options.each do |option|
@@ -227,7 +227,7 @@ class FPM::Package
   # Add a new source to this package.
   # The exact behavior depends on the kind of package being managed.
   #
-  # For instance: 
+  # For instance:
   #
   # * for FPM::Package::Dir, << expects a path to a directory or files.
   # * for FPM::Package::RPM, << expects a path to an rpm.
@@ -270,21 +270,21 @@ class FPM::Package
 
   # Clean up any temporary storage used by this class.
   def cleanup
-    cleanup_staging unless logger.level == :debug
-    cleanup_build unless logger.level == :debug
+    cleanup_staging
+    cleanup_build
   end # def cleanup
 
   def cleanup_staging
     if File.directory?(staging_path)
       logger.debug("Cleaning up staging path", :path => staging_path)
-      FileUtils.rm_r(staging_path) 
+      FileUtils.rm_r(staging_path)
     end
   end # def cleanup_staging
 
   def cleanup_build
     if File.directory?(build_path)
       logger.debug("Cleaning up build path", :path => build_path)
-      FileUtils.rm_r(build_path) 
+      FileUtils.rm_r(build_path)
     end
   end # def cleanup_build
 
@@ -292,7 +292,7 @@ class FPM::Package
   #
   # The paths will all be relative to staging_path and will not include that
   # path.
-  # 
+  #
   # This method will emit 'leaf' paths. Files, symlinks, and other file-like
   # things are emitted. Intermediate directories are ignored, but
   # empty directories are emitted.
@@ -317,7 +317,7 @@ class FPM::Package
       .select { |path| is_leaf.call(path) } \
       .collect { |path| path[staging_path.length + 1.. -1] }
   end # def files
- 
+
   def template_dir
     File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "templates"))
   end
@@ -390,7 +390,7 @@ class FPM::Package
 
   class << self
     # This method is invoked when subclass occurs.
-    # 
+    #
     # Lets us track all known FPM::Package subclasses
     def inherited(klass)
       @subclasses ||= {}
@@ -441,7 +441,7 @@ class FPM::Package
 
     def default_attributes(&block)
       return if @options.nil?
-      @options.each do |flag, param, help, options, block|
+      @options.each do |flag, param, help, options, _block|
         attr = flag.first.gsub(/^-+/, "").gsub(/-/, "_").gsub("[no_]", "")
         attr += "?" if param == :flag
         yield attr.to_sym, options[:default]
@@ -509,7 +509,7 @@ class FPM::Package
   def provides=(value)
     if !value.is_a?(Array)
       @provides = [value]
-    else 
+    else
       @provides = value
     end
   end

data/lib/fpm/package/cpan.rb

@@ -27,6 +27,9 @@ class FPM::Package::CPAN < FPM::Package
   option "--perl-lib-path", "PERL_LIB_PATH",
     "Path of target Perl Libraries"
 
+  option "--sandbox-non-core", :flag,
+    "Sandbox all non-core modules, even if they're already installed", :default => true
+
   private
   def input(package)
     #if RUBY_VERSION =~ /^1\.8/
@@ -49,18 +52,18 @@ class FPM::Package::CPAN < FPM::Package
     end
 
     # Read package metadata (name, version, etc)
-    if File.exists?(File.join(moduledir, "META.json"))
+    if File.exist?(File.join(moduledir, "META.json"))
       metadata = JSON.parse(File.read(File.join(moduledir, ("META.json"))))
-    elsif File.exists?(File.join(moduledir, ("META.yml")))
+    elsif File.exist?(File.join(moduledir, ("META.yml")))
       require "yaml"
       metadata = YAML.load_file(File.join(moduledir, ("META.yml")))
-    elsif File.exists?(File.join(moduledir, "MYMETA.json"))
+    elsif File.exist?(File.join(moduledir, "MYMETA.json"))
       metadata = JSON.parse(File.read(File.join(moduledir, ("MYMETA.json"))))
-    elsif File.exists?(File.join(moduledir, ("MYMETA.yml")))
+    elsif File.exist?(File.join(moduledir, ("MYMETA.yml")))
       require "yaml"
       metadata = YAML.load_file(File.join(moduledir, ("MYMETA.yml")))
     else
-      raise FPM::InvalidPackageConfiguration, 
+      raise FPM::InvalidPackageConfiguration,
         "Could not find package metadata. Checked for META.json and META.yml"
     end
     self.version = metadata["version"]
@@ -100,14 +103,23 @@ class FPM::Package::CPAN < FPM::Package
     # We'll install to a temporary directory.
     logger.info("Installing any build or configure dependencies")
 
-    cpanm_flags = ["-L", build_path("cpan"), moduledir]
-    cpanm_flags += ["-n"] if attributes[:cpan_test?]
+    if attributes[:cpan_sandbox_non_core?]
+      cpanm_flags = ["-L", build_path("cpan"), moduledir]
+    else
+      cpanm_flags = ["-l", build_path("cpan"), moduledir]
+    end
+
+    # This flag causes cpanm to ONLY download dependencies, skipping the target
+    # module itself.  This is fine, because the target module has already been
+    # downloaded, and there's no need to download twice, test twice, etc.
+    cpanm_flags += ["--installdeps"]
+    cpanm_flags += ["-n"] if !attributes[:cpan_test?]
     cpanm_flags += ["--mirror", "#{attributes[:cpan_mirror]}"] if !attributes[:cpan_mirror].nil?
     cpanm_flags += ["--mirror-only"] if attributes[:cpan_mirror_only?] && !attributes[:cpan_mirror].nil?
 
     safesystem(attributes[:cpan_cpanm_bin], *cpanm_flags)
 
-    if !attributes[:no_auto_depends?] 
+    if !attributes[:no_auto_depends?]
       unless metadata["requires"].nil?
         metadata["requires"].each do |dep_name, version|
           # Special case for representing perl core as a version.
@@ -116,7 +128,7 @@ class FPM::Package::CPAN < FPM::Package
             next
           end
           dep = search(dep_name)
-          
+
           if dep.include?("distribution")
             name = fix_name(dep["distribution"])
           else
@@ -156,7 +168,7 @@ class FPM::Package::CPAN < FPM::Package
 
       # Try Makefile.PL, Build.PL
       #
-      if File.exists?("Build.PL")
+      if File.exist?("Build.PL")
         # Module::Build is in use here; different actions required.
         safesystem(attributes[:cpan_perl_bin],
                    "-Mlocal::lib=#{build_path("cpan")}",
@@ -180,7 +192,7 @@ class FPM::Package::CPAN < FPM::Package
                      # Empty install_base to avoid local::lib being used.
                      "--install_base", "")
         end
-      elsif File.exists?("Makefile.PL")
+      elsif File.exist?("Makefile.PL")
         if attributes[:cpan_perl_lib_path]
           perl_lib_path = attributes[:cpan_perl_lib_path]
           safesystem(attributes[:cpan_perl_bin],
@@ -206,7 +218,7 @@ class FPM::Package::CPAN < FPM::Package
 
 
       else
-        raise FPM::InvalidPackageConfiguration, 
+        raise FPM::InvalidPackageConfiguration,
           "I don't know how to build #{name}. No Makefile.PL nor " \
           "Build.PL found"
       end
@@ -231,10 +243,10 @@ class FPM::Package::CPAN < FPM::Package
     # Find any shared objects in the staging directory to set architecture as
     # native if found; otherwise keep the 'all' default.
     Find.find(staging_path) do |path|
-      if path =~ /\.so$/  
+      if path =~ /\.so$/
         logger.info("Found shared library, setting architecture=native",
                      :path => path)
-        self.architecture = "native" 
+        self.architecture = "native"
       end
     end
   end
@@ -280,7 +292,7 @@ class FPM::Package::CPAN < FPM::Package
     release_metadata = JSON.parse(data)
     archive = release_metadata["archive"]
 
-    # should probably be basepathed from the url 
+    # should probably be basepathed from the url
     tarball = File.basename(archive)
 
     url_base = "http://www.cpan.org/"
@@ -289,7 +301,7 @@ class FPM::Package::CPAN < FPM::Package
     #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
     url = "#{url_base}/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{archive}"
     logger.debug("Fetching perl module", :url => url)
-    
+
     begin
       response = httpfetch(url)
     rescue Net::HTTPServerException => e
@@ -336,7 +348,7 @@ class FPM::Package::CPAN < FPM::Package
   def httpfetch(url)
     uri = URI.parse(url)
     if ENV['http_proxy']
-      proxy = URI.parse(ENV['http_proxy'])  
+      proxy = URI.parse(ENV['http_proxy'])
       http = Net::HTTP.Proxy(proxy.host,proxy.port,proxy.user,proxy.password).new(uri.host, uri.port)
     else
       http = Net::HTTP.new(uri.host, uri.port)