fpm 1.16.0 → 1.18.0

data/lib/fpm/package/rpm.rb

@@ -156,7 +156,7 @@ class FPM::Package::RPM < FPM::Package
 
   option "--macro-expansion", :flag,
            "install-time macro expansion in %pre %post %preun %postun scripts " \
-           "(see: https://rpm.org/user_doc/scriptlet_expansion.html)", :default => false
+           "(see: https://rpm-software-management.github.io/rpm/manual/scriptlet_expansion.html)", :default => false
 
   option "--verifyscript", "FILE",
     "a script to be run on verification" do |val|
@@ -175,7 +175,7 @@ class FPM::Package::RPM < FPM::Package
      rpm_trigger = []
      option "--trigger-#{trigger_type}", "'[OPT]PACKAGE: FILEPATH'", "Adds a rpm trigger script located in FILEPATH, " \
             "having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. " \
-            "See: http://rpm.org/api/4.4.2.2/triggers.html" do |trigger|
+            "See: https://rpm-software-management.github.io/rpm/manual/triggers.html" do |trigger|
        match = trigger.match(/^(\[.*\]|)(.*): (.*)$/)
        @logger.fatal("Trigger '#{trigger_type}' definition can't be parsed ('#{trigger}')") unless match
        opt, pkg, file = match.captures
@@ -199,8 +199,8 @@ class FPM::Package::RPM < FPM::Package
   # If and only if any of the above are done, then also replace ' with \', " with \", and \ with \\\\
   #   to accommodate escape and quote processing that rpm will perform in that case (but not otherwise)
   def rpm_fix_name(name)
-    if name.match?(/[ \t*?%$\[\]]/)
-      name = name.gsub(/(\ |\t|\[|\]|\*|\?|\%|\$|'|"|\\)/, {
+    if name.match?(/[ \t*?%${}\[\]]/)
+      name = name.gsub(/(\ |\t|\[|\]|\*|\?|\%|\$|'|"|\{|\}|\\)/, {
         ' '  => '?',
         "\t" => '?',
         '%'  => '[%]',
@@ -209,6 +209,10 @@ class FPM::Package::RPM < FPM::Package
         '*'  => '[*]',
         '['  => '[\[]',
         ']'  => '[\]]',
+        #'{'  => '[\{]',
+        #'}'  => '[\}]',
+        '{'  => '?',
+        '}'  => '?',
         '"'  => '\\"',
         "'"  => "\\'",
         '\\' => '\\\\\\\\',

data/lib/fpm/package/virtualenv.rb

@@ -36,7 +36,7 @@ class FPM::Package::Virtualenv < FPM::Package
     :default => nil
 
   option "--setup-install", :flag, "After building virtualenv run setup.py install "\
-  "useful when building a virtualenv for packages and including their requirements from "
+  "useful when building a virtualenv for packages and including their requirements from "\
   "requirements.txt"
 
   option "--system-site-packages", :flag, "Give the virtual environment access to the "\
@@ -158,6 +158,31 @@ class FPM::Package::Virtualenv < FPM::Package
       end
     end
 
+    # [2025-09-30] virtualenv-tools seems broken?
+    # The --update-path will look for a VIRTUAL_ENV= line in bin/activate,
+    # however, the version I tested looks for it with quotations, like VIRTUAL_ENV='
+    # And at time of writing, my `virtualenv` tool doesn't use quotations on this variable
+    #
+    # Maybe best case we can patch it here instead. The path update tool
+    # looks for the original virtualenv path and I think updates any bin 
+    # files which point to it.
+    patched = []
+    activate_bin = File.join(virtualenv_build_folder, "bin/activate")
+    fd = File.open(activate_bin)
+    fd.each_line do |line|
+      re = /^VIRTUAL_ENV=([^'"].*)$/
+      match = line.match(re)
+      if match
+        # Quote the VIRTUAL_ENV var assignment to help virtualenv-tools work?
+        patched << "VIRTUAL_ENV='#{match}'\n"
+      else
+        patched << line
+      end
+    end
+    fd.close
+    File.write(activate_bin, patched.join)
+
+    # Rewrite the base path inside the virtualenv to prepare it to be packaged.
     ::Dir.chdir(virtualenv_build_folder) do
       safesystem("virtualenv-tools", "--update-path", virtualenv_folder)
     end
@@ -191,7 +216,6 @@ class FPM::Package::Virtualenv < FPM::Package
     dir.input(".")
     @staging_path = dir.staging_path
     dir.cleanup_build
-
   end # def input
 
   # Delete python precompiled files found in a given folder.

data/lib/fpm/package.rb

@@ -3,7 +3,6 @@ require "fpm/util" # local
 require "pathname" # stdlib
 require "find"
 require "tmpdir" # stdlib
-require "ostruct"
 require "backports/latest"
 require "socket" # stdlib, for Socket.gethostname
 require "shellwords" # stdlib, for Shellwords.escape
@@ -227,7 +226,7 @@ class FPM::Package
   def converted_from(origin)
     # nothing to do by default. Subclasses may implement this.
     # See the RPM package class for an example.
-  end # def converted
+  end # def converted_from
 
   # Add a new source to this package.
   # The exact behavior depends on the kind of package being managed.
@@ -325,7 +324,7 @@ class FPM::Package
 
   def template_dir
     File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "templates"))
-  end
+  end # def template_dir
 
   def template(path)
     template_path = File.join(template_dir, path)
@@ -438,7 +437,7 @@ class FPM::Package
 
       help = "(#{type} only) #{help}"
       @options << [flag, param, help, options, block]
-    end # def options
+    end # def option
 
     # Apply the options for this package on the clamp command
     #
@@ -511,7 +510,7 @@ class FPM::Package
         File.chmod(0755, out)
       end
     end
-  end
+  end # def write_scripts
 
   # Get the contents of the script by a given name.
   #
@@ -548,7 +547,7 @@ class FPM::Package
     else
       @provides = value
     end
-  end
+  end # def provides=
 
   # General public API
   public(:type, :initialize, :convert, :input, :output, :to_s, :cleanup, :files,

data/lib/fpm/rake_task.rb

@@ -1,13 +1,39 @@
 require "fpm/namespace"
-require "ostruct"
 require "rake"
 require "rake/tasklib"
 
 class FPM::RakeTask < Rake::TaskLib
+  class Options
+    attr_accessor :args
+
+    def initialize(defaults=nil)
+      if defaults.nil?
+        @h = Hash.new
+      else
+        @h = defaults
+      end
+    end
+
+    def method_missing(m, *args)
+      if m.end_with?("=")
+        raise ArgumentError, "#{self.class.name}##{m} ... Expected 1 arg, got #{args.length}" if args.length != 1
+        @h[m[0...-1]] = args[0]
+      else
+        raise ArgumentError, "Expected 0 arg, got #{args.length}" if args.length != 0
+        return @h[m]
+      end
+    end
+
+    def to_h
+      return @h
+    end
+  end # Options
+
   attr_reader :options
 
   def initialize(package_name, opts = {}, &block)
-    @options = OpenStruct.new(:name => package_name.to_s)
+    #@options = OpenStruct.new(:name => package_name.to_s)
+    @options = Options.new(:name => package_name.to_s)
     @source, @target = opts.values_at(:source, :target).map(&:to_s)
     @directory = File.expand_path(opts[:directory].to_s)
 
@@ -18,8 +44,8 @@ class FPM::RakeTask < Rake::TaskLib
 
     task(options.name) do |_, task_args|
       block.call(*[options, task_args].first(block.arity)) if block_given?
-      abort("Must specify args") unless options.respond_to?(:args)
-      @args = options.delete_field(:args)
+      abort("Must specify args") if options.args.nil?
+      @args = options.args
       run_cli
     end
   end

data/lib/fpm/util.rb

@@ -38,7 +38,7 @@ module FPM::Util
     shell = ENV["SHELL"]
     return "/bin/sh" if shell.nil? || shell.empty?
     return shell
-  end
+  end # def default_shell
 
   ############################################################################
   # execmd([env,] cmd [,opts])
@@ -136,7 +136,7 @@ module FPM::Util
       raise ExecutableNotFound.new(program)
     end
 
-    logger.debug("Running command", :args => args2)
+    logger.info("Running command", :args => args2)
 
     stdout_r, stdout_w = IO.pipe
     stderr_r, stderr_w = IO.pipe
@@ -250,7 +250,7 @@ module FPM::Util
       end
     end
     # If no combination of ar and options omits timestamps, fall back to default.
-    @@ar_cmd = ["ar", "-qc"]
+    @@ar_cmd = ["ar", "-qcS"]
     FileUtils.rm_f([testarchive, emptyfile])
     return @@ar_cmd
   end # def ar_cmd
@@ -259,7 +259,7 @@ module FPM::Util
   def ar_cmd_deterministic?
     ar_cmd if not defined? @@ar_cmd_deterministic
     return @@ar_cmd_deterministic
-  end
+  end # def ar_cmd_deterministic?
 
   # Get the recommended 'tar' command for this platform.
   def tar_cmd
@@ -306,7 +306,7 @@ module FPM::Util
   def tar_cmd_supports_sort_names_and_set_mtime?
     tar_cmd if not defined? @@tar_cmd_deterministic
     return @@tar_cmd_deterministic
-  end
+  end # def tar_cmd_supports_sort_names_and_set_mtime?
 
   def copy_metadata(source, destination)
     source_stat = File::lstat(source)
@@ -332,7 +332,15 @@ module FPM::Util
 
 
   def copy_entry(src, dst, preserve=false, remove_destination=false)
-    case File.ftype(src)
+    st = File.lstat(src)
+
+    filetype = if st.ftype == "file" && st.nlink > 1
+      "hardlink"
+    else
+      st.ftype
+    end
+
+    case filetype
     when 'fifo'
       if File.respond_to?(:mkfifo)
         File.mkfifo(dst)
@@ -350,18 +358,23 @@ module FPM::Util
       raise  UnsupportedSpecialFile.new("File is device which fpm doesn't know how to copy (#{File.ftype(src)}): #{src}")
     when 'directory'
       FileUtils.mkdir(dst) unless File.exist? dst
-    else
-      # if the file with the same dev and inode has been copied already -
+    when 'hardlink'
+      # Handle hardlinks
+      # 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)
+        logger.debug("Copying hardlink", :src => src, :dst => dst, :link => known_entry)
       else
         FileUtils.copy_entry(src, dst, preserve, false,
                              remove_destination)
         copied_entries[[st.dev, st.ino]] = dst
       end
+    else
+      # Normal file, just copy it.
+      FileUtils.copy_entry(src, dst, preserve, false,
+                           remove_destination)
     end # else...
   end # def copy_entry
 
@@ -439,7 +452,7 @@ module FPM::Util
       # Ruby 3.1.0 and newer
       return ERB.new(template_code, trim_mode: "-")
     end
-  end
+  end # def erbnew
 end # module FPM::Util
 
 require 'fpm/util/tar_writer'

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.16.0"
+  VERSION = "1.18.0"
 end

data/templates/sh.erb

@@ -137,7 +137,7 @@ function save_environment(){
 
     # just piping env to a file doesn't quote the variables. This does
     # filter out multiline junk, _, and functions. _ is a readonly variable.
-    env | grep -v "^_=" | grep -v "^[^=(]*()=" | egrep "^[^ ]+=" | while read ENVVAR ; do
+    env | grep -v "^_=" | grep -v "^[^=(]*()=" | grep -v "^BASH_FUNC_.*%%=" |egrep "^[^ ]+=" | 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2026-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: insist
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +198,7 @@ files:
 - lib/fpm/package/pleaserun.rb
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/parse_requires.py
 - lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/package/sh.rb
@@ -238,7 +238,7 @@ homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -254,8 +254,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []

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

@@ -1,115 +0,0 @@
-from distutils.core import Command
-import os
-import sys
-import pkg_resources
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    def u(s):
-        return s
-else:
-    def u(s):
-        if isinstance(u, unicode):
-            return u
-        return s.decode('utf-8')
-
-
-# Note, the last time I coded python daily was at Google, so it's entirely
-# possible some of my techniques below are outdated or bad.
-# If you have fixes, let me know.
-
-
-class get_metadata(Command):
-    description = "get package metadata"
-    user_options = [
-        ('load-requirements-txt', 'l',
-         "load dependencies from requirements.txt"),
-        ("output=", "o", "output destination for metadata json")
-    ]
-    boolean_options = ['load-requirements-txt']
-
-    def initialize_options(self):
-        self.load_requirements_txt = False
-        self.cwd = None
-        self.output = None
-
-    def finalize_options(self):
-        self.cwd = os.getcwd()
-        self.requirements_txt = os.path.join(self.cwd, "requirements.txt")
-        # make sure we have a requirements.txt
-        if self.load_requirements_txt:
-            self.load_requirements_txt = os.path.exists(self.requirements_txt)
-
-    def process_dep(self, dep):
-        deps = []
-        if hasattr(dep, 'marker') and dep.marker:
-            # PEP0508 marker present
-            if not dep.marker.evaluate():
-                return deps
-
-        if dep.specs:
-            for operator, version in dep.specs:
-                deps.append("%s %s %s" % (dep.project_name,
-                        operator, version))
-        else:
-            deps.append(dep.project_name)
-
-        return deps
-
-    def run(self):
-        data = {
-            "name": self.distribution.get_name(),
-            "version": self.distribution.get_version(),
-            "author": u("%s <%s>") % (
-                u(self.distribution.get_author()),
-                u(self.distribution.get_author_email()),
-            ),
-            "description": self.distribution.get_description(),
-            "license": self.distribution.get_license(),
-            "url": self.distribution.get_url(),
-        }
-
-        if self.distribution.has_ext_modules():
-            data["architecture"] = "native"
-        else:
-            data["architecture"] = "all"
-
-        final_deps = []
-
-        if self.load_requirements_txt:
-            requirement = open(self.requirements_txt).readlines()
-            for dep in pkg_resources.parse_requirements(requirement):
-                final_deps.extend(self.process_dep(dep))
-        else:
-            if getattr(self.distribution, 'install_requires', None):
-                for dep in pkg_resources.parse_requirements(
-                        self.distribution.install_requires):
-                    final_deps.extend(self.process_dep(dep))
-            if getattr(self.distribution, 'extras_require', None):
-                for dep in pkg_resources.parse_requirements(
-                        v for k, v in self.distribution.extras_require.items()
-                        if k.startswith(':') and pkg_resources.evaluate_marker(k[1:])):
-                    final_deps.extend(self.process_dep(dep))
-
-        data["dependencies"] = final_deps
-
-        output = open(self.output, "w")
-        if hasattr(json, 'dumps'):
-            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))
-        output.close()