omnibus 5.4.0 → 5.5.0

data/lib/omnibus/packagers/deb.rb

@@ -80,10 +80,10 @@ module Omnibus
     #
     def vendor(val = NULL)
       if null?(val)
-        @vendor || 'Omnibus <omnibus@getchef.com>'
+        @vendor || "Omnibus <omnibus@getchef.com>"
       else
         unless val.is_a?(String)
-          raise InvalidValue.new(:vendor, 'be a String')
+          raise InvalidValue.new(:vendor, "be a String")
         end
 
         @vendor = val
@@ -108,7 +108,7 @@ module Omnibus
         @license || project.license
       else
         unless val.is_a?(String)
-          raise InvalidValue.new(:license, 'be a String')
+          raise InvalidValue.new(:license, "be a String")
         end
 
         @license = val
@@ -130,10 +130,10 @@ module Omnibus
     #
     def priority(val = NULL)
       if null?(val)
-        @priority || 'extra'
+        @priority || "extra"
       else
         unless val.is_a?(String)
-          raise InvalidValue.new(:priority, 'be a String')
+          raise InvalidValue.new(:priority, "be a String")
         end
 
         @priority = val
@@ -155,10 +155,10 @@ module Omnibus
     #
     def section(val = NULL)
       if null?(val)
-        @section || 'misc'
+        @section || "misc"
       else
         unless val.is_a?(String)
-          raise InvalidValue.new(:section, 'be a String')
+          raise InvalidValue.new(:section, "be a String")
         end
 
         @section = val
@@ -187,7 +187,7 @@ module Omnibus
     # @return [String]
     #
     def debian_dir
-      @debian_dir ||= File.join(staging_dir, 'DEBIAN')
+      @debian_dir ||= File.join(staging_dir, "DEBIAN")
     end
 
     #
@@ -197,8 +197,8 @@ module Omnibus
     # @return [void]
     #
     def write_control_file
-      render_template(resource_path('control.erb'),
-        destination: File.join(debian_dir, 'control'),
+      render_template(resource_path("control.erb"),
+        destination: File.join(debian_dir, "control"),
         variables: {
           name:           safe_base_package_name,
           version:        safe_version,
@@ -227,8 +227,8 @@ module Omnibus
     def write_conffiles_file
       return if project.config_files.empty?
 
-      render_template(resource_path('conffiles.erb'),
-        destination: File.join(debian_dir, 'conffiles'),
+      render_template(resource_path("conffiles.erb"),
+        destination: File.join(debian_dir, "conffiles"),
         variables: {
           config_files: project.config_files,
         }
@@ -242,13 +242,13 @@ module Omnibus
     # @return [void]
     #
     def write_scripts
-      %w(preinst postinst prerm postrm).each do |script|
+      %w{preinst postinst prerm postrm}.each do |script|
         path = File.join(project.package_scripts_path, script)
 
         if File.file?(path)
           log.debug(log_key) { "Adding script `#{script}' to `#{debian_dir}' from #{path}" }
           copy_file(path, debian_dir)
-          log.debug(log_key)  { "SCRIPT FILE:  #{debian_dir}/#{script}" }
+          log.debug(log_key) { "SCRIPT FILE:  #{debian_dir}/#{script}" }
           FileUtils.chmod(0755, File.join(debian_dir, script))
         end
       end
@@ -264,15 +264,15 @@ module Omnibus
       path = "#{staging_dir}/**/*"
       hash = FileSyncer.glob(path).inject({}) do |hash, path|
         if File.file?(path) && !File.symlink?(path) && !(File.dirname(path) == debian_dir)
-          relative_path = path.gsub("#{staging_dir}/", '')
+          relative_path = path.gsub("#{staging_dir}/", "")
           hash[relative_path] = digest(path, :md5)
         end
 
         hash
       end
 
-      render_template(resource_path('md5sums.erb'),
-        destination: File.join(debian_dir, 'md5sums'),
+      render_template(resource_path("md5sums.erb"),
+        destination: File.join(debian_dir, "md5sums"),
         variables: {
           md5sums: hash,
         }
@@ -328,7 +328,7 @@ module Omnibus
       if project.package_name =~ /\A[a-z0-9\.\+\-]+\z/
         project.package_name.dup
       else
-        converted = project.package_name.downcase.gsub(/[^a-z0-9\.\+\-]+/, '-')
+        converted = project.package_name.downcase.gsub(/[^a-z0-9\.\+\-]+/, "-")
 
         log.warn(log_key) do
           "The `name' component of Debian package names can only include " \
@@ -361,7 +361,7 @@ module Omnibus
       version = project.build_version.dup
 
       if version =~ /\-/
-        converted = version.gsub('-', '~')
+        converted = version.tr("-", "~")
 
         log.warn(log_key) do
           "Dashes hold special significance in the Debian package versions. " \
@@ -378,7 +378,7 @@ module Omnibus
       if version =~ /\A[a-zA-Z0-9\.\+\:\~]+\z/
         version
       else
-        converted = version.gsub(/[^a-zA-Z0-9\.\+\:\~]+/, '_')
+        converted = version.gsub(/[^a-zA-Z0-9\.\+\:\~]+/, "_")
 
         log.warn(log_key) do
           "The `version' component of Debian package names can only include " \

data/lib/omnibus/packagers/ips.rb

@@ -66,7 +66,7 @@ module Omnibus
     #
     def publisher_prefix(val = NULL)
       if null?(val)
-        @publisher_prefix || 'Omnibus'
+        @publisher_prefix || "Omnibus"
       else
         @publisher_prefix = val
       end
@@ -81,7 +81,8 @@ module Omnibus
     # @see Base#package_name
     #
     def package_name
-      "#{safe_base_package_name}.p5p"
+      version = project.build_version.split(/[^\d]/)[0..2].join(".")
+      "#{safe_base_package_name}-#{version}-#{project.build_iteration}.#{safe_architecture}.p5p"
     end
 
     #
@@ -90,8 +91,8 @@ module Omnibus
     #   http://docs.oracle.com/cd/E23824_01/html/E21796/pkg-5.html
     #
     def fmri_package_name
-      version = project.build_version.split(/[^\d]/)[0..2].join('.')
-      platform =  Ohai['platform_version']
+      version = project.build_version.split(/[^\d]/)[0..2].join(".")
+      platform = Ohai["platform_version"]
       "#{safe_base_package_name}@#{version},#{platform}-#{project.build_iteration}"
     end
 
@@ -101,7 +102,7 @@ module Omnibus
     # @return [String]
     #
     def transform_file
-      @transform_file ||= File.join(staging_dir, 'doc-transform')
+      @transform_file ||= File.join(staging_dir, "doc-transform")
     end
 
     #
@@ -110,7 +111,7 @@ module Omnibus
     # @return [String]
     #
     def pkg_metadata_file
-      @pkg_metadata_file ||= File.join(staging_dir, 'gen.manifestfile')
+      @pkg_metadata_file ||= File.join(staging_dir, "gen.manifestfile")
     end
 
     #
@@ -128,7 +129,7 @@ module Omnibus
     # @return [String]
     #
     def repo_dir
-      @repo_dir ||= File.join(staging_dir, 'publish', 'repo')
+      @repo_dir ||= File.join(staging_dir, "publish", "repo")
     end
 
     #
@@ -137,7 +138,7 @@ module Omnibus
     # @return [String]
     #
     def source_dir
-      @source_dir ||= File.join(staging_dir, 'proto_install')
+      @source_dir ||= File.join(staging_dir, "proto_install")
     end
 
     #
@@ -150,7 +151,7 @@ module Omnibus
       if project.package_name =~ /\A[a-z0-9\.\+\-]+\z/
         project.package_name.dup
       else
-        converted = project.package_name.downcase.gsub(/[^a-z0-9\.\+\-]+/, '-')
+        converted = project.package_name.downcase.gsub(/[^a-z0-9\.\+\-]+/, "-")
 
         log.warn(log_key) do
           "The `name' component of IPS package names can only include " \
@@ -169,11 +170,11 @@ module Omnibus
     #
     def safe_architecture
       if intel?
-        'i386'
+        "i386"
       elsif sparc?
-        'sparc'
+        "sparc"
       else
-        Ohai['kernel']['machine']
+        Ohai["kernel"]["machine"]
       end
     end
 
@@ -184,10 +185,10 @@ module Omnibus
     # @return [void]
     #
     def write_transform_file
-      render_template(resource_path('doc-transform.erb'),
+      render_template(resource_path("doc-transform.erb"),
         destination: transform_file,
         variables: {
-          pathdir: project.install_dir.split('/')[1],
+          pathdir: project.install_dir.split("/")[1],
         }
       )
     end
@@ -200,7 +201,7 @@ module Omnibus
     # @return [void]
     #
     def write_pkg_metadata
-      render_template(resource_path('gen.manifestfile.erb'),
+      render_template(resource_path("gen.manifestfile.erb"),
         destination: pkg_metadata_file,
         variables: {
           name:              safe_base_package_name,
@@ -264,7 +265,7 @@ module Omnibus
     def publish_ips_pkg
       shellout!("pkgrepo -s #{repo_dir} set publisher/prefix=#{publisher_prefix}")
       shellout!("pkgsend publish -s #{repo_dir} -d #{source_dir} #{pkg_manifest_file}.4.res")
-      log.info(log_key) { "Published IPS package to repo: #{repo_dir}"}
+      log.info(log_key) { "Published IPS package to repo: #{repo_dir}" }
 
       repo_info = shellout("pkg list -afv -g #{repo_dir}").stdout
       log.debug(log_key) do
@@ -286,7 +287,7 @@ module Omnibus
       # The destination file cannot already exist
       File.delete(package_path) if File.exist?(package_path)
       shellout!("pkgrecv -s #{repo_dir} -a -d #{package_path} #{safe_base_package_name}")
-      log.info(log_key) { "Exported IPS package archive: #{package_path}"}
+      log.info(log_key) { "Exported IPS package archive: #{package_path}" }
 
       list_pkgarchive = shellout("pkgrepo list -s #{package_path} '*@latest'").stdout
       log.debug(log_key) do

data/lib/omnibus/packagers/makeself.rb

@@ -19,7 +19,7 @@ module Omnibus
     # @return [Hash]
     SCRIPT_MAP = {
       # Default Omnibus naming
-      postinst: 'postinst',
+      postinst: "postinst",
     }.freeze
 
     id :makeself
@@ -55,7 +55,7 @@ module Omnibus
     # @return [String]
     #
     def makeself
-      resource_path('makeself.sh')
+      resource_path("makeself.sh")
     end
 
     #
@@ -65,7 +65,7 @@ module Omnibus
     # @return [String]
     #
     def makeself_header
-      resource_path('makeself-header.sh')
+      resource_path("makeself-header.sh")
     end
 
     #
@@ -76,8 +76,8 @@ module Omnibus
     # @return [void]
     #
     def write_makeselfinst
-      makeselfinst_staging_path = File.join(staging_dir, 'makeselfinst')
-      render_template(resource_path('makeselfinst.erb'),
+      makeselfinst_staging_path = File.join(staging_dir, "makeselfinst")
+      render_template(resource_path("makeselfinst.erb"),
         destination: makeselfinst_staging_path,
         variables: {
           install_dir: project.install_dir,
@@ -113,7 +113,7 @@ module Omnibus
       log.info(log_key) { "Creating makeself package" }
 
       Dir.chdir(staging_dir) do
-        shellout! <<-EOH.gsub(/^ {10}/, '')
+        shellout! <<-EOH.gsub(/^ {10}/, "")
           #{makeself} \\
             --header "#{makeself_header}" \\
             --gzip \\
@@ -135,7 +135,7 @@ module Omnibus
     # @return [String]
     #
     def safe_architecture
-      Ohai['kernel']['machine']
+      Ohai["kernel"]["machine"]
     end
   end
 end