fpm 0.4.0pre3 → 0.4.0

data/CHANGELIST

@@ -11,7 +11,6 @@
   - rpm support: Add --rpm-rpmbuild-define for passing a --define flag to rpmbuild
     (via Naresh V)
   - PHP pear source support (fpm -s pear ...) (via Andrew Gaffney)
-  TODO(sissel): pull/163, make sure --post-process is supported
 
 0.3.10 (Oct 10, 2011)
   - Allow taking a list of files/inputs on stdin with '-' or with the --inputs

data/lib/fpm/command.rb

@@ -33,12 +33,12 @@ class FPM::Command < Clamp::Command
     "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."
-  option ["-p", "--package"], "OUTPUT",
-    "The package file path to output.", :default => "NAME-FULLVERSION.ARCH.TYPE"
+  option ["-p", "--package"], "OUTPUT", "The package file path to output."
   option ["-n", "--name"], "NAME", "The name to give to the package"
   option "--verbose", :flag, "Enable verbose output"
   option "--debug", :flag, "Enable debug output"
-  option ["-v", "--version"], "VERSION", "The version to give to the package"
+  option ["-v", "--version"], "VERSION", "The version to give to the package",
+    :default => 1.0
   option "--iteration", "ITERATION",
     "The iteration to give to the package. RPM calls this the 'release'. " \
     "FreeBSD calls it 'PORTREVISION'. Debian calls this 'debian_revision'",
@@ -78,7 +78,8 @@ class FPM::Command < Clamp::Command
   end # --replaces
   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." do |val|
+    " in debs and %config in rpm. You can specify a directory to have it " \
+    "scanned marking all files found as config files" do |val|
     @config_files ||= []
     @config_files << val
   end # --config-files
@@ -98,28 +99,6 @@ class FPM::Command < Clamp::Command
     @exclude_pattern ||= []
     @exclude_pattern << val
   end # -x / --exclude
-  option "--post-install", "FILE",
-    "a script to be run after package installation",
-    :attribute_name => :after_install do |val|
-    File.expand_path(val) # Get the full path to the script
-  end # --post-install
-  option "--pre-install", "FILE",
-    "a script to be run before package installation",
-    :attribute_name => :before_install do |val|
-    File.expand_path(val) # Get the full path to the script
-  end # --pre-install
-  # TODO(sissel): Name the flag --post-remove for clarity
-  option "--post-uninstall", "FILE",
-    "a script to be run after package removal",
-    :attribute_name => :after_remove do |val|
-    File.expand_path(val) # Get the full path to the script
-  end # --post-uninstall
-  # TODO(sissel): Name the flag --pre-remove for clarity
-  option "--pre-uninstall", "FILE",
-    "a script to be run before package removal",
-    :attribute_name => :before_remove do |val|
-    File.expand_path(val) # Get the full path to the script
-  end # --pre-uninstall
   option "--description", "DESCRIPTION", "Add a description for this package.",
     :default => "no description"
   option "--url", "URI", "Add a url for this package.",
@@ -127,13 +106,50 @@ class FPM::Command < Clamp::Command
   option "--inputs", "INPUTS_PATH",
     "The path to a file containing a newline-separated list of " \
     "files and dirs to use as input."
+
+  option "--post-install", "FILE",
+    "(DEPRECATED, use --after-install) a script to be run after " \
+    "package installation" do |val|
+    @after_install = File.expand_path(val) # Get the full path to the script
+  end # --post-install (DEPRECATED)
+  option "--pre-install", "FILE",
+    "(DEPRECATED, use --before-install) a script to be run before " \
+    "package installation" do |val|
+    @before_install = File.expand_path(val) # Get the full path to the script
+  end # --pre-install (DEPRECATED)
+  option "--post-uninstall", "FILE",
+      "(DEPRECATED, use --after-remove) a script to be run after " \
+      "package removal" do |val|
+    @after_remove = File.expand_path(val) # Get the full path to the script
+  end # --post-uninstall (DEPRECATED)
+  option "--pre-uninstall", "FILE",
+    "(DEPRECATED, use --before-remove) a script to be run before " \
+    "package removal"  do |val|
+    @before_remove = File.expand_path(val) # Get the full path to the script
+  end # --pre-uninstall (DEPRECATED)
+
+  option "--after-install", "FILE",
+    "a script to be run after package installation" do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --after-install
+  option "--before-install", "FILE",
+    "a script to be run before package installation" do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --pre-install
+  option "--after-remove", "FILE",
+    "a script to be run after package removal" do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --after-remove
+  option "--before-remove", "FILE",
+    "a script to be run before package removal" do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --before-remove
+
   parameter "[ARGS] ...",
     "Inputs to the source package type. For the 'dir' type, this is the files" \
     " and directories you want to include in the package. For others, like " \
     "'gem', it specifies the packages to download and use as the gem input",
     :attribute_name => :args
-
-  # package-level settings
   def settings
     @settings ||= {}
   end
@@ -207,6 +223,17 @@ class FPM::Command < Clamp::Command
       input.input(arg) 
     end
 
+    # If --inputs was specified, read it as a file.
+    if !inputs.nil?
+      if !File.exists?(inputs)
+        @logger.fatal("File given for --inputs does not exist (#{inputs})")
+        return 1
+      end
+
+      # Read each line as a path
+      File.new(inputs, "r").each_line { |path| input.input(path) }
+    end
+
     # Override package settings if they are not the default flag values
     # the below proc essentially does:
     #
@@ -239,16 +266,36 @@ class FPM::Command < Clamp::Command
     input.provides += provides
     input.replaces += replaces
 
-    input.scripts[:before_install] = before_install # --pre-install
-    input.scripts[:after_install] = after_install # --post-install
-    input.scripts[:before_remove] = before_remove # --pre-uninstall
-    input.scripts[:after_remove] = after_remove # --post-uninstall
+    setscript = proc do |scriptname|
+      path = self.send(scriptname)
+      # Skip scripts not set
+      next if path.nil?
+
+      # 'self.send(scriptname) == self.before_install == --before-install
+      if !File.exists?(path)
+        $stderr.puts("No such file (for #{scriptname.to_s}): #{path.inspect}")
+        return 1
+      end
+      input.scripts[scriptname] = File.read(path)
+    end
+
+    setscript.call(:before_install)
+    setscript.call(:after_install)
+    setscript.call(:before_remove)
+    setscript.call(:after_remove)
     
     # Convert to the output type
     output = input.convert(output_class)
 
-    # Write the output somewhere
-    output.output(output.to_s(package))
+    # Write the output somewhere, package can be nil if no --package is specified, 
+    # and that's OK.
+    begin
+      output.output(output.to_s(package))
+    rescue FPM::Package::FileAlreadyExists => e
+      @logger.fatal(e.message)
+      return 1
+    end
+
     return 0
   ensure
     input.cleanup unless input.nil?

data/lib/fpm/package.rb

@@ -13,6 +13,13 @@ 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
+    def to_s
+      return "File already exists, refusing to continue: #{super}"
+    end # def to_s
+  end # class FileAlreadyExists
 
   # The name of this package
   attr_accessor :name
@@ -109,8 +116,15 @@ class FPM::Package
       @maintainer = "<#{ENV["USER"]}@#{Socket.gethostname}>"
     end
 
+    # Set attribute defaults based on flags
+    # This allows you to define command line options with default values
+    # that also are obeyed if fpm is used programmatically.
+    self.class.default_attributes do |attribute, value|
+      attributes[attribute] = value
+    end
+
     @name = nil
-    @architecture = "all"
+    @architecture = "native"
     @description = "no description given"
     @version = nil
     @epoch = nil
@@ -119,6 +133,19 @@ 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|
+          # clamp makes option attributes available as accessor methods
+          # do --foo-bar is available as 'foo_bar'
+          # make these available as package attributes.
+          attr = "#{attr}?" if !respond_to?(attr)
+          input.attributes[attr.to_sym] = send(attr) if respond_to?(attr)
+        end
+      end
+    end
 
     @provides = []
     @conflicts = []
@@ -264,7 +291,8 @@ class FPM::Package
       .gsub("NAME", name.to_s) \
       .gsub("FULLVERSION", fullversion) \
       .gsub("VERSION", version.to_s) \
-      .gsub("EPOCH", epoch.to_s)
+      .gsub("ITERATION", iteration.to_s) \
+      .gsub("EPOCH", epoch.to_s) \
       .gsub("TYPE", type.to_s)
   end # def to_s
 
@@ -330,6 +358,15 @@ class FPM::Package
       end
     end # def apply_options
 
+    def default_attributes(&block)
+      return if @options.nil?
+      @options.each do |flag, param, help, options, block|
+        attr = flag.first.gsub(/^-+/, "").gsub(/-/, "_")
+        attr += "?" if param == :flag
+        yield attr.to_sym, options[:default]
+      end
+    end # def default_attributes
+
     # Get the type of this package class.
     #
     # For "Foo::Bar::BAZ" this will return "baz"

data/lib/fpm/package/deb.rb

@@ -4,8 +4,10 @@ require "fpm/package"
 require "fpm/errors"
 require "fpm/util"
 require "fileutils"
-require "insist"
 
+# Support for debian packages (.deb files)
+#
+# This class supports both input and output of packages.
 class FPM::Package::Deb < FPM::Package
   # Map of what scripts are named.
   SCRIPT_MAP = {
@@ -50,6 +52,8 @@ class FPM::Package::Deb < FPM::Package
     value.to_i
   end
 
+  private
+
   # Return the architecture. This will default to native if not yet set.
   # It will also try to use dpkg and 'uname -m' to figure out what the
   # native 'architecture' value should be.
@@ -63,11 +67,11 @@ class FPM::Package::Deb < FPM::Package
       else
         @architecture = %x{uname -m}.chomp
       end
-    elsif @architecture == "x86_64"
+    end
+    if @architecture == "x86_64"
       # Debian calls x86_64 "amd64"
       @architecture = "amd64"
     end
-
     return @architecture
   end # def architecture
 
@@ -182,10 +186,11 @@ class FPM::Package::Deb < FPM::Package
   end # def extract_files
 
   def output(output_path)
-    insist { File.directory?(build_path) } == true
+    # Abort if the target path already exists.
+    raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
 
     # create 'debian-binary' file, required to make a valid debian package
-    File.write(build_path("debian-binary"), "2.0")
+    File.write(build_path("debian-binary"), "2.0\n")
 
     write_control_tarball
 
@@ -325,6 +330,7 @@ class FPM::Package::Deb < FPM::Package
 
       @logger.debug("Writing control file", :path => control)
       File.write(control, control_data)
+      edit_file(control) if attributes[:edit?]
     end
   end # def write_control
 
@@ -333,13 +339,14 @@ class FPM::Package::Deb < FPM::Package
   # SCRIPT_MAP is a map from the package ':after_install' to debian
   # 'post_install' names
   def write_scripts
-    SCRIPT_MAP.each do |script, filename|
-      next if scripts[script].nil?
+    SCRIPT_MAP.each do |scriptname, filename|
+      next if scripts[scriptname].nil?
 
-      with(control_path(filename)) do |path|
-        FileUtils.cp(scripts[script], filename)
+      with(control_path(filename)) do |controlscript|
+        @logger.debug("Writing control script", :source => filename, :target => controlscript)
+        File.write(controlscript, scripts[scriptname])
         # deb maintainer scripts are required to be executable
-        File.chmod(0755, filename)
+        File.chmod(0755, controlscript)
       end
     end 
   end # def write_scripts
@@ -363,5 +370,13 @@ class FPM::Package::Deb < FPM::Package
       File.chmod(0755, control_path("templates"))
     end
   end # def write_debconf
-  public(:input, :output)
+
+  def to_s(format=nil)
+    # Default format if nil
+    # git_1.7.9.3-1_amd64.deb
+    return super("NAME_FULLVERSION_ARCH.TYPE") if format.nil?
+    return super(format)
+  end # def to_s
+
+  public(:input, :output, :architecture, :name, :converted_from, :to_s)
 end # class FPM::Target::Deb

data/lib/fpm/package/dir.rb

@@ -4,9 +4,28 @@ require "fileutils"
 require "find"
 require "socket"
 
+# A directory package.
+#
+# This class supports both input and output. As a note, 'output' will
+# only emit the files, not any metadata. This is an effective way
+# to extract another package type.
 class FPM::Package::Dir < FPM::Package
   private
 
+  # Add a new path to this package.
+  #
+  # If the path is a directory, it is copied recursively. The behavior
+  # of the copying is modified by the :chdir and :prefix attributes.
+  #
+  # If :prefix is set, the destination path is prefixed with that value.
+  # If :chdir is set, the current directory is changed to that value
+  # during the copy.
+  #
+  # Example: Copy /etc/X11 into this package as /opt/xorg/X11:
+  #
+  #     package.attributes[:prefix] = "/opt/xorg"
+  #     package.attributes[:chdir] = "/etc"
+  #     package.input("X11")
   def input(path)
     @logger.debug("Copying", :input => path)
     @logger["method"] = "input"
@@ -25,9 +44,11 @@ class FPM::Package::Dir < FPM::Package
     self.license = "unknown"
     self.vendor = [ENV["USER"], Socket.gethostname].join("@")
   ensure
+    # Clean up any logger context we added.
     @logger.remove("method")
   end # def input
 
+  # Output this package to the given directory.
   def output(dir)
     dir = File.expand_path(dir)
     ::Dir.chdir(staging_path) do
@@ -60,6 +81,9 @@ class FPM::Package::Dir < FPM::Package
     end
   end # def clone
 
+  # Copy, recursively, from source to destination.
+  #
+  # Files will be hardlinked if possible, but copied otherwise.
   def copy(source, destination)
     directory = File.dirname(destination)
     if !File.directory?(directory)

data/lib/fpm/package/gem.rb

@@ -12,9 +12,10 @@ require "fpm/util"
 # The following attributes are supported:
 #
 # * :gem_bin_path
-# * :package_name_prefix
+# * :gem_package_name_prefix
 # * :gem_gem
 class FPM::Package::Gem < FPM::Package
+  # Flags '--foo' will be accessable  as attributes[:gem_foo]
   option "--bin-path", "DIRECTORY", "The directory to install gem executables",
     :default => ::Gem::bindir
   option "--package-prefix", "NAMEPREFIX",
@@ -29,6 +30,10 @@ class FPM::Package::Gem < FPM::Package
   option "--gem", "PATH_TO_GEM",
           "The path to the 'gem' tool (defaults to 'gem' and searches " \
           "your $PATH)", :default => "gem"
+  option "--fix-name", :flag, "Should the target package name be prefixed?",
+    :default => true
+  option "--fix-dependencies", :flag, "Should the package dependencies be " \
+    "prefixed?", :default => true
 
   def input(gem)
     # 'arg'  is the name of the rubygem we should unpack.
@@ -97,7 +102,14 @@ class FPM::Package::Gem < FPM::Package
         attributes[:gem_package_name_prefix] = attributes[:gem_package_prefix]
       end
 
-      self.name = [attributes[:gem_package_name_prefix], spec.name].join("-")
+      # name prefixing is optional, if enabled, a name 'foo' will become
+      # 'rubygem-foo' (depending on what the gem_package_name_prefix is)
+      self.name = spec.name
+      if attributes[:gem_fix_name?]
+        self.name = fix_name(spec.name)
+      end
+
+      #self.name = [attributes[:gem_package_name_prefix], spec.name].join("-")
       self.license = (spec.license or "no license listed in #{File.basename(file)}")
       self.version = spec.version.to_s
       self.vendor = spec.author
@@ -132,7 +144,12 @@ class FPM::Package::Gem < FPM::Package
 
         # Some reqs can be ">= a, < b" versions, let's handle that.
         reqs.to_s.split(/, */).each do |req|
-          self.dependencies << "#{attributes[:gem_package_name_prefix]}-#{dep.name} #{req}"
+          if attributes[:gem_fix_dependencies?] 
+            name = fix_name(dep.name) 
+          else 
+            name = dep.name
+          end
+          self.dependencies << "#{name} #{req}"
         end
       end # runtime_dependencies
     end # ::Gem::Package
@@ -157,6 +174,12 @@ class FPM::Package::Gem < FPM::Package
     args << gem_path
     safesystem(*args)
   end # def install_to_staging
-
+  
+  # Sanitize package name.
+  # This prefixes the package name with 'rubygem' (but depends on the attribute
+  # :gem_package_name_prefix
+  def fix_name(name)
+    return [attributes[:gem_package_name_prefix], name].join("-")
+  end # def fix_name
   public(:input, :output)
 end # class FPM::Package::Gem

data/lib/fpm/package/pear.rb

@@ -3,10 +3,20 @@ require "fpm/package"
 require "fileutils"
 require "fpm/util"
 
+# This provides PHP PEAR package support.
+#
+# This provides input support, but not output support.
 class FPM::Package::PEAR < FPM::Package
-  option "--package-prefix", "PREFIX",
-    "Name prefix for python package", :default => "php-pear"
+  option "--package-name-prefix", "PREFIX",
+    "Name prefix for pear package", :default => "php-pear"
 
+  # Input a PEAR package.
+  #
+  # The parameter is a PHP PEAR package name.
+  #
+  # Attributes that affect behavior here:
+  # * :prefix - changes the install root, default is /usr/share
+  # * :pear_package_name_prefix - changes the 
   def input(input_package)
     if !program_in_path?("pear")
       raise ExecutableNotFound.new("pear")
@@ -21,7 +31,7 @@ class FPM::Package::PEAR < FPM::Package
     @logger.info("Fetching package information", :package => input_package)
     pear_cmd = "pear -c #{config} remote-info #{input_package}"
     name = %x{#{pear_cmd} | sed -ne '/^Package\s*/s/^Package\s*//p'}.chomp
-    self.name = "#{attributes[:pear_package_prefix]}-#{name}"
+    self.name = "#{attributes[:pear_package_name_prefix]}-#{name}"
     self.version = %x{#{pear_cmd} | sed -ne '/^Latest\s*/s/^Latest\s*//p'}.chomp
     self.description  = %x{#{pear_cmd} | sed -ne '/^Summary\s*/s/^Summary\s*//p'}.chomp
 

data/lib/fpm/package/python.rb

@@ -7,7 +7,18 @@ require "fileutils"
 require "tmpdir"
 require "json"
 
+# Support for python packages. 
+#
+# This supports input, but not output.
+#
+# Example:
+#
+#     # Download the django python package:
+#     pkg = FPM::Package::Python.new
+#     pkg.input("Django")
+#
 class FPM::Package::Python < FPM::Package
+  # Flags '--foo' will be accessable  as attributes[:python_foo]
   option "--bin", "PYTHON_EXECUTABLE",
     "The path to the python executable you wish to run.", :default => "python"
   option "--easyinstall", "EASYINSTALL_EXECUTABLE",
@@ -15,9 +26,30 @@ class FPM::Package::Python < FPM::Package
   option "--pypi", "PYPI_URL",
     "PyPi Server uri for retrieving packages.",
     :default => "http://pypi.python.org/simple"
-  option "--package-prefix", "PREFIX",
-    "Name prefix for python package", :default => "python"
-
+  option "--package-prefix", "NAMEPREFIX",
+    "(DEPRECATED, use --package-name-prefix) Name to prefix the package " \
+    "name with." do |value|
+    @logger.warn("Using deprecated flag: --package-prefix. Please use " \
+                 "--package-name-prefix")
+    value
+  end
+  option "--package-name-prefix", "PREFIX", "Name to prefix the package " \
+    "name with.", :default => "python"
+  option "--fix-name", :flag, "Should the target package name be prefixed?",
+    :default => true
+  option "--fix-dependencies", :flag, "Should the package dependencies be " \
+    "prefixed?", :default => true
+
+
+  private
+
+  # Input a package.
+  #
+  # The 'package' can be any of:
+  #
+  # * A name of a package on pypi (ie; easy_install some-package)
+  # * The path to a directory containing setup.py
+  # * The path to a setup.py
   def input(package)
     path_to_package = download_if_necessary(package, version)
 
@@ -36,7 +68,11 @@ class FPM::Package::Python < FPM::Package
     install_to_staging(setup_py)
   end # def input
 
+  # Download the given package if necessary. If version is given, that version
+  # will be downloaded, otherwise the latest is fetched.
   def download_if_necessary(package, version=nil)
+    # TODO(sissel): this should just be a 'download' method, the 'if_necessary'
+    # part should go elsewhere.
     path = package
     # If it's a path, assume local build.
     if File.directory?(path) or (File.exists?(path) and File.basename(path) == "setup.py")
@@ -51,30 +87,32 @@ class FPM::Package::Python < FPM::Package
       want_pkg = "#{package}==#{version}"
     end
 
-    # TODO(sissel): support a settable path to 'easy_install'
-    # TODO(sissel): support a tunable for uthe url to pypi
-    safesystem("easy_install", "-i", "http://pypi.python.org/simple",
-               "--editable", "-U", "--build-directory", build_path, want_pkg)
+    target = build_path(package)
+    FileUtils.mkdir(target) unless File.directory?(target)
+
+    safesystem(attributes[:python_easyinstall], "-i", attributes[:python_pypi],
+               "--editable", "-U", "--build-directory", target, want_pkg)
 
     # easy_install will put stuff in @tmpdir/packagename/, so find that:
     #  @tmpdir/somepackage/setup.py
-    dirs = ::Dir.glob(File.join(build_path, "*"))
+    dirs = ::Dir.glob(File.join(target, "*"))
     if dirs.length != 1
       raise "Unexpected directory layout after easy_install. Maybe file a bug? The directory is #{build_path}"
     end
     return dirs.first
   end # def download
 
+  # Load the package information like name, version, dependencies.
   def load_package_info(setup_py)
-    if !attributes.include?(:package_name_prefix)
-      attributes[:package_name_prefix] = "python"
+    if !attributes[:python_package_prefix].nil?
+      attributes[:python_package_name_prefix] = attributes[:python_package_prefix]
     end
 
     # Add ./pyfpm/ to the python library path
     pylib = File.expand_path(File.dirname(__FILE__))
-    setup_cmd = "env PYTHONPATH=#{pylib} #{self.attributes[:python_bin]} #{setup_py} --command-packages=pyfpm get_metadata"
+    setup_cmd = "env PYTHONPATH=#{pylib} #{attributes[:python_bin]} #{setup_py} --command-packages=pyfpm get_metadata"
     output = ::Dir.chdir(File.dirname(setup_py)) { `#{setup_cmd}` }
-    puts output
+    @logger.warn("json output from setup.py", :data => output)
     metadata = JSON.parse(output[/\{.*\}/msx])
 
     self.architecture = metadata["architecture"]
@@ -83,11 +121,20 @@ class FPM::Package::Python < FPM::Package
     self.version = metadata["version"]
     self.url = metadata["url"]
 
-    self.name = fix_name(metadata["name"])
+    # name prefixing is optional, if enabled, a name 'foo' will become
+    # 'python-foo' (depending on what the python_package_name_prefix is)
+    if attributes[:python_fix_name?]
+      self.name = fix_name(metadata["name"])
+    else
+      self.name = metadata["name"]
+    end
 
     self.dependencies += metadata["dependencies"].collect do |dep|
       name, cmp, version = dep.split
-      name = fix_name(name)
+      # dependency name prefixing is optional, if enabled, a name 'foo' will
+      # become 'python-foo' (depending on what the python_package_name_prefix
+      # is)
+      name = fix_name(name) if attributes[:python_fix_dependencies?]
       "#{name} #{cmp} #{version}"
     end
   end # def load_package_info
@@ -101,25 +148,32 @@ class FPM::Package::Python < FPM::Package
     if name.start_with?("python")
       # If the python package is called "python-foo" strip the "python-" part while
       # prepending the package name prefix.
-      return [attributes[:package_name_prefix], name.gsub(/^python-/, "")].join("-")
+      return [attributes[:python_package_name_prefix], name.gsub(/^python-/, "")].join("-")
     else
-      return [attributes[:package_name_prefix], name].join("-")
+      return [attributes[:python_package_name_prefix], name].join("-")
     end
   end # def fix_name
 
+  # Install this package to the staging directory
   def install_to_staging(setup_py)
     dir = File.dirname(setup_py)
 
     # Some setup.py's assume $PWD == current directory of setup.py, so let's
     # chdir first.
     ::Dir.chdir(dir) do
+
+      # Install with a specific prefix if requested
       if attributes[:prefix]
         safesystem(attributes[:python_bin], "setup.py", "install", "--prefix",
                    File.join(staging_path, attributes[:prefix]))
       else
+        # Otherwise set the root in staging_path
+        # TODO(sissel): there needs to be a way to force 
         safesystem(attributes[:python_bin], "setup.py", "install", "--root",
                    staging_path)
       end
     end
   end # def install_to_staging
+
+  public(:input)
 end # class FPM::Package::Python

data/lib/fpm/package/rpm.rb

@@ -67,7 +67,6 @@ class FPM::Package::RPM < FPM::Package
 
     self.architecture = tags[:arch]
     self.category = tags[:group]
-    self.config_files = config_files
     self.description = tags[:description]
     self.epoch = (tags[:epoch] || [nil]).first # for some reason epoch is an array
     self.iteration = tags[:release]
@@ -78,16 +77,28 @@ class FPM::Package::RPM < FPM::Package
     self.vendor = tags[:vendor]
     self.version = tags[:version]
 
-    # TODO(sissel): Collect {pre,post}{install,uninstall} scripts
+    self.scripts[:before_install] = tags[:prein]
+    self.scripts[:after_install] = tags[:postin]
+    self.scripts[:before_remove] = tags[:preun]
+    self.scripts[:after_remove] = tags[:postun]
+    # TODO(sissel): prefix these scripts above with a shebang line if there isn't one?
+    # Also taking into account the value of tags[preinprog] etc, something like:
+    #    #!#{tags[:preinprog]}
+    #    #{tags[prein]}
     # TODO(sissel): put 'trigger scripts' stuff into attributes
-    # TODO(sissel): support provides
-    # TODO(sissel): support conflicts
-    # TODO(sissel): support replaces
 
     self.dependencies += rpm.requires.collect do |name, operator, version|
       [name, operator, version].join(" ")
     end
+    self.conflicts += rpm.conflicts.collect do |name, operator, version|
+      [name, operator, version].join(" ")
+    end
+    self.provides += rpm.provides.collect do |name, operator, version|
+      [name, operator, version].join(" ")
+    end
     #input.replaces += replaces
+    
+    self.config_files += rpm.config_files
 
     # Extract to the staging directory
     rpm.extract(staging_path)
@@ -112,11 +123,6 @@ class FPM::Package::RPM < FPM::Package
     edit_file(specfile) if attributes[:edit?]
 
     args << specfile
-    #if defines.empty?
-      #args = prefixargs + spec
-    #else
-      #args = prefixargs + defines.collect{ |define| ["--define", define] }.flatten + spec
-    #end
 
     @logger.info("Running rpmbuild", :args => args)
     safesystem(*args)
@@ -129,5 +135,10 @@ class FPM::Package::RPM < FPM::Package
     @logger.log("Created rpm", :path => output_path)
   end # def output
 
-  public(:input, :output, :converted_from)
+  def to_s(format=nil)
+    return super("NAME-VERSION-ITERATION.ARCH.TYPE") if format.nil?
+    return super(format)
+  end # def to_s
+
+  public(:input, :output, :converted_from, :architecture, :to_s)
 end # class FPM::Package::RPM

data/templates/rpm.erb

@@ -31,6 +31,9 @@ Requires: <%= req %>
 <% provides.each do |prov| -%>
 Provides: <%= prov %>
 <% end -%>
+<% conflicts.each do |conflict| -%>
+Conflicts: <%= conflict %>
+<% end -%>
 <% replaces.each do |repl| -%>
 <%# The closes equivalent in RPM to "replaces" is "Obsoletes" -%>
 Obsoletes: <%= repl %>
@@ -63,36 +66,39 @@ fi
 %clean
 # noop
 
-<% if scripts["pre-install"] -%>
+<% if scripts[:before_install] -%>
 %pre
-<%= File.read(scripts["pre-install"]) %>
+<%= scripts[:before_install] %>
 
 <% end -%>
-<% if scripts["post-install"] -%>
+<% if scripts[:after_install] -%>
 %post
-<%= File.read(scripts["post-install"]) %>
+<%= scripts[:after_install] %>
 
 <% end -%>
-<% if scripts["pre-uninstall"] -%>
+<% if scripts[:before_remove] -%>
 %preun
-<%= File.read(scripts["pre-uninstall"]) %>
+<%= scripts[:before_remove] %>
 
 <% end -%>
-<% if scripts["post-uninstall"] -%>
+<% if scripts[:after_remove] -%>
 %postun
-<%= File.read(scripts["post-uninstall"]) %>
+<%= scripts[:after_remove] %>
 
 <% end -%>
 %files
 %defattr(-,root,root,-)
 <%# Output config files and then regular files. -%>
-<%= config_files.collect { |c| '%config ' + c }.join("\n") -%>
-<%# list only files, not directories? %>
+<% config_files.each do |path| -%>
+%config <%= path %>
+<% end -%>
+<%# list only files, not directories? -%>
 <%= 
-  # Reject directories, then prefix files with "/", then make sure
-  # paths with spaces are quoted. I hate rpm so much.
+  # Reject directories or config files already listed, then prefix files with
+  # "/", then make sure paths with spaces are quoted. I hate rpm so much.
   files.reject { |f| File.directory?(File.join(staging_path, f)) } \
     .collect { |f| "/#{f}" } \
+    .reject { |f| config_files.include?(f) } \
     .collect { |f| f[/\s/] and "\"#{f}\"" or f } \
     .join("\n") 
 %>

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.0pre3
-  prerelease: 5
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14151240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,43 +21,63 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14151240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: &14150740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *14150740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &14150240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *14150240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: arr-pm
-  requirement: &14149860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *14149860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &14149400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14149400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rush
-  requirement: &14148980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14148980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14148560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,18 +117,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14148560
-- !ruby/object:Gem::Dependency
-  name: insist
-  requirement: &14148140 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: insist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
   prerelease: false
-  version_requirements: *14148140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 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!
@@ -155,12 +195,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling