fpm 1.4.0 → 1.5.0

data/lib/fpm/package/rpm.rb

@@ -86,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"
@@ -119,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 " \
@@ -165,11 +176,15 @@ class FPM::Package::RPM < FPM::Package
   # 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)
@@ -306,12 +321,16 @@ class FPM::Package::RPM < FPM::Package
 
   def rpm_get_trigger_type(flag)
     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}')")
@@ -512,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" \
@@ -527,7 +554,6 @@ 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
 
@@ -552,5 +578,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/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
 
@@ -50,7 +50,7 @@ class FPM::Package::Tar < FPM::Package
     output_check(output_path)
     # 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

@@ -25,6 +25,10 @@ class FPM::Package::Virtualenv < FPM::Package
   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
 
@@ -72,9 +76,14 @@ class FPM::Package::Virtualenv < FPM::Package
                "pip", "distribute")
     safesystem(pip_exe, "uninstall", "-y", "distribute")
 
-    safesystem(pip_exe, "install", "-i",
-               attributes[:virtualenv_pypi],
-               package)
+    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")

data/lib/fpm/rake_task.rb

@@ -0,0 +1,59 @@
+require "ostruct"
+require "rake"
+require "rake/tasklib"
+
+class FPM::RakeTask < Rake::TaskLib
+  attr_reader :options
+
+  def initialize(package_name, opts = {}, &block)
+    @options = OpenStruct.new(:name => package_name.to_s)
+    @source, @target = opts.values_at(:source, :target).map(&:to_s)
+    @directory = File.expand_path(opts[:directory].to_s)
+
+    (@source.empty? || @target.empty? || options.name.empty?) &&
+      abort("Must specify package name, source and output")
+
+    desc "Package #{@name}" unless ::Rake.application.last_comment
+
+    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)
+      run_cli
+    end
+  end
+
+  private
+
+  def parsed_options
+    options.to_h.map do |option, value|
+      opt = option.to_s.tr("_", "-")
+
+      case
+      when value.is_a?(String), value.is_a?(Symbol)
+        %W(--#{opt} #{value})
+      when value.is_a?(Array)
+        value.map { |v| %W(--#{opt} #{v}) }
+      when value.is_a?(TrueClass)
+        "--#{opt}"
+      when value.is_a?(FalseClass)
+        "--no-#{opt}"
+      else
+        fail TypeError, "Unexpected type: #{value.class}"
+      end
+    end
+  end
+
+  def run_cli
+    require "fpm"
+    require "fpm/command"
+
+    args = %W(-t #{@target} -s #{@source} -C #{@directory})
+    args << parsed_options
+    args << @args
+
+    args.flatten!.compact!
+
+    exit(FPM::Command.new("fpm").run(args) || 0)
+  end
+end

data/lib/fpm/util.rb

@@ -135,17 +135,14 @@ module FPM::Util
         system("#{tar} > /dev/null 2> /dev/null")
         return tar unless $?.exitstatus == 127
       end
+    when "FreeBSD"
+      # use gnutar instead
+      return "gtar"
     else
       return "tar"
     end
   end # def tar_cmd
 
-  # Run a block with a value.
-  # Useful in lieu of assigning variables
-  def with(value, &block)
-    block.call(value)
-  end # def with
-
   # wrapper around mknod ffi calls
   def mknod_w(path, mode, dev)
     rc = -1

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/templates/deb/postinst_upgrade.sh.erb

@@ -7,6 +7,19 @@ after_upgrade() {
 <% if script?(:after_upgrade) -%>
 <%=  script(:after_upgrade) %>
 <% end -%>
+
+<% if attributes[:deb_systemd] -%>
+systemctl --system daemon-reload >/dev/null || true
+if ! systemctl is-enabled <%= attributes[:deb_systemd] %> >/dev/null 
+then
+    systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
+    systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+<% if attributes[:deb_systemd_restart_after_upgrade?] -%>
+else
+    systemctl restart <%= attributes[:deb_systemd] %> >/dev/null || true
+<% end -%>
+fi
+<% end -%>
 }
 
 after_install() {
@@ -17,6 +30,12 @@ after_install() {
 <% if script?(:after_install) -%>
 <%=  script(:after_install) %>
 <% end -%>
+
+<% if attributes[:deb_systemd] -%>
+systemctl --system daemon-reload >/dev/null || true
+systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
+systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+<% end -%>
 }
 
 if [ "${1}" = "configure" -a -z "${2}" ] || \

data/templates/deb/prerm_upgrade.sh.erb

@@ -7,6 +7,13 @@ before_remove() {
 <% if script?(:before_remove) -%>
 <%=  script(:before_remove) %>
 <% end -%>
+
+<%# Removing the systemd service-%>
+<% if attributes[:deb_systemd] -%>
+systemctl stop <%= attributes[:deb_systemd] %> >/dev/null || true
+systemctl disable <%= attributes[:deb_systemd] %> >/dev/null || true
+systemctl --system daemon-reload >/dev/null || true
+<% end -%>
 }
 
 dummy() {

data/templates/pacman.erb

@@ -0,0 +1,47 @@
+# Generated by fpm
+# Hello packaging friend!
+#
+# If you find yourself using this 'fpm --edit' feature frequently, it is
+# a sign that fpm is missing a feature! I welcome your feature requests!
+# Please visit the following URL and ask for a feature that helps you never
+# need to edit this file again! :)
+#   https://github.com/jordansissel/fpm/issues
+# ------------------------------------------------------------------------
+#
+pkgname = <%= name %>
+<% if !epoch.nil? -%>
+pkgver = <%= epoch %>:<%= version %>-<%= iteration %>
+<% else -%>
+pkgver = <%= version %>-<%= iteration %>
+<% end -%>
+pkgdesc = <%= description %>
+<% if !url.nil? and !url.empty? -%>
+url = <%= url %>
+<% else -%>
+url = http://nourlgiven.example.com/
+<% end -%>
+builddate = <%= builddate %>
+packager = <%= maintainer %>
+size = <%= size %>
+arch = <%= architecture %>
+license = <%= license %>
+<% replaces.each do |repl| -%>
+replaces = <%= repl %>
+<% end -%>
+group = <%= category %>
+<% conflicts.each do |confl| -%>
+conflict = <%= confl %>
+<% end -%>
+<% provides.each do |prov| -%>
+provides = <%= prov %>
+<% end -%>
+<% config_files.each do |conf| -%>
+<%   conf.gsub(/^\/+/, "") -%>
+backup = <%= conf %>
+<% end -%>
+<% dependencies.each do |req| -%>
+depend = <%= req %>
+<% end -%>
+<% attributes.fetch(:pacman_opt_depends, []).each do |opt| -%>
+optdepend = <%= opt %>
+<% end -%>

data/templates/pacman/INSTALL.erb

@@ -0,0 +1,41 @@
+<%# In each function, a `:` is the first command. -%>
+<%# This makes sure that at least one command is in the function -%>
+<%# This avoids a lot of potential errors, including the case that -%>
+<%# the script is non-empty, but just whitespace and/or comments -%>
+<%# see issue #875 for more details -%>
+<% if script?(:before_install) -%>
+pre_install() {
+    :
+<%= script(:before_install) %>
+}
+<% end -%>
+<% if script?(:after_install) -%>
+post_install() {
+    :
+<%= script(:after_install) %>
+}
+<% end -%>
+<% if script?(:before_upgrade) -%>
+pre_upgrade() {
+    :
+<%= script(:before_upgrade) %>
+}
+<% end -%>
+<% if script?(:after_upgrade) -%>
+post_upgrade() {
+    :
+<%= script(:after_upgrade) %>
+}
+<% end -%>
+<% if script?(:before_remove) -%>
+pre_remove() {
+    :
+<%= script(:before_remove) %>
+}
+<% end -%>
+<% if script?(:after_remove) -%>
+post_remove() {
+    :
+<%= script(:after_remove) %>
+}
+<% end -%>

data/templates/rpm.erb

@@ -43,7 +43,7 @@ Epoch: <%= epoch %>
 <% end -%>
 Release: <%= iteration or 1 %><%= "%{?dist}" if attributes[:rpm_dist] %>
 <%# use the first line of the description as the summary -%>
-Summary: <%= description.split("\n").first.empty? ? "_" :  description.split("\n").first %>
+Summary: <%= summary %>
 <% if !attributes[:rpm_autoreqprov?] -%>
 AutoReqProv: no
 <% else -%>
@@ -83,6 +83,9 @@ Packager: <%= maintainer %>
 <% dependencies.each do |req| -%>
 Requires: <%= req %>
 <% end -%>
+<% (attributes[:rpm_tags] or []).each do |tag| -%>
+<%= tag %>
+<% end -%>
 <% end -%>
 <% provides.each do |prov| -%>
 Provides: <%= prov %>

data/templates/sh.erb

@@ -62,8 +62,9 @@ function slug_already_current(){
         if [ "$FORCE" == "1" ] ; then
         log "Force was specified. Proceeding with install after renaming live directory to allow running service to shutdown correctly."
             local real_dir=$(readlink ${INSTALL_ROOT}/current)
-            if [ -f ${real_dir}.old ] ; then
+            if [ -e ${real_dir}.old ] ; then
                 # remove that .old directory, if needed
+                log "removing existing .old version of release"
                 rm -rf ${real_dir}.old
             fi
             mv ${real_dir} ${real_dir}.old
@@ -196,6 +197,7 @@ function unpack_payload(){
 function run_post_install(){
     local AFTER_INSTALL=$INSTALL_DIR/.fpm/after_install
     if [ -r $AFTER_INSTALL ] ; then
+        set_post_install_vars
         chmod +x $AFTER_INSTALL
         log "Running post install script"
         output=$($AFTER_INSTALL 2>&1)
@@ -206,11 +208,23 @@ function run_post_install(){
     return 0
 }
 
+function set_post_install_vars(){
+    # for rationale on the `:`, see #871
+    :
+    <% if respond_to?(:package_metadata)%>
+      <% package_metadata_hash = JSON.parse(package_metadata)%>
+      <% package_metadata_hash.each do |k,v| %>
+        <%= "export #{k.upcase}='#{v}'; "%>
+      <% end %>
+    <% end %>
+}
+
 function create_symlinks(){
     [ -n "$USE_FLAT_RELEASE_DIRECTORY" ] && return
 
     export CURRENT_DIR="$INSTALL_ROOT/current"
-    if [ -e "$CURRENT_DIR" ] ; then
+    if [ -e "$CURRENT_DIR" ] || [ -h "$CURRENT_DIR" ] ; then
+        log "Removing current symlink"
         OLD_CURRENT_TARGET=$(readlink $CURRENT_DIR)
         rm "$CURRENT_DIR"
     fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -108,6 +108,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-xz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: corefines
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -186,15 +242,19 @@ files:
 - lib/fpm/package/deb.rb
 - lib/fpm/package/dir.rb
 - lib/fpm/package/empty.rb
+- lib/fpm/package/freebsd.rb
 - lib/fpm/package/gem.rb
 - lib/fpm/package/npm.rb
 - lib/fpm/package/osxpkg.rb
 - lib/fpm/package/p5p.rb
+- lib/fpm/package/pacman.rb
 - lib/fpm/package/pear.rb
 - lib/fpm/package/pkgin.rb
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
+- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/package/sh.rb
@@ -202,6 +262,7 @@ files:
 - lib/fpm/package/tar.rb
 - lib/fpm/package/virtualenv.rb
 - lib/fpm/package/zip.rb
+- lib/fpm/rake_task.rb
 - lib/fpm/util.rb
 - lib/fpm/version.rb
 - templates/deb.erb
@@ -213,6 +274,8 @@ files:
 - templates/deb/prerm_upgrade.sh.erb
 - templates/osxpkg.erb
 - templates/p5p_metadata.erb
+- templates/pacman.erb
+- templates/pacman/INSTALL.erb
 - templates/puppet/package.pp.erb
 - templates/puppet/package/remove.pp.erb
 - templates/rpm.erb