omnibus 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTI1NmVlOGQxN2VlMDU1M2VhMDU1NDA3ZjI3M2QxZmI0YzcwNTIyMQ==
+    MmE1YTFhZDlhZTEyOGJlMzFiNTc2YzY0OWU2NTYxODVlOGVkNWZkMg==
   data.tar.gz: !binary |-
-    MjhhMDNhYTVmZGYyZTE2MDFiMmIyZmEwZmI2MzM1YjYwZTZlZTFmYw==
+    OWVkZDk0ZTg4OTNiODU4OWQwYzU5ZDRkMmMxMzM1ODM5OGZiYWRjZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTY5N2NiNGM4MmE2MDVhZDNiNzc3Y2Y3OWM2NDllMjE4MTQyY2ViZTkxNmVj
-    ZGVkY2I0NTgxODdmMmFmNTViY2RkNDdiNmJiNjA5MWE5MjQ5ZmUyOGU4YjU1
-    ZDNiYTEwOGEyNzliZmRjMGVlYjdjNjkzYzgwOWIzMzU4MTU0MzI=
+    MWEyOWQyZDNkMWNjZDNmNmExODE5OWNhNDRiZDVkOTQyYzg4NjZhZWNkZDVl
+    MGY2OWMxMWFlNzljMWJkZDY2ODExYjIwZjEwN2NmODM1ZDkxZjJjN2FhMDQx
+    ZjliZDA0MWQzYzExNmY4ZmI0MmE4NjA4ZGZmZDU4ZmE5MzA3OTE=
   data.tar.gz: !binary |-
-    MmU3ODFlN2YxMmViYzIzMTZiNTAxZWM2YWVjYTI2NTRhYzk1OTU3MjYwMDAx
-    NmFjZWJhZGYyNGEyZjBkY2QwNGM3ODEzOTQwZjE4YzMwMTg0OWNiNDI1MDg5
-    NWQ1ZWExOTNjNTdmNmRjNTQ1ODljM2RkNWNiMjFmYWI3OGU1YTg=
+    MWQ4Yjg1Mjc3ZTMxNDBjNjk1MGRiZWZlNDk5NWUxOGU0OTQ4Y2NkNTQ2OTVj
+    MjIxZmNhMjY0ZTFhNGVlYzIxOTYwNmNjZTY4MjczODhkYmUyMWFmZGYwOTI1
+    ZGY2ZGExN2ZlODRlNWE2YzBlMjUxYjY1NmZmOWY1YTU0MjNiNmU=

data/.yardopts

@@ -4,4 +4,3 @@
 -
 CHANGELOG.md
 LICENSE
-TODO.md

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 1.0.4 (May 23, 2013)
+
+FEATURES:
+
+* Add `release package` command which releases a single package with associated 
+  metadata file to a single S3 bucket.
+* Arch Linux health check whitelist support
+
+IMPROVEMENTS:
+
+* Add libstdc++ to Mac whitelist libs - this allows the health check pass when 
+  depending on C++ libs.
+* Change scope of `Omnibus::Library` instance from global to project.
+
+BUG FIXES:
+
+* [CHEF-4214] - projects in multi-project omnibus repositories share dependency scope
+
+
 ## 1.0.3 (May 2, 2013)
 
 FEATURES:

data/README.md

@@ -6,6 +6,12 @@
 Easily create full-stack installers for your project across a variety
 of platforms.
 
+Seth Chisamore and Christopher Maier of Opscode gave an introductory
+talk on Omnibus at ChefConf 2013, entitled **Eat the Whole Bowl:
+Building a Full-Stack Installer with Omnibus**
+([video](http://www.youtube.com/watch?v=q8iJAntXCNY),
+[slides](https://speakerdeck.com/schisamo/eat-the-whole-bowl-building-a-full-stack-installer-with-omnibus)).
+
 ## Prerequisites
 
 Omnibus is designed to run with a minimal set of prerequisites. You'll

data/lib/omnibus.rb

@@ -188,13 +188,10 @@ module Omnibus
       raise ArgumentError, "Overrides argument must be a hash!  You passed #{overrides.inspect}."
     end
 
-    # TODO: Why are we doing a full Cartesian product of (projects x
-    # software) without regard for the actual dependencies of the
-    # projects?
-    software_files.each do |f|
-      Omnibus.projects.each do |p|
+    Omnibus.projects.each do |p|
+      software_files.each do |f|
         s = Omnibus::Software.load(f, p, overrides)
-        Omnibus.component_added(s) if p.dependency?(s)
+        p.library.component_added(s) if p.dependency?(s.name)
       end
     end
   end

data/lib/omnibus/artifact.rb

@@ -0,0 +1,151 @@
+module Omnibus
+  class Artifact
+
+    attr_reader :path
+    attr_reader :platforms
+    attr_reader :config
+
+    # @param path [String] relative or absolute path to a package file.
+    # @param platforms [Array<Array<String, String, String>>] an Array of
+    #   distro, distro version, architecture tuples. By convention, the first
+    #   platform is the platform on which the artifact was built.
+    # @param config [#Hash<Symbol, Object>] configuration for the release.
+    #   Artifact only uses `:build_version => String`.
+    def initialize(path, platforms, config)
+      @path = path
+      @platforms = platforms
+      @config = config
+    end
+
+    # Adds this artifact to the `release_manifest`, which is mutated. Intended
+    # to be used in a visitor-pattern fashion over a collection of Artifacts to
+    # generate a final release manifest.
+    #
+    # @param release_manifest [Hash{ String => Hash }] a version 1 style release
+    #   manifest Hash (see example)
+    #
+    # @example Add the package to release_manifest:
+    #   add_to_release_manifest!( {} )
+    #     "el" => {
+    #       "5" => { "x86_64" => { "11.4.0-1" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm" } }
+    #     }
+    # @return [Hash{String=>Hash}] the updated release manifest.
+    def add_to_release_manifest!(release_manifest)
+      platforms.each do |distro, version, arch|
+        release_manifest[distro] ||= {}
+        release_manifest[distro][version] ||= {}
+        release_manifest[distro][version][arch] = { build_version => relpath }
+        # TODO: when adding checksums, the desired format is like this:
+        # build_support_json[platform][platform_version][machine_architecture][options[:version]]["relpath"] = build_location
+      end
+      release_manifest
+    end
+
+    # Adds this artifact to the `release_manifest`, which is mutated. Intended
+    # to be used in a visitor-pattern fashion over a collection of Artifacts to
+    # generate a final release manifest.
+    #
+    # @param release_manifest [Hash{ String => Hash }] a version 2 style release
+    #   manifest Hash (see example)
+    #
+    # @example Add the package to release_manifest:
+    #   add_to_release_manifest!( {} )
+    #     "el" => {
+    #       "5" => {
+    #         "x86_64" => {
+    #           "11.4.0-1" => {
+    #             "relpath" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm",
+    #             "md5" => "123f00d...",
+    #             "sha256" => 456beef..."
+    #           }
+    #         }
+    #       }
+    #     }
+    # @return [Hash{String=>Hash}] the updated release manifest.
+    def add_to_v2_release_manifest!(release_manifest)
+      platforms.each do |distro, version, arch|
+        pkg_info = {
+          "relpath" => relpath,
+          "md5" => md5,
+          "sha256" => sha256
+        }
+
+        release_manifest[distro] ||= {}
+        release_manifest[distro][version] ||= {}
+        release_manifest[distro][version][arch] = { build_version => pkg_info  }
+      end
+      release_manifest
+    end
+
+    # Metadata about the artifact as a flat Hash.
+    #
+    # @example For a RHEL/CentOS 6, 64-bit package of project version 11.4.0-1
+    #   flat_metadata
+    #     { "platform" => "el",
+    #       "platform_version" => "6",
+    #       "arch" => "x86_64",
+    #       "version" => "11.4.0-1",
+    #       "md5" => "d41d8cd98f00b204e9800998ecf8427e",
+    #       "sha256" => "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }
+    #
+    # @return [Hash{String=>String}] the artifact metadata
+    def flat_metadata
+      distro, version, arch = build_platform
+      {
+        "platform" => distro,
+        "platform_version" => version,
+        "arch" => arch,
+        "version" => build_version,
+        "basename" => File.basename(path),
+        "md5" => md5,
+        "sha256" => sha256
+      }
+    end
+
+    # Platform on which the artifact was built. By convention, this is the
+    # first in the list of platforms passed to {#initialize}.
+    # @return [Array<String, String, String>] an Array of distro, distro
+    #   version, architecture.
+    def build_platform
+      platforms.first
+    end
+
+    # @return [String] build version of the project.
+    def build_version
+      config[:version]
+    end
+
+    # @return [String] relative path at which the artifact should be located
+    #   when uploaded to artifact repo.
+    # @example Chef 11.4.0-1 on 64 bit RHEL 6:
+    #   relpath
+    #     "/el/6/x86_64/chef-11.4.0-1.el5.x86_64.rpm"
+    def relpath
+      # upload build to build platform directory
+      "/#{build_platform.join('/')}/#{path.split('/').last}"
+    end
+
+    # @return [String] hex encoded MD5 of the package
+    def md5
+      @md5 ||= digest(Digest::MD5)
+    end
+
+    # @return [String] hex encoded SHA2-256 of the package
+    def sha256
+      @sha256 ||= digest(Digest::SHA256)
+    end
+
+    private
+
+    def digest(digest_class)
+      digest = digest_class.new
+      File.open(path) do |io|
+        while chunk = io.read(1024 * 8)
+          digest.update(chunk)
+        end
+      end
+      digest.hexdigest
+    end
+  end
+end
+

data/lib/omnibus/cli/application.rb

@@ -19,6 +19,7 @@ require 'omnibus'
 require 'omnibus/cli/base'
 require 'omnibus/cli/build'
 require 'omnibus/cli/cache'
+require 'omnibus/cli/release'
 
 module Omnibus
   module CLI
@@ -109,6 +110,9 @@ module Omnibus
       desc "cache [COMMAND]", "Perform cache management tasks"
       subcommand "cache", Omnibus::CLI::Cache
 
+      desc "release [COMMAND]", "Perform release tasks"
+      subcommand "release", Omnibus::CLI::Release
+
       ###########################################################################
       # Class Methods
       ###########################################################################

data/lib/omnibus/cli/base.rb

@@ -37,12 +37,16 @@ module Omnibus
         current_command = config[:current_command] ? config[:current_command].name : config[:current_task].name
         return if current_command == "help"
 
-        if path = @options[:path]
-          if (config = @options[:config]) && File.exist?(@options[:config])
+        if config = @options[:config]
+          if config && File.exist?(@options[:config])
             say("Using Omnibus configuration file #{config}", :green)
             Omnibus.load_configuration(config)
+          elsif config
+            say("No configuration file `#{config}', using defaults", :yellow)
           end
+        end
 
+        if path = @options[:path]
           # TODO: merge in all relevant CLI options here, as they should
           # override anything from a configuration file.
           Omnibus::Config.project_root(path)

data/lib/omnibus/cli/release.rb

@@ -0,0 +1,49 @@
+#
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 'omnibus/cli/base'
+require 'omnibus/cli/application'
+require 'omnibus/package_release'
+require 'json'
+
+module Omnibus
+  module CLI
+
+
+    class Release < Base
+
+      namespace :release
+
+      def initialize(args, options, config)
+        super(args, options, config)
+      end
+
+      desc "package PATH", "Upload a single package to S3"
+      option :public, :type => :boolean, :default => false, :desc => "Make S3 object publicly readable"
+      def package(path)
+        access_policy = options[:public] ? :public_read : :private
+
+        uploader = PackageRelease.new(path, :access => access_policy) do |uploaded_item|
+          say("Uploaded #{uploaded_item}", :green)
+        end
+        uploader.release
+      end
+
+    end
+  end
+end
+

data/lib/omnibus/config.rb

@@ -17,6 +17,7 @@
 
 require 'mixlib/config'
 require 'omnibus/exceptions'
+require 'json'
 
 module Omnibus
 
@@ -145,6 +146,34 @@ module Omnibus
 
     # @!endgroup
 
+    # @!group S3 Release Parameters
+
+    # @!attribute [rw] release_s3_bucket
+    #   The name of the S3 bucket you want to release artifacts to.
+    #
+    #   Defaults to `nil`.  Must be set to use `release package` command.
+    #
+    #   @return [String, nil]
+    release_s3_bucket nil
+
+    # @!attribute [rw] release_s3_access_key
+    #   The S3 access key to use for S3 artifact release.
+    #
+    #   Defaults to `nil`.  Must be set to use `release package` command.
+    #
+    #   @return [String, nil]
+    release_s3_access_key nil
+
+    # @!attribute [rw] release_s3_secret_key
+    #   The S3 secret key to use for S3 artifact release
+    #
+    #   Defaults to `nil`.  Must be set to use `release package` command.
+    #
+    #   @return [String, nil]
+    release_s3_secret_key nil
+
+    # @!endgroup
+
     # @!group Miscellaneous Configuration Parameters
 
     # @!attribute [rw] override_file

data/lib/omnibus/exceptions.rb

@@ -32,6 +32,65 @@ module Omnibus
     end
   end
 
+  class NoPackageFile < RuntimeError
+    def initialize(package_path)
+      @package_path = package_path
+    end
+
+    def to_s
+      """
+      Cannot locate or access the package at the given path:
+
+        #{@package_path}
+      """
+    end
+  end
+
+  class NoPackageMetadataFile < RuntimeError
+    def initialize(package_metadata_path)
+      @package_metadata_path = package_metadata_path
+    end
+
+    def to_s
+      """
+      Cannot locate or access the package metadata file at the given path:
+
+        #{@package_metadata_path}
+      """
+    end
+  end
+
+  class InvalidS3ReleaseConfiguration < RuntimeError
+    def initialize(s3_bucket, s3_access_key, s3_secret_key)
+      @s3_bucket, @s3_access_key, @s3_secret_key = s3_bucket, s3_access_key, s3_secret_key
+    end
+
+    def to_s
+      """
+      One or more required S3 configuration values is missing.
+
+      Your effective configuration was the following:
+
+          release_s3_bucket     => #{@s3_bucket.inspect}
+          release_s3_access_key => #{@s3_access_key.inspect}
+          release_s3_secret_key => #{@s3_secret_key.inspect}
+
+      To release a package to S3, add the following values to your
+      config file:
+
+          release_s3_bucket      ENV['S3_BUCKET_NAME']
+          release_s3_access_key  ENV['S3_ACCESS_KEY']
+          release_s3_secret_key  ENV['S3_SECRET_KEY']
+
+      Note that you are not required to use environment variables as
+      illustrated (and the ones listed have no special significance in
+      Omnibus), but it is encouraged to prevent spread of sensitive
+      information and inadvertent check-in of same to version control
+      systems.
+
+      """
+    end
+  end
   # Raise this error if a needed Project configuration value has not
   # been set.
   class MissingProjectConfiguration < RuntimeError

data/lib/omnibus/health_check.rb

@@ -36,6 +36,19 @@ module Omnibus
                       /linux-gate\.so/
                      ]
 
+    ARCH_WHITELIST_LIBS = [
+                           /libc\.so/,
+                           /libcrypt\.so/,
+                           /libdb-5\.3\.so/,
+                           /libdl\.so/,
+                           /libffi\.so/,
+                           /libgdbm\.so/,
+                           /libm\.so/,
+                           /libpthread\.so/,
+                           /librt\.so/,
+                           /libutil\.so/
+                          ]
+
     SOLARIS_WHITELIST_LIBS = [
                               /libaio\.so/,
                               /libavl\.so/,
@@ -96,7 +109,8 @@ module Omnibus
                           /libutil\.dylib/,
                           /libffi\.dylib/,
                           /libncurses\.5\.4\.dylib/,
-                          /libiconv/
+                          /libiconv/,
+                          /libstdc\+\+\.6\.dylib/
                          ]
 
     FREEBSD_WHITELIST_LIBS = [
@@ -202,6 +216,8 @@ module Omnibus
       safe = nil
 
       whitelist_libs = case OHAI.platform
+                       when 'arch'
+                         ARCH_WHITELIST_LIBS
                        when 'mac_os_x'
                          MAC_WHITELIST_LIBS
                        when 'solaris2'