omnibus 6.0.1 → 6.0.24

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -22,16 +22,16 @@ module Omnibus
     include DownloadHelpers
 
     # Use 7-zip to extract 7z/zip for Windows
-    WIN_7Z_EXTENSIONS = %w{.7z .zip}
+    WIN_7Z_EXTENSIONS = %w{.7z .zip}.freeze
 
     # tar probably has compression scheme linked in, otherwise for tarballs
-    COMPRESSED_TAR_EXTENSIONS = %w{.tar.gz .tgz tar.bz2 .tar.xz .txz .tar.lzma}
+    COMPRESSED_TAR_EXTENSIONS = %w{.tar.gz .tgz tar.bz2 .tar.xz .txz .tar.lzma}.freeze
     TAR_EXTENSIONS = COMPRESSED_TAR_EXTENSIONS + [".tar"]
 
     ALL_EXTENSIONS = WIN_7Z_EXTENSIONS + TAR_EXTENSIONS
 
     # Digest types used for verifying file checksums
-    DIGESTS = [:sha512, :sha256, :sha1, :md5]
+    DIGESTS = [:sha512, :sha256, :sha1, :md5].freeze
 
     #
     # A fetch is required if the downloaded_file (such as a tarball) does not
@@ -112,13 +112,15 @@ module Omnibus
     end
 
     #
-    # The path on disk to the downloaded asset. This method requires the
-    # presence of a +source_uri+.
+    # The path on disk to the downloaded asset. The filename is defined by
+    # +source :cached_name+. If ommited, then it comes from the software's
+    # +source :url+ value
     #
     # @return [String]
     #
     def downloaded_file
-      filename = File.basename(source[:url], "?*")
+      filename = source[:cached_name] if source[:cached_name]
+      filename ||= File.basename(source[:url], "?*")
       File.join(Config.cache_dir, filename)
     end
 

data/lib/omnibus/generator_files/.kitchen.local.yml.erb

@@ -0,0 +1,10 @@
+#
+# The .kitchen.local.yml takes preference and is compiled into the top-level
+# .kitchen.yml. Uncomment the following section to use VMWare Fusion instead of
+# the default Vagrant driver of VirtualBox.
+#
+
+# driver:
+#   provider: vmware_fusion
+#   customize:
+#     memsize: 4096

data/lib/omnibus/generator_files/.kitchen.yml.erb

@@ -0,0 +1,41 @@
+driver:
+  name: vagrant
+  forward_agent: yes
+  customize:
+    cpus: 2
+    memory: 2048
+  synced_folders:
+    - ['.', '/home/vagrant/<%= config[:name] %>']
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: centos-6
+    run_list: yum-epel::default
+  - name: centos-7
+    run_list: yum-epel::default
+  - name: debian-8
+    run_list: apt::default
+  - name: debian-9
+    run_list: apt::default
+  - name: freebsd-10
+    run_list: freebsd::portsnap
+  - name: freebsd-11
+    run_list: freebsd::portsnap
+  - name: ubuntu-14.04
+    run_list: apt::default
+  - name: ubuntu-16.04
+    run_list: apt::default
+  - name: ubuntu-18.04
+    run_list: apt::default
+
+suites:
+  - name: default
+    run_list: omnibus::default
+    attributes:
+      omnibus:
+        build_user:          vagrant
+        build_user_group:    vagrant
+        build_user_password: vagrant
+        install_dir:         /opt/<%= config[:name] %>

data/lib/omnibus/generator_files/Gemfile.erb

@@ -13,9 +13,9 @@ gem 'omnibus', '~> <%= Omnibus::VERSION.split('.')[0...-1].join('.') %>'
 # by running `bundle install --without development` to speed up build times.
 group :development do
   # Use Berkshelf for resolving cookbook dependencies
-  gem 'berkshelf', '~> 3.3'
+  gem 'berkshelf'
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',    '~> 1.4'
-  gem 'kitchen-vagrant', '~> 0.18'
+  gem 'test-kitchen',
+  gem 'kitchen-vagrant',
 end

data/lib/omnibus/git_repository.rb

@@ -37,7 +37,7 @@ module Omnibus
     end
 
     def git(cmd)
-      shellout!("git #{cmd}", :cwd => repo_path).stdout
+      shellout!("git #{cmd}", cwd: repo_path).stdout
     end
   end
 end

data/lib/omnibus/licensing.rb

@@ -657,6 +657,7 @@ EOH
       "AGPL-3.0",      # GNU Affero General Public License v3
       "GPL-2.0",       # GNU General Public License version 2.0
       "GPL-3.0",       # GNU General Public License version 3.0
+      "LGPL-2.0",      # GNU Library or "Lesser" General Public License version 2.0
       "LGPL-2.1",      # GNU Library or "Lesser" General Public License version 2.1
       "LGPL-3.0",      # GNU Library or "Lesser" General Public License version 3.0
       "HPND",          # Historical Permission Notice and Disclaimer

data/lib/omnibus/metadata.rb

@@ -46,24 +46,24 @@ module Omnibus
 
         data = {
           # Package
-          basename:         package.name,
-          md5:              package.md5,
-          sha1:             package.sha1,
-          sha256:           package.sha256,
-          sha512:           package.sha512,
-          platform:         platform_shortname,
+          basename: package.name,
+          md5: package.md5,
+          sha1: package.sha1,
+          sha256: package.sha256,
+          sha512: package.sha512,
+          platform: platform_shortname,
           platform_version: platform_version,
-          arch:             arch,
+          arch: arch,
 
           # Project
-          name:             project.name,
-          friendly_name:    project.friendly_name,
-          homepage:         project.homepage,
-          version:          project.build_version,
-          iteration:        project.build_iteration,
-          license:          project.license,
+          name: project.name,
+          friendly_name: project.friendly_name,
+          homepage: project.homepage,
+          version: project.build_version,
+          iteration: project.build_iteration,
+          license: project.license,
           version_manifest: project.built_manifest.to_hash,
-          license_content:  File.exist?(project.license_file_path) ? File.read(project.license_file_path) : "",
+          license_content: File.exist?(project.license_file_path) ? File.read(project.license_file_path) : "",
         }
 
         instance = new(package, data)
@@ -170,7 +170,7 @@ module Omnibus
       # rubocop:disable Lint/DuplicateCaseCondition
       def truncate_platform_version(platform_version, platform)
         case platform
-        when "centos", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "sles", "suse", "smartos", "nexus", "ios_xr"
+        when "centos", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "sles", "suse", "smartos"
           # Only want MAJOR (e.g. Debian 7, OmniOS r151006, SmartOS 20120809T221258Z)
           platform_version.split(".").first
         when "aix", "alpine", "mac_os_x", "openbsd", "slackware", "solaris2", "opensuse", "opensuseleap", "ubuntu", "amazon"

data/lib/omnibus/packager.rb

@@ -38,17 +38,18 @@ module Omnibus
     # @return [Hash<String, Class>]
     #
     PLATFORM_PACKAGER_MAP = {
-      "debian"   => DEB,
-      "fedora"   => RPM,
-      "suse"     => RPM,
-      "rhel"     => RPM,
-      "wrlinux"  => RPM,
-      "aix"      => BFF,
-      "solaris"  => Solaris,
-      "ips"      => IPS,
-      "windows"  => [MSI, APPX],
+      "debian" => DEB,
+      "fedora" => RPM,
+      "suse" => RPM,
+      "rhel" => RPM,
+      "wrlinux" => RPM,
+      "amazon" => RPM,
+      "aix" => BFF,
+      "solaris" => Solaris,
+      "ips" => IPS,
+      "windows" => [MSI, APPX],
       "mac_os_x" => PKG,
-      "smartos"  => PKGSRC,
+      "smartos" => PKGSRC,
     }.freeze
 
     #

data/lib/omnibus/packagers/appx.rb

@@ -64,10 +64,10 @@ module Omnibus
       render_template(resource_path("AppxManifest.xml.erb"),
         destination: "#{windows_safe_path(project.install_dir)}/AppxManifest.xml",
         variables: {
-          name:            project.package_name,
-          friendly_name:   project.friendly_name,
-          version:         windows_package_version,
-          maintainer:      project.maintainer,
+          name: project.package_name,
+          friendly_name: project.friendly_name,
+          version: windows_package_version,
+          maintainer: project.maintainer,
           certificate_subject: certificate_subject.gsub('"', """),
         }
       )

data/lib/omnibus/packagers/base.rb

@@ -127,6 +127,25 @@ module Omnibus
     #
     expose :windows_safe_path
 
+    #
+    # Skip this packager during build process
+    #
+    # @example
+    #   skip_package true
+    #
+    # @param [TrueClass, FalseClass] value
+    #   whether to delay validation or not
+    #
+    # @return [TrueClass, FalseClass]
+    #   whether to skip this packager type or not
+    def skip_packager(val = false)
+      unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
+        raise InvalidValue.new(:skip_packager, "be TrueClass or FalseClass")
+      end
+      @skip_package ||= val
+    end
+    expose :skip_packager
+
     #
     # @!endgroup
     # --------------------------------------------------

data/lib/omnibus/packagers/bff.rb

@@ -19,12 +19,12 @@ module Omnibus
     # @return [Hash]
     SCRIPT_MAP = {
       # Default Omnibus naming
-      preinst:  "Pre-installation Script",
+      preinst: "Pre-installation Script",
       postinst: "Post-installation Script",
-      config:   "Configuration Script",
+      config: "Configuration Script",
       unconfig: "Unconfiguration Script",
-      prerm:    "Pre_rm Script",
-      postrm:   "Unconfiguration Script",
+      prerm: "Pre_rm Script",
+      postrm: "Unconfiguration Script",
     }.freeze
 
     id :bff
@@ -144,11 +144,11 @@ module Omnibus
           alt = path.gsub(/(:|,)/, "__")
           log.debug(log_key) { "Renaming #{path} to #{alt}" }
 
-          File.rename(path, alt) if File.exists?(path)
+          File.rename(path, alt) if File.exist?(path)
 
           # Create a config script if needed based on resources/bff/config.erb
           config_script_path = File.join(scripts_staging_dir, "config")
-          unless File.exists? config_script_path
+          unless File.exist? config_script_path
             render_template(resource_path("config.erb"),
               destination: "#{scripts_staging_dir}/config",
               variables: {
@@ -182,13 +182,13 @@ module Omnibus
       render_template(resource_path("gen.template.erb"),
         destination: File.join(staging_dir, "gen.template"),
         variables: {
-          name:           safe_base_package_name,
-          install_dir:    project.install_dir,
-          friendly_name:  project.friendly_name,
-          version:        bff_version,
-          description:    project.description,
-          files:          files,
-          scripts:        scripts,
+          name: safe_base_package_name,
+          install_dir: project.install_dir,
+          friendly_name: project.friendly_name,
+          version: bff_version,
+          description: project.description,
+          files: files,
+          scripts: scripts,
         }
       )
 

data/lib/omnibus/packagers/deb.rb

@@ -305,21 +305,21 @@ module Omnibus
       render_template(resource_path("control.erb"),
         destination: File.join(debian_dir, "control"),
         variables: {
-          name:           safe_base_package_name,
-          version:        safe_version,
-          iteration:      safe_build_iteration,
-          vendor:         vendor,
-          license:        license,
-          architecture:   safe_architecture,
-          maintainer:     project.maintainer,
+          name: safe_base_package_name,
+          version: safe_version,
+          iteration: safe_build_iteration,
+          vendor: vendor,
+          license: license,
+          architecture: safe_architecture,
+          maintainer: project.maintainer,
           installed_size: package_size,
-          homepage:       project.homepage,
-          description:    project.description,
-          priority:       priority,
-          section:        section,
-          conflicts:      project.conflicts,
-          replaces:       project.replaces,
-          dependencies:   project.runtime_dependencies,
+          homepage: project.homepage,
+          description: project.description,
+          priority: priority,
+          section: section,
+          conflicts: project.conflicts,
+          replaces: project.replaces,
+          dependencies: project.runtime_dependencies,
         }
       )
     end

data/lib/omnibus/packagers/ips.rb

@@ -223,16 +223,16 @@ module Omnibus
     # @return [String]
     #
     def symlinks_file
-      if File.exists?(resource_path("#{safe_base_package_name}-symlinks.erb"))
+      if File.exist?(resource_path("#{safe_base_package_name}-symlinks.erb"))
         "#{safe_base_package_name}-symlinks.erb"
-      elsif File.exists?(resource_path("symlinks.erb"))
+      elsif File.exist?(resource_path("symlinks.erb"))
         "symlinks.erb"
       end
     end
 
     #
     # A set of symbolic links to installed commands that
-    #`pkgmogrify' will apply to the package manifest. Is called only when
+    # `pkgmogrify' will apply to the package manifest. Is called only when
     # "#{safe_base_package_name}-symlinks.erb" or "symlinks.erb" template resource
     # exists locally
     #
@@ -257,11 +257,11 @@ module Omnibus
       render_template(resource_path("gen.manifestfile.erb"),
         destination: pkg_metadata_file,
         variables: {
-          name:              safe_base_package_name,
+          name: safe_base_package_name,
           fmri_package_name: fmri_package_name,
-          description:       project.description,
-          summary:           project.friendly_name,
-          arch:              safe_architecture,
+          description: project.description,
+          summary: project.friendly_name,
+          arch: safe_architecture,
         }
       )
 

data/lib/omnibus/packagers/msi.rb

@@ -166,6 +166,29 @@ module Omnibus
     end
     expose :wix_light_extension
 
+    #
+    # Signal delay validation for wix light
+    #
+    # @example
+    #   wix_light_deplay_validation true
+    #
+    # @param [TrueClass, FalseClass] value
+    #   whether to delay validation or not
+    #
+    # @return [String]
+    #   whether we're a bundle or not
+    def wix_light_delay_validation(val = false)
+      unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
+        raise InvalidValue.new(:iwix_light_delay_validation, "be TrueClass or FalseClass")
+      end
+      @delay_validation ||= val
+      unless @delay_validation
+        return ""
+      end
+      "-sval"
+    end
+    expose :wix_light_delay_validation
+
     #
     # Set the wix candle extensions to load
     #
@@ -225,6 +248,29 @@ module Omnibus
     end
     expose :fast_msi
 
+    #
+    # Set or retrieve the localization. Take a look at
+    # this list[https://www.firegiant.com/wix/tutorial/user-interface/do-you-speak-english/]
+    # of valid localizations.
+    #
+    # @example
+    #   localization 'de-de'
+    #
+    # @param [String] val
+    #   the localization to set
+    #
+    # @return [String]
+    #   the set localization
+    #
+    def localization(val = "en-us")
+      unless val.is_a?(String)
+        raise InvalidValue.new(:localization, "be a String")
+      end
+
+      @localization ||= val
+    end
+    expose :localization
+
     #
     # Discovers a path to a gem/file included in a gem under the install directory.
     #
@@ -288,12 +334,12 @@ module Omnibus
     # @return [void]
     #
     def write_localization_file
-      render_template(resource_path("localization-en-us.wxl.erb"),
-        destination: "#{staging_dir}/localization-en-us.wxl",
+      render_template(resource_path("localization-#{localization}.wxl.erb"),
+        destination: "#{staging_dir}/localization-#{localization}.wxl",
         variables: {
-          name:          project.package_name,
+          name: project.package_name,
           friendly_name: project.friendly_name,
-          maintainer:    project.maintainer,
+          maintainer: project.maintainer,
         }
       )
     end
@@ -307,12 +353,12 @@ module Omnibus
       render_template(resource_path("parameters.wxi.erb"),
         destination: "#{staging_dir}/parameters.wxi",
         variables: {
-          name:            project.package_name,
-          friendly_name:   project.friendly_name,
-          maintainer:      project.maintainer,
-          upgrade_code:    upgrade_code,
-          parameters:      parameters,
-          version:         windows_package_version,
+          name: project.package_name,
+          friendly_name: project.friendly_name,
+          maintainer: project.maintainer,
+          upgrade_code: upgrade_code,
+          parameters: parameters,
+          version: windows_package_version,
           display_version: msi_display_version,
         }
       )
@@ -356,11 +402,11 @@ module Omnibus
       render_template(resource_path("source.wxs.erb"),
         destination: "#{staging_dir}/source.wxs",
         variables: {
-          name:          project.package_name,
+          name: project.package_name,
           friendly_name: project.friendly_name,
-          maintainer:    project.maintainer,
-          hierarchy:     hierarchy,
-          fastmsi:       fast_msi,
+          maintainer: project.maintainer,
+          hierarchy: hierarchy,
+          fastmsi: fast_msi,
           wix_install_dir: wix_install_dir,
         }
       )
@@ -375,14 +421,14 @@ module Omnibus
       render_template(resource_path("bundle.wxs.erb"),
         destination: "#{staging_dir}/bundle.wxs",
         variables: {
-          name:            project.package_name,
-          friendly_name:   project.friendly_name,
-          maintainer:      project.maintainer,
-          upgrade_code:    upgrade_code,
-          parameters:      parameters,
-          version:         windows_package_version,
+          name: project.package_name,
+          friendly_name: project.friendly_name,
+          maintainer: project.maintainer,
+          upgrade_code: upgrade_code,
+          parameters: parameters,
+          version: windows_package_version,
           display_version: msi_display_version,
-          msi:             windows_safe_path(Config.package_dir, msi_name),
+          msi: windows_safe_path(Config.package_dir, msi_name),
         }
       )
     end
@@ -465,11 +511,12 @@ module Omnibus
         <<-EOH.split.join(" ").squeeze(" ").strip
         light.exe
           -nologo
+          #{wix_light_delay_validation}
           -ext WixUIExtension
           -ext WixBalExtension
           #{wix_extension_switches(wix_light_extensions)}
-          -cultures:en-us
-          -loc "#{windows_safe_path(staging_dir, 'localization-en-us.wxl')}"
+          -cultures:#{localization}
+          -loc "#{windows_safe_path(staging_dir, "localization-#{localization}.wxl")}"
           bundle.wixobj
           -out "#{out_file}"
         EOH
@@ -477,10 +524,11 @@ module Omnibus
         <<-EOH.split.join(" ").squeeze(" ").strip
           light.exe
             -nologo
+            #{wix_light_delay_validation}
             -ext WixUIExtension
             #{wix_extension_switches(wix_light_extensions)}
-            -cultures:en-us
-            -loc "#{windows_safe_path(staging_dir, 'localization-en-us.wxl')}"
+            -cultures:#{localization}
+            -loc "#{windows_safe_path(staging_dir, "localization-#{localization}.wxl")}"
             project-files.wixobj source.wixobj
             -out "#{out_file}"
         EOH