cure-fpm 1.3.3b → 1.6.0b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c3e4d7828bf8053b0f9e78c2b048087ffabea5
-  data.tar.gz: a445f6f23d074bbc7532f1354b2c94dbe473a877
+  metadata.gz: 793e76e8e1b3a125e0100ab92d7ffc0c755edbed
+  data.tar.gz: 669e6e34742b95d5bae4f2084aaa72fff8298286
 SHA512:
-  metadata.gz: 692a9db40f3bcd804a5f3b3a93fb39af4ac29731a63773bfafb21763889d0c35c74ac88bb726a425920d26151699e837155868a7cea0769f8ad403cb77299fa1
-  data.tar.gz: 44d0f61f3e3eb2e43e7d4a59e183a904d9e2d0da24788f0837d9cf016aa26fae113279097f79c892293a22c293db48036fa5f651e6117407e892e0627bd53e37
+  metadata.gz: b2db1b84e6d8148beebe2def93bb948bd7d67eabc34ba4d417a06d5bf3aef28ff13cb8d152bf2bcd2472df98d4a44f856b04f13e635ddfd218a360b60b7e0bfd
+  data.tar.gz: b67535eda96144747b07df6e0a714f1dbe0cbb64f0cc6126d637897620bcd3b1f3f8dba7ad9bbb6c84917486b60c0774d21fbfb42e6869c1ff02c679d0b1958f

data/CHANGELIST

@@ -1,3 +1,76 @@
+1.6.0 (May 25, 2016)
+  - New source: pleaserun. This lets you create packages that will install a
+    system service. An after-install script is used in the package to determine
+    which service platform to target (systemd, upstart, etc). (#1119, #1112)
+  - New target: Alpine Linux "apk" packages. (#1054, George Lester)
+  - deb: don't append `.conf` to an upstart file if the file name already ends
+    in `.conf`. (#1115, josegonzalez)
+  - freebsd: fix bug where --package flag was ignored. (#1093, Paweł Tomulik)
+  - Improvements to the fpm rake tasks (#1101, Evan Gilman)
+  
+1.5.0 (April 12, 2016)
+  - Arch package support is now available via -s pacman and -t pacman. 
+    (#916; wonderful community effort making this happen!)
+  - FreeBSD packages can now be built `-t freebsd` 
+    (#1073; huge community effort making this happen!)
+  - You can now set fpm flags and arguments with the FPMOPTS environment
+    variable (#977, mildred)
+  - Using --exclude-file no longer causes a crash. Yay! (#982, wyaeld)
+  - A new rake task is available for folks who want to invoke fpm from rake
+    (#756, pstengel)
+  - On FreeBSD, when tarring, gtar is now used. (#1008, liv3d)
+  - virtualenv: Add --virtualenv-pypi-extra-url flag to specify additional PyPI
+    locations to use when searching for packages (#1012, Paul Krohn)
+  - deb: Init scripts, etc/default, and upstart files are automatically added
+    as config files in a debian package. Disable this behavior with
+    ---deb-auto-config-files
+  - deb: Small changes to make lintian complain less about our resulting debs.
+  - deb: New flag --deb-systemd lets you specify a systemd service file to include
+    in your package. (#952, Jens Peter Schroer)
+  - cpan: Add --[no-]cpan-cpanm-force flag to pass --force to cpanm.
+  - rpm: File names with both spaces and symbols should now be packageable.
+    (#946, iwonbigbro)
+  - cpan: Now queries MetaCPAN for package info if we can't find any in the
+    cpan archive we just downloaded. (#849, BaxterStockman)
+  - rpm: You can now specify custom rpm tags at the command line. Be careful,
+    as no validation is done on this before sending to rpmbuild. (#687, vStone)
+  - cpan: Install if the package name given is a local file (#986, mdom)
+  - sh: Metadata now available as env vars for post-install scripts (#1006, Ed Healy)
+  - rpm: No more warning if you don't set an epoch. (#1053, Joseph Frazier)
+
+
+1.4.0 (July 26, 2015)
+  - 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/LICENSE

@@ -1,6 +1,6 @@
 (This is an MIT-style license)
 
-Copyright (c) 2011,2012,2013 Jordan Sissel and contributors.
+Copyright (c) 2011-2016 Jordan Sissel and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/fpm.rb

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

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",
@@ -52,8 +56,8 @@ class FPM::Command < Clamp::Command
     :attribute_name => :chdir
   option "--prefix", "PREFIX",
     "A path to prefix files with when building the target package. This may " \
-    "be necessary for all input packages. For example, the 'gem' type will " \
-    "prefix with your gem directory automatically."
+    "not be necessary for all input packages. For example, the 'gem' type " \
+    "will prefix with your gem directory automatically."
   option ["-p", "--package"], "OUTPUT", "The package file path to output."
   option ["-f", "--force"], :flag, "Force output even if it will overwrite an " \
     "existing file", :default => false
@@ -103,12 +107,12 @@ class FPM::Command < Clamp::Command
     "specified multiple times.", :multivalued => true,
     :attribute_name => :provides
   option "--conflicts", "CONFLICTS",
-    "Other packages/versions this package conflicts with. This flag can " \
+    "Other packages/versions this package conflicts with. This flag can be " \
     "specified multiple times.", :multivalued => true,
     :attribute_name => :conflicts
   option "--replaces", "REPLACES",
-    "Other packages/versions this package replaces. This flag can be " \
-    "specified multiple times.", :multivalued => true,
+    "Other packages/versions this package replaces. Equivalent of rpm's 'Obsoletes'. " \
+    "This flag can be specified multiple times.", :multivalued => true,
     :attribute_name => :replaces
 
   option "--config-files", "CONFIG_FILES",
@@ -118,7 +122,9 @@ class FPM::Command < Clamp::Command
     "directory all files inside it will be recursively marked as config files.",
     :multivalued => true, :attribute_name => :config_files
   option "--directories", "DIRECTORIES", "Recursively mark a directory as being owned " \
-    "by the package", :multivalued => true, :attribute_name => :directories
+    "by the package. Use this flag multiple times if you have multiple directories " \
+    "and they are not under the same parent directory ", :multivalued => true,
+    :attribute_name => :directories
   option ["-a", "--architecture"], "ARCHITECTURE",
     "The architecture name. Usually matches 'uname -m'. For automatic values," \
     " you can use '-a all' or '-a native'. These two strings will be " \
@@ -139,12 +145,14 @@ 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|
-    # Replace literal "\n" sequences with a newline character.
-    val.gsub("\\n", "\n")
-  end
+    " You can include '\\n' sequences to indicate newline breaks.",
+    :default => "no description"
   option "--url", "URI", "Add a url for this package.",
     :default => "http://example.com/no-uri-given"
   option "--inputs", "INPUTS_PATH",
@@ -191,17 +199,17 @@ 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|
+        "Currently only supports deb, rpm and pacman packages." do |val|
     File.expand_path(val) # Get the full path to the script
   end # --after-upgrade
   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|
+        "Currently only supports deb, rpm and pacman packages." do |val|
     File.expand_path(val) # Get the full path to the script
   end # --before-upgrade
 
@@ -215,7 +223,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 +280,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 +301,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"
@@ -305,15 +313,15 @@ class FPM::Command < Clamp::Command
     #
     # Things like '--foo-bar' will be available as pkg.attributes[:foo_bar]
     self.class.declared_options.each do |option|
-      with(option.attribute_name) do |attr|
+      option.attribute_name.tap do |attr|
         next if attr == "help"
         # 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}")
@@ -324,12 +332,18 @@ class FPM::Command < Clamp::Command
       end
     end
 
-    # Each remaining command line parameter is used as an 'input' argument.
-    # 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) 
+    if input_type == "pleaserun"
+      # Special case for pleaserun that all parameters are considered the 'command'
+      # to run through pleaserun.
+      input.input(args)
+    else
+      # Each remaining command line parameter is used as an 'input' argument.
+      # 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)
+      end
     end
 
     # If --inputs was specified, read it as a file.
@@ -340,12 +354,30 @@ 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
+
+      # Ensure hash is initialized
+      input.attributes[:excludes] ||= []
+
+      # Read each line as a path
+      File.new(exclude_file, "r").each_line do |line|
+        # Handle each line as if it were an argument
+        input.attributes[:excludes] << line.strip
+      end
+    end
+
     # Override package settings if they are not the default flag values
     # the below proc essentially does:
     #
@@ -371,7 +403,6 @@ class FPM::Command < Clamp::Command
     set.call(input, :url)
     set.call(input, :vendor)
     set.call(input, :version)
-    set.call(input, :architecture)
 
     input.conflicts += conflicts
     input.dependencies += dependencies
@@ -389,7 +420,6 @@ class FPM::Command < Clamp::Command
 
     input.attrs = h
 
-    
     script_errors = []
     setscript = proc do |scriptname|
       # 'self.send(scriptname) == self.before_install == --before-install
@@ -435,9 +465,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)
@@ -484,7 +514,7 @@ class FPM::Command < Clamp::Command
     end
   end # def execute
 
-  def run(*args)
+  def run(*run_args)
     logger.subscribe(STDOUT)
 
     # fpm initialization files, note the order of the following array is
@@ -493,21 +523,41 @@ class FPM::Command < Clamp::Command
     rc_files = [ ".fpm" ]
     rc_files << File.join(ENV["HOME"], ".fpm") if ENV["HOME"]
 
+    rc_args = []
+
+    if ENV["FPMOPTS"]
+      logger.warn("Loading flags from FPMOPTS environment variable")
+      rc_args.push(*Shellwords.shellsplit(ENV["FPMOPTS"]))
+    end
+
     rc_files.each do |rc_file|
       if File.readable? rc_file
         logger.warn("Loading flags from rc file #{rc_file}")
-        File.readlines(rc_file).each do |line|
-          # reverse becasue 'unshift' pushes onto the left side of the array.
-          Shellwords.shellsplit(line).reverse.each do |arg|
-            # Put '.fpm'-file flags *before* the command line flags
-            # so that we the CLI can override the .fpm flags
-            ARGV.unshift(arg)
-          end
-        end
+        rc_args.push(*Shellwords.shellsplit(File.read(rc_file)))
       end
     end
 
-    super(*args)
+    flags = []
+    args = []
+    while rc_args.size > 0 do
+      arg = rc_args.shift
+      opt = self.class.find_option(arg)
+      if opt and not opt.flag?
+        flags.push(arg)
+        flags.push(rc_args.shift)
+      elsif opt or arg[0] == "-"
+        flags.push(arg)
+      else
+        args.push(arg)
+      end
+    end
+
+    logger.warn("Additional options: #{flags.join " "}") if flags.size > 0
+    logger.warn("Additional arguments: #{args.join " "}") if args.size > 0
+
+    ARGV.unshift(*flags)
+    ARGV.push(*args)
+    super(*run_args)
   rescue FPM::Package::InvalidArgument => e
     logger.error("Invalid package argument: #{e}")
     return 1
@@ -542,21 +592,21 @@ class FPM::Command < Clamp::Command
 
       # Verify the types requested are valid
       types = FPM::Package.types.keys.sort
-      with(@command.input_type) do |val|
+      @command.input_type.tap do |val|
         next if val.nil?
         mandatory(FPM::Package.types.include?(val),
                   "Invalid input package -s flag) type #{val.inspect}. " \
                   "Expected one of: #{types.join(", ")}")
       end
 
-      with(@command.output_type) do |val|
+      @command.output_type.tap do |val|
         next if val.nil?
         mandatory(FPM::Package.types.include?(val),
                   "Invalid output package (-t flag) type #{val.inspect}. " \
                   "Expected one of: #{types.join(", ")}")
       end
 
-      with (@command.dependencies) do |dependencies|
+      @command.dependencies.tap do |dependencies|
         # Verify dependencies don't include commas (#257)
         dependencies.each do |dep|
           next unless dep.include?(",")

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,11 +151,11 @@ 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|
-        with(option.attribute_name) do |attr|
+        option.attribute_name.tap do |attr|
           # clamp makes option attributes available as accessor methods
           # do --foo-bar is available as 'foo_bar'
           # make these available as package attributes.
@@ -216,7 +216,7 @@ class FPM::Package
     return pkg
   end # def convert
 
-  # This method is invoked on a package when it has been covered to a new
+  # This method is invoked on a package when it has been converted to a new
   # package format. The purpose of this method is to do any extra conversion
   # steps, like translating dependency conditions, etc.
   def converted_from(origin)
@@ -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
@@ -331,17 +331,31 @@ class FPM::Package
     return erb
   end # def template
 
-  def to_s(fmt="NAME.TYPE")
-    fmt = "NAME.TYPE" if fmt.nil?
-    fullversion = version.to_s
-    fullversion += "-#{iteration}" if iteration
-    return fmt.gsub("ARCH", architecture.to_s) \
-      .gsub("NAME", name.to_s) \
-      .gsub("FULLVERSION", fullversion) \
-      .gsub("VERSION", version.to_s) \
-      .gsub("ITERATION", iteration.to_s) \
-      .gsub("EPOCH", epoch.to_s) \
-      .gsub("TYPE", type.to_s)
+  #######################################
+  # The following methods are provided to
+  # easily override particular substitut-
+  # ions performed by to_s for subclasses
+  #######################################
+  def to_s_arch;        architecture.to_s;  end
+  def to_s_name;        name.to_s;          end
+  def to_s_fullversion; iteration ? "#{version}-#{iteration}" : "#{version}"; end
+  def to_s_version;     version.to_s;       end
+  def to_s_iteration;   iteration.to_s;     end
+  def to_s_epoch;       epoch.to_s;         end
+  def to_s_type;        type.to_s;          end
+  def to_s_extension;   type.to_s;          end
+  #######################################
+
+  def to_s(fmt=nil)
+    fmt = "NAME.EXTENSION" if fmt.nil?
+    return fmt.gsub("ARCH", to_s_arch) \
+      .gsub("NAME",         to_s_name) \
+      .gsub("FULLVERSION",  to_s_fullversion) \
+      .gsub("VERSION",      to_s_version) \
+      .gsub("ITERATION",    to_s_iteration) \
+      .gsub("EPOCH",        to_s_epoch) \
+      .gsub("TYPE",         to_s_type) \
+      .gsub("EXTENSION",    to_s_extension)
   end # def to_s
 
   def edit_file(path)
@@ -351,7 +365,7 @@ class FPM::Package
     system("#{editor} #{Shellwords.escape(path)}")
     if !$?.success?
       raise ProcessFailed.new("'#{editor}' failed (exit code " \
-                              "#{$?.exitstatus}) Full command was: "\
+                              "#{$?.exitstatus}) Full command was: " \
                               "#{command}");
     end
 
@@ -379,7 +393,7 @@ class FPM::Package
 
         if File.fnmatch(wildcard, match_path)
           logger.info("Removing excluded path", :path => match_path, :matches => wildcard)
-          FileUtils.remove_entry_secure(path)
+          FileUtils.rm_r(path)
           Find.prune
           break
         end
@@ -390,7 +404,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 +455,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 +523,7 @@ class FPM::Package
   def provides=(value)
     if !value.is_a?(Array)
       @provides = [value]
-    else 
+    else
       @provides = value
     end
   end