fpm 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d61a0cdec8509988ddad4461c5d8e97ec8e13e7d
+  data.tar.gz: 1450b23e93208cf29b03ee1e65fc2b3e4c21502f
+SHA512:
+  metadata.gz: 2f93f3d2dad2f43aa06db81125b39962855519e7e6c854636b95a378336ca8be63888b65a53c7400528c6b43278d711eaf3d2803df4f980231b7891495c78813
+  data.tar.gz: 5533a18ec9ef6c1a8b43a8a9e7c26bef3bd878eb79b3e7cfd086080ce2f0d17cbc5d606ec6808b5c20b0469ca0c0d7ce325750dc6f80ab549a0cd44ce66bc964

data/CHANGELIST

@@ -1,3 +1,34 @@
+1.1.0 (???)
+  - New package type: zip, for converting to and from zip files (Jordan Sissel)
+  - New package type: sh, a self-extracting package installation shell archive. (#651, Chris Gerber)
+  - 'fpm --version' will now emit the version of fpm.
+  - rpm: supports packaging fifo files (Adam Stephens)
+  - deb: Add --deb-use-file-permissions (Adam Stephens)
+  - cpan: Improve how fpm tries to find cpan artifacts for download (#614, Tim Nicholas)
+  - gem: Add --gem-disable-dependency for removing one or more specific rubygem
+    dependencies from the automatically-generated list (#598, Derek Olsen)
+  - python: Add --python-scripts-executable for setting a custom interpreter to
+    use for the hashbang line at the top of may python package scripts.
+    (#628, Vladimir Rutsky)
+  - Allow absolute paths with --directories even when --prefix is used (Vladimir Rutsky)
+  - dir: Now correctly identifies hardlinked files and creates a package correctly
+    with that knowledge (#365, #623, #659; Vladimir Rutsky)
+  - rpm: Add --rpm-auto-add-exclude-directories for excluding directories
+    from the --rpm-auto-add-directories behavior (#640, Vladimir Rutsky)
+  - general: --config-files now accepts directories and will recursively mark any
+    files within as config files inside the package (#642, Vladimir Rutsky)
+  - general: If you specify a --config-files path that doesn't exist, you will
+    now get an error. (#654, Alan Franzoni)
+  - python: Support --python-pypi when using --python-pip (#652, David Lindquist)
+  - deb: Tests now try to make packages ensure we don't upset lintian (#648, Sam Crang)
+  - rpm: Fix architecture targeting (#676, Rob Kinyon)
+  - rpm: Allow --rpm-user and --rpm-group to override the user/group even if
+    --rpm-use-file-permissions is enabled. (#679, Jordan Sissel)
+  - gem: Add --gem-version-bins for appending the gem version to the file name
+    of executable scripts a rubygem may install. (Jan Vansteenkiste)
+  - python: Attempt to provide better error messages for known issues in python
+    environments (#664, Jordan Sissel)
+
 1.0.2 (January 10, 2013)
   - rpm: No longer converts - to _ in dependency strings (#603, Bulat
     Shakirzyanov)

data/lib/fpm/command.rb

@@ -101,7 +101,8 @@ class FPM::Command < Clamp::Command
   option "--config-files", "CONFIG_FILES",
     "Mark a file in the package as being a config file. This uses 'conffiles'" \
     " in debs and %config in rpm. If you have multiple files to mark as " \
-    "configuration files, specify this flag multiple times.",
+    "configuration files, specify this flag multiple times.  If argument is " \
+    "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
@@ -217,6 +218,12 @@ class FPM::Command < Clamp::Command
 
   # Execute this command. See Clamp::Command#execute and Clamp's documentation
   def execute
+    # Short-circuit if someone simply runs `fpm --version`
+    if ARGV == [ "--version" ]
+      puts FPM::VERSION
+      return 0
+    end
+
     @logger.level = :warn
 
     if (stray_flags = args.grep(/^-/); stray_flags.any?)
@@ -385,8 +392,9 @@ class FPM::Command < Clamp::Command
 
     # Write the output somewhere, package can be nil if no --package is specified, 
     # and that's OK.
+    package_file = output.to_s(package)
     begin
-      output.output(output.to_s(package))
+      output.output(package_file)
     rescue FPM::Package::FileAlreadyExists => e
       @logger.fatal(e.message)
       return 1
@@ -395,6 +403,7 @@ class FPM::Command < Clamp::Command
       return 1
     end
 
+    @logger.log("Created package", :path => package_file)
     return 0
   rescue FPM::Util::ExecutableNotFound => e
     @logger.error("Need executable '#{e}' to convert #{input_type} to #{output_type}")

data/lib/fpm/package/cpan.rb

@@ -242,6 +242,7 @@ class FPM::Package::CPAN < FPM::Package
   def download(metadata, cpan_version=nil)
     distribution = metadata["distribution"]
     author = metadata["author"]
+
     @logger.info("Downloading perl module",
                  :distribution => distribution,
                  :version => cpan_version)
@@ -257,9 +258,27 @@ class FPM::Package::CPAN < FPM::Package
       end
     end
 
-    tarball = "#{distribution}-#{self.version}.tar.gz"
+    metacpan_release_url = "http://api.metacpan.org/v0/release/#{author}/#{distribution}-#{self.version}"
+    begin
+      release_response = httpfetch(metacpan_release_url)
+    rescue Net::HTTPServerException => e
+      @logger.error("metacpan release query failed.", :error => e.message,
+                    :module => package, :url => metacpan_release_url)
+      raise FPM::InvalidPackageConfiguration, "metacpan release query failed"
+    end
+
+    data = release_response.body
+    release_metadata = JSON.parse(data)
+    archive = release_metadata["archive"]
+
+    # should probably be basepathed from the url 
+    tarball = File.basename(archive)
+
+    url_base = "http://www.cpan.org/"
+    url_base = "#{attributes[:cpan_mirror]}" if !attributes[:cpan_mirror].nil?
+
     #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
-    url = "http://www.cpan.org/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

data/lib/fpm/package/deb.rb

@@ -76,6 +76,9 @@ class FPM::Package::Deb < FPM::Package
   option "--priority", "PRIORITY", 
     "The debian package 'priority' value.", :default => "extra"
 
+  option "--use-file-permissions", :flag, 
+    "Use existing file permissions when defining ownership and modes"
+
   option "--user", "USER", "The owner of files in this package", :default => 'root'
 
   option "--group", "GROUP", "The group owner of files in this package", :default => 'root'
@@ -342,23 +345,6 @@ class FPM::Package::Deb < FPM::Package
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
 
-    tar_flags = []
-    if !attributes[:deb_user].nil?
-      if attributes[:deb_user] == 'root'
-        tar_flags += [ "--numeric-owner", "--owner", "0" ]
-      else
-        tar_flags += [ "--owner", attributes[:deb_user] ]
-      end
-    end
-
-    if !attributes[:deb_group].nil?
-      if attributes[:deb_group] == 'root'
-        tar_flags += [ "--numeric-owner", "--group", "0" ]
-      else
-        tar_flags += [ "--group", attributes[:deb_group] ]
-      end
-    end
-
     if attributes[:deb_changelog]
       dest_changelog = File.join(staging_path, "usr/share/doc/#{name}/changelog.Debian")
       FileUtils.mkdir_p(File.dirname(dest_changelog))
@@ -396,7 +382,7 @@ class FPM::Package::Deb < FPM::Package
       FileUtils.ln_s("/lib/init/upstart-job", dest_init)
     end
 
-    args = [ tar_cmd, "-C", staging_path, compression ] + tar_flags + [ "-cf", datatar, "." ]
+    args = [ tar_cmd, "-C", staging_path, compression ] + data_tar_flags + [ "-cf", datatar, "." ]
     safesystem(*args)
 
     # pack up the .deb, which is just an 'ar' archive with 3 files
@@ -406,7 +392,6 @@ class FPM::Package::Deb < FPM::Package
         safesystem("ar", "-qc", output_path, "debian-binary", "control.tar.gz", datatar)
       end
     end
-    @logger.log("Created deb package", :path => output_path)
   end # def output
 
   def converted_from(origin)
@@ -612,7 +597,10 @@ class FPM::Package::Deb < FPM::Package
     File.open(control_path("conffiles"), "w") do |out|
       # 'config_files' comes from FPM::Package and is usually set with
       # FPM::Command's --config-files flag
-      allconfigs.each { |cf| out.puts(cf) }
+      allconfigs.each do |cf|
+        # We need to put the leading / back. Stops lintian relative-conffile error.
+        out.puts("/" + cf)
+      end
     end
   end # def write_conffiles
 
@@ -664,5 +652,27 @@ class FPM::Package::Deb < FPM::Package
     return super(format)
   end # def to_s
 
-  public(:input, :output, :architecture, :name, :prefix, :converted_from, :to_s)
+  def data_tar_flags
+    data_tar_flags = []
+    if attributes[:deb_use_file_permissions?].nil?
+      if !attributes[:deb_user].nil?
+        if attributes[:deb_user] == 'root'
+          data_tar_flags += [ "--numeric-owner", "--owner", "0" ]
+        else
+          data_tar_flags += [ "--owner", attributes[:deb_user] ]
+        end
+      end
+
+      if !attributes[:deb_group].nil?
+        if attributes[:deb_group] == 'root'
+          data_tar_flags += [ "--numeric-owner", "--group", "0" ]
+        else
+          data_tar_flags += [ "--group", attributes[:deb_group] ]
+        end
+      end
+    end
+    return data_tar_flags
+  end # def data_tar_flags
+
+  public(:input, :output, :architecture, :name, :prefix, :converted_from, :to_s, :data_tar_flags)
 end # class FPM::Target::Deb

data/lib/fpm/package/gem.rb

@@ -38,6 +38,11 @@ class FPM::Package::Gem < FPM::Package
     "shebang rewritten to use env?", :default => true
 
   option "--prerelease", :flag, "Allow prerelease versions of a gem", :default => false
+  option "--disable-dependency", "gem_name",
+    "The gem name to remove from dependency list",
+    :multivalued => true, :attribute_name => :gem_disable_dependencies
+
+  option "--version-bins", :flag, "Append the version to the bins", :default => false
 
   def input(gem)
     # 'arg'  is the name of the rubygem we should unpack.
@@ -147,6 +152,10 @@ class FPM::Package::Gem < FPM::Package
 
         # Some reqs can be ">= a, < b" versions, let's handle that.
         reqs.to_s.split(/, */).each do |req|
+          if attributes[:gem_disable_dependencies]
+            next if attributes[:gem_disable_dependencies].include?(dep.name)
+          end
+
           if attributes[:gem_fix_dependencies?]
             name = fix_name(dep.name)
           else
@@ -198,6 +207,11 @@ class FPM::Package::Gem < FPM::Package
       ::Dir.rmdir(tmp)
       tmp = File.dirname(tmp)
     end
+    if attributes[:gem_version_bins?]
+      (::Dir.entries(bin_path) - ['.','..']).each do |bin|
+        FileUtils.mv("#{bin_path}/#{bin}", "#{bin_path}/#{bin}-#{self.version}")
+      end
+    end
   end # def install_to_staging
   
   # Sanitize package name.

data/lib/fpm/package/python.rb

@@ -63,6 +63,12 @@ class FPM::Package::Python < FPM::Package
   option "--obey-requirements-txt", :flag, "Use a requirements.txt file " \
     "in the top-level directory of the python package for dependency " \
     "detection.", :default => false
+  option "--scripts-executable", "PYTHON_EXECUTABLE", "Set custom python " \
+    "interpreter in installing scripts. By default distutils will replace " \
+    "python interpreter in installing scripts (specified by shebang) with " \
+    "current python interpreter (sys.executable). This option is equivalent " \
+    "to appending 'build_scripts --executable PYTHON_EXECUTABLE' arguments " \
+    "to 'setup.py install' command."
 
   private
 
@@ -121,8 +127,7 @@ class FPM::Package::Python < FPM::Package
                  "--build-directory", target, want_pkg)
     else
       @logger.debug("using pip", :pip => attributes[:python_pip])
-      safesystem(attributes[:python_pip], "install", "--no-install",
-                 "-U", "--build", target, want_pkg)
+      safesystem(attributes[:python_pip], "install", "--no-install", "-i", attributes[:python_pypi], "-U", "--build", target, want_pkg)
     end
 
     # easy_install will put stuff in @tmpdir/packagename/, so find that:
@@ -140,6 +145,26 @@ class FPM::Package::Python < FPM::Package
       attributes[:python_package_name_prefix] = attributes[:python_package_prefix]
     end
 
+    begin 
+      json_test_code = [
+        "try:",
+        "  import json",
+        "except ImportError:",
+        "  import simplejson as json"
+      ].join("\n")
+      safesystem("#{attributes[:python_bin]} -c '#{json_test_code}'")
+    rescue FPM::Util::ProcessFailed => e
+      @logger.error("Your python environment is missing json support (either json or simplejson python module). I cannot continue without this.", :python => attributes[:python_bin], :error => e)
+      raise FPM::Util::ProcessFailed, "Python (#{attributes[:python_bin]}) is missing simplejson or json modules."
+    end
+
+    begin
+      safesystem("#{attributes[:python_bin]} -c 'import pkg_resources'")
+    rescue FPM::Util::ProcessFailed => e
+      @logger.error("Your python environment is missing a working setuptools module. I tried to find the 'pkg_resources' module but failed.", :python => attributes[:python_bin], :error => e)
+      raise FPM::Util::ProcessFailed, "Python (#{attributes[:python_bin]}) is missing pkg_resources module."
+    end
+
     # Add ./pyfpm/ to the python library path
     pylib = File.expand_path(File.dirname(__FILE__))
 
@@ -272,6 +297,11 @@ class FPM::Package::Python < FPM::Package
         flags += [ "--install-scripts", File.join(prefix, "bin") ]
       end
 
+      if !attributes[:python_scripts_executable].nil?
+        # Overwrite installed python scripts shebang binary with provided executable
+        flags += [ "build_scripts", "--executable", attributes[:python_scripts_executable] ]
+      end
+
       safesystem(attributes[:python_bin], "setup.py", "install", *flags)
     end
   end # def install_to_staging

data/lib/fpm/package/rpm.rb

@@ -30,19 +30,11 @@ class FPM::Package::RPM < FPM::Package
   } unless defined?(COMPRESSION_MAP)
 
   option "--use-file-permissions", :flag, 
-      "Use existing file permissions when defining ownership and modes"
+      "Use existing file permissions when defining ownership and modes."
 
-  option "--user", "USER",
-    "Set the user to USER in the %files section.", 
-    :default => 'root' do |value|
-      value
-  end
+  option "--user", "USER", "Set the user to USER in the %files section. Overrides the user when used with use-file-permissions setting."
 
-  option "--group", "GROUP",
-    "Set the group to GROUP in the %files section.",
-    :default => 'root' do |value|
-      value
-  end
+  option "--group", "GROUP", "Set the group to GROUP in the %files section. Overrides the group when used with use-file-permissions setting."
 
   option "--defattrfile", "ATTR",
     "Set the default file mode (%defattr).",
@@ -95,6 +87,9 @@ class FPM::Package::RPM < FPM::Package
   option "--sign", :flag, "Pass --sign to rpmbuild"
 
   option "--auto-add-directories", :flag, "Auto add directories not part of filesystem"
+  option "--auto-add-exclude-directories", "DIRECTORIES",
+    "Additional directories ignored by '--rpm-auto-add-directories' flag",
+    :multivalued => true, :attribute_name => :auto_add_exclude_directories
 
   option "--autoreqprov", :flag, "Enable RPM's AutoReqProv option"
   option "--autoreq", :flag, "Enable RPM's AutoReq option"
@@ -141,8 +136,11 @@ class FPM::Package::RPM < FPM::Package
     # Stat the original filename in the relative staging path
     ::Dir.chdir(staging_path) do
       stat = File.stat(original_file.gsub(/\"/, '').sub(/^\//,''))
-      user = Etc.getpwuid(stat.uid).name
-      group = Etc.getgrgid(stat.gid).name
+
+      # rpm_user and rpm_group attribute should override file ownership
+      # otherwise use the current file user/group by name.
+      user = attributes[:rpm_user] || Etc.getpwuid(stat.uid).name
+      group = attributes[:rpm_group] || Etc.getgrgid(stat.gid).name
       mode = stat.mode
       return sprintf("%%attr(%o, %s, %s) %s\n", mode & 4095 , user, group, file)
     end
@@ -301,11 +299,19 @@ class FPM::Package::RPM < FPM::Package
     rpm.extract(staging_path)
   end # def input
 
+  def prefixed_path(path)
+    Pathname.new(path).absolute?() ? path : File.join(self.prefix, path)
+  end # def prefixed_path
+
   def output(output_path)
     output_check(output_path)
     %w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| FileUtils.mkdir_p(build_path(d)) }
     args = ["rpmbuild", "-bb"]
 
+    if %x{uname -m}.chomp != self.architecture
+      args += [ '--target', self.architecture ]
+    end
+
     # issue #309
     if !attributes[:rpm_os].nil?
       rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
@@ -324,6 +330,7 @@ class FPM::Package::RPM < FPM::Package
     if attributes[:rpm_auto_add_directories?]
       fs_dirs_list = File.join(template_dir, "rpm", "filesystem_list")
       fs_dirs = File.readlines(fs_dirs_list).reject { |x| x =~ /^\s*#/}.map { |x| x.chomp }
+      fs_dirs.concat((attributes[:auto_add_exclude_directories] or []))
 
       Find.find(staging_path) do |path|
         next if path == staging_path
@@ -333,7 +340,7 @@ class FPM::Package::RPM < FPM::Package
         end
       end
     else
-      self.directories = self.directories.map { |x| File.join(self.prefix, x) }
+      self.directories = self.directories.map { |x| self.prefixed_path(x) }
       alldirs = []
       self.directories.each do |path|
         Find.find(File.join(staging_path, path)) do |subpath|
@@ -348,14 +355,15 @@ class FPM::Package::RPM < FPM::Package
     # scan all conf file paths for files and add them
     allconfigs = []
     self.config_files.each do |path|
-      cfg_path = File.expand_path(path, staging_path)
+      cfg_path = File.join(staging_path, path)
+      raise "Config file path #{cfg_path} does not exist" unless File.exist?(cfg_path)
       Find.find(cfg_path) do |p|
         allconfigs << p.gsub("#{staging_path}/", '') if File.file? p
       end
     end
     allconfigs.sort!.uniq!
 
-    self.config_files = allconfigs.map { |x| File.join(self.prefix, x) }
+    self.config_files = allconfigs.map { |x| File.join("/", x) }
 
     (attributes[:rpm_rpmbuild_define] or []).each do |define|
       args += ["--define", define]
@@ -383,8 +391,6 @@ class FPM::Package::RPM < FPM::Package
       # This should only output one rpm, should we verify this?
       FileUtils.cp(rpmpath, output_path)
     end
-
-    @logger.log("Created rpm", :path => output_path)
   end # def output
 
   def prefix
@@ -394,7 +400,7 @@ class FPM::Package::RPM < FPM::Package
   def build_sub_dir
     return "BUILD"
     #return File.join("BUILD", prefix)
-  end # def prefix
+  end # def build_sub_dir
 
   def version
     if @version.kind_of?(String) and @version.include?("-")
@@ -433,5 +439,5 @@ class FPM::Package::RPM < FPM::Package
 
   public(:input, :output, :converted_from, :architecture, :to_s, :iteration,
          :payload_compression, :digest_algorithm, :prefix, :build_sub_dir,
-         :epoch, :version)
+         :epoch, :version, :prefixed_path)
 end # class FPM::Package::RPM

data/lib/fpm/package/sh.rb

@@ -0,0 +1,75 @@
+require "erb"
+require "fpm/namespace"
+require "fpm/package"
+require "fpm/errors"
+require "fpm/util"
+require "backports"
+require "fileutils"
+require "digest"
+
+# Support for self extracting sh files (.sh files)
+#
+# This class only supports output of packages.
+#
+# The sh package is a single sh file with a bzipped tar payload concatenated to the end.
+# The script can unpack the tarball to install it and call optional post install scripts.
+class FPM::Package::Sh < FPM::Package
+
+  def output(output_path)
+    create_scripts
+
+    # Make one file. The installscript can unpack itself.
+    `cat #{install_script} #{payload} > #{output_path}`
+    FileUtils.chmod("+x", output_path)
+  end
+
+  def create_scripts
+    if script?(:before_install)
+      # the scripts are kept in the payload so what would before install be if we've already
+      # unpacked the payload?
+      raise "sh package does not support before install scripts."
+    end
+
+    if script?(:after_install)
+      File.write(File.join(fpm_meta_path, "after_install"), script(:after_install))
+    end
+  end
+
+  def install_script
+    path = build_path("installer.sh")
+    File.open(path, "w") do |file|
+      file.write template("sh.erb").result(binding)
+    end
+    path
+  end
+
+  # Returns the path to the tar file containing the packed up staging directory
+  def payload
+    payload_tar = build_path("payload.tar")
+    @logger.info("Creating payload tar ", :path => payload_tar)
+
+    args = [ tar_cmd,
+             "-C",
+             staging_path,
+             "-cf",
+             payload_tar,
+             "--owner=0",
+             "--group=0",
+             "--numeric-owner",
+             "." ]
+
+    unless safesystem(*args)
+      raise "Command failed while creating payload tar: #{args}"
+    end
+    payload_tar
+  end
+
+  # Where we keep metadata and post install scripts and such
+  def fpm_meta_path
+    @fpm_meta_path ||= begin
+                         path = File.join(staging_path, ".fpm")
+                         FileUtils.mkdir_p(path)
+                         path
+                       end
+  end
+end

data/lib/fpm/package/zip.rb

@@ -0,0 +1,63 @@
+require "backports" # gem backports
+require "fpm/package"
+require "fpm/util"
+require "fileutils"
+require "fpm/package/dir"
+
+# Use a zip as a package.
+#
+# This provides no metadata. Both input and output are supported.
+class FPM::Package::Zip < FPM::Package
+
+  # Input a zipfile.
+  def input(input_path)
+    # use part of the filename as the package name
+    self.name = File.extname(input_path)[1..-1]
+
+    realpath = Pathname.new(input_path).realpath.to_s
+    ::Dir.chdir(build_path) do
+      safesystem("unzip", realpath)
+    end
+
+    # use dir to set stuff up properly, mainly so I don't have to reimplement
+    # the chdir/prefix stuff special for zip.
+    dir = convert(FPM::Package::Dir)
+    if attributes[:chdir]
+      dir.attributes[:chdir] = File.join(build_path, attributes[:chdir])
+    else
+      dir.attributes[:chdir] = build_path
+    end
+
+    cleanup_staging
+    # Tell 'dir' to input "." and chdir/prefix will help it figure out the
+    # rest.
+    dir.input(".")
+    @staging_path = dir.staging_path
+    dir.cleanup_build
+  end # def input
+
+  # Output a tarball.
+  #
+  # If the output path ends predictably (like in .tar.gz) it will try to obey
+  # the compression type.
+  def output(output_path)
+    output_check(output_path)
+    
+    files = Find.find(staging_path).to_a
+    safesystem("zip", output_path, *files)
+  end # def output
+
+  # Generate the proper tar flags based on the path name.
+  def tar_compression_flag(path)
+    case path
+      when /\.tar\.bz2$/
+        return "-j"
+      when /\.tar\.gz$|\.tgz$/
+        return "-z"
+      when /\.tar\.xz$/
+        return "-J"
+      else
+        return nil
+    end
+  end # def tar_compression_flag
+end # class FPM::Package::Tar

data/lib/fpm/util.rb

@@ -30,18 +30,29 @@ module FPM::Util
     return envpath.select { |p| File.executable?(File.join(p, program)) }.any?
   end # def program_in_path
 
+  def program_exists?(program)
+    # Scan path to find the executable
+    # Do this to help the user get a better error message.
+    return program_in_path?(program) if !program.include?("/") 
+    return File.executable?(program)
+  end # def program_exists?
+
+  def default_shell
+    shell = ENV["SHELL"] 
+    return "/bin/sh" if shell.nil? || shell.empty?
+    return shell
+  end
+
   # 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] ]
+      args = [ default_shell, "-c", args[0] ]
     end
     program = args[0]
 
-    # Scan path to find the executable
-    # Do this to help the user get a better error message.
-    if !program.include?("/") and !program_in_path?(program)
+    if !program_exists?(program)
       raise ExecutableNotFound.new(program)
     end
 
@@ -73,7 +84,7 @@ module FPM::Util
     return success
   end # def safesystem
 
-# Run a command safely in a way that captures output and status.
+  # 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] ]
@@ -155,7 +166,29 @@ module FPM::Util
     when 'directory'
       FileUtils.mkdir(dst) unless File.exists? dst
     else
-      FileUtils.copy_entry(src, dst)
-    end
-  end
+      # if the file with the same dev and inode has been copied already -
+      # hard link it's copy to `dst`, otherwise make an actual copy
+      st = File.lstat(src)
+      known_entry = copied_entries[[st.dev, st.ino]]
+      if known_entry
+        FileUtils.ln(known_entry, dst)
+      else
+        FileUtils.copy_entry(src, dst)
+        copied_entries[[st.dev, st.ino]] = dst
+      end
+    end # else...
+  end # def copy_entry
+
+  def copied_entries
+    # TODO(sissel): I wonder that this entry-copy knowledge needs to be put
+    # into a separate class/module. As is, calling copy_entry the same way
+    # in slightly different contexts will result in weird or bad behavior.
+    # What I mean is if we do:
+    #   pkg = FPM::Package::Dir...
+    #   pkg.output()...
+    #   pkg.output()...
+    # The 2nd output call will fail or behave weirdly because @copied_entries
+    # is already populated. even though this is anew round of copying.
+    return @copied_entries ||= {}
+  end # def copied_entries
 end # module FPM::Util

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/templates/rpm.erb

@@ -41,7 +41,6 @@ Epoch: <%= epoch %>
 Release: <%= iteration or 1 %>
 <%# use the first line of the description as the summary -%>
 Summary: <%= description.split("\n").first.empty? ? "_" :  description.split("\n").first %>
-BuildArch: <%= architecture %>
 <% if !attributes[:rpm_autoreqprov?] -%>
 AutoReqProv: no
 <% else -%>
@@ -127,7 +126,7 @@ Obsoletes: <%= repl %>
 <% end -%>
 
 %files
-%defattr(<%= attributes[:rpm_defattrfile] %>,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,<%= attributes[:rpm_defattrdir] %>)
+%defattr(<%= attributes[:rpm_defattrfile] %>,<%= attributes[:rpm_user] || "root" %>,<%= attributes[:rpm_group] || "root" %>,<%= attributes[:rpm_defattrdir] %>)
 <%# Output config files and then regular files. -%>
 <% config_files.each do |path| -%>
 %config(noreplace) <%= rpm_file_entry(path) %>

data/templates/sh.erb

@@ -0,0 +1,297 @@
+#!/bin/bash
+
+# bail out if any part of this fails
+set -e
+
+# This is the self-extracting installer script for an FPM shell installer package.
+# It contains the logic to unpack a tar archive appended to the end of this script
+# and, optionally, to run post install logic.
+# Run the package file with -h to see a usage message or look at the print_usage method.
+#
+# The post install scripts are called with INSTALL_ROOT, INSTALL_DIR and VERBOSE exported
+# into the environment for their use.
+#
+# INSTALL_ROOT = the path passed in with -i or a relative directory of the name of the package
+#                file with no extension
+# INSTALL_DIR  = the same as INSTALL_ROOT unless -c (capistrano release directory) argumetn
+#                is used. Then it is $INSTALL_ROOT/releases/<datestamp>
+# CURRENT_DIR  = if -c argument is used, this is set to the $INSTALL_ROOT/current which is
+#                symlinked to INSTALL_DIR
+# VERBOSE      = is set if the package was called with -v for verbose output
+function main() {
+    set_install_dir
+
+    create_pid
+
+    wait_for_others
+
+    kill_others
+
+    set_owner
+
+    unpack_payload
+
+    if [ "$UNPACK_ONLY" == "1" ] ; then
+        echo "Unpacking complete, not moving symlinks or restarting because unpack only was specified."
+    else
+        create_symlinks
+
+        set +e # don't exit on errors to allow us to clean up
+        if ! run_post_install ; then
+            revert_symlinks
+            log "Installation failed."
+            exit 1
+        else
+            clean_out_old_releases
+            log "Installation complete."
+        fi
+    fi
+}
+
+# deletes the PID file for this installation
+function delete_pid(){
+    rm -f ${INSTALL_ROOT}/$$.pid 2> /dev/null
+}
+
+# creates a PID file for this installation
+function create_pid(){
+    trap "delete_pid" EXIT
+    echo $$> ${INSTALL_ROOT}/$$.pid
+}
+
+
+# checks for other PID files and sleeps for a grace period if found
+function wait_for_others(){
+    local count=`ls ${INSTALL_ROOT}/*.pid | wc -l`
+
+    if [ $count -gt 1 ] ; then
+        sleep 10
+    fi
+}
+
+# kills other running installations
+function kill_others(){
+    for PID_FILE in $(ls ${INSTALL_ROOT}/*.pid) ; do
+        local p=`cat ${PID_FILE}`
+        if ! [ $p == $$ ] ; then
+            kill -9 $p
+            rm -f $PID_FILE 2> /dev/null
+        fi
+    done
+}
+
+# echos metadata file. A function so that we can have it change after we set INSTALL_ROOT
+function fpm_metadata_file(){
+    echo "${INSTALL_ROOT}/.install-metadata"
+}
+
+# if this package was installed at this location already we will find a metadata file with the details
+# about the installation that we left here. Load from that if available but allow command line args to trump
+function load_environment(){
+    local METADATA=$(fpm_metadata_file)
+    if [ -r "${METADATA}" ] ; then
+        log "Found existing metadata file '${METADATA}'. Loading previous install details. Env vars in current environment will take precedence over saved values."
+        local TMP="/tmp/$(basename $0).$$.tmp"
+        # save existing environment, load saved environment from previous run from install-metadata and then
+        # overlay current environment so that anything set currencly will take precedence
+        # but missing values will be loaded from previous runs.
+        save_environment "$TMP"
+        source "${METADATA}"
+        source $TMP
+        rm "$TMP"
+    fi
+}
+
+# write out metadata for future installs
+function save_environment(){
+    local METADATA=$1
+    echo -n "" > ${METADATA} # empty file
+
+    # just piping env to a file doesn't quote the variables. This does
+    # filter out multiline junk and _. _ is a readonly variable
+    env | egrep "^[^ ]+=.*" | grep -v "^_=" | while read ENVVAR ; do
+        local NAME=${ENVVAR%%=*}
+        # sed is to preserve variable values with dollars (for escaped variables or $() style command replacement),
+        # and command replacement backticks
+        # Escaped parens captures backward reference \1 which gets replaced with backslash and \1 to esape them in the saved
+        # variable value
+        local VALUE=$(eval echo '$'$NAME | sed 's/\([$`]\)/\\\1/g')
+        echo "export $NAME=\"$VALUE\"" >> ${METADATA}
+    done
+
+    if [ -n "${OWNER}" ] ; then
+        chown ${OWNER} ${METADATA}
+    fi
+}
+
+function set_install_dir(){
+    # if INSTALL_ROOT isn't set by parsed args, use basename of package file with no extension
+    DEFAULT_DIR=$(echo $(basename $0) | sed -e 's/\.[^\.]*$//')
+    INSTALL_DIR=${INSTALL_ROOT:-$DEFAULT_DIR}
+
+    DATESTAMP=$(date +%Y%m%d%H%M%S)
+    if [ -z "$USE_FLAT_RELEASE_DIRECTORY" ] ; then
+        <%= "RELEASE_ID=#{release_id}" if respond_to?(:release_id) %>
+        INSTALL_DIR="${RELEASES_DIR}/${RELEASE_ID:-$DATESTAMP}"
+    fi
+
+    mkdir -p "$INSTALL_DIR" || die "Unable to create install directory $INSTALL_DIR"
+
+    export INSTALL_DIR
+
+    log "Installing package to '$INSTALL_DIR'"
+}
+
+function set_owner(){
+    export OWNER=${OWNER:-$USER}
+    log "Installing as user $OWNER"
+}
+
+function unpack_payload(){
+    if [ "$FORCE" == "1" ] || [ ! "$(ls -A $INSTALL_DIR)" ] ; then
+        log "Unpacking payload . . ."
+        local archive_line=$(grep -a -n -m1 '__ARCHIVE__$' $0 | sed 's/:.*//')
+        tail -n +$((archive_line + 1)) $0 | tar -C $INSTALL_DIR -xf - > /dev/null || die "Failed to unpack payload from the end of '$0' into '$INSTALL_DIR'"
+    else
+        # Files are already here, just move symlinks
+        log "Directory already exists and has contents ($INSTALL_DIR). Not unpacking payload."
+    fi
+}
+
+function run_post_install(){
+    local AFTER_INSTALL=$INSTALL_DIR/.fpm/after_install
+    if [ -r $AFTER_INSTALL ] ; then
+        chmod +x $AFTER_INSTALL
+        log "Running post install script"
+        log $($AFTER_INSTALL)
+        return $?
+    fi
+    return 0
+}
+
+function create_symlinks(){
+    [ -n "$USE_FLAT_RELEASE_DIRECTORY" ] && return
+
+    export CURRENT_DIR="$INSTALL_ROOT/current"
+    if [ -e "$CURRENT_DIR" ] ; then
+        OLD_CURRENT_TARGET=$(readlink $CURRENT_DIR)
+        rm "$CURRENT_DIR"
+    fi
+    ln -s "$INSTALL_DIR" "$CURRENT_DIR"
+
+    log "Symlinked '$INSTALL_DIR' to '$CURRENT_DIR'"
+}
+
+# in case post install fails we may have to back out switching the symlink to current
+# We can't switch the symlink after because post install may assume that it is in the
+# exact state of being installed (services looking to current for their latest code)
+function revert_symlinks(){
+    if [ -n "$OLD_CURRENT_TARGET" ] ; then
+        log "Putting current symlink back to '$OLD_CURRENT_TARGET'"
+        if [ -e "$CURRENT_DIR" ] ; then
+            rm "$CURRENT_DIR"
+        fi
+        ln -s "$OLD_CURRENT_TARGET" "$CURRENT_DIR"
+    fi
+}
+
+function clean_out_old_releases(){
+    [ -n "$USE_FLAT_RELEASE_DIRECTORY" ] && return
+
+    while [ $(ls -tr "${RELEASES_DIR}" | wc -l) -gt 2 ] ; do
+        OLDEST_RELEASE=$(ls -tr "${RELEASES_DIR}" | head -1)
+        log "Deleting old release '${OLDEST_RELEASE}'"
+        rm -rf "${RELEASES_DIR}/${OLDEST_RELEASE}"
+    done
+}
+
+function print_usage(){
+    echo "Usage: `basename $0` [options]"
+    echo "Install this package"
+    echo "  -i <DIRECTORY> : install_root - an optional directory to install to."
+    echo "      Default is package file name without file extension"
+    echo "  -o <USER>     : owner - the name of the user that will own the files installed"
+    echo "                   by the package. Defaults to current user"
+    echo "  -r: disable capistrano style release directories - Default behavior is to create a releases directory inside"
+    echo "      install_root and unpack contents into a date stamped (or build time id named) directory under the release"
+    echo "      directory. Then create a 'current' symlink under install_root to the unpacked"
+    echo "      directory once installation is complete replacing the symlink if it already "
+    echo "      exists. If this flag is set just install into install_root directly"
+    echo "  -u: Unpack the package, but do not install and symlink the payload"
+    echo "  -f: force - Always overwrite existing installations"
+    echo "  -y: yes - Don't prompt to clobber existing installations"
+    echo "  -v: verbose - More output on installation"
+    echo "  -h: help -  Display this message"
+}
+
+function die () {
+    local message=$*
+    echo "Error: $message : $!"
+    exit 1
+}
+
+function log(){
+    local message=$*
+    if [ -n "$VERBOSE" ] ; then
+        echo "$*"
+    fi
+}
+
+function parse_args() {
+    args=`getopt i:o:rfuyvh $*`
+
+    if [ $? != 0 ] ; then
+        print_usage
+        exit 2
+    fi
+    set -- $args
+    for i
+    do
+        case "$i"
+            in
+            -r)
+                USE_FLAT_RELEASE_DIRECTORY=1
+                shift;;
+            -i)
+                shift;
+                export INSTALL_ROOT="$1"
+                export RELEASES_DIR="${INSTALL_ROOT}/releases"
+                shift;;
+            -o)
+                shift;
+                export OWNER="$1"
+                shift;;
+            -v)
+                export VERBOSE=1
+                shift;;
+            -u)
+                UNPACK_ONLY=1
+                shift;;
+            -f)
+                FORCE=1
+                shift;;
+            -y)
+                CONFIRM="y"
+                shift;;
+            -h)
+                print_usage
+                exit 0
+                shift;;
+            --)
+                shift; break;;
+        esac
+    done
+}
+
+# parse args first to get install root
+parse_args $*
+# load environment from previous installations so we get defaults from that
+load_environment
+# reparse args so they can override any settings from previous installations if provided on the command line
+parse_args $*
+
+main
+save_environment $(fpm_metadata_file)
+exit 0
+
+__ARCHIVE__

metadata

@@ -1,100 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: cabin
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: backports
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: arr-pm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
-- !ruby/object:Gem::Dependency
-  name: ftw
-  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
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.30
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,55 +83,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: insist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,49 +139,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stud
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
@@ -228,39 +187,42 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fpm.rb
-- lib/fpm/package.rb
-- lib/fpm/version.rb
-- lib/fpm/namespace.rb
-- lib/fpm/util.rb
-- lib/fpm/errors.rb
 - lib/fpm/command.rb
-- lib/fpm/package/pkgin.rb
-- lib/fpm/package/tar.rb
-- lib/fpm/package/pyfpm/__init__.pyc
-- lib/fpm/package/pyfpm/get_metadata.pyc
-- lib/fpm/package/pyfpm/get_metadata.py
-- lib/fpm/package/pyfpm/__init__.py
+- lib/fpm/errors.rb
+- lib/fpm/namespace.rb
+- lib/fpm/package/cpan.rb
+- lib/fpm/package/deb.rb
 - lib/fpm/package/dir.rb
-- lib/fpm/package/npm.rb
+- lib/fpm/package/empty.rb
 - lib/fpm/package/gem.rb
-- lib/fpm/package/deb.rb
+- lib/fpm/package/npm.rb
+- lib/fpm/package/osxpkg.rb
+- lib/fpm/package/pear.rb
+- lib/fpm/package/pkgin.rb
 - lib/fpm/package/puppet.rb
-- lib/fpm/package/cpan.rb
+- lib/fpm/package/pyfpm/__init__.py
+- lib/fpm/package/pyfpm/__init__.pyc
+- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/python.rb
-- lib/fpm/package/osxpkg.rb
-- lib/fpm/package/solaris.rb
 - lib/fpm/package/rpm.rb
-- lib/fpm/package/empty.rb
-- lib/fpm/package/pear.rb
+- lib/fpm/package/sh.rb
+- lib/fpm/package/solaris.rb
+- lib/fpm/package/tar.rb
+- lib/fpm/package/zip.rb
+- lib/fpm/package.rb
+- lib/fpm/util.rb
+- lib/fpm/version.rb
+- lib/fpm.rb
 - bin/fpm
-- templates/rpm.erb
+- templates/deb/ldconfig.sh.erb
 - templates/deb.erb
 - templates/osxpkg.erb
-- templates/rpm/filesystem_list
-- templates/deb/ldconfig.sh.erb
-- templates/puppet/package.pp.erb
 - templates/puppet/package/remove.pp.erb
+- templates/puppet/package.pp.erb
+- templates/rpm/filesystem_list
+- templates/rpm.erb
+- templates/sh.erb
 - templates/solaris.erb
 - LICENSE
 - CONTRIBUTORS
@@ -268,27 +230,26 @@ files:
 homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fpm - package building and mangling
 test_files: []