fpm 1.3.3 → 1.4.0

data/lib/fpm/package/pyfpm/get_metadata.py

@@ -90,7 +90,15 @@ class get_metadata(Command):
 
         output = open(self.output, "w")
         if hasattr(json, 'dumps'):
-            output.write(json.dumps(data, indent=2))
+            def default_to_str(obj):
+                """ Fall back to using __str__ if possible """
+                # This checks if the class of obj defines __str__ itself,
+                # so we don't fall back to an inherited __str__ method.
+                if "__str__" in type(obj).__dict__:
+                    return str(obj)
+                return json.JSONEncoder.default(self, obj)
+
+            output.write(json.dumps(data, indent=2, default=default_to_str))
         else:
             # For Python 2.5 and Debian's python-json
             output.write(json.write(data))

data/lib/fpm/package/python.rb

@@ -7,7 +7,7 @@ require "fileutils"
 require "tmpdir"
 require "json"
 
-# Support for python packages. 
+# Support for python packages.
 #
 # This supports input, but not output.
 #
@@ -28,7 +28,7 @@ class FPM::Package::Python < FPM::Package
     "is used instead", :default => nil
   option "--pypi", "PYPI_URL",
     "PyPi Server uri for retrieving packages.",
-    :default => "http://pypi.python.org/simple"
+    :default => "https://pypi.python.org/simple"
   option "--package-prefix", "NAMEPREFIX",
     "(DEPRECATED, use --package-name-prefix) Name to prefix the package " \
     "name with." do |value|
@@ -69,6 +69,10 @@ class FPM::Package::Python < FPM::Package
     "current python interpreter (sys.executable). This option is equivalent " \
     "to appending 'build_scripts --executable PYTHON_EXECUTABLE' arguments " \
     "to 'setup.py install' command."
+  option "--disable-dependency", "python_package_name",
+    "The python package name to remove from dependency list",
+    :multivalued => true, :attribute_name => :python_disable_dependency,
+    :default => []
 
   private
 
@@ -88,7 +92,7 @@ class FPM::Package::Python < FPM::Package
       setup_py = path_to_package
     end
 
-    if !File.exists?(setup_py)
+    if !File.exist?(setup_py)
       logger.error("Could not find 'setup.py'", :path => setup_py)
       raise "Unable to find python package; tried #{setup_py}"
     end
@@ -104,7 +108,7 @@ class FPM::Package::Python < FPM::Package
     # 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")
+    if File.directory?(path) or (File.exist?(path) and File.basename(path) == "setup.py")
       return path
     end
 
@@ -127,7 +131,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-deps", "--no-install", "-i", attributes[:python_pypi], "-U", "--build", target, want_pkg)
+      safesystem(attributes[:python_pip], "install", "--no-deps", "--no-install", "--no-use-wheel", "-i", attributes[:python_pypi], "-U", "--build", target, want_pkg)
     end
 
     # easy_install will put stuff in @tmpdir/packagename/, so find that:
@@ -145,7 +149,7 @@ class FPM::Package::Python < FPM::Package
       attributes[:python_package_name_prefix] = attributes[:python_package_prefix]
     end
 
-    begin 
+    begin
       json_test_code = [
         "try:",
         "  import json",
@@ -219,7 +223,7 @@ class FPM::Package::Python < FPM::Package
     self.name = self.name.downcase if attributes[:python_downcase_name?]
 
     if !attributes[:no_auto_depends?] and attributes[:python_dependencies?]
-      self.dependencies = metadata["dependencies"].collect do |dep|
+      metadata["dependencies"].each do |dep|
         dep_re = /^([^<>!= ]+)\s*(?:([<>!=]{1,2})\s*(.*))?$/
         match = dep_re.match(dep)
         if match.nil?
@@ -228,6 +232,8 @@ class FPM::Package::Python < FPM::Package
         end
         name, cmp, version = match.captures
 
+        next if attributes[:python_disable_dependency].include?(name)
+
         # convert == to =
         if cmp == "=="
           logger.info("Converting == dependency requirement to =", :dependency => dep )
@@ -241,7 +247,8 @@ class FPM::Package::Python < FPM::Package
 
         # convert dependencies from python-Foo to python-foo
         name = name.downcase if attributes[:python_downcase_dependencies?]
-        "#{name} #{cmp} #{version}"
+
+        self.dependencies << "#{name} #{cmp} #{version}"
       end
     end # if attributes[:python_dependencies?]
   end # def load_package_info
@@ -267,7 +274,7 @@ class FPM::Package::Python < FPM::Package
 
     prefix = "/"
     prefix = attributes[:prefix] unless attributes[:prefix].nil?
-    
+
     # Some setup.py's assume $PWD == current directory of setup.py, so let's
     # chdir first.
     ::Dir.chdir(project_dir) do

data/lib/fpm/package/rpm.rb

@@ -29,7 +29,7 @@ class FPM::Package::RPM < FPM::Package
     "bzip2" => "w9.bzdio"
   } unless defined?(COMPRESSION_MAP)
 
-  option "--use-file-permissions", :flag, 
+  option "--use-file-permissions", :flag,
       "Use existing file permissions when defining ownership and modes."
 
   option "--user", "USER", "Set the user to USER in the %files section. Overrides the user when used with use-file-permissions setting."
@@ -55,6 +55,8 @@ class FPM::Package::RPM < FPM::Package
     next rpmbuild_define
   end
 
+  option "--dist", "DIST-TAG", "Set the rpm distribution."
+
   option "--digest", DIGEST_ALGORITHM_MAP.keys.join("|"),
     "Select a digest algorithm. md5 works on the most platforms.",
     :default => "md5" do |value|
@@ -98,7 +100,7 @@ class FPM::Package::RPM < FPM::Package
   option "--attr", "ATTRFILE",
     "Set the attribute for a file (%attr).",
     :multivalued => true, :attribute_name => :attrs
-  
+
   option "--init", "FILEPATH", "Add FILEPATH as an init script",
 	:multivalued => true do |file|
     next File.expand_path(file)
@@ -149,14 +151,14 @@ class FPM::Package::RPM < FPM::Package
        match = trigger.match(/^(\[.*\]|)(.*): (.*)$/)
        @logger.fatal("Trigger '#{trigger_type}' definition can't be parsed ('#{trigger}')") unless match
        opt, pkg, file = match.captures
-       @logger.fatal("File given for --trigger-#{trigger_type} does not exist (#{file})") unless File.exists?(file)
+       @logger.fatal("File given for --trigger-#{trigger_type} does not exist (#{file})") unless File.exist?(file)
        rpm_trigger << [pkg, File.read(file), opt.tr('[]','')]
        next rpm_trigger
      end
    end
- 
+
   private
-    
+
   # Fix path name
   # Replace [ with [\[] to make rpm not use globs
   # Replace * with [*] to make rpm not use globs
@@ -289,7 +291,7 @@ class FPM::Package::RPM < FPM::Package
       script_path = self.attributes[scriptname]
       # Skip scripts not set
       next if script_path.nil?
-      if !File.exists?(script_path)
+      if !File.exist?(script_path)
         logger.error("No such file (for #{scriptname.to_s}): #{script_path.inspect}")
         script_errors	 << script_path
       end
@@ -303,7 +305,6 @@ class FPM::Package::RPM < FPM::Package
   end # def converted
 
   def rpm_get_trigger_type(flag)
-    puts "#{flag.to_s(2)}"
     if (flag & (1 << 25)) == (1 << 25)
        :rpm_trigger_before_install
     elsif (flag & (1 << 16)) == (1 << 16)
@@ -375,13 +376,13 @@ class FPM::Package::RPM < FPM::Package
       [name, operator, version].join(" ")
     end
     #input.replaces += replaces
-    
+
     self.config_files += rpm.config_files
 
     # rpms support '%dir' things for specifying empty directories to package,
     # but the rpm header itself doesn't actually record this information.
     # so there's no 'directories' to copy, so don't try to merge in the
-    # 'directories' feature. 
+    # 'directories' feature.
     # TODO(sissel): If you want this feature, we'll have to find scan
     # the extracted rpm for empty directories. I'll wait until someone asks for
     # this feature
@@ -414,6 +415,9 @@ class FPM::Package::RPM < FPM::Package
       args += ["--target", rpm_target]
     end
 
+    # set the rpm dist tag
+    args += ["--define", "dist .#{attributes[:rpm_dist]}"] if attributes[:rpm_dist]
+
     args += [
       "--define", "buildroot #{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
@@ -531,7 +535,10 @@ class FPM::Package::RPM < FPM::Package
   end # def epoch
 
   def to_s(format=nil)
-    return super("NAME-VERSION-ITERATION.ARCH.TYPE") if format.nil?
+    if format.nil?
+      return super("NAME-VERSION-ITERATION.DIST.ARCH.TYPE").gsub('DIST', attributes[:rpm_dist]) if attributes[:rpm_dist]
+      return super("NAME-VERSION-ITERATION.ARCH.TYPE")
+    end
     return super(format)
   end # def to_s
 

data/lib/fpm/package/sh.rb

@@ -11,7 +11,7 @@ require "digest"
 #
 # 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 sh package is a single sh file with a 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
 
@@ -24,12 +24,6 @@ class FPM::Package::Sh < FPM::Package
   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

data/lib/fpm/package/solaris.rb

@@ -75,7 +75,7 @@ class FPM::Package::Solaris < FPM::Package
       # Should create a package directory named by the package name.
       safesystem("pkgmk", "-o", "-f", "#{build_path}/Prototype", "-d", build_path)
     end
-    
+
 
     # Convert the 'package directory' built above to a real solaris package.
     safesystem("pkgtrans", "-s", build_path, output_path, name)

data/lib/fpm/package/virtualenv.rb

@@ -0,0 +1,136 @@
+require "fpm/namespace"
+require "fpm/package"
+require "fpm/util"
+
+# Support for python virtualenv packages.
+#
+# This supports input, but not output.
+#
+class FPM::Package::Virtualenv < FPM::Package
+  # Flags '--foo' will be accessable  as attributes[:virtualenv_foo]
+
+  option "--pypi", "PYPI_URL",
+  "PyPi Server uri for retrieving packages.",
+  :default => "https://pypi.python.org/simple"
+  option "--package-name-prefix", "PREFIX", "Name to prefix the package " \
+  "name with.", :default => "virtualenv"
+
+  option "--install-location", "DIRECTORY", "Location to which to " \
+  "install the virtualenv by default.", :default => "/usr/share/python" do |path|
+    File.expand_path(path)
+  end
+
+  option "--fix-name", :flag, "Should the target package name be prefixed?",
+  :default => true
+  option "--other-files-dir", "DIRECTORY", "Optionally, the contents of the " \
+  "specified directory may be added to the package. This is useful if the " \
+  "virtualenv needs configuration files, etc.", :default => nil
+
+  private
+
+  # Input a package.
+  #
+  #     `package` can look like `psutil==2.2.1` or `psutil`.
+  def input(package)
+    installdir = attributes[:virtualenv_install_location]
+    m = /^([^=]+)==([^=]+)$/.match(package)
+    package_version = nil
+
+    if m
+      package_name = m[1]
+      package_version = m[2]
+      self.version ||= package_version
+    else
+      package_name = package
+      package_version = nil
+    end
+
+    virtualenv_name = package_name
+
+    self.name ||= package_name
+
+    if self.attributes[:virtualenv_fix_name?]
+      self.name = [self.attributes[:virtualenv_package_name_prefix],
+                   self.name].join("-")
+    end
+
+    virtualenv_folder =
+      File.join(installdir,
+                virtualenv_name)
+
+    virtualenv_build_folder = build_path(virtualenv_folder)
+
+    ::FileUtils.mkdir_p(virtualenv_build_folder)
+
+    safesystem("virtualenv", virtualenv_build_folder)
+    pip_exe = File.join(virtualenv_build_folder, "bin", "pip")
+    python_exe = File.join(virtualenv_build_folder, "bin", "python")
+
+    # Why is this hack here? It looks important, so I'll keep it in.
+    safesystem(pip_exe, "install", "-U", "-i",
+               attributes[:virtualenv_pypi],
+               "pip", "distribute")
+    safesystem(pip_exe, "uninstall", "-y", "distribute")
+
+    safesystem(pip_exe, "install", "-i",
+               attributes[:virtualenv_pypi],
+               package)
+
+    if package_version.nil?
+      frozen = safesystemout(pip_exe, "freeze")
+      package_version = frozen[/#{package}==[^=]+$/].split("==")[1].chomp!
+      self.version ||= package_version
+    end
+
+    ::Dir[build_path + "/**/*"].each do |f|
+      if ! File.world_readable? f
+        File.lchmod(File.stat(f).mode | 444)
+      end
+    end
+
+    ::Dir.chdir(virtualenv_build_folder) do
+      safesystem("virtualenv-tools", "--update-path", virtualenv_folder)
+    end
+
+    if !attributes[:virtualenv_other_files_dir].nil?
+      # Copy all files from other dir to build_path
+      Find.find(attributes[:virtualenv_other_files_dir]) do |path|
+        src = path.gsub(/^#{attributes[:virtualenv_other_files_dir]}/, '')
+        dst = File.join(build_path, src)
+        copy_entry(path, dst, preserve=true, remove_destination=true)
+        copy_metadata(path, dst)
+      end
+    end
+
+    remove_python_compiled_files virtualenv_build_folder
+
+    # use dir to set stuff up properly, mainly so I don't have to reimplement
+    # the chdir/prefix stuff special for tar.
+    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
+
+  # Delete python precompiled files found in a given folder.
+  def remove_python_compiled_files path
+    logger.debug("Now removing python object and compiled files from the virtualenv")
+    Find.find(path) do |path|
+      if path.end_with? '.pyc' or path.end_with? '.pyo'
+        FileUtils.rm path
+      end
+    end
+  end
+  public(:input)
+end # class FPM::Package::Virtualenv

data/lib/fpm/package/zip.rb

@@ -42,7 +42,7 @@ class FPM::Package::Zip < FPM::Package
   # 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

data/lib/fpm/util.rb

@@ -24,6 +24,8 @@ module FPM::Util
 
   # Is the given program in the system's PATH?
   def program_in_path?(program)
+    # return false if path is not set
+    return false unless ENV['PATH']
     # Scan path to find the executable
     # Do this to help the user get a better error message.
     envpath = ENV["PATH"].split(":")
@@ -33,12 +35,12 @@ module FPM::Util
   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 program_in_path?(program) if !program.include?("/")
     return File.executable?(program)
   end # def program_exists?
 
   def default_shell
-    shell = ENV["SHELL"] 
+    shell = ENV["SHELL"]
     return "/bin/sh" if shell.nil? || shell.empty?
     return shell
   end
@@ -139,7 +141,7 @@ module FPM::Util
   end # def tar_cmd
 
   # Run a block with a value.
-  # Useful in lieu of assigning variables 
+  # Useful in lieu of assigning variables
   def with(value, &block)
     block.call(value)
   end # def with
@@ -157,7 +159,30 @@ module FPM::Util
     rc
   end
 
-  def copy_entry(src, dst)
+  def copy_metadata(source, destination)
+    source_stat = File::lstat(source)
+    dest_stat = File::lstat(destination)
+
+    # If this is a hard-link, there's no metadata to copy.
+    # If this is a symlink, what it points to hasn't been copied yet.
+    return if source_stat.ino == dest_stat.ino || dest_stat.symlink?
+
+    File.utime(source_stat.atime, source_stat.mtime, destination)
+    mode = source_stat.mode
+    begin
+      File.lchown(source_stat.uid, source_stat.gid, destination)
+    rescue Errno::EPERM
+      # clear setuid/setgid
+      mode &= 01777
+    end
+
+    unless source_stat.symlink?
+      File.chmod(mode, destination)
+    end
+  end # def copy_metadata
+
+
+  def copy_entry(src, dst, preserve=false, remove_destination=false)
     case File.ftype(src)
     when 'fifo', 'characterSpecial', 'blockSpecial', 'socket'
       st = File.stat(src)
@@ -173,7 +198,8 @@ module FPM::Util
       if known_entry
         FileUtils.ln(known_entry, dst)
       else
-        FileUtils.copy_entry(src, dst)
+        FileUtils.copy_entry(src, dst, preserve=preserve,
+                             remove_destination=remove_destination)
         copied_entries[[st.dev, st.ino]] = dst
       end
     end # else...