fpm-aeppert 1.6.2 → 1.11.0

data/lib/fpm/package/dir.rb

@@ -1,6 +1,6 @@
 require "fpm/package"
 require "fpm/util"
-require "backports"
+require "backports/latest"
 require "fileutils"
 require "find"
 require "socket"
@@ -83,8 +83,8 @@ class FPM::Package::Dir < FPM::Package
     # can include license data from themselves (rpms, gems, etc),
     # but to make sure a simple dir -> rpm works without having
     # to specify a license.
-    self.license = "unknown"
-    self.vendor = [ENV["USER"], Socket.gethostname].join("@")
+    self.license ||= "unknown"
+    self.vendor ||= [ENV["USER"], Socket.gethostname].join("@")
   ensure
     # Clean up any logger context we added.
     logger.remove("method")
@@ -101,18 +101,7 @@ class FPM::Package::Dir < FPM::Package
     end
 
     # Write the scripts, too.
-    scripts_path = File.join(output_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))
-      require "pry"
-      binding.pry
-      File.chmod(0755, out)
-    end
-
+    write_scripts
   ensure
     logger.remove("method")
   end # def output
@@ -147,14 +136,20 @@ class FPM::Package::Dir < FPM::Package
 
     # For single file copies, permit file destinations
     fileinfo = File.lstat(source)
-    if fileinfo.file? && !File.directory?(destination)
+    destination_is_directory = File.directory?(destination)
+    if fileinfo.file? && !destination_is_directory
       if destination[-1,1] == "/"
         copy(source, File.join(destination, source))
       else
         copy(source, destination)
       end
     elsif fileinfo.symlink?
-      copy(source, File.join(destination, source))
+      # Treat them same as files
+      if destination[-1,1] == "/"
+        copy(source, File.join(destination, source))
+      else
+        copy(source, destination)
+      end
     else
       # Copy all files from 'path' into staging_path
       Find.find(source) do |path|

data/lib/fpm/package/empty.rb

@@ -1,5 +1,5 @@
 require "fpm/package"
-require "backports"
+require "backports/latest"
 
 # Empty Package type. For strict/meta/virtual package creation
 

data/lib/fpm/package/freebsd.rb

@@ -1,4 +1,4 @@
-require "backports" # gem backports
+require "backports/latest" # gem backports
 require "fpm/package"
 require "fpm/util"
 require "digest"
@@ -12,18 +12,6 @@ class FPM::Package::FreeBSD < FPM::Package
     :after_remove       => "post-deinstall",
   } unless defined?(SCRIPT_MAP)
 
-  def self.default_abi
-    abi_name = %x{uname -s}.chomp
-    abi_version = %x{uname -r}.chomp.split(".")[0]
-    abi_arch = %x{uname -m}.chomp
-
-    [abi_name, abi_version, abi_arch].join(":")
-  end
-
-  option "--abi", "ABI",
-         "Sets the FreeBSD abi pkg field to specify binary compatibility.",
-         :default => default_abi
-
   option "--origin", "ABI",
          "Sets the FreeBSD 'origin' pkg field",
          :default => "fpm/<name>"
@@ -58,7 +46,7 @@ class FPM::Package::FreeBSD < FPM::Package
     pkg_version = (iteration and (iteration.to_i > 0)) ?  "#{version}-#{iteration}" : "#{version}"
 
     pkgdata = {
-      "abi" => attributes[:freebsd_abi],
+      "arch" => architecture,
       "name" => name,
       "version" => pkg_version,
       "comment" => description,
@@ -110,6 +98,29 @@ class FPM::Package::FreeBSD < FPM::Package
     end
   end # def output
 
+  # Handle architecture naming conversion:
+  # <osname>:<osversion>:<arch>:<wordsize>[.other]
+  def architecture
+    osname    = %x{uname -s}.chomp
+    osversion = %x{uname -r}.chomp.split('.').first
+
+    # Essentially because no testing on other platforms
+    arch = 'x86'
+
+    wordsize = case @architecture
+    when nil, 'native'
+      %x{getconf LONG_BIT}.chomp # 'native' is current arch
+    when 'amd64'
+      '64'
+    when 'i386'
+      '32'
+    else
+      %x{getconf LONG_BIT}.chomp # default to native, the current arch
+    end
+
+    return [osname, osversion, arch, wordsize].join(':')
+  end
+
   def add_path(tar, tar_path, path)
     stat = File.lstat(path)
     if stat.directory?

data/lib/fpm/package/gem.rb

@@ -4,6 +4,7 @@ require "rubygems"
 require "fileutils"
 require "fpm/util"
 require "yaml"
+require "git"
 
 # A rubygems package.
 #
@@ -44,9 +45,36 @@ class FPM::Package::Gem < FPM::Package
   option "--disable-dependency", "gem_name",
     "The gem name to remove from dependency list",
     :multivalued => true, :attribute_name => :gem_disable_dependencies
+  option "--embed-dependencies", :flag, "Should the gem dependencies " \
+    "be installed?", :default => false
 
   option "--version-bins", :flag, "Append the version to the bins", :default => false
 
+  option "--stagingdir", "STAGINGDIR",
+    "The directory where fpm installs the gem temporarily before conversion. " \
+    "Normally a random subdirectory of workdir."
+
+  option "--git-repo", "GIT_REPO",
+    "Use this git repo address as the source of the gem instead of " \
+    "rubygems.org.", :default => nil
+
+  option "--git-branch", "GIT_BRANCH",
+    "When using a git repo as the source of the gem instead of " \
+    "rubygems.org, use this git branch.",
+    :default => nil
+
+  # Override parent method
+  def staging_path(path=nil)
+    @gem_staging_path ||= attributes[:gem_stagingdir] || Stud::Temporary.directory("package-#{type}-staging")
+    @staging_path = @gem_staging_path
+
+    if path.nil?
+      return @staging_path
+    else
+      return File.join(@staging_path, path)
+    end
+  end # def staging_path
+
   def input(gem)
     # 'arg'  is the name of the rubygem we should unpack.
     path_to_gem = download_if_necessary(gem, version)
@@ -73,21 +101,33 @@ class FPM::Package::Gem < FPM::Package
 
     logger.info("Trying to download", :gem => gem_name, :version => gem_version)
 
-    gem_fetch = [ "#{attributes[:gem_gem]}", "fetch", gem_name]
-
-    gem_fetch += ["--prerelease"] if attributes[:gem_prerelease?]
-    gem_fetch += ["--version", gem_version] if gem_version
-
     download_dir = build_path(gem_name)
     FileUtils.mkdir(download_dir) unless File.directory?(download_dir)
 
-    ::Dir.chdir(download_dir) do |dir|
-      logger.debug("Downloading in directory #{dir}")
-      safesystem(*gem_fetch)
+    if attributes[:gem_git_repo]
+      logger.debug("Git cloning in directory #{download_dir}")
+      g = Git.clone(attributes[:gem_git_repo],gem_name,:path => download_dir)
+      if attributes[:gem_git_branch]
+        g.branch(attributes[:gem_git_branch]).checkout
+        g.pull('origin',attributes[:gem_git_branch])
+      end
+      gem_build = [ "#{attributes[:gem_gem]}", "build", "#{g.dir.to_s}/#{gem_name}.gemspec"]
+      ::Dir.chdir(g.dir.to_s) do |dir|
+        logger.debug("Building in directory #{dir}")
+        safesystem(*gem_build)
+      end
+      gem_files = ::Dir.glob(File.join(g.dir.to_s, "*.gem"))
+    else
+      gem_fetch = [ "#{attributes[:gem_gem]}", "fetch", gem_name]
+      gem_fetch += ["--prerelease"] if attributes[:gem_prerelease?]
+      gem_fetch += ["--version", gem_version] if gem_version
+      ::Dir.chdir(download_dir) do |dir|
+        logger.debug("Downloading in directory #{dir}")
+        safesystem(*gem_fetch)
+      end
+      gem_files = ::Dir.glob(File.join(download_dir, "*.gem"))
     end
 
-    gem_files = ::Dir.glob(File.join(download_dir, "*.gem"))
-
     if gem_files.length != 1
       raise "Unexpected number of gem files in #{download_dir},  #{gem_files.length} should be 1"
     end
@@ -144,7 +184,7 @@ class FPM::Package::Gem < FPM::Package
     # composing multiple packages, it's best to explicitly include it in the provides list.
     self.provides << "#{self.name} = #{self.version}"
 
-    if !attributes[:no_auto_depends?]
+    if !attributes[:no_auto_depends?] && !attributes[:gem_embed_dependencies?]
       spec.runtime_dependencies.map do |dep|
         # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'
         if dep.respond_to?(:requirement)
@@ -180,8 +220,18 @@ class FPM::Package::Gem < FPM::Package
 
     ::FileUtils.mkdir_p(installdir)
     # TODO(sissel): Allow setting gem tool path
-    args = [attributes[:gem_gem], "install", "--quiet", "--no-ri", "--no-rdoc",
-       "--no-user-install", "--install-dir", installdir, "--ignore-dependencies"]
+    args = [attributes[:gem_gem], "install", "--quiet", "--no-user-install", "--install-dir", installdir]
+    if ::Gem::VERSION =~ /^[012]\./ 
+      args += [ "--no-ri", "--no-rdoc" ]
+    else
+      # Rubygems 3.0.0 changed --no-ri to --no-document
+      args += [ "--no-document" ]
+    end
+
+    if !attributes[:gem_embed_dependencies?]
+      args += ["--ignore-dependencies"]
+    end
+
     if attributes[:gem_env_shebang?]
       args += ["-E"]
     end
@@ -231,6 +281,21 @@ class FPM::Package::Gem < FPM::Package
         FileUtils.mv("#{bin_path}/#{bin}", "#{bin_path}/#{bin}-#{self.version}")
       end
     end
+
+    if attributes[:source_date_epoch_from_changelog?]
+      detect_source_date_from_changelog(installdir)
+    end
+
+    # Remove generated Makefile and gem_make.out files, if any; they
+    # are not needed, and may contain generated paths that cause
+    # different output on successive runs.
+    Find.find(installdir) do |path|
+      if path =~ /.*(gem_make.out|Makefile|mkmf.log)$/
+        logger.info("Removing no longer needed file %s to reduce nondeterminism" % path)
+        File.unlink(path)
+      end
+    end
+
   end # def install_to_staging
 
   # Sanitize package name.
@@ -239,5 +304,75 @@ class FPM::Package::Gem < FPM::Package
   def fix_name(name)
     return [attributes[:gem_package_name_prefix], name].join("-")
   end # def fix_name
+
+  # Regular expression to accept a gem changelog line, and store date & version, if any, in named capture groups.
+  # Supports formats suggested by http://keepachangelog.com and https://github.com/tech-angels/vandamme
+  # as well as other similar formats that actually occur in the wild.
+  # Build it in pieces for readability, and allow version and date in either order.
+  # Whenever you change this, add a row to the test case in spec/fpm/package/gem_spec.rb.
+  # Don't even try to handle dates that lack four-digit years.
+  # Building blocks:
+  P_RE_LEADIN    = '^[#=]{0,3}\s?'
+  P_RE_VERSION_  = '[\w\.-]+\.[\w\.-]+[a-zA-Z0-9]'
+  P_RE_SEPARATOR = '\s[-=/(]?\s?'
+  P_RE_DATE1     = '\d{4}-\d{2}-\d{2}'
+  P_RE_DATE2     = '\w+ \d{1,2}(?:st|nd|rd|th)?,\s\d{4}'
+  P_RE_DATE3     = '\w+\s+\w+\s+\d{1,2},\s\d{4}'
+  P_RE_DATE      = "(?<date>#{P_RE_DATE1}|#{P_RE_DATE2}|#{P_RE_DATE3})"
+  P_RE_URL       = '\(https?:[-\w/.%]*\)'    # In parens, per markdown
+  P_RE_GTMAGIC   = '\[\]'                    # github magic version diff, per chandler
+  P_RE_VERSION   = "\\[?(?:Version |v)?(?<version>#{P_RE_VERSION_})\\]?(?:#{P_RE_URL}|#{P_RE_GTMAGIC})?"
+  # The final RE's:
+  P_RE_VERSION_DATE = "#{P_RE_LEADIN}#{P_RE_VERSION}#{P_RE_SEPARATOR}#{P_RE_DATE}"
+  P_RE_DATE_VERSION = "#{P_RE_LEADIN}#{P_RE_DATE}#{P_RE_SEPARATOR}#{P_RE_VERSION}"
+
+  # Detect release date, if found, store in attributes[:source_date_epoch]
+  def detect_source_date_from_changelog(installdir)
+    name = self.name.sub("rubygem-", "") + "-" + self.version
+    changelog = nil
+    datestr = nil
+    r1 = Regexp.new(P_RE_VERSION_DATE)
+    r2 = Regexp.new(P_RE_DATE_VERSION)
+
+    # Changelog doesn't have a standard name, so check all common variations
+    # Sort this list using LANG=C, i.e. caps first
+    [
+      "CHANGELIST",
+      "CHANGELOG", "CHANGELOG.asciidoc", "CHANGELOG.md", "CHANGELOG.rdoc", "CHANGELOG.rst", "CHANGELOG.txt",
+      "CHANGES",   "CHANGES.md",   "CHANGES.txt",
+      "ChangeLog", "ChangeLog.md", "ChangeLog.txt",
+      "Changelog", "Changelog.md", "Changelog.txt",
+      "changelog", "changelog.md", "changelog.txt",
+    ].each do |changelogname|
+      path = File.join(installdir, "gems", name, changelogname)
+      if File.exist?(path)
+        changelog = path
+        File.open path do |file|
+          file.each_line do |line|
+            if line =~ /#{self.version}/
+              [r1, r2].each do |r|
+                if r.match(line)
+                  datestr = $~[:date]
+                  break
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+    if datestr
+      date = Date.parse(datestr)
+      sec = date.strftime("%s")
+      attributes[:source_date_epoch] = sec
+      logger.debug("Gem %s has changelog date %s, setting source_date_epoch to %s" % [name, datestr, sec])
+    elsif changelog
+      logger.debug("Gem %s changelog %s did not have recognizable date for release %s" % [name, changelog, self.version])
+    else
+      logger.debug("Gem %s did not have changelog with recognized name" % [name])
+      # FIXME: check rubygems.org?
+    end
+  end # detect_source_date_from_changelog
+
   public(:input, :output)
 end # class FPM::Package::Gem

data/lib/fpm/package/pacman.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require "fpm/package"
 require "fpm/util"
-require "backports"
+require "backports/latest"
 require "fileutils"
 require "find"
 

data/lib/fpm/package/pleaserun.rb

@@ -10,13 +10,14 @@ require "pleaserun/cli"
 # This does not currently support 'output'
 class FPM::Package::PleaseRun < FPM::Package
   # TODO(sissel): Implement flags.
-  
+
   require "pleaserun/platform/systemd"
   require "pleaserun/platform/upstart"
   require "pleaserun/platform/launchd"
   require "pleaserun/platform/sysv"
 
   option "--name", "SERVICE_NAME", "The name of the service you are creating"
+  option "--chdir", "CHDIR", "The working directory used by the service"
 
   private
   def input(command)
@@ -27,6 +28,10 @@ class FPM::Package::PleaseRun < FPM::Package
       ::PleaseRun::Platform::Launchd.new("10.9"), # OS X
       ::PleaseRun::Platform::SYSV.new("lsb-3.1") # Ancient stuff
     ]
+    pleaserun_attributes = [ "chdir", "user", "group", "umask", "chroot", "nice", "limit_coredump",
+                             "limit_cputime", "limit_data", "limit_file_size", "limit_locked_memory",
+                             "limit_open_files", "limit_user_processes", "limit_physical_memory", "limit_stack_size",
+                             "log_directory", "log_file_stderr", "log_file_stdout"]
 
     attributes[:pleaserun_name] ||= File.basename(command.first)
     attributes[:prefix] ||= "/usr/share/pleaserun/#{attributes[:pleaserun_name]}"
@@ -41,6 +46,13 @@ class FPM::Package::PleaseRun < FPM::Package
       else
         platform.name
       end
+      pleaserun_attributes.each do |attribute_name|
+        attribute = "pleaserun_#{attribute_name}".to_sym
+        if attributes.has_key?(attribute) and not attributes[attribute].nil?
+          platform.send("#{attribute_name}=", attributes[attribute])
+        end
+      end
+
       base = staging_path(File.join(attributes[:prefix], "#{platform.platform}/#{platform.target_version || "default"}"))
       target = File.join(base, "files")
       actions_script = File.join(base, "install_actions.sh")

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

@@ -47,6 +47,11 @@ class get_metadata(Command):
 
     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,

data/lib/fpm/package/python.rb

@@ -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
 
@@ -225,7 +229,7 @@ class FPM::Package::Python < FPM::Package
 
     if !attributes[:no_auto_depends?] and attributes[:python_dependencies?]
       metadata["dependencies"].each do |dep|
-        dep_re = /^([^<>!= ]+)\s*(?:([<>!=]{1,2})\s*(.*))?$/
+        dep_re = /^([^<>!= ]+)\s*(?:([~<>!=]{1,2})\s*(.*))?$/
         match = dep_re.match(dep)
         if match.nil?
           logger.error("Unable to parse dependency", :dependency => dep)
@@ -236,7 +240,7 @@ class FPM::Package::Python < FPM::Package
         next if attributes[:python_disable_dependency].include?(name)
 
         # convert == to =
-        if cmp == "=="
+        if cmp == "==" or cmp == "~="
           logger.info("Converting == dependency requirement to =", :dependency => dep )
           cmp = "="
         end
@@ -310,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