fpm 1.2.0 → 1.3.0

data/lib/fpm/package/puppet.rb

@@ -18,7 +18,7 @@ class FPM::Package::Puppet < FPM::Package
   # this package.
   def generate_specfile(builddir)
     paths = []
-    @logger.info("PWD: #{File.join(builddir, unpack_data_to)}")
+    logger.info("PWD: #{File.join(builddir, unpack_data_to)}")
     fileroot = File.join(builddir, unpack_data_to)
     Dir.chdir(fileroot) do
       Find.find(".") do |p|
@@ -26,17 +26,17 @@ class FPM::Package::Puppet < FPM::Package
         paths << p
       end
     end
-    @logger.info(paths[-1])
+    logger.info(paths[-1])
     manifests = %w{package.pp package/remove.pp}
 
     ::Dir.mkdir(File.join(builddir, "manifests"))
     manifests.each do |manifest|
       dir = File.join(builddir, "manifests", File.dirname(manifest))
-      @logger.info("manifests targeting: #{dir}")
+      logger.info("manifests targeting: #{dir}")
       ::Dir.mkdir(dir) if !File.directory?(dir)
 
       File.open(File.join(builddir, "manifests", manifest), "w") do |f|
-        @logger.info("manifest: #{f.path}")
+        logger.info("manifest: #{f.path}")
         template = template(File.join("puppet", "#{manifest}.erb"))
         ::Dir.chdir(fileroot) do
           f.puts template.result(binding)
@@ -62,7 +62,7 @@ class FPM::Package::Puppet < FPM::Package
 
     if File.exists?(params[:output])
       # TODO(sissel): Allow folks to choose output?
-      @logger.error("Puppet module directory '#{params[:output]}' already " \
+      logger.error("Puppet module directory '#{params[:output]}' already " \
                     "exists. Delete it or choose another output (-p flag)")
     end
 
@@ -71,7 +71,7 @@ class FPM::Package::Puppet < FPM::Package
 
     # Copy 'files' from builddir to :output/files
     Find.find("files", "manifests") do |path|
-      @logger.info("Copying path: #{path}")
+      logger.info("Copying path: #{path}")
       if File.directory?(path)
         ::Dir.mkdir(File.join(params[:output], path))
       else
@@ -100,7 +100,7 @@ class FPM::Package::Puppet < FPM::Package
       return pwent.name
     rescue ArgumentError => e
       # Invalid user id? No user? Return the uid.
-      @logger.warn("Failed to find username for uid #{uid}")
+      logger.warn("Failed to find username for uid #{uid}")
       return uid.to_s
     end
   end # def uid2user
@@ -112,7 +112,7 @@ class FPM::Package::Puppet < FPM::Package
       return grent.name
     rescue ArgumentError => e
       # Invalid user id? No user? Return the uid.
-      @logger.warn("Failed to find group for gid #{gid}")
+      logger.warn("Failed to find group for gid #{gid}")
       return gid.to_s
     end
   end # def uid2user

data/lib/fpm/package/python.rb

@@ -32,7 +32,7 @@ class FPM::Package::Python < FPM::Package
   option "--package-prefix", "NAMEPREFIX",
     "(DEPRECATED, use --package-name-prefix) Name to prefix the package " \
     "name with." do |value|
-    @logger.warn("Using deprecated flag: --package-prefix. Please use " \
+    logger.warn("Using deprecated flag: --package-prefix. Please use " \
                  "--package-name-prefix")
     value
   end
@@ -89,7 +89,7 @@ class FPM::Package::Python < FPM::Package
     end
 
     if !File.exists?(setup_py)
-      @logger.error("Could not find 'setup.py'", :path => setup_py)
+      logger.error("Could not find 'setup.py'", :path => setup_py)
       raise "Unable to find python package; tried #{setup_py}"
     end
 
@@ -108,7 +108,7 @@ class FPM::Package::Python < FPM::Package
       return path
     end
 
-    @logger.info("Trying to download", :package => package)
+    logger.info("Trying to download", :package => package)
 
     if version.nil?
       want_pkg = "#{package}"
@@ -121,12 +121,12 @@ class FPM::Package::Python < FPM::Package
 
     if attributes[:python_pip].nil?
       # no pip, use easy_install
-      @logger.debug("no pip, defaulting to easy_install", :easy_install => attributes[:python_easyinstall])
+      logger.debug("no pip, defaulting to easy_install", :easy_install => attributes[:python_easyinstall])
       safesystem(attributes[:python_easyinstall], "-i",
                  attributes[:python_pypi], "--editable", "-U",
                  "--build-directory", target, want_pkg)
     else
-      @logger.debug("using pip", :pip => attributes[:python_pip])
+      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)
     end
 
@@ -154,14 +154,14 @@ class FPM::Package::Python < FPM::Package
       ].join("\n")
       safesystem("#{attributes[:python_bin]} -c '#{json_test_code}'")
     rescue FPM::Util::ProcessFailed => e
-      @logger.error("Your python environment is missing json support (either json or simplejson python module). I cannot continue without this.", :python => attributes[:python_bin], :error => e)
+      logger.error("Your python environment is missing json support (either json or simplejson python module). I cannot continue without this.", :python => attributes[:python_bin], :error => e)
       raise FPM::Util::ProcessFailed, "Python (#{attributes[:python_bin]}) is missing simplejson or json modules."
     end
 
     begin
       safesystem("#{attributes[:python_bin]} -c 'import pkg_resources'")
     rescue FPM::Util::ProcessFailed => e
-      @logger.error("Your python environment is missing a working setuptools module. I tried to find the 'pkg_resources' module but failed.", :python => attributes[:python_bin], :error => e)
+      logger.error("Your python environment is missing a working setuptools module. I tried to find the 'pkg_resources' module but failed.", :python => attributes[:python_bin], :error => e)
       raise FPM::Util::ProcessFailed, "Python (#{attributes[:python_bin]}) is missing pkg_resources module."
     end
 
@@ -184,20 +184,20 @@ class FPM::Package::Python < FPM::Package
       # Capture the output, which will be JSON metadata describing this python
       # package. See fpm/lib/fpm/package/pyfpm/get_metadata.py for more
       # details.
-      @logger.info("fetching package metadata", :setup_cmd => setup_cmd)
+      logger.info("fetching package metadata", :setup_cmd => setup_cmd)
 
       success = safesystem(setup_cmd)
       #%x{#{setup_cmd}}
       if !success
-        @logger.error("setup.py get_metadata failed", :command => setup_cmd,
+        logger.error("setup.py get_metadata failed", :command => setup_cmd,
                       :exitcode => $?.exitstatus)
         raise "An unexpected error occurred while processing the setup.py file"
       end
       File.read(tmp)
     end
-    @logger.debug("result from `setup.py get_metadata`", :data => output)
+    logger.debug("result from `setup.py get_metadata`", :data => output)
     metadata = JSON.parse(output)
-    @logger.info("object output of get_metadata", :json => metadata)
+    logger.info("object output of get_metadata", :json => metadata)
 
     self.architecture = metadata["architecture"]
     self.description = metadata["description"]
@@ -223,14 +223,14 @@ class FPM::Package::Python < FPM::Package
         dep_re = /^([^<>!= ]+)\s*(?:([<>!=]{1,2})\s*(.*))?$/
         match = dep_re.match(dep)
         if match.nil?
-          @logger.error("Unable to parse dependency", :dependency => dep)
+          logger.error("Unable to parse dependency", :dependency => dep)
           raise FPM::InvalidPackageConfiguration, "Invalid dependency '#{dep}'"
         end
         name, cmp, version = match.captures
 
         # convert == to =
         if cmp == "=="
-          @logger.info("Converting == dependency requirement to =", :dependency => dep )
+          logger.info("Converting == dependency requirement to =", :dependency => dep )
           cmp = "="
         end
 

data/lib/fpm/package/rpm.rb

@@ -98,6 +98,11 @@ 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)
+  end
 
   rpmbuild_filter_from_provides = []
   option "--filter-from-provides", "REGEX",
@@ -135,8 +140,23 @@ class FPM::Package::RPM < FPM::Package
     "posttrans script" do |val|
     File.expand_path(val) # Get the full path to the script
   end # --posttrans
-  private
 
+  ["before-install","after-install","before-uninstall","after-target-uninstall"].each do |trigger_type|
+     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|
+       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)
+       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
@@ -167,7 +187,7 @@ class FPM::Package::RPM < FPM::Package
 
     # Stat the original filename in the relative staging path
     ::Dir.chdir(staging_path) do
-      stat = File.stat(original_file.gsub(/\"/, '').sub(/^\//,''))
+      stat = File.lstat(original_file.gsub(/\"/, '').sub(/^\//,''))
 
       # rpm_user and rpm_group attribute should override file ownership
       # otherwise use the current file user/group by name.
@@ -257,7 +277,7 @@ class FPM::Package::RPM < FPM::Package
           nextversion = version.split('.').collect { |v| v.to_i }
           nextversion[-1] += 1
           nextversion = nextversion.join(".")
-          @logger.warn("Converting dependency #{dep} to #{name} >= #{version}, #{name} < #{nextversion}")
+          logger.warn("Converting dependency #{dep} to #{name} >= #{version}, #{name} < #{nextversion}")
           ["#{name} >= #{version}", "#{name} < #{nextversion}"]
         else
           dep
@@ -270,7 +290,7 @@ class FPM::Package::RPM < FPM::Package
       # Skip scripts not set
       next if script_path.nil?
       if !File.exists?(script_path)
-        @logger.error("No such file (for #{scriptname.to_s}): #{script_path.inspect}")
+        logger.error("No such file (for #{scriptname.to_s}): #{script_path.inspect}")
         script_errors	 << script_path
       end
       # Load the script into memory.
@@ -282,6 +302,21 @@ class FPM::Package::RPM < FPM::Package
   setscript.call(:rpm_pretrans)
   end # def converted
 
+  def rpm_get_trigger_type(flag)
+    puts "#{flag.to_s(2)}"
+    if (flag & (1 << 25)) == (1 << 25)
+       :rpm_trigger_before_install
+    elsif (flag & (1 << 16)) == (1 << 16)
+       :rpm_trigger_after_install
+    elsif (flag & (1 << 17)) == (1 << 17)
+       :rpm_trigger_before_uninstall
+    elsif (flag & (1 << 18)) == (1 << 18)
+       :rpm_trigger_after_target_uninstall
+    else
+       @logger.fatal("I don't know about this triggerflag ('#{flag}')")
+    end
+  end # def rpm_get_trigger
+
   def input(path)
     rpm = ::RPM::File.new(path)
 
@@ -313,7 +348,17 @@ class FPM::Package::RPM < FPM::Package
     # Also taking into account the value of tags[preinprog] etc, something like:
     #    #!#{tags[:preinprog]}
     #    #{tags[prein]}
-    # TODO(sissel): put 'trigger scripts' stuff into attributes
+
+    val = tags[:triggerindex].zip(tags[:triggername],tags[:triggerflags],tags[:triggerversion]).group_by{ |x| x[0]}
+    val = val.collect do |order,data|
+      new_data = data.collect { |x| [ x[1], rpm.operator(x[2]), x[3]].join(" ").strip}.join(", ")
+      [order, rpm_get_trigger_type(data[0][2]), new_data]
+    end
+    val.each do |order, attr,data|
+      self.attributes[attr] = [] if self.attributes[attr].nil?
+      scriptprog = (tags[:triggerscriptprog][order] == '/bin/sh') ? "" : "-p #{tags[:triggerscriptprog][order]}"
+      self.attributes[attr] << [data,tags[:triggerscripts][order],scriptprog]
+    end
 
     if !attributes[:no_auto_depends?]
       self.dependencies += rpm.requires.collect do |name, operator, version|
@@ -415,6 +460,15 @@ class FPM::Package::RPM < FPM::Package
 
     self.config_files = allconfigs.map { |x| File.join("/", x) }
 
+    # add init script if present
+    (attributes[:rpm_init_list] or []).each do |init|
+      name = File.basename(init, ".init")
+      dest_init = File.join(staging_path, "etc/init.d/#{name}")
+      FileUtils.mkdir_p(File.dirname(dest_init))
+      FileUtils.cp init, dest_init
+      File.chmod(0755, dest_init)
+    end
+
     (attributes[:rpm_rpmbuild_define] or []).each do |define|
       args += ["--define", define]
     end
@@ -434,7 +488,7 @@ class FPM::Package::RPM < FPM::Package
 
     args << specfile
 
-    @logger.info("Running rpmbuild", :args => args)
+    logger.info("Running rpmbuild", :args => args)
     safesystem(*args)
 
     ::Dir["#{build_path}/RPMS/**/*.rpm"].each do |rpmpath|
@@ -454,7 +508,7 @@ class FPM::Package::RPM < FPM::Package
 
   def version
     if @version.kind_of?(String) and @version.include?("-")
-      @logger.warn("Package version '#{@version}' includes dashes, converting" \
+      logger.warn("Package version '#{@version}' includes dashes, converting" \
                    " to underscores")
       @version = @version.gsub(/-/, "_")
     end
@@ -467,7 +521,7 @@ 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")
+      logger.warn("no value for epoch is set, defaulting to nil")
       return nil
     end
 

data/lib/fpm/package/sh.rb

@@ -46,7 +46,7 @@ class FPM::Package::Sh < FPM::Package
   # Returns the path to the tar file containing the packed up staging directory
   def payload
     payload_tar = build_path("payload.tar")
-    @logger.info("Creating payload tar ", :path => payload_tar)
+    logger.info("Creating payload tar ", :path => payload_tar)
 
     args = [ tar_cmd,
              "-C",

data/lib/fpm/util.rb

@@ -56,7 +56,7 @@ module FPM::Util
       raise ExecutableNotFound.new(program)
     end
 
-    @logger.debug("Running command", :args => args)
+    logger.debug("Running command", :args => args)
 
     # Create a pair of pipes to connect the
     # invoked process to the cabin logger
@@ -69,10 +69,10 @@ module FPM::Util
 
     process.start
     stdout_w.close; stderr_w.close
-    @logger.debug('Process is running', :pid => process.pid)
+    logger.debug('Process is running', :pid => process.pid)
     # Log both stdout and stderr as 'info' because nobody uses stderr for
     # actually reporting errors and as a result 'stderr' is a misnomer.
-    @logger.pipe(stdout_r => :info, stderr_r => :info)
+    logger.pipe(stdout_r => :info, stderr_r => :info)
 
     process.wait
     success = (process.exit_code == 0)
@@ -95,7 +95,7 @@ module FPM::Util
       raise ExecutableNotFound.new(program)
     end
 
-    @logger.debug("Running command", :args => args)
+    logger.debug("Running command", :args => args)
 
     stdout_r, stdout_w = IO.pipe
     stderr_r, stderr_w = IO.pipe
@@ -108,7 +108,7 @@ module FPM::Util
     stdout_w.close; stderr_w.close
     stdout_r_str = stdout_r.read
     stdout_r.close; stderr_r.close
-    @logger.debug("Process is running", :pid => process.pid)
+    logger.debug("Process is running", :pid => process.pid)
 
     process.wait
     success = (process.exit_code == 0)
@@ -223,4 +223,8 @@ module FPM::Util
       return [constraint]
     end
   end #def expand_pesimistic_constraints
+
+  def logger
+    @logger ||= Cabin::Channel.get
+  end # def logger
 end # module FPM::Util

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/templates/deb.erb

@@ -1,7 +1,9 @@
 Package: <%= name %>
 Version: <%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>
 License: <%= license %>
+<% if !vendor.nil? and !vendor.empty? -%>
 Vendor: <%= vendor %>
+<% end -%>
 Architecture: <%= architecture %>
 Maintainer: <%= maintainer  %>
 Installed-Size: <%= attributes[:deb_installed_size] %>

data/templates/deb/changelog.erb

@@ -0,0 +1,5 @@
+<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium
+
+  * Package created with FPM.
+
+ -- <%= maintainer %>[two spaces]  <%= Time.now.strftime("%a, %d %b %Y %T %z") %>

data/templates/deb/postinst_upgrade.sh.erb

@@ -0,0 +1,31 @@
+after_upgrade() {
+<% if script?(:after_upgrade) -%>
+<%=  script(:after_upgrade) %>
+<% end -%>
+}
+
+after_install() {
+<% if script?(:after_install) -%>
+<%=  script(:after_install) %>
+<% end -%>
+}
+
+if [ "${1}" = "configure " -a -z "${2}" ]
+then
+    # "after install" here
+    after_install
+elif [ "${1}" = "configure" -a -n "${2}" ]
+then
+    upgradeFromVersion="${2}"
+    # "after upgrade" here
+    # NOTE: This slot is also used when deb packages are removed,
+    # but their config files aren't, but a newer version of the
+    # package is installed later, called "Config-Files" state.
+    # basically, that still looks a _lot_ like an upgrade to me.
+    after_upgrade "${2}"
+elif echo "${1}" | grep -E -q "(abort|fail)"
+then
+    echo "Failed to install before the post-installation script was run." >&2
+    exit 1
+fi
+

data/templates/deb/postrm_upgrade.sh.erb

@@ -0,0 +1,37 @@
+after_remove() {
+<% if script?(:after_remove) -%>
+<%=  script(:after_remove) %>
+<% end -%>
+}
+
+dummy() {
+}
+
+
+if [ "${1}" = "remove" ]
+then
+    # "after remove" goes here
+    after_remove
+elif [ "${1}" = "purge" -a -z "${2}" ]
+then
+    # like "on remove", but executes after dpkg deletes config files
+    # 'apt-get purge' runs 'on remove' section, then this section.
+    # Maybe we ignore this; it seems really fine-grained.
+    # There is no equivalent in RPM or ARCH. A debian-specific argument
+    # might perhaps be used here, but most people
+    # probably don't need it.
+    dummy
+elif [ "${1}" = "upgrade" ]
+then
+    # This represents the case where the old package's postrm is called after
+    # the 'preinst' script is called.
+    # We should ignore this and just use 'preinst upgrade' and
+    # 'postinst configure'. The newly installed package should do the
+    # upgrade, not the uninstalled one, since it can't anticipate what new
+    # things it will have to do to upgrade for the new version.
+    dummy
+elif echo "${1}" | grep -E -q '(fail|abort)'
+then
+    echo "Failed to install before the post-removal script was run." >&2
+    exit 1
+fi