omnibus 4.0.0.beta.1 → 4.0.0.rc.1

data/lib/omnibus/packagers/deb.rb

@@ -175,7 +175,7 @@ module Omnibus
     # extension.
     #
     def package_name
-      "#{safe_project_name}_#{safe_version}-#{safe_build_iteration}_#{safe_architecture}.deb"
+      "#{safe_base_package_name}_#{safe_version}-#{safe_build_iteration}_#{safe_architecture}.deb"
     end
 
     #
@@ -200,7 +200,7 @@ module Omnibus
       render_template(resource_path('control.erb'),
         destination: File.join(debian_dir, 'control'),
         variables: {
-          name:           safe_project_name,
+          name:           safe_base_package_name,
           version:        safe_version,
           iteration:      safe_build_iteration,
           vendor:         vendor,
@@ -317,21 +317,21 @@ module Omnibus
     end
 
     #
-    # Return the Debian-ready project name, converting any invalid characters to
+    # Return the Debian-ready base package name, converting any invalid characters to
     # dashes (+-+).
     #
     # @return [String]
     #
-    def safe_project_name
-      if project.name =~ /\A[a-zA-Z0-9\.\+\-]+\z/
-        project.name.dup
+    def safe_base_package_name
+      if project.package_name =~ /\A[a-zA-Z0-9\.\+\-]+\z/
+        project.package_name.dup
       else
-        converted = project.name.gsub(/[^a-zA-Z0-9\.\+\-]+/, '-')
+        converted = project.package_name.gsub(/[^a-zA-Z0-9\.\+\-]+/, '-')
 
         log.warn(log_key) do
           "The `name' compontent of Debian package names can only include " \
           "alphabetical characters (a-z, A-Z), numbers (0-9), dots (.), " \
-          "plus signs (+), and dashes (-). Converting `#{project.name}' to " \
+          "plus signs (+), and dashes (-). Converting `#{project.package_name}' to " \
           "`#{converted}'."
         end
 
@@ -381,6 +381,8 @@ module Omnibus
       case Ohai['kernel']['machine']
       when 'x86_64'
         'amd64'
+      when 'i686'
+        'i386'
       else
         Ohai['kernel']['machine']
       end

data/lib/omnibus/packagers/makeself.rb

@@ -16,6 +16,14 @@
 
 module Omnibus
   class Packager::Makeself < Packager::Base
+    # @return [Hash]
+    SCRIPT_MAP = {
+      # Default Omnibus naming
+      postinst: 'makeselfinst',
+      # Default Makeself naming
+      makeselfinst: 'makeselfinst',
+    }.freeze
+
     id :makeself
 
     setup do
@@ -27,8 +35,8 @@ module Omnibus
     end
 
     build do
-      # Render the post_extract file
-      write_post_extract_file
+      # Write the scripts
+      write_scripts
 
       # Create the makeself archive
       create_makeself_package
@@ -36,7 +44,7 @@ module Omnibus
 
     # @see Base#package_name
     def package_name
-      "#{project.name}-#{project.build_version}_#{project.build_iteration}.#{safe_architecture}.run"
+      "#{project.package_name}-#{project.build_version}_#{project.build_iteration}.#{safe_architecture}.run"
     end
 
     #
@@ -60,21 +68,21 @@ module Omnibus
     end
 
     #
-    # Write the post-extraction file that will be executed upon extraction of
-    # the makeself file.
+    # Copy all scripts in {Project#package_scripts_path} to the staging
+    # directory.
     #
     # @return [void]
     #
-    def write_post_extract_file
-      render_template(resource_path('post_extract.sh.erb'),
-        destination: File.join(staging_dir, 'post_extract.sh'),
-        mode: 0755,
-        variables: {
-          name:          project.name,
-          friendly_name: project.friendly_name,
-          install_dir:   project.install_dir,
-        }
-      )
+    def write_scripts
+      SCRIPT_MAP.each do |source, destination|
+        source_path = File.join(project.package_scripts_path, source.to_s)
+
+        if File.file?(source_path)
+          destination_path = File.join(staging_dir, destination)
+          log.debug(log_key) { "Adding script `#{source}' to `#{destination_path}'" }
+          copy_file(source_path, destination_path)
+        end
+      end
     end
 
     #
@@ -93,7 +101,7 @@ module Omnibus
             "#{staging_dir}" \\
             "#{package_name}" \\
             "#{project.description}" \\
-            "./post_extract.sh"
+            "./makeselfinst"
         EOH
       end
 

data/lib/omnibus/packagers/msi.rb

@@ -65,7 +65,7 @@ module Omnibus
 
         # Create the msi, ignoring the 204 return code from light.exe since it is
         # about some expected warnings
-        shellout! <<-EOH.split.join(' ').squeeze(' ').strip
+        light_command = <<-EOH.split.join(' ').squeeze(' ').strip
           light.exe
             -nologo
             -ext WixUIExtension
@@ -75,6 +75,7 @@ module Omnibus
             project-files.wixobj source.wixobj
             -out "#{windows_safe_path(Config.package_dir, package_name)}"
         EOH
+        shellout!(light_command, returns: [0, 204])
       end
     end
 
@@ -182,7 +183,7 @@ module Omnibus
 
     # @see Base#package_name
     def package_name
-      "#{project.name}-#{project.build_version}-#{project.build_iteration}.msi"
+      "#{project.package_name}-#{project.build_version}-#{project.build_iteration}.msi"
     end
 
     #
@@ -203,7 +204,7 @@ module Omnibus
       render_template(resource_path('localization-en-us.wxl.erb'),
         destination: "#{staging_dir}/localization-en-us.wxl",
         variables: {
-          name:          project.name,
+          name:          project.package_name,
           friendly_name: project.friendly_name,
           maintainer:    project.maintainer,
         }
@@ -219,7 +220,7 @@ module Omnibus
       render_template(resource_path('parameters.wxi.erb'),
         destination: "#{staging_dir}/parameters.wxi",
         variables: {
-          name:            project.name,
+          name:            project.package_name,
           friendly_name:   project.friendly_name,
           maintainer:      project.maintainer,
           upgrade_code:    upgrade_code,
@@ -268,7 +269,7 @@ module Omnibus
       render_template(resource_path('source.wxs.erb'),
         destination: "#{staging_dir}/source.wxs",
         variables: {
-          name:          project.name,
+          name:          project.package_name,
           friendly_name: project.friendly_name,
           maintainer:    project.maintainer,
           hierarchy:     hierarchy,

data/lib/omnibus/packagers/pkg.rb

@@ -16,12 +16,25 @@
 
 module Omnibus
   class Packager::PKG < Packager::Base
+    # @return [Hash]
+    SCRIPT_MAP = {
+      # Default Omnibus naming
+      preinst:  'preinstall',
+      postinst: 'postinstall',
+      # Default PKG naming
+      preinstall:  'preinstall',
+      postinstall: 'postinstall',
+    }.freeze
+
     id :pkg
 
     setup do
       # Create the resources directory
       create_directory(resources_dir)
 
+      # Create the scripts directory
+      create_directory(scripts_dir)
+
       # Render the license
       render_template(resource_path('license.html.erb'),
         destination: "#{resources_dir}/license.html",
@@ -29,6 +42,8 @@ module Omnibus
           name:          project.name,
           friendly_name: project.friendly_name,
           maintainer:    project.maintainer,
+          build_version: project.build_version,
+          package_name:  project.package_name,
         }
       )
 
@@ -39,6 +54,8 @@ module Omnibus
           name:          project.name,
           friendly_name: project.friendly_name,
           maintainer:    project.maintainer,
+          build_version: project.build_version,
+          package_name:  project.package_name,
         }
       )
 
@@ -47,6 +64,8 @@ module Omnibus
     end
 
     build do
+      write_scripts
+
       build_component_pkg
 
       write_distribution_file
@@ -106,7 +125,7 @@ module Omnibus
 
     # @see Base#package_name
     def package_name
-      "#{safe_project_name}-#{safe_version}-#{safe_build_iteration}.pkg"
+      "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}.pkg"
     end
 
     #
@@ -130,6 +149,36 @@ module Omnibus
       File.expand_path("#{staging_dir}/Resources")
     end
 
+    #
+    # The path where the package scripts will live. We cannot store
+    # scripts in the top-level staging dir, because +pkgbuild+'s
+    # +--scripts+ flag expects a directory that does not contain the parent
+    # package.
+    #
+    # @return [String]
+    #
+    def scripts_dir
+      File.expand_path("#{staging_dir}/Scripts")
+    end
+
+    #
+    # Copy all scripts in {Project#package_scripts_path} to the package
+    # directory.
+    #
+    # @return [void]
+    #
+    def write_scripts
+      SCRIPT_MAP.each do |source, destination|
+        source_path = File.join(project.package_scripts_path, source.to_s)
+
+        if File.file?(source_path)
+          destination_path = File.join(scripts_dir, destination)
+          log.debug(log_key) { "Adding script `#{source}' to `#{destination_path}'" }
+          copy_file(source_path, destination_path)
+        end
+      end
+    end
+
     #
     # Construct the intermediate build product. It can be installed with the
     # Installer.app, but doesn't contain the data needed to customize the
@@ -142,7 +191,7 @@ module Omnibus
         pkgbuild \\
           --identifier "#{safe_identifier}" \\
           --version "#{safe_version}" \\
-          --scripts "#{project.package_scripts_path}" \\
+          --scripts "#{scripts_dir}" \\
           --root "#{project.install_dir}" \\
           --install-location "#{project.install_dir}" \\
           "#{component_pkg}"
@@ -204,24 +253,24 @@ module Omnibus
     # @return [String] the filename of the component .pkg file to create.
     #
     def component_pkg
-      "#{safe_project_name}-core.pkg"
+      "#{safe_base_package_name}-core.pkg"
     end
 
     #
-    # Return the PKG-ready project name, removing any invalid characters.
+    # Return the PKG-ready base package name, removing any invalid characters.
     #
     # @return [String]
     #
-    def safe_project_name
-      if project.name =~ /\A[[:alnum:]]+\z/
-        project.name.dup
+    def safe_base_package_name
+      if project.package_name =~ /\A[[:alnum:]]+\z/
+        project.package_name.dup
       else
-        converted = project.name.downcase.gsub(/[^[:alnum:]+]/, '')
+        converted = project.package_name.downcase.gsub(/[^[:alnum:]+]/, '')
 
         log.warn(log_key) do
           "The `name' compontent of Mac package names can only include " \
           "alphabetical characters (a-z, A-Z), and numbers (0-9). Converting " \
-          "`#{project.name}' to `#{converted}'."
+          "`#{project.package_name}' to `#{converted}'."
         end
 
         converted
@@ -239,7 +288,7 @@ module Omnibus
       return identifier if identifier
 
       maintainer = project.maintainer.gsub(/[^[:alnum:]+]/, '').downcase
-      "test.#{maintainer}.pkg.#{safe_project_name}"
+      "test.#{maintainer}.pkg.#{safe_base_package_name}"
     end
 
     #

data/lib/omnibus/packagers/rpm.rb

@@ -18,8 +18,22 @@
 
 module Omnibus
   class Packager::RPM < Packager::Base
-    # @return [Array]
-    SCRIPTS = %w(pre post preun postun verifyscript pretans posttrans).freeze
+    # @return [Hash]
+    SCRIPT_MAP = {
+      # Default Omnibus naming
+      preinst:  'pre',
+      postinst: 'post',
+      prerm:    'preun',
+      postrm:   'postun',
+      # Default RPM naming
+      pre:          'pre',
+      post:         'post',
+      preun:        'preun',
+      postun:       'postun',
+      verifyscript: 'verifyscript',
+      pretans:      'pretans',
+      posttrans:    'posttrans',
+    }.freeze
 
     id :rpm
 
@@ -196,7 +210,7 @@ module Omnibus
     # @return [String]
     #
     def package_name
-      "#{safe_project_name}-#{safe_version}-#{safe_build_iteration}.#{safe_architecture}.rpm"
+      "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}.#{safe_architecture}.rpm"
     end
 
     #
@@ -216,11 +230,11 @@ module Omnibus
     #
     def write_rpm_spec
       # Create a map of scripts that exist and their contents
-      scripts = SCRIPTS.inject({}) do |hash, name|
-        path = File.join(project.package_scripts_path, name)
+      scripts = SCRIPT_MAP.inject({}) do |hash, (source, destination)|
+        path =  File.join(project.package_scripts_path, source.to_s)
 
         if File.file?(path)
-          hash[name] = File.read(path)
+          hash[destination] = File.read(path)
         end
 
         hash
@@ -239,7 +253,7 @@ module Omnibus
       render_template(resource_path('spec.erb'),
         destination: spec_file,
         variables: {
-          name:           safe_project_name,
+          name:           safe_base_package_name,
           version:        safe_version,
           iteration:      safe_build_iteration,
           vendor:         vendor,
@@ -270,16 +284,17 @@ module Omnibus
     # @return [void]
     #
     def create_rpm_file
-      log.info(log_key) { "Creating .rpm file" }
-
       command =  %|fakeroot rpmbuild|
       command << %| -bb|
       command << %| --buildroot #{staging_dir}/BUILD|
-      command << %| --define "_topdir #{staging_dir}"|
+      command << %| --define '_topdir #{staging_dir}'|
 
       if signing_passphrase
+        log.info(log_key) { "Signing enabled for .rpm file" }
+
         if File.exist?("#{ENV['HOME']}/.rpmmacros")
           log.info(log_key) { "Detected .rpmmacros file at `#{ENV['HOME']}'" }
+          home = ENV['HOME']
         else
           log.info(log_key) { "Using default .rpmmacros file from Omnibus" }
 
@@ -293,15 +308,17 @@ module Omnibus
               gpg_path: "#{ENV['HOME']}/.gnupg", # TODO: Make this configurable
             }
           )
+        end
 
-          command << " --sign"
-          command << " #{spec_file}"
+        command << " --sign"
+        command << " #{spec_file}"
 
-          with_rpm_signing do |signing_script|
-            shellout!("#{signing_script} \"#{command}\"", environment: { 'HOME' => home })
-          end
+        with_rpm_signing do |signing_script|
+          log.info(log_key) { "Creating .rpm file" }
+          shellout!("#{signing_script} \"#{command}\"", environment: { 'HOME' => home })
         end
       else
+        log.info(log_key) { "Creating .rpm file" }
         command << " #{spec_file}"
         shellout!("#{command}")
       end
@@ -371,21 +388,21 @@ module Omnibus
     end
 
     #
-    # Return the RPM-ready project name, converting any invalid characters to
+    # Return the RPM-ready base package name, converting any invalid characters to
     # dashes (+-+).
     #
     # @return [String]
     #
-    def safe_project_name
-      if project.name =~ /\A[a-z0-9\.\+\-]+\z/
-        project.name.dup
+    def safe_base_package_name
+      if project.package_name =~ /\A[a-z0-9\.\+\-]+\z/
+        project.package_name.dup
       else
-        converted = project.name.downcase.gsub(/[^a-z0-9\.\+\-]+/, '-')
+        converted = project.package_name.downcase.gsub(/[^a-z0-9\.\+\-]+/, '-')
 
         log.warn(log_key) do
           "The `name' compontent of RPM package names can only include " \
           "lowercase alphabetical characters (a-z), numbers (0-9), dots (.), " \
-          "plus signs (+), and dashes (-). Converting `#{project.name}' to " \
+          "plus signs (+), and dashes (-). Converting `#{project.package_name}' to " \
           "`#{converted}'."
         end
 
@@ -410,15 +427,15 @@ module Omnibus
     # @return [String]
     #
     def safe_version
-      if project.build_version =~ /\A[a-zA-Z0-9\.\+\-]+\z/
+      if project.build_version =~ /\A[a-zA-Z0-9\.\+\_]+\z/
         project.build_version.dup
       else
-        converted = project.build_version.gsub(/[^a-zA-Z0-9\.\+\-]+/, '-')
+        converted = project.build_version.gsub('-', '_')
 
         log.warn(log_key) do
-          "The `version' compontent of RPM package names can only include " \
+          "The `version' component of RPM package names can only include " \
           "alphabetical characters (a-z, A-Z), numbers (0-9), dots (.), " \
-          "plus signs (+), and dashes (-). Converting " \
+          "plus signs (+), and underscores (_). Converting " \
           "`#{project.build_version}' to `#{converted}'."
         end