omnibus 6.0.1 → 6.0.24

data/lib/omnibus/packagers/pkg.rb

@@ -19,10 +19,10 @@ module Omnibus
     # @return [Hash]
     SCRIPT_MAP = {
       # Default Omnibus naming
-      preinst:  "preinstall",
+      preinst: "preinstall",
       postinst: "postinstall",
       # Default PKG naming
-      preinstall:  "preinstall",
+      preinstall: "preinstall",
       postinstall: "postinstall",
     }.freeze
 
@@ -39,11 +39,11 @@ module Omnibus
       render_template(resource_path("license.html.erb"),
         destination: "#{resources_dir}/license.html",
         variables: {
-          name:          project.name,
+          name: project.name,
           friendly_name: project.friendly_name,
-          maintainer:    project.maintainer,
+          maintainer: project.maintainer,
           build_version: project.build_version,
-          package_name:  project.package_name,
+          package_name: project.package_name,
         }
       )
 
@@ -51,11 +51,11 @@ module Omnibus
       render_template(resource_path("welcome.html.erb"),
         destination: "#{resources_dir}/welcome.html",
         variables: {
-          name:          project.name,
+          name: project.name,
           friendly_name: project.friendly_name,
-          maintainer:    project.maintainer,
+          maintainer: project.maintainer,
           build_version: project.build_version,
-          package_name:  project.package_name,
+          package_name: project.package_name,
         }
       )
 
@@ -218,8 +218,8 @@ module Omnibus
         mode: 0600,
         variables: {
           friendly_name: project.friendly_name,
-          identifier:    safe_identifier,
-          version:       safe_version,
+          identifier: safe_identifier,
+          version: safe_version,
           component_pkg: component_pkg,
         }
       )

data/lib/omnibus/packagers/pkgsrc.rb

@@ -62,11 +62,11 @@ module Omnibus
     end
 
     def write_buildinfo
-      buildinfo_content = <<-EOF
-MACHINE_ARCH=#{safe_architecture}
-OPSYS=#{opsys}
-OS_VERSION=#{os_version}
-PKGTOOLS_VERSION=#{PKGTOOLS_VERSION}
+      buildinfo_content = <<~EOF
+        MACHINE_ARCH=#{safe_architecture}
+        OPSYS=#{opsys}
+        OS_VERSION=#{os_version}
+        PKGTOOLS_VERSION=#{PKGTOOLS_VERSION}
       EOF
 
       File.open(build_info, "w+") do |f|

data/lib/omnibus/packagers/rpm.rb

@@ -21,18 +21,18 @@ module Omnibus
     # @return [Hash]
     SCRIPT_MAP = {
       # Default Omnibus naming
-      preinst:  "pre",
+      preinst: "pre",
       postinst: "post",
-      prerm:    "preun",
-      postrm:   "postun",
+      prerm: "preun",
+      postrm: "postun",
       # Default RPM naming
-      pre:          "pre",
-      post:         "post",
-      preun:        "preun",
-      postun:       "postun",
+      pre: "pre",
+      post: "post",
+      preun: "preun",
+      postun: "postun",
       verifyscript: "verifyscript",
-      pretans:      "pretans",
-      posttrans:    "posttrans",
+      pretrans: "pretrans",
+      posttrans: "posttrans",
     }.freeze
 
     id :rpm
@@ -361,28 +361,28 @@ module Omnibus
       render_template(resource_path("spec.erb"),
         destination: spec_file,
         variables: {
-          name:            safe_base_package_name,
-          version:         safe_version,
-          iteration:       safe_build_iteration,
-          vendor:          vendor,
-          license:         license,
-          dist_tag:        dist_tag,
-          maintainer:      project.maintainer,
-          homepage:        project.homepage,
-          description:     project.description,
-          priority:        priority,
-          category:        category,
-          conflicts:       project.conflicts,
-          replaces:        project.replaces,
-          dependencies:    project.runtime_dependencies,
-          user:            project.package_user,
-          group:           project.package_group,
-          scripts:         scripts,
-          config_files:    config_files,
-          files:           files,
-          build_dir:       build_dir,
+          name: safe_base_package_name,
+          version: safe_version,
+          iteration: safe_build_iteration,
+          vendor: vendor,
+          license: license,
+          dist_tag: dist_tag,
+          maintainer: project.maintainer,
+          homepage: project.homepage,
+          description: project.description,
+          priority: priority,
+          category: category,
+          conflicts: project.conflicts,
+          replaces: project.replaces,
+          dependencies: project.runtime_dependencies,
+          user: project.package_user,
+          group: project.package_group,
+          scripts: scripts,
+          config_files: config_files,
+          files: files,
+          build_dir: build_dir,
           platform_family: Ohai["platform_family"],
-          compression:     compression,
+          compression: compression,
         }
       )
     end
@@ -583,7 +583,7 @@ module Omnibus
       #
       if version =~ /\-/
         if Ohai["platform_family"] == "wrlinux"
-          converted = version.tr("-", "_") #WRL has an elderly RPM version
+          converted = version.tr("-", "_") # WRL has an elderly RPM version
           log.warn(log_key) do
             "Omnibus replaces dashes (-) with tildes (~) so pre-release " \
             "versions get sorted earlier than final versions.  However, the " \

data/lib/omnibus/packagers/solaris.rb

@@ -21,10 +21,10 @@ module Omnibus
     # @return [Hash]
     SCRIPT_MAP = {
       # Default Omnibus naming
-      postinst:  "postinstall",
+      postinst: "postinstall",
       postrm: "postremove",
       # Default Solaris naming
-      postinstall:  "postinstall",
+      postinstall: "postinstall",
       postremove: "postremove",
     }.freeze
 

data/lib/omnibus/packagers/windows_base.rb

@@ -17,7 +17,7 @@
 module Omnibus
   class Packager::WindowsBase < Packager::Base
     DEFAULT_TIMESTAMP_SERVERS = ["http://timestamp.digicert.com",
-                                 "http://timestamp.verisign.com/scripts/timestamp.dll"]
+                                 "http://timestamp.verisign.com/scripts/timestamp.dll"].freeze
 
     #
     # Set the signing certificate name
@@ -145,7 +145,7 @@ module Omnibus
                 STDERR
                 ------
                 #{status.stderr}
-                EOH
+          EOH
         end
       end
       status.exitstatus == 0

data/lib/omnibus/project.rb

@@ -1141,6 +1141,10 @@ module Omnibus
           packager.evaluate(&block)
         end
 
+        if packager.skip_packager
+          log.info(log_key) { "Skipping #{packager.id} per project configuration." }
+          next
+        end
         # Run the actual packager
         packager.run!
 

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -95,7 +95,7 @@ module Omnibus
         local_path: artifact.path,
         client:     client,
         checksums: {
-          "md5"  => md5,
+          "md5" => md5,
           "sha1" => sha1,
         }
       )
@@ -151,13 +151,13 @@ module Omnibus
                 {
                   type: File.extname(package.path).split(".").last,
                   sha1: package.metadata[:sha1],
-                  md5:  package.metadata[:md5],
+                  md5: package.metadata[:md5],
                   name: package.metadata[:basename],
                 },
                 {
                   type: File.extname(package.metadata.path).split(".").last,
                   sha1: digest(package.metadata.path, :sha1),
-                  md5:  digest(package.metadata.path, :md5),
+                  md5: digest(package.metadata.path, :md5),
                   name: File.basename(package.metadata.path),
                 },
               ]
@@ -211,21 +211,21 @@ module Omnibus
     #
     def metadata_properties_for(package)
       metadata = {
-        "omnibus.project"          => package.metadata[:name],
-        "omnibus.platform"         => package.metadata[:platform],
+        "omnibus.project" => package.metadata[:name],
+        "omnibus.platform" => package.metadata[:platform],
         "omnibus.platform_version" => package.metadata[:platform_version],
-        "omnibus.architecture"     => package.metadata[:arch],
-        "omnibus.version"          => package.metadata[:version],
-        "omnibus.iteration"        => package.metadata[:iteration],
-        "omnibus.license"          => package.metadata[:license],
-        "omnibus.md5"              => package.metadata[:md5],
-        "omnibus.sha1"             => package.metadata[:sha1],
-        "omnibus.sha256"           => package.metadata[:sha256],
-        "omnibus.sha512"           => package.metadata[:sha512],
-        "md5"                      => package.metadata[:md5],
-        "sha1"                     => package.metadata[:sha1],
-        "sha256"                   => package.metadata[:sha256],
-        "sha512"                   => package.metadata[:sha512],
+        "omnibus.architecture" => package.metadata[:arch],
+        "omnibus.version" => package.metadata[:version],
+        "omnibus.iteration" => package.metadata[:iteration],
+        "omnibus.license" => package.metadata[:license],
+        "omnibus.md5" => package.metadata[:md5],
+        "omnibus.sha1" => package.metadata[:sha1],
+        "omnibus.sha256" => package.metadata[:sha256],
+        "omnibus.sha512" => package.metadata[:sha512],
+        "md5" => package.metadata[:md5],
+        "sha1" => package.metadata[:sha1],
+        "sha256" => package.metadata[:sha256],
+        "sha512" => package.metadata[:sha512],
       }.tap do |h|
         if build_record?
           h["build.name"] = package.metadata[:name]

data/lib/omnibus/publishers/s3_publisher.rb

@@ -30,13 +30,27 @@ module Omnibus
 
         # Upload the metadata first
         log.debug(log_key) { "Uploading '#{package.metadata.name}'" }
-        store_object(key_for(package, package.metadata.name), FFI_Yajl::Encoder.encode(package.metadata.to_hash, pretty: true),
-                     nil, access_policy)
+
+        s3_metadata_object = store_object(
+          key_for(package, package.metadata.name),
+          FFI_Yajl::Encoder.encode(package.metadata.to_hash, pretty: true),
+          nil,
+          access_policy
+        )
+
+        log.debug(log_key) { "Uploading is completed. Download URL (#{access_policy}): #{s3_metadata_object.public_url}" }
 
         # Upload the actual package
         log.info(log_key) { "Uploading '#{package.name}'" }
-        store_object(key_for(package, package.name), package.content,
-                     package.metadata[:md5], access_policy)
+
+        s3_object = store_object(
+          key_for(package, package.name),
+          package.content,
+          package.metadata[:md5],
+          access_policy
+        )
+
+        log.info(log_key) { "Uploading is completed. Download URL (#{access_policy}): #{s3_object.public_url}" }
 
         # If a block was given, "yield" the package to the caller
         yield(package) if block
@@ -47,8 +61,8 @@ module Omnibus
 
     def s3_configuration
       config = {
-        region:            @options[:region],
-        bucket_name:       @options[:bucket],
+        region: @options[:region],
+        bucket_name: @options[:bucket],
       }
 
       if Config.publish_s3_profile

data/lib/omnibus/s3_cache.rb

@@ -140,11 +140,11 @@ module Omnibus
 
       def s3_configuration
         config = {
-          region:                   Config.s3_region,
-          bucket_name:              Config.s3_bucket,
-          endpoint:                 Config.s3_endpoint,
-          use_accelerate_endpoint:  Config.s3_accelerate,
-          force_path_style:         Config.s3_force_path_style,
+          region: Config.s3_region,
+          bucket_name: Config.s3_bucket,
+          endpoint: Config.s3_endpoint,
+          use_accelerate_endpoint: Config.s3_accelerate,
+          force_path_style: Config.s3_force_path_style,
         }
 
         if Config.s3_profile

data/lib/omnibus/s3_helpers.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "aws-sdk"
+require "aws-sdk-s3"
 require "aws-sdk-core/credentials"
 require "aws-sdk-core/shared_credentials"
 require "base64"
@@ -68,7 +68,7 @@ module Omnibus
       #
       def resource_params
         params = {
-          use_accelerate_endpoint:  s3_configuration[:use_accelerate_endpoint],
+          use_accelerate_endpoint: s3_configuration[:use_accelerate_endpoint],
           force_path_style: s3_configuration[:force_path_style],
         }
 
@@ -93,6 +93,9 @@ module Omnibus
           Aws::SharedCredentials.new(profile_name: s3_configuration[:profile])
         elsif s3_configuration[:access_key_id] && s3_configuration[:secret_access_key]
           Aws::Credentials.new(s3_configuration[:access_key_id], s3_configuration[:secret_access_key])
+        else
+          # No credentials specified, only public data will be retrievable
+          Aws::Credentials.new(nil, nil)
         end
       end
 
@@ -126,7 +129,7 @@ module Omnibus
       # @param [String] content_md5
       # @param [String] acl
       #
-      # @return [true]
+      # @return [Aws::S3::Object]
       #
       def store_object(key, content, content_md5, acl)
         bucket.put_object({
@@ -135,7 +138,6 @@ module Omnibus
           content_md5: to_base64_digest(content_md5),
           acl: acl,
         })
-        true
       end
 
       #

data/lib/omnibus/software.rb

@@ -294,7 +294,7 @@ module Omnibus
         extra_keys = val.keys - [
           :git, :file, :path, :url, # fetcher types
           :md5, :sha1, :sha256, :sha512, # hash type - common to all fetchers
-          :cookie, :warning, :unsafe, :extract, # used by net_fetcher
+          :cookie, :warning, :unsafe, :extract, :cached_name, # used by net_fetcher
           :options, # used by path_fetcher
           :submodules # used by git_fetcher
         ]
@@ -665,11 +665,6 @@ module Omnibus
             "OBJECT_MODE" => "64",
             "ARFLAGS" => "-X64 cru",
           }
-        when "mac_os_x"
-          {
-            "LDFLAGS" => "-L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
-          }
         when "solaris2"
           if platform_version.satisfies?("<= 5.10")
             solaris_flags = {
@@ -700,7 +695,7 @@ module Omnibus
             "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
           }
           # Enable gcc version 4.8 if it is available
-          if which("gcc-4.8")
+          if which("gcc-4.8") && platform_version.satisfies?("< 12")
             suse_flags["CC"] = "gcc-4.8"
             suse_flags["CXX"] = "g++-4.8"
           end
@@ -758,16 +753,16 @@ module Omnibus
         extra_linker_flags["LD_OPTIONS"] = ld_options
       end
 
-      env.merge(compiler_flags).
-        merge(extra_linker_flags).
+      env.merge(compiler_flags)
+        .merge(extra_linker_flags).
         # always want to favor pkg-config from embedded location to not hose
         # configure scripts which try to be too clever and ignore our explicit
         # CFLAGS and LDFLAGS in favor of pkg-config info
         merge({ "PKG_CONFIG_PATH" => "#{install_dir}/embedded/lib/pkgconfig" }).
         # Set default values for CXXFLAGS and CPPFLAGS.
-        merge("CXXFLAGS" => compiler_flags["CFLAGS"]).
-        merge("CPPFLAGS" => compiler_flags["CFLAGS"]).
-        merge("OMNIBUS_INSTALL_DIR" => install_dir)
+        merge("CXXFLAGS" => compiler_flags["CFLAGS"])
+        .merge("CPPFLAGS" => compiler_flags["CFLAGS"])
+        .merge("OMNIBUS_INSTALL_DIR" => install_dir)
     end
     expose :with_standard_compiler_flags
 

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "6.0.1"
+  VERSION = "6.0.24".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -135,6 +135,7 @@ MAC_WHITELIST_LIBS = [
   /libiconv/,
   /libstdc\+\+\.6\.dylib/,
   /libc\+\+\.1\.dylib/,
+  /Security/,
 ].freeze
 
 FREEBSD_WHITELIST_LIBS = [

data/omnibus.gemspec

@@ -6,7 +6,7 @@ require "omnibus/version"
 Gem::Specification.new do |gem|
   gem.name           = "omnibus"
   gem.version        = Omnibus::VERSION
-  gem.license        = "Apache 2.0"
+  gem.license        = "Apache-2.0"
   gem.author         = "Chef Software, Inc."
   gem.email          = "releng@chef.io"
   gem.summary        = "Omnibus is a framework for building self-installing, full-stack software builds."
@@ -15,18 +15,18 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.4"
 
-  gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/*")
+  gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/{*,.kitchen*}")
   gem.bindir = "bin"
   gem.executables = %w{omnibus}
   gem.test_files = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "aws-sdk",          "~> 2"
+  gem.add_dependency "aws-sdk-s3",       "~> 1"
   gem.add_dependency "chef-sugar",       ">= 3.3"
   gem.add_dependency "cleanroom",        "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
-  gem.add_dependency "mixlib-shellout",  "~> 2.0"
-  gem.add_dependency "ohai",             ">= 13", "< 15"
+  gem.add_dependency "mixlib-shellout",  ">= 2.0", "< 4.0"
+  gem.add_dependency "ohai",             ">= 13", "< 16"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_dependency "thor",             "~> 0.18"
   gem.add_dependency "license_scout",    "~> 1.0"
@@ -34,10 +34,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-versioning"
   gem.add_dependency "pedump"
 
-  gem.add_development_dependency "bundler"
   gem.add_development_dependency "artifactory", "~> 2.0"
   gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "= 0.6"
+  gem.add_development_dependency "chefstyle",   "= 0.12"
   gem.add_development_dependency "fauxhai",     ">= 5.2"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"