omnibus 5.4.0 → 5.5.0

data/lib/omnibus/project.rb

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'time'
-require 'ffi_yajl'
-require 'omnibus/manifest'
-require 'omnibus/manifest_entry'
-require 'omnibus/reports'
+require "time"
+require "ffi_yajl"
+require "omnibus/manifest"
+require "omnibus/manifest_entry"
+require "omnibus/reports"
 
 module Omnibus
   class Project
@@ -30,7 +30,7 @@ module Omnibus
       #
       # @return [Project]
       #
-      def load(name, manifest=nil)
+      def load(name, manifest = nil)
         loaded_projects[name] ||= begin
           filepath = Omnibus.project_path(name)
 
@@ -77,7 +77,7 @@ module Omnibus
     include Sugarable
     include Util
 
-    def initialize(filepath = nil, manifest=nil)
+    def initialize(filepath = nil, manifest = nil)
       @filepath = filepath
       @manifest = manifest
     end
@@ -105,7 +105,7 @@ module Omnibus
     #
     def name(val = NULL)
       if null?(val)
-        @name || raise(MissingRequiredAttribute.new(self, :name, 'hamlet'))
+        @name || raise(MissingRequiredAttribute.new(self, :name, "hamlet"))
       else
         @name = val
       end
@@ -177,9 +177,9 @@ module Omnibus
     #
     def install_dir(val = NULL)
       if null?(val)
-        @install_dir || raise(MissingRequiredAttribute.new(self, :install_dir, '/opt/chef'))
+        @install_dir || raise(MissingRequiredAttribute.new(self, :install_dir, "/opt/chef"))
       else
-        @install_dir = val.gsub('\\', '/').squeeze('/').chomp('/')
+        @install_dir = val.tr('\\', "/").squeeze("/").chomp("/")
       end
     end
     expose :install_dir
@@ -197,9 +197,9 @@ module Omnibus
     #
     def default_root
       if windows?
-        'C:'
+        "C:"
       else
-        '/opt'
+        "/opt"
       end
     end
     expose :default_root
@@ -235,7 +235,7 @@ module Omnibus
     #
     def maintainer(val = NULL)
       if null?(val)
-        @maintainer || raise(MissingRequiredAttribute.new(self, :maintainer, 'Chef Software, Inc.'))
+        @maintainer || raise(MissingRequiredAttribute.new(self, :maintainer, "Chef Software, Inc."))
       else
         @maintainer = val
       end
@@ -258,7 +258,7 @@ module Omnibus
     #
     def homepage(val = NULL)
       if null?(val)
-        @homepage || raise(MissingRequiredAttribute.new(self, :homepage, 'https://www.getchef.com'))
+        @homepage || raise(MissingRequiredAttribute.new(self, :homepage, "https://www.getchef.com"))
       else
         @homepage = val
       end
@@ -367,7 +367,7 @@ module Omnibus
     #
     def build_version(val = NULL, &block)
       if block && !null?(val)
-        raise Error, 'You cannot specify additional parameters to ' \
+        raise Error, "You cannot specify additional parameters to " \
           '#build_version when a block is given!'
       end
 
@@ -383,7 +383,6 @@ module Omnibus
     end
     expose :build_version
 
-
     #
     # Set or retrieve the git revision of the omnibus
     # project being built.
@@ -437,7 +436,7 @@ module Omnibus
     #
     def package(id, &block)
       unless block
-        raise InvalidValue.new(:package, 'have a block')
+        raise InvalidValue.new(:package, "have a block")
       end
 
       packagers[id] << block
@@ -490,7 +489,7 @@ module Omnibus
     #
     def package_user(val = NULL)
       if null?(val)
-        @package_user || 'root'
+        @package_user || "root"
       else
         @package_user = val
       end
@@ -537,7 +536,7 @@ module Omnibus
     #
     def package_group(val = NULL)
       if null?(val)
-        @package_group || Ohai['root_group'] || 'root'
+        @package_group || Ohai["root_group"] || "root"
       else
         @package_group = val
       end
@@ -711,7 +710,7 @@ module Omnibus
     #
     def license(val = NULL)
       if null?(val)
-        @license || 'Unspecified'
+        @license || "Unspecified"
       else
         @license = val
       end
@@ -776,7 +775,7 @@ module Omnibus
       if null?(path)
         @json_manifest_path || File.join(install_dir, "version-manifest.json")
       else
-        @json_manifest_path=path
+        @json_manifest_path = path
       end
     end
     expose :json_manifest_path
@@ -932,12 +931,12 @@ module Omnibus
     end
 
     #
-    # Instantiate a new instance of the best packager for this system.
+    # Instantiate new instances of the best packagers for this system.
     #
-    # @return [~Packager::Base]
+    # @return [[~Packager::Base]]
     #
-    def packager
-      @packager ||= Packager.for_current_system.new(self)
+    def packagers_for_system
+      @packagers_for_system ||= Packager.for_current_system.map { |p| p.new(self) }
     end
 
     #
@@ -1073,20 +1072,21 @@ module Omnibus
       FileUtils.rm_rf(install_dir)
       FileUtils.mkdir_p(install_dir)
 
-      softwares.each do |software|
-        software.build_me
+      Licensing.create_incrementally(self) do |license_collector|
+        softwares.each do |software|
+          software.build_me([license_collector])
+        end
       end
 
       write_json_manifest
       write_text_manifest
-      Licensing.create!(self)
       HealthCheck.run!(self)
       package_me
       compress_me
     end
 
     def write_json_manifest
-      File.open(json_manifest_path, 'w') do |f|
+      File.open(json_manifest_path, "w") do |f|
         f.write(FFI_Yajl::Encoder.encode(built_manifest.to_hash, pretty: true))
       end
     end
@@ -1097,7 +1097,7 @@ module Omnibus
     # omnibus-software.
     #
     def write_text_manifest
-      File.open(text_manifest_path, 'w') do |f|
+      File.open(text_manifest_path, "w") do |f|
         f.puts "#{name} #{build_version}"
         f.puts ""
         f.puts Omnibus::Reports.pretty_version_map(self)
@@ -1118,32 +1118,34 @@ module Omnibus
     #
     #
     def package_me
-      destination = File.expand_path('pkg', Config.project_root)
+      destination = File.expand_path("pkg", Config.project_root)
 
       # Create the destination directory
       unless File.directory?(destination)
         FileUtils.mkdir_p(destination)
       end
 
-      # Evaluate any packager-specific blocks, in order.
-      packagers[packager.id].each do |block|
-        packager.evaluate(&block)
-      end
+      packagers_for_system.each do |packager|
+        # Evaluate any packager-specific blocks, in order.
+        packagers[packager.id].each do |block|
+          packager.evaluate(&block)
+        end
 
-      # Run the actual packager
-      packager.run!
+        # Run the actual packager
+        packager.run!
 
-      # Copy the generated package and metadata back into the workspace
-      package_path = File.join(Config.package_dir, packager.package_name)
-      FileUtils.cp(package_path, destination, preserve: true)
-      FileUtils.cp("#{package_path}.metadata.json", destination, preserve: true)
+        # Copy the generated package and metadata back into the workspace
+        package_path = File.join(Config.package_dir, packager.package_name)
+        FileUtils.cp(package_path, destination, preserve: true)
+        FileUtils.cp("#{package_path}.metadata.json", destination, preserve: true)
+      end
     end
 
     #
     #
     #
     def compress_me
-      destination = File.expand_path('pkg', Config.project_root)
+      destination = File.expand_path("pkg", Config.project_root)
 
       # Create the destination directory
       unless File.directory?(destination)
@@ -1211,7 +1213,7 @@ module Omnibus
         if filepath && File.exist?(filepath)
           update_with_file_contents(digest, filepath)
         else
-          update_with_string(digest, '<DYNAMIC>')
+          update_with_string(digest, "<DYNAMIC>")
         end
 
         digest.hexdigest

data/lib/omnibus/publisher.rb

@@ -76,7 +76,7 @@ module Omnibus
           # the platform map is a simple hash with publish to build platform mappings
           @options[:platform_mappings].each_pair do |build_platform, publish_platforms|
             # Splits `ubuntu-12.04` into `ubuntu` and `12.04`
-            build_platform, build_platform_version = build_platform.rpartition('-') - %w( - )
+            build_platform, build_platform_version = build_platform.rpartition("-") - %w{ - }
 
             # locate the package for the build platform
             packages = build_packages.select do |p|
@@ -92,7 +92,7 @@ module Omnibus
             end
 
             publish_platforms.each do |publish_platform|
-              publish_platform, publish_platform_version = publish_platform.rpartition('-') - %w( - )
+              publish_platform, publish_platform_version = publish_platform.rpartition("-") - %w{ - }
 
               packages.each do |p|
                 # create a copy of our package before mucking with its metadata
@@ -115,7 +115,7 @@ module Omnibus
         end
 
         if publish_packages.empty?
-          log.info(log_key) { 'No packages found, skipping publish' }
+          log.info(log_key) { "No packages found, skipping publish" }
         end
 
         publish_packages

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -14,14 +14,14 @@
 # limitations under the License.
 #
 
-require 'uri'
-require 'benchmark'
+require "uri"
+require "benchmark"
 
 module Omnibus
   class ArtifactoryPublisher < Publisher
     def publish(&block)
-      log.info(log_key) { 'Starting artifactory publisher' }
-      safe_require('artifactory')
+      log.info(log_key) { "Starting artifactory publisher" }
+      safe_require("artifactory")
 
       packages.each do |package|
         # Make sure the package is good to go!
@@ -40,7 +40,7 @@ module Omnibus
             artifact_for(package).upload(
               repository,
               remote_path,
-              properties,
+              properties
             )
             # Upload the package's assoacited `*.metadata.json` file
             log.info(log_key) { "Uploading '#{package.name}.metadata.json'" }
@@ -49,12 +49,12 @@ module Omnibus
               "#{remote_path}.metadata.json",
               # *.metadata.json files should not include
               # the checksum properties
-              properties.dup.delete_if { |k,v| k =~ /^omnibus\.(md5|sha)/ },
+              properties.dup.delete_if { |k, v| k =~ /^omnibus\.(md5|sha)/ }
             )
           end
         rescue Artifactory::Error::HTTPError => e
           if (retries -= 1) != 0
-            log.info(log_key) { "Upload failed with exception: #{e}"}
+            log.info(log_key) { "Upload failed with exception: #{e}" }
             log.info(log_key) { "Retrying failed publish #{retries} more time(s)..." }
             retry
           else
@@ -62,10 +62,10 @@ module Omnibus
           end
         end
 
-        log.debug(log_key)  { "Elapsed time to publish #{package.name}:  #{1000*upload_time} ms" }
+        log.debug(log_key) { "Elapsed time to publish #{package.name}:  #{1000 * upload_time} ms" }
 
         # If a block was given, "yield" the package to the caller
-        block.call(package) if block
+        yield(package) if block
       end
 
       if build_record?
@@ -95,8 +95,8 @@ module Omnibus
         local_path: artifact.path,
         client:     client,
         checksums: {
-          'md5'  => md5,
-          'sha1' => sha1,
+          "md5"  => md5,
+          "sha1" => sha1,
         }
       )
     end
@@ -122,7 +122,7 @@ module Omnibus
                      # we already know the `version_manifest` entry is
                      # missing so we can't pull in the `build_git_revision`
                      nil,
-                     metadata[:license],
+                     metadata[:license]
                    )
                  end
 
@@ -135,40 +135,40 @@ module Omnibus
         number: manifest.build_version,
         vcs_revision: manifest.build_git_revision,
         build_agent: {
-          name: 'omnibus',
+          name: "omnibus",
           version: Omnibus::VERSION,
         },
         properties: default_properties.merge(
-          'omnibus.project'            => name,
-          'omnibus.version'            => manifest.build_version,
-          'omnibus.build_git_revision' => manifest.build_git_revision,
-          'omnibus.license'            => manifest.license,
+          "omnibus.project"            => name,
+          "omnibus.version"            => manifest.build_version,
+          "omnibus.build_git_revision" => manifest.build_git_revision,
+          "omnibus.license"            => manifest.license
         ),
         modules: [
           {
             # com.getchef:chef-server:12.0.0
             id: [
-              Config.artifactory_base_path.gsub('/', '.'),
+              Config.artifactory_base_path.tr("/", "."),
               name,
               manifest.build_version,
-            ].join(':'),
+            ].join(":"),
             artifacts: packages.map do |package|
               [
                 {
-                  type: File.extname(package.path).split('.').last,
+                  type: File.extname(package.path).split(".").last,
                   sha1: package.metadata[:sha1],
                   md5:  package.metadata[:md5],
                   name: package.metadata[:basename],
                 },
                 {
-                  type: File.extname(package.metadata.path).split('.').last,
+                  type: File.extname(package.metadata.path).split(".").last,
                   sha1: digest(package.metadata.path, :sha1),
                   md5:  digest(package.metadata.path, :md5),
                   name: File.basename(package.metadata.path),
-                }
+                },
               ]
-            end.flatten
-          }
+            end.flatten,
+          },
         ]
       )
     end
@@ -203,7 +203,7 @@ module Omnibus
         proxy_username: Config.artifactory_proxy_username,
         proxy_password: Config.artifactory_proxy_password,
         proxy_address:  Config.artifactory_proxy_address,
-        proxy_port:     Config.artifactory_proxy_port,
+        proxy_port:     Config.artifactory_proxy_port
       )
     end
 
@@ -217,21 +217,21 @@ module Omnibus
     #
     def metadata_properties_for(package)
       metadata = {
-        '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]
+        "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],
       }.tap do |h|
         if build_record?
-          h['build.name'] = package.metadata[:name]
-          h['build.number'] = package.metadata[:version]
+          h["build.name"] = package.metadata[:name]
+          h["build.number"] = package.metadata[:version]
         end
       end
 
@@ -276,7 +276,7 @@ module Omnibus
         package.metadata[:version],
         package.metadata[:platform],
         package.metadata[:platform_version],
-        package.metadata[:basename],
+        package.metadata[:basename]
       )
     end
   end

data/lib/omnibus/publishers/s3_publisher.rb

@@ -14,14 +14,14 @@
 # limitations under the License.
 #
 
-require 'omnibus/s3_helpers'
+require "omnibus/s3_helpers"
 
 module Omnibus
   class S3Publisher < Publisher
     include S3Helpers
 
     def publish(&block)
-      log.info(log_key) { 'Starting S3 publisher' }
+      log.info(log_key) { "Starting S3 publisher" }
 
       packages.each do |package|
         # Make sure the package is good to go!
@@ -39,7 +39,7 @@ module Omnibus
                      package.metadata[:md5], access_policy)
 
         # If a block was given, "yield" the package to the caller
-        block.call(package) if block
+        yield(package) if block
       end
     end
 
@@ -71,7 +71,7 @@ module Omnibus
         package.metadata[:platform_version],
         package.metadata[:arch],
         package.name,
-        *stuff,
+        *stuff
       )
     end
 
@@ -84,10 +84,10 @@ module Omnibus
     #   the access policy
     #
     def access_policy
-      if @options[:acl].to_s == 'public'
-        'public-read'
+      if @options[:acl].to_s == "public"
+        "public-read"
       else
-        'private'
+        "private"
       end
     end
   end

data/lib/omnibus/reports.rb

@@ -39,7 +39,7 @@ module Omnibus
     end
 
     def pretty_version_map(project)
-      out = ''
+      out = ""
       version_map = project.library.version_map
 
       # Pull out data to print out
@@ -52,20 +52,20 @@ module Omnibus
       overridden_versions = non_nil_values(version_map.values.select { |v| v[:overridden] }, :default_version)
 
       # Determine how wide the printed table columns need to be
-      name_width = column_width(version_map.keys, 'Component')
-      version_width = column_width(versions, 'Installed Version')
-      guid_width = column_width(guids, 'Version GUID')
-      override_width = column_width(overridden_versions, 'Overridden From')
+      name_width = column_width(version_map.keys, "Component")
+      version_width = column_width(versions, "Installed Version")
+      guid_width = column_width(guids, "Version GUID")
+      override_width = column_width(overridden_versions, "Overridden From")
 
       total_width = name_width + version_width + guid_width + override_width
-      divider = '-' * total_width
+      divider = "-" * total_width
 
       # Print out the column headers
-      out << 'Component'.ljust(name_width)
-      out << 'Installed Version'.ljust(version_width)
-      out << 'Version GUID'.ljust(guid_width)
+      out << "Component".ljust(name_width)
+      out << "Installed Version".ljust(version_width)
+      out << "Version GUID".ljust(guid_width)
       # Only print out column if something was overridden
-      out << 'Overridden From'.ljust(override_width) if override_width > 0
+      out << "Overridden From".ljust(override_width) if override_width > 0
       out << "\n"
       out << divider << "\n"
 

data/lib/omnibus/s3_cache.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require 'fileutils'
-require 'omnibus/s3_helpers'
+require "fileutils"
+require "omnibus/s3_helpers"
 
 module Omnibus
   class S3Cache
@@ -76,14 +76,14 @@ module Omnibus
           log.info(log_key) do
             "Caching '#{fetcher.downloaded_file}' to '#{Config.s3_bucket}/#{key}'"
           end
-          
+
           # Fetcher has already verified the downloaded file in software.fetch.
           # Compute the md5 from scratch because the fetcher may have been
           # specified with a different hashing algorithm.
           md5 = digest(fetcher.downloaded_file, :md5)
 
-          File.open(fetcher.downloaded_file, 'rb') do |file|
-            store_object(key, file, md5, 'public-read')
+          File.open(fetcher.downloaded_file, "rb") do |file|
+            store_object(key, file, md5, "public-read")
           end
         end
 
@@ -126,7 +126,7 @@ module Omnibus
         end
 
         unless software.fetcher.checksum
-          raise InsufficientSpecification.new('source md5 checksum', software)
+          raise InsufficientSpecification.new("source md5 checksum", software)
         end
 
         "#{software.name}-#{software.version}-#{software.fetcher.checksum}"
@@ -139,7 +139,7 @@ module Omnibus
           region:               Config.s3_region,
           access_key_id:        Config.s3_access_key,
           secret_access_key:    Config.s3_secret_key,
-          bucket_name:          Config.s3_bucket
+          bucket_name:          Config.s3_bucket,
         }
       end
 

data/lib/omnibus/s3_helpers.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require 'aws-sdk'
-require 'base64'
+require "aws-sdk"
+require "base64"
 
 module Omnibus
   module S3Helpers
@@ -25,9 +25,10 @@ module Omnibus
 
     module InstanceMethods
       private
+
       #
       # Returns the configuration for S3. You must provide keys
-      # :region, 
+      # :region,
       #
       # @example
       #   {
@@ -65,11 +66,11 @@ module Omnibus
         @s3_bucket ||= begin
                          bucket = client.bucket(s3_configuration[:bucket_name])
                          unless bucket.exists?
-                           bucket_config = if s3_configuration[:region] == 'us-east-1'
+                           bucket_config = if s3_configuration[:region] == "us-east-1"
                                              nil
                                            else
                                              {
-                                               location_constraint: s3_configuration[:region]
+                                               location_constraint: s3_configuration[:region],
                                              }
                                            end
                            bucket.create(create_bucket_configuration: bucket_config)
@@ -93,7 +94,7 @@ module Omnibus
           key: key,
           body: content,
           content_md5: to_base64_digest(content_md5),
-          acl: acl
+          acl: acl,
         })
         true
       end
@@ -110,7 +111,7 @@ module Omnibus
       #
       def to_base64_digest(content_md5)
         if content_md5
-          md5_digest = content_md5.unpack('a2'*16).collect {|i| i.hex.chr }.join
+          md5_digest = content_md5.unpack("a2" * 16).collect { |i| i.hex.chr }.join
           Base64.encode64(md5_digest).strip
         end
       end

data/lib/omnibus/semantic_version.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require 'mixlib/versioning'
+require "mixlib/versioning"
 
 module Omnibus
   class SemanticVersion