omnibus 4.0.0 → 4.1.0

data/lib/omnibus/generator_files/README.md.erb

@@ -63,6 +63,23 @@ Full help for the Omnibus command line interface can be accessed with the
 $ bin/omnibus help
 ```
 
+Version Manifest
+----------------
+
+Git-based software definitions may specify branches as their
+default_version. In this case, the exact git revision to use will be
+determined at build-time unless a project override (see below) or
+external version manifest is used.  To generate a version manifest use
+the `omnibus manifest` command:
+
+```
+omnibus manifest PROJECT -l warn
+```
+
+This will output a JSON-formatted manifest containing the resolved
+version of every software definition.
+
+
 Kitchen-based Build Environment
 -------------------------------
 Every Omnibus project ships will a project-specific

data/lib/omnibus/generator_files/omnibus.rb.erb

@@ -40,8 +40,14 @@
 # solaris_compiler 'gcc'
 # build_retries 5
 # fetcher_read_timeout 120
+# fetcher_retries 5
 
 # Load additional software
 # ------------------------------
 # software_gems ['omnibus-software', 'my-company-software']
 # local_software_dirs ['/path/to/local/software']
+
+# Windows architecture defaults
+# ------------------------------
+windows_arch   %w{x86 x64}.include?((ENV['OMNIBUS_WINDOWS_ARCH'] || '').downcase) ?
+                 ENV['OMNIBUS_WINDOWS_ARCH'].downcase.to_sym : :x86

data/lib/omnibus/git_repository.rb

@@ -0,0 +1,43 @@
+require 'omnibus/util'
+
+module Omnibus
+  class GitRepository
+    include Util
+
+    def initialize(path='./')
+      @repo_path = path
+    end
+
+    def authors(start_ref, end_ref)
+      formatted_log_between(start_ref, end_ref, '%aN').lines.map(&:chomp).uniq
+    end
+
+    def commit_messages(start_ref, end_ref)
+      formatted_log_between(start_ref, end_ref, '%B').lines.to_a
+    end
+
+    def revision
+      git("rev-parse HEAD").strip
+    end
+
+    def latest_tag
+      git('describe --abbrev=0').chomp
+    end
+
+    def file_at_revision(path, revision)
+      git("show #{revision}:#{path}")
+    end
+
+    private
+
+    attr_reader :repo_path
+
+    def formatted_log_between(start_ref, end_ref, format)
+      git("log #{start_ref}..#{end_ref} --pretty=\"format:#{format}\"")
+    end
+
+    def git(cmd)
+      shellout!("git #{cmd}", :cwd => repo_path).stdout
+    end
+  end
+end

data/lib/omnibus/health_check.rb

@@ -72,12 +72,14 @@ module Omnibus
       /libmd5\.so/,
       /libmd\.so/,
       /libmp\.so/,
+      /libresolv\.so/,
       /libscf\.so/,
       /libsec\.so/,
       /libsocket\.so/,
       /libssl.so/,
       /libthread.so/,
       /libuutil\.so/,
+      /libkstat\.so/,
       # solaris 11 libraries:
       /libc\.so\.1/,
       /libm\.so\.2/,
@@ -136,6 +138,8 @@ module Omnibus
       /libthr\.so/,
       /libutil\.so/,
       /libelf\.so/,
+      /libkvm\.so/,
+      /libprocstat\.so/,
     ].freeze
 
     class << self
@@ -177,7 +181,7 @@ module Omnibus
         log.warn(log_key) { 'Skipping health check on Windows' }
         return true
       end
-
+      log.info(log_key) {"Running health on #{project.name}"}
       bad_libs =  case Ohai['platform']
                   when 'mac_os_x'
                     health_check_otool

data/lib/omnibus/manifest.rb

@@ -0,0 +1,134 @@
+#
+# Copyright 2015 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'json'
+
+module Omnibus
+  class Manifest
+    class InvalidManifestFormat < Exception; end
+    class NotAManifestEntry < Exception; end
+    class MissingManifestEntry < Exception; end
+
+    include Logging
+
+    LATEST_MANIFEST_FORMAT = 1
+
+    attr_reader :build_version, :build_git_revision
+    def initialize(version=nil, git_rev=nil)
+      @data = {}
+      @build_version = version
+      @build_git_revision = git_rev
+    end
+
+    def entry_for(name)
+      if @data.key?(name)
+        @data[name]
+      else
+        raise MissingManifestEntry, "No manifest entry found for #{name}"
+      end
+    end
+
+    def add(name, entry)
+      if ! entry.is_a? Omnibus::ManifestEntry
+        raise NotAManifestEntry, "#{entry} is not an Omnibus:ManifestEntry"
+      end
+
+      if @data.key?(name)
+        log.warn(log_key) { "Overritting existing manifest entry for #{name}" }
+      end
+
+      @data[name] = entry
+      self
+    end
+
+    def each
+      @data.each do |key, entry|
+        yield entry
+      end
+    end
+
+    def entry_names
+      @data.keys
+    end
+
+    def to_hash
+      software_hash = @data.inject({}) do |memo, (k,v)|
+        memo[k] = v.to_hash
+        memo
+      end
+      ret = {
+        'manifest_format' => LATEST_MANIFEST_FORMAT,
+        'software' => software_hash
+      }
+      ret['build_version'] = build_version if build_version
+      ret['build_git_revision'] = build_git_revision if build_git_revision
+      ret
+    end
+
+    #
+    # The JSON representation of this build manifest.
+    #
+    # @return [String]
+    #
+    def to_json
+      JSON.pretty_generate(to_hash)
+    end
+
+    #
+    # Class Methods
+    #
+
+    def self.from_hash(manifest_data)
+      case manifest_data['manifest_format'].to_i
+      when 1
+        from_hash_v1(manifest_data)
+      else
+        raise InvalidManifestFormat, "Unknown manifest fromat version: #{manifest_data['manifest_format']}"
+      end
+    end
+
+    def self.from_hash_v1(manifest_data)
+      m = Omnibus::Manifest.new(manifest_data['build_version'], manifest_data['build_git_revision'])
+      manifest_data['software'].each do |name, entry_data|
+        m.add(name, Omnibus::ManifestEntry.new(name, keys_to_syms(entry_data)))
+      end
+      m
+    end
+
+    def self.from_file(filename)
+      from_hash(JSON.parse(File.read(File.expand_path(filename))))
+    end
+
+    private
+
+    #
+    # Utility function to convert a Hash with String keys to a Hash
+    # with Symbol keys, recursively.
+    #
+    # @returns [Hash]
+    #
+    def self.keys_to_syms(h)
+      h.inject({}) do |memo, (k, v)|
+        memo[k.to_sym] = if v.is_a? Hash
+                           keys_to_syms(v)
+                         else
+                           v
+                         end
+        memo
+      end
+    end
+  end
+end

data/lib/omnibus/manifest_diff.rb

@@ -0,0 +1,88 @@
+module Omnibus
+  class EmptyManifestDiff
+    def updated
+      []
+    end
+
+    def added
+      []
+    end
+
+    def removed
+      []
+    end
+
+    def empty?
+      true
+    end
+  end
+
+  class ManifestDiff
+    def initialize(first, second)
+      @first = first
+      @second = second
+    end
+
+    def updated
+      @updated ||=
+        begin
+          (first.entry_names & second.entry_names).collect do |name|
+          diff(first.entry_for(name), second.entry_for(name))
+        end.compact
+        end
+    end
+
+    def removed
+      @removed ||=
+        begin
+          (first.entry_names - second.entry_names).collect do |name|
+          removed_entry(first.entry_for(name))
+        end
+        end
+    end
+
+    def added
+      @added ||=
+        begin
+          (second.entry_names - first.entry_names).collect do |name|
+          new_entry(second.entry_for(name))
+        end
+        end
+    end
+
+    def empty?
+      updated.empty? && removed.empty? && added.empty?
+    end
+
+    private
+
+    attr_reader :first, :second
+
+    def new_entry(entry)
+      { name: entry.name,
+        new_version: entry.locked_version,
+        source_type: entry.source_type,
+        source: entry.locked_source }
+    end
+
+
+    def removed_entry(entry)
+      { name: entry.name,
+        old_version: entry.locked_version,
+        source_type: entry.source_type,
+        source: entry.locked_source }
+    end
+
+    def diff(a, b)
+      if a == b
+        nil
+      else
+        { name: b.name,
+          old_version: a.locked_version,
+          new_version: b.locked_version,
+          source_type: b.source_type,
+          source: b.locked_source }
+      end
+    end
+  end
+end

data/lib/omnibus/manifest_entry.rb

@@ -0,0 +1,43 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Omnibus
+  class ManifestEntry
+    attr_reader :locked_version, :locked_source, :source_type, :described_version, :name
+    def initialize(name, manifest_data)
+      @name = name
+      @locked_version = manifest_data[:locked_version]
+      @locked_source = manifest_data[:locked_source]
+      @source_type = manifest_data[:source_type]
+      @described_version = manifest_data[:described_version]
+    end
+
+    def to_hash
+      {
+        "locked_version" => @locked_version,
+        "locked_source" => @locked_source,
+        "source_type" => @source_type,
+        "described_version" => @described_version
+      }
+    end
+
+    def ==(other)
+      if other.is_a?(ManifestEntry)
+        (self.to_hash == other.to_hash) && (self.name == other.name)
+      end
+    end
+  end
+end

data/lib/omnibus/metadata.rb

@@ -108,7 +108,11 @@ module Omnibus
       # @return [String]
       #
       def arch
-        Ohai['kernel']['machine']
+        if (Ohai['platform'] == 'windows') && (Config.windows_arch.to_sym == :x86)
+          'i386'
+        else
+          Ohai['kernel']['machine']
+        end
       end
 
       #
@@ -176,6 +180,10 @@ module Omnibus
           #
           #  http://www.jrsoftware.org/ishelp/index.php?topic=winvernotes
           #
+          # Microsoft's version listing (more general than the above) is here:
+          #
+          # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx
+          #
           case platform_version
           when '5.0.2195', '2000'   then '2000'
           when '5.1.2600', 'xp'     then 'xp'
@@ -193,6 +201,7 @@ module Omnibus
           # version is the same as Windows 8.1. It's only here for completeness
           # and documentation.
           when /6\.3\.\d+/, '2012r2' then '2012r2'
+          when /^10\.0/ then '10'
           else
             raise UnknownPlatformVersion.new(platform, platform_version)
           end
@@ -253,6 +262,15 @@ module Omnibus
       true
     end
 
+    #
+    # Hash representation of this metadata.
+    #
+    # @return [Hash]
+    #
+    def to_hash
+      @data.dup
+    end
+
     #
     # The JSON representation of this metadata.
     #

data/lib/omnibus/package.rb

@@ -103,6 +103,15 @@ module Omnibus
       @metadata ||= Metadata.for_package(self)
     end
 
+    #
+    # Set the metadata for this package
+    #
+    # @param [Metadata] metadata
+    #
+    def metadata=(metadata)
+      @metadata = metadata
+    end
+
     #
     # Validate the presence of the required components for the package.
     #