omnibus 5.5.0 → 5.6.0

data/lib/omnibus/project.rb

@@ -368,7 +368,7 @@ module Omnibus
     def build_version(val = NULL, &block)
       if block && !null?(val)
         raise Error, "You cannot specify additional parameters to " \
-          '#build_version when a block is given!'
+          "#build_version when a block is given!"
       end
 
       if block
@@ -1034,7 +1034,7 @@ module Omnibus
     # @return [1, 0, -1]
     #
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
 
     #
@@ -1076,6 +1076,9 @@ module Omnibus
         softwares.each do |software|
           software.build_me([license_collector])
         end
+
+        # If nothing has dirtied the cache, checkout the last cache dir
+        restore_complete_build unless dirty?
       end
 
       write_json_manifest
@@ -1085,6 +1088,13 @@ module Omnibus
       compress_me
     end
 
+    def restore_complete_build
+      if Config.use_git_caching
+        log.info(log_key) { "Cache not dirtied, restoring last marker" }
+        GitCache.new(softwares.last).restore_from_cache
+      end
+    end
+
     def write_json_manifest
       File.open(json_manifest_path, "w") do |f|
         f.write(FFI_Yajl::Encoder.encode(built_manifest.to_hash, pretty: true))
@@ -1189,7 +1199,7 @@ module Omnibus
     # @return [true, false]
     #
     def ==(other)
-      self.hash == other.hash
+      hash == other.hash
     end
     alias_method :eql?, :==
 

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -138,12 +138,6 @@ module 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
-        ),
         modules: [
           {
             # com.getchef:chef-server:12.0.0
@@ -228,6 +222,10 @@ module Omnibus
         "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

@@ -46,12 +46,17 @@ module Omnibus
     private
 
     def s3_configuration
-      {
+      config = {
         region:            @options[:region],
-        access_key_id:     Config.publish_s3_access_key,
-        secret_access_key: Config.publish_s3_secret_key,
         bucket_name:       @options[:bucket],
       }
+
+      if Config.publish_s3_profile
+        config[:profile]            = Config.publish_s3_profile
+      else
+        config[:access_key_id]      = Config.publish_s3_access_key
+        config[:secret_access_key]  = Config.publish_s3_secret_key
+      end
     end
 
     #

data/lib/omnibus/reports.rb

@@ -25,7 +25,7 @@ module Omnibus
     # will be stored in the column, the width is 0 (i.e., nothing
     # should be printed, not even the column header)
     def column_width(items, column_name)
-      widest_item = items.max { |a, b| a.size <=> b.size }
+      widest_item = items.max_by(&:size)
       if widest_item
         widest = (widest_item.size >= column_name.size) ? widest_item : column_name
         widest.size + PADDING

data/lib/omnibus/s3_cache.rb

@@ -132,15 +132,28 @@ module Omnibus
         "#{software.name}-#{software.version}-#{software.fetcher.checksum}"
       end
 
+      def url_for(software)
+        client.bucket(Config.s3_bucket).object(S3Cache.key_for(software)).public_url
+      end
+
       private
 
       def s3_configuration
-        {
-          region:               Config.s3_region,
-          access_key_id:        Config.s3_access_key,
-          secret_access_key:    Config.s3_secret_key,
-          bucket_name:          Config.s3_bucket,
+        config = {
+          region:                   Config.s3_region,
+          bucket_name:              Config.s3_bucket,
+          endpoint:                 Config.s3_endpoint,
+          use_accelerate_endpoint:  Config.s3_accelerate,
         }
+
+        if Config.s3_profile
+          config[:profile] = Config.s3_profile
+        else
+          config[:access_key_id] = Config.s3_access_key,
+          config[:secret_access_key] = Config.s3_secret_key
+        end
+
+        config
       end
 
       #

data/lib/omnibus/s3_helpers.rb

@@ -15,6 +15,8 @@
 #
 
 require "aws-sdk"
+require "aws-sdk-core/credentials"
+require "aws-sdk-core/shared_credentials"
 require "base64"
 
 module Omnibus
@@ -32,10 +34,10 @@ module Omnibus
       #
       # @example
       #   {
-      #     region:               'us-east-1',
-      #     access_key_id:        Config.s3_access_key,
-      #     secret_access_key:    Config.s3_secret_key,
-      #     bucket_name:          Config.s3_bucket
+      #     region:                   'us-east-1',
+      #     bucket_name:              Config.s3_bucket,
+      #     endpoint:                 Config.s3_endpoint,
+      #     use_accelerate_endpoint:  Config.s3_accelerate
       #   }
       #
       # @return [Hash<String, String>]
@@ -50,11 +52,46 @@ module Omnibus
       # @return [Aws::S3::Resource]
       #
       def client
-        @s3_client ||= Aws::S3::Resource.new(
-          region:            s3_configuration[:region],
-          access_key_id:     s3_configuration[:access_key_id],
-          secret_access_key: s3_configuration[:secret_access_key]
+        Aws.config.update(
+          region: s3_configuration[:region],
+          credentials: get_credentials
         )
+
+        @s3_client ||= Aws::S3::Resource.new(resource_params)
+      end
+
+      #
+      # S3 Resource Parameters
+      #
+      # @return [Hash]
+      #
+      def resource_params
+        params = {
+          use_accelerate_endpoint:  s3_configuration[:use_accelerate_endpoint],
+        }
+
+        if s3_configuration[:use_accelerate_endpoint]
+          params[:endpoint] = "https://s3-accelerate.amazonaws.com"
+        end
+
+        if s3_configuration[:endpoint]
+          params[:endpoint] = s3_configuration[:endpoint]
+        end
+
+        params
+      end
+
+      #
+      # Create credentials object based on credential profile or access key
+      # parameters for use by the client object.
+      #
+      # @return [Aws::SharedCredentials, Aws::Credentials]
+      def get_credentials
+        if s3_configuration[:profile]
+          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])
+        end
       end
 
       #

data/lib/omnibus/software.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012 Chef Software, Inc.
+# Copyright 2012-2017, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ module Omnibus
     # @return [1, 0, -1]
     #
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
 
     #
@@ -399,6 +399,39 @@ module Omnibus
     end
     expose :skip_transitive_dependency_licensing
 
+    #
+    # Set or retrieve licensing information of the dependencies.
+    # The information set is not validated or inspected. It is directly
+    #   passed to LicenseScout.
+    #
+    # @example
+    # dependency_licenses [
+    #   {
+    #     dependency_name: "logstash-output-websocket",
+    #     dependency_manager: "logstash_plugin",
+    #     license: "Apache-2.0",
+    #     license_file: [
+    #       "relative/path/to/license/file",
+    #       "https://download.elastic.co/logstash/LICENSE"
+    #     ]
+    #   },
+    #   ...
+    # ]
+    #
+    # @param [Hash] val
+    # @param [Array<Hash>] val
+    #   dependency license information.
+    # @return [Array<Hash>]
+    #
+    def dependency_licenses(val = NULL)
+      if null?(val)
+        @dependency_licenses || nil
+      else
+        @dependency_licenses = Array(val)
+      end
+    end
+    expose :dependency_licenses
+
     #
     # Evaluate a block only if the version matches.
     #
@@ -454,7 +487,7 @@ module Omnibus
       rescue ArgumentError
         log.warn(log_key) do
           "Version #{final_version} for software #{name} was not parseable. " \
-          'Comparison methods such as #satisfies? will not be available for this version.'
+          "Comparison methods such as #satisfies? will not be available for this version."
         end
         final_version
       end
@@ -644,7 +677,7 @@ module Omnibus
               # http://lists.gnu.org/archive/html/bug-libtool/2005-10/msg00004.html
               "CC" => "gcc -static-libgcc",
               "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
-              "CFLAGS" => "-I#{install_dir}/embedded/include",
+              "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
             }
           elsif platform_version.satisfies?(">= 5.11")
             solaris_flags = {
@@ -670,6 +703,17 @@ module Omnibus
             freebsd_flags["CXX"] = "clang++"
           end
           freebsd_flags
+        when "suse"
+          suse_flags = {
+            "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
+            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
+          }
+          # Enable gcc version 4.8 if it is available
+          if which("gcc-4.8")
+            suse_flags["CC"] = "gcc-4.8"
+            suse_flags["CXX"] = "g++-4.8"
+          end
+          suse_flags
         when "windows"
           arch_flag = windows_arch_i386? ? "-m32" : "-m64"
           opt_flag = windows_arch_i386? ? "-march=i686" : "-march=x86-64"
@@ -684,13 +728,7 @@ module Omnibus
             # soon as gcc emits aligned SSE xmm register spills which generate
             # GPEs and terminate the application very rudely with very little
             # to debug with.
-            #
-            # TODO: This was true of our old TDM gcc 4.7 compilers. Is it still
-            # true with mingw-w64?
-            #
-            # XXX: Temporarily turning -O3 into -O2 -fno-lto to work around some
-            # weird linker issues.
-            "CFLAGS" => "-I#{install_dir}/embedded/include #{arch_flag} -O2 -fno-lto #{opt_flag}",
+            "CFLAGS" => "-I#{install_dir}/embedded/include #{arch_flag} -O3 #{opt_flag}",
           }
         else
           {
@@ -737,7 +775,8 @@ module Omnibus
         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("CPPFLAGS" => compiler_flags["CFLAGS"]).
+        merge("OMNIBUS_INSTALL_DIR" => install_dir)
     end
     expose :with_standard_compiler_flags
 
@@ -920,6 +959,7 @@ module Omnibus
 
       @overrides
     end
+    expose :overrides
 
     #
     # Determine if this software version overridden externally, relative to the
@@ -996,9 +1036,9 @@ module Omnibus
     def fetcher
       @fetcher ||=
         if source_type == :url && File.basename(source[:url], "?*").end_with?(*NetFetcher::ALL_EXTENSIONS)
-          Fetcher.fetcher_class_for_source(self.source).new(manifest_entry, fetch_dir, build_dir)
+          Fetcher.fetcher_class_for_source(source).new(manifest_entry, fetch_dir, build_dir)
         else
-          Fetcher.fetcher_class_for_source(self.source).new(manifest_entry, project_dir, build_dir)
+          Fetcher.fetcher_class_for_source(source).new(manifest_entry, project_dir, build_dir)
         end
     end
 
@@ -1080,7 +1120,7 @@ module Omnibus
     # @return [true, false]
     #
     def ==(other)
-      self.hash == other.hash
+      hash == other.hash
     end
     alias_method :eql?, :==
 
@@ -1124,28 +1164,6 @@ module Omnibus
       @git_cache ||= GitCache.new(self)
     end
 
-    #
-    # The proper platform-specific "$PATH" key.
-    #
-    # @return [String]
-    #
-    def path_key
-      # The ruby devkit needs ENV['Path'] set instead of ENV['PATH'] because
-      # $WINDOWSRAGE, and if you don't set that your native gem compiles
-      # will fail because the magic fixup it does to add the mingw compiler
-      # stuff won't work.
-      #
-      # Turns out there is other build environments that only set ENV['PATH'] and if we
-      # modify ENV['Path'] then it ignores that.  So, we scan ENV and returns the first
-      # one that we find.
-      #
-      if Ohai["platform"] == "windows"
-        ENV.keys.grep(/\Apath\Z/i).first
-      else
-        "PATH"
-      end
-    end
-
     #
     # Apply overrides in the @overrides hash that mask instance variables
     # that are set by parsing the DSL

data/lib/omnibus/sugarable.rb

@@ -67,5 +67,9 @@ module Omnibus
     def windows_arch_i386?
       Config.windows_arch.to_sym == :x86
     end
+
+    def fips_mode?
+      !!Config.fips_mode
+    end
   end
 end

data/lib/omnibus/templating.rb

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 require "erb"
 
 module Omnibus
@@ -23,6 +22,32 @@ module Omnibus
       base.send(:include, Logging)
     end
 
+    #
+    # Render an erb template to a String variable.
+    #
+    # @return [String]
+    #
+    # @param [String] source
+    #   the path on disk where the ERB template lives
+    #
+    # @option options [Fixnum] :mode (default: +0644+)
+    #   the mode of the rendered file
+    # @option options [Hash] :variables (default: +{}+)
+    #   the list of variables to pass to the template
+    #
+    def render_template_content(source, variables = {})
+      template = ERB.new(File.read(source), nil, "-")
+
+      struct =
+        if variables.empty?
+          Struct.new("Empty")
+        else
+          Struct.new(*variables.keys).new(*variables.values)
+        end
+
+      template.result(struct.instance_eval { binding })
+    end
+
     #
     # Render an erb template on disk at +source+. If the +:destination+ option
     # is given, the file will be rendered at +:destination+, otherwise the
@@ -41,8 +66,7 @@ module Omnibus
     #
     def render_template(source, options = {})
       destination = options.delete(:destination) || source.chomp(".erb")
-
-      mode      = options.delete(:mode) || 0644
+      mode = options.delete(:mode) || 0644
       variables = options.delete(:variables) || {}
 
       log.info(log_key) { "Rendering `#{source}' to `#{destination}'" }
@@ -52,16 +76,8 @@ module Omnibus
           "Unknown option(s): #{options.keys.map(&:inspect).join(', ')}"
       end
 
-      template = ERB.new(File.read(source), nil, "-")
-
-      struct =
-        if variables.empty?
-          Struct.new("Empty")
-        else
-          Struct.new(*variables.keys).new(*variables.values)
-        end
-
-      result = template.result(struct.instance_eval { binding })
+      # String value returned from #render_template_content
+      result = render_template_content(source, variables)
 
       File.open(destination, "w", mode) do |file|
         file.write(result)