fpm 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea647fcf022326ec4218db722e99c134664446ef0f5ce1885a7440acb1bc6a85
-  data.tar.gz: 8fa7b284c275629fac6d598211c2c54628c527435afbc835582279c760162786
+  metadata.gz: d2157b42ae94755f7521964dc3f92af2a535ee87506303aca5bb72222b48495b
+  data.tar.gz: 8772b7c1f612dfe8bd698b136418bda8c7b63d9243b1b253832917ad926cab7c
 SHA512:
-  metadata.gz: a8f4c7e20bc10732d29febc59824562d2da5d1273d6ca96788d0e033b08b9b4dad1fac8281f8030f70a65dd465fbffc194448f13291cc51105172e35370c1800
-  data.tar.gz: 4fcd3503b21ec04b1edb28ffca688898799d35f437cf097f4a3938adab78644bd0294bf9a4af327827bea63df04028150ada442727a0a41c005b59911c2d7a42
+  metadata.gz: 9cee7c2885fcf85d75cdc74b2e41399ddce10693fefc3c0b09c49e73b16fcd73140527d646ee5886ef231de7cb202a67f22130d01324d83923195833693f00e2
+  data.tar.gz: 18f5d405ecd21a0309abf1e08219b0b23aa60eb2e8e7e3f00d7c17ea31e5a3e7b4cbf3a9b9e5bbfb467111a4b8ea9424d61a0f0ff81c9179490e54b17cbfde29

data/CHANGELOG.rst

@@ -1,6 +1,10 @@
 Release Notes and Change Log
 ============================
 
+1.15.1 (January 31, 2023)
+^^^^^^^^^^^^^^^^^^^^^^^^^
+* Ruby 3.2.0 now supported. This fixes error 'undefined method exists? for File' '(`#1981`_, `#1988`_; Nicholas Hubbard, romulasry)
+
 1.15.0 (November 13, 2022)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 * New flag ``--fpm-options-file path/to/file`` which allows you to specify additional fpm flags in an external file of your choosing. (`#1905`_, `#1902`_, `#1827`_; Jordan Sissel, Will Furnell, hjpotter92)
@@ -14,7 +18,6 @@ Release Notes and Change Log
 * python: Fix errors in how fpm invoked ``pip``. Previously, fpm would use pip's ``--build`` flag, but this was removed a while ago, and fpm is now aware! (`#1896`_, `#1831`_, `#1893`_, `#1916`_; Jordan Sissel, Svyatogor Chuykov)
 * pleaserun: Add ``--pleaserun-user`` flag. (`#1912`_; Evgeny Stambulchik)
 * deb: The default ``--deb-priority`` is now "optional" instead of "extra" (`#1913`_; Chris Novakovic)
-* https://github.com/jordansissel/fpm/pull/1897 (`#1897`_; Jordan Sissel)
 * Enable installation of fpm on older versions of ruby. This change removed ``git`` rubygem dependency. (`#1946`_, `#1923`_; Jordan Sissel, Andreas Wirooks, Ruslan Kuprieiev, jamshid, Lorenzo Castellino, Sam Hughes)
 * Enable operation of fpm on very old versions of ruby (as old as Ruby 1.9.3). This changed removed ``json`` rubygem dependency. (`#1950`_, `#1949`_, `#1741`_, `#1264`_, `#1798`_, `#1800`_, `#1784`_; Jordan Sissel and many others)
 * Fix bug where subprocesses could hang waiting for input (`#1955`_, `#1519`_, `#1522`_; Nicholas Hubbard, William N. Braswell, Jr.)
@@ -22,7 +25,7 @@ Release Notes and Change Log
 * internal: Fix a code typo (`#1948`_; Nicholas Hubbard)
 * internal tests: Support newer versions of lintian (`#1939`_, `#1907`_; Jordan Sissel)
 * Improve support for Ruby 3.1.0 and newer that would previously crash with an error mentioning Psych::DisallowedClass (`#1898`_, `#1895`_; Jordan Sissel, Alexandre ZANNI)
-* Improve support for Ruby 3.1.0 and newer that changed the API for ERB
+* Improve support for Ruby 3.1.0 and newer that changed the API for ERB (`#1897`_; Jordan Sissel)
 
 1.14.2 (March 30, 2022)
 ^^^^^^^^^^^^^^^^^^^^^^^

data/lib/fpm/command.rb

@@ -298,7 +298,7 @@ class FPM::Command < Clamp::Command
       args << "."
     end
 
-    if !File.exists?(workdir)
+    if !File.exist?(workdir)
       logger.fatal("Given --workdir=#{workdir} is not a path that exists.")
       raise FPM::Package::InvalidArgument, "The given workdir '#{workdir}' does not exist."
     end
@@ -371,7 +371,7 @@ class FPM::Command < Clamp::Command
 
     # If --inputs was specified, read it as a file.
     if !inputs.nil?
-      if !File.exists?(inputs)
+      if !File.exist?(inputs)
         logger.fatal("File given for --inputs does not exist (#{inputs})")
         return 1
       end
@@ -386,7 +386,7 @@ class FPM::Command < Clamp::Command
     # If --exclude-file was specified, read it as a file and append to
     # the exclude pattern list.
     if !exclude_file.nil?
-      if !File.exists?(exclude_file)
+      if !File.exist?(exclude_file)
         logger.fatal("File given for --exclude-file does not exist (#{exclude_file})")
         return 1
       end
@@ -451,7 +451,7 @@ class FPM::Command < Clamp::Command
       # Skip scripts not set
       next if path.nil?
 
-      if !File.exists?(path)
+      if !File.exist?(path)
         logger.error("No such file (for #{scriptname.to_s}): #{path.inspect}")
         script_errors << path
       end

data/lib/fpm/package/deb.rb

@@ -43,7 +43,15 @@ class FPM::Package::Deb < FPM::Package
   # epoch - This is a single (generally small) unsigned integer
   # upstream_version - must contain only alphanumerics 6 and the characters . + - ~
   # debian_revision - only alphanumerics and the characters + . ~
-  RELATIONSHIP_FIELD_PATTERN = /^(?<name>[A-z0-9][A-z0-9_.-]+)(?: *\((?<relation>[<>=]+) *(?<version>(?:[0-9]+:)?[0-9A-Za-z+~.-]+(?:-[0-9A-Za-z+~.]+)?)\))?$/
+  VERSION_FIELD_PATTERN = /
+    (?:(?:[0-9]+):)?        # The epoch, an unsigned int
+    (?:[A-Za-z0-9+~.-]+)     # upstream version, probably should not contain dashes?
+    (?:-[A-Za-z0-9+~.]+)?  # debian_revision
+  /x # Version field pattern
+  RELATIONSHIP_FIELD_PATTERN = /^
+    (?<name>[A-z0-9][A-z0-9_.-]+)
+    (?:\s*\((?<relation>[<>=]+)\s(?<version>#{VERSION_FIELD_PATTERN})\))?
+  $/x # Relationship field pattern
 
   option "--ignore-iteration-in-dependencies", :flag,
             "For '=' (equal) dependencies, allow iterations on the specified " \
@@ -292,6 +300,21 @@ class FPM::Package::Deb < FPM::Package
     return (attributes[:prefix] or "/")
   end # def prefix
 
+  def version
+    if @version.kind_of?(String)
+      if @version.start_with?("v") && @version.gsub(/^v/, "") =~ /^#{VERSION_FIELD_PATTERN}$/
+        logger.warn("Debian 'Version' field needs to start with a digit. I was provided '#{@version}' which seems like it just has a 'v' prefix to an otherwise-valid Debian version, I'll remove the 'v' for you.")
+        @version = @version.gsub(/^v/, "")
+      end
+
+      if @version !~ /^#{VERSION_FIELD_PATTERN}$/
+        raise FPM::InvalidPackageConfiguration, "The version looks invalid for Debian packages. Debian version field must contain only alphanumerics and . (period), + (plus), - (hyphen) or ~ (tilde). I have '#{@version}' which which isn't valid."
+      end
+    end
+
+    return @version
+  end
+
   def input(input_path)
     extract_info(input_path)
     extract_files(input_path)
@@ -568,7 +591,7 @@ class FPM::Package::Deb < FPM::Package
       end # No need to close, GzipWriter#close will close it.
     end
 
-    if File.exists?(dest_changelog) and not File.exists?(dest_upstream_changelog)
+    if File.exist?(dest_changelog) and not File.exist?(dest_upstream_changelog)
       # see https://www.debian.org/doc/debian-policy/ch-docs.html#s-changelogs
       File.rename(dest_changelog, dest_upstream_changelog)
     end
@@ -724,7 +747,7 @@ class FPM::Package::Deb < FPM::Package
 
     if origin == FPM::Package::Deb
       changelog_path = staging_path("usr/share/doc/#{name}/changelog.Debian.gz")
-      if File.exists?(changelog_path)
+      if File.exist?(changelog_path)
         logger.debug("Found a deb changelog file, using it.", :path => changelog_path)
         attributes[:deb_changelog] = build_path("deb_changelog")
         File.open(attributes[:deb_changelog], "w") do |deb_changelog|
@@ -738,7 +761,7 @@ class FPM::Package::Deb < FPM::Package
 
     if origin == FPM::Package::Deb
       changelog_path = staging_path("usr/share/doc/#{name}/changelog.gz")
-      if File.exists?(changelog_path)
+      if File.exist?(changelog_path)
         logger.debug("Found an upstream changelog file, using it.", :path => changelog_path)
         attributes[:deb_upstream_changelog] = build_path("deb_upstream_changelog")
         File.open(attributes[:deb_upstream_changelog], "w") do |deb_upstream_changelog|
@@ -1015,7 +1038,7 @@ class FPM::Package::Deb < FPM::Package
     etcfiles = []
     # Add everything in /etc
     begin
-      if !attributes[:deb_no_default_config_files?] && File.exists?(staging_path("/etc"))
+      if !attributes[:deb_no_default_config_files?] && File.exist?(staging_path("/etc"))
         logger.warn("Debian packaging tools generally labels all files in /etc as config files, " \
                     "as mandated by policy, so fpm defaults to this behavior for deb packages. " \
                     "You can disable this default behavior with --deb-no-default-config-files flag")
@@ -1189,5 +1212,5 @@ class FPM::Package::Deb < FPM::Package
     return data_tar_flags
   end # def data_tar_flags
 
-  public(:input, :output, :architecture, :name, :prefix, :converted_from, :to_s, :data_tar_flags)
+  public(:input, :output, :architecture, :name, :prefix, :version, :converted_from, :to_s, :data_tar_flags)
 end # class FPM::Target::Deb

data/lib/fpm/package/dir.rb

@@ -43,7 +43,7 @@ class FPM::Package::Dir < FPM::Package
     # This mapping should work the same way 'rsync -a' does
     #   Meaning 'rsync -a source dest'
     #   and 'source=dest' in fpm work the same as the above rsync
-    if path =~ /.=./ && !File.exists?(chdir == '.' ? path : File.join(chdir, path))
+    if path =~ /.=./ && !File.exist?(chdir == '.' ? path : File.join(chdir, path))
       origin, destination = path.split("=", 2)
 
       if File.directory?(origin) && origin[-1,1] == "/"

data/lib/fpm/package/puppet.rb

@@ -60,7 +60,7 @@ class FPM::Package::Puppet < FPM::Package
       end # case name
     end # self.scripts.each
 
-    if File.exists?(params[:output])
+    if File.exist?(params[:output])
       # TODO(sissel): Allow folks to choose output?
       logger.error("Puppet module directory '#{params[:output]}' already " \
                     "exists. Delete it or choose another output (-p flag)")

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

@@ -112,3 +112,4 @@ class get_metadata(Command):
         else:
             # For Python 2.5 and Debian's python-json
             output.write(json.write(data))
+        output.close()

data/lib/fpm/package/python.rb

@@ -259,7 +259,9 @@ class FPM::Package::Python < FPM::Package
     self.description = metadata["description"]
     # Sometimes the license field is multiple lines; do best-effort and just
     # use the first line.
-    self.license = metadata["license"].split(/[\r\n]+/).first
+    if metadata["license"]
+      self.license = metadata["license"].split(/[\r\n]+/).first
+    end
     self.version = metadata["version"]
     self.url = metadata["url"]
 

data/lib/fpm/util.rb

@@ -345,7 +345,7 @@ module FPM::Util
     when 'characterSpecial', 'blockSpecial'
       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.exists? dst
+      FileUtils.mkdir(dst) unless File.exist? dst
     else
       # 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

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.15.0"
+  VERSION = "1.15.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: fpm - package building and mangling