cure-fpm 1.3.3b → 1.6.0b

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|
@@ -73,6 +73,10 @@ class FPM::Package::Python < FPM::Package
     "The python package name to remove from dependency list",
     :multivalued => true, :attribute_name => :python_disable_dependency,
     :default => []
+  option "--setup-py-arguments", "setup_py_argument",
+    "Arbitrary argument(s) to be passed to setup.py",
+    :multivalued => true, :attribute_name => :python_setup_py_arguments,
+    :default => []
 
   private
 
@@ -92,7 +96,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
@@ -108,7 +112,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
 
@@ -131,7 +135,8 @@ 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)
+      # TODO: Support older versions of pip
+      safesystem(attributes[:python_pip], "download", "--no-clean", "--no-deps", "--no-binary", ":all:", "-i", attributes[:python_pypi], "--build", target,  want_pkg)
     end
 
     # easy_install will put stuff in @tmpdir/packagename/, so find that:
@@ -149,7 +154,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",
@@ -274,7 +279,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
@@ -309,6 +314,13 @@ class FPM::Package::Python < FPM::Package
         flags += [ "build_scripts", "--executable", attributes[:python_scripts_executable] ]
       end
 
+      if !attributes[:python_setup_py_arguments].nil? and !attributes[:python_setup_py_arguments].empty?
+        # Add optional setup.py arguments
+        attributes[:python_setup_py_arguments].each do |a|
+          flags += [ a ]
+        end
+      end
+
       safesystem(attributes[:python_bin], "setup.py", "install", *flags)
     end
   end # def install_to_staging

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|
@@ -84,6 +86,9 @@ class FPM::Package::RPM < FPM::Package
     File.read(File.expand_path(file))
   end
 
+  option "--summary", "SUMMARY",
+    "Set the RPM summary. Overrides the first line on the description if set"
+
   option "--sign", :flag, "Pass --sign to rpmbuild"
 
   option "--auto-add-directories", :flag, "Auto add directories not part of filesystem"
@@ -98,7 +103,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)
@@ -117,6 +122,14 @@ class FPM::Package::RPM < FPM::Package
     next rpmbuild_filter_from_requires
   end
 
+  rpm_tags = []
+  option "--tag", "TAG",
+    "Adds a custom tag in the spec file as is. " \
+    "Example: --rpm-tag 'Requires(post): /usr/sbin/alternatives'" do |add_tag|
+      rpm_tags << add_tag
+    next rpm_tags
+  end
+
   option "--ignore-iteration-in-dependencies", :flag,
             "For '=' (equal) dependencies, allow iterations on the specified " \
             "version. Default is to be specific. This option allows the same " \
@@ -149,25 +162,29 @@ 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
   # Replace ? with [?] to make rpm not use globs
   # Replace % with [%] to make rpm not expand macros
   def rpm_fix_name(name)
-    name = "\"#{name}\"" if name[/\s/]
-    name = name.gsub("[", "[\\[]")
-    name = name.gsub("*", "[*]")
-    name = name.gsub("?", "[?]")
-    name = name.gsub("%", "[%]")
+    name = name.gsub(/(\ |\[|\]|\*|\?|\%|\$)/, {
+      ' ' => '?',
+      '%' => '[%]',
+      '$' => '[$]',
+      '?' => '[?]',
+      '*' => '[*]',
+      '[' => '[\[]',
+      ']' => '[\]]'
+    })
   end
 
   def rpm_file_entry(file)
@@ -289,7 +306,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,14 +320,17 @@ 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)
+       # RPMSENSE_TRIGGERPREIN = (1 << 25),  /*!< %triggerprein dependency. */
        :rpm_trigger_before_install
     elsif (flag & (1 << 16)) == (1 << 16)
+       # RPMSENSE_TRIGGERIN  = (1 << 16),    /*!< %triggerin dependency. */
        :rpm_trigger_after_install
     elsif (flag & (1 << 17)) == (1 << 17)
+       # RPMSENSE_TRIGGERUN  = (1 << 17),    /*!< %triggerun dependency. */
        :rpm_trigger_before_uninstall
     elsif (flag & (1 << 18)) == (1 << 18)
+       # RPMSENSE_TRIGGERPOSTUN = (1 << 18), /*!< %triggerpostun dependency. */
        :rpm_trigger_after_target_uninstall
     else
        @logger.fatal("I don't know about this triggerflag ('#{flag}')")
@@ -375,13 +395,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 +434,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}",
@@ -508,6 +531,14 @@ class FPM::Package::RPM < FPM::Package
     #return File.join("BUILD", prefix)
   end # def build_sub_dir
 
+  def summary
+    if !attributes[:rpm_summary]
+      return @description.split("\n").first || "_"
+    end
+
+    return attributes[:rpm_summary]
+  end # def summary
+
   def version
     if @version.kind_of?(String) and @version.include?("-")
       logger.warn("Package version '#{@version}' includes dashes, converting" \
@@ -523,16 +554,25 @@ class FPM::Package::RPM < FPM::Package
     return @epoch if @epoch.is_a?(Numeric)
 
     if @epoch.nil? or @epoch.empty?
-      logger.warn("no value for epoch is set, defaulting to nil")
       return nil
     end
 
     return @epoch
   end # def epoch
 
+  def to_s_dist;
+    attributes[:rpm_dist] ? "#{attributes[:rpm_dist]}" : "DIST";
+  end
+
   def to_s(format=nil)
-    return super("NAME-VERSION-ITERATION.ARCH.TYPE") if format.nil?
-    return super(format)
+    if format.nil?
+      format = if attributes[:rpm_dist]
+        "NAME-VERSION-ITERATION.DIST.ARCH.EXTENSION"
+      else
+        "NAME-VERSION-ITERATION.ARCH.EXTENSION"
+      end
+    end
+    return super(format.gsub("DIST", to_s_dist))
   end # def to_s
 
   def payload_compression
@@ -545,5 +585,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, :prefixed_path)
+         :summary, :epoch, :version, :prefixed_path)
 end # class FPM::Package::RPM

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/tar.rb

@@ -19,7 +19,7 @@ class FPM::Package::Tar < FPM::Package
     args = ["-xf", input_path, "-C", build_path]
 
     # Add the tar compression flag if necessary
-    with(tar_compression_flag(input_path)) do |flag|
+    tar_compression_flag(input_path).tap do |flag|
       args << flag unless flag.nil?
     end
 
@@ -48,9 +48,21 @@ class FPM::Package::Tar < FPM::Package
   # the compression type.
   def output(output_path)
     output_check(output_path)
+
+    # Write the scripts, too.
+    scripts_path = File.join(staging_path, ".scripts")
+    ::Dir.mkdir(scripts_path)
+    [:before_install, :after_install, :before_remove, :after_remove].each do |name|
+      next unless script?(name)
+      out = File.join(scripts_path, name.to_s)
+      logger.debug("Writing script", :source => name, :target => out)
+      File.write(out, script(name))
+      File.chmod(0755, out)
+    end
+
     # Unpack the tarball to the staging path
     args = ["-cf", output_path, "-C", staging_path]
-    with(tar_compression_flag(output_path)) do |flag|
+    tar_compression_flag(output_path).tap do |flag|
       args << flag unless flag.nil?
     end
     args << "."

data/lib/fpm/package/virtualenv.rb

@@ -0,0 +1,145 @@
+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
+  option "--pypi-extra-url", "PYPI_EXTRA_URL",
+    "PyPi extra-index-url for pointing to your priviate PyPi",
+    :multivalued => true, :attribute_name => :virtualenv_pypi_extra_index_urls,
+    :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")
+
+    extra_index_url_args = []
+    if attributes[:virtualenv_pypi_extra_index_urls]
+      attributes[:virtualenv_pypi_extra_index_urls].each do |extra_url|
+        extra_index_url_args << "--extra-index-url" << extra_url
+      end
+    end
+    pip_args = [pip_exe, "install", "-i", attributes[:virtualenv_pypi]] << extra_index_url_args << package
+    safesystem(*pip_args.flatten)
+
+    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.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