omnibus 3.0.0 → 3.1.0

data/lib/omnibus/{templates → generator_files}/Gemfile.erb

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 # Use Berkshelf for resolving cookbook dependencies
-gem 'berkshelf', '~> 3.0.0.beta'
+gem 'berkshelf', '~> 3.0'
 
 # Install omnibus software
 gem 'omnibus', '~> <%= Omnibus::VERSION.split('.')[0...-1].join('.') %>'
 gem 'omnibus-software', github: 'opscode/omnibus-software'
 
-# Use Test Kitchen with Vagrant for convering the build environment
+# Use Test Kitchen with Vagrant for converging the build environment
 gem 'test-kitchen',    '~> 1.2'
 gem 'kitchen-vagrant', '~> 0.14'

data/lib/omnibus/{templates → generator_files}/README.md.erb

@@ -19,7 +19,7 @@ Usage
 You create a platform-specific package using the `build project` command:
 
 ```shell
-$ bin/omnibus build project <%= config[:name] %>
+$ bin/omnibus build <%= config[:name] %>
 ```
 
 The platform/architecture type of the package created will match the platform
@@ -33,7 +33,7 @@ You can clean up all temporary files generated during the build process with
 the `clean` command:
 
 ```shell
-$ bin/omnibus clean
+$ bin/omnibus clean <%= config[:name] %>
 ```
 
 Adding the `--purge` purge option removes __ALL__ files generated during the
@@ -41,7 +41,7 @@ build including the project install directory (`/opt/<%= config[:name] %>`) and
 the package cache directory (`/var/cache/omnibus/pkg`):
 
 ```shell
-$ bin/omnibus clean --purge
+$ bin/omnibus clean <%= config[:name] %> --purge
 ```
 
 ### Help
@@ -56,8 +56,7 @@ $ bin/omnibus help
 Kitchen-based Build Environment
 -------------------------------
 Every Omnibus project ships will a project-specific
-[Berksfile](http://berkshelf.com/) and [Vagrantfile](http://www.vagrantup.com/)
-that will allow you to build your omnibus projects on all of the projects listed
+[Berksfile](http://berkshelf.com/) that will allow you to build your omnibus projects on all of the projects listed
 in the `.kitchen.yml`. You can add/remove additional platforms as needed by
 changing the list found in the `.kitchen.yml` `platforms` YAML stanza.
 
@@ -76,7 +75,7 @@ liking, you can bring up an individual build environment using the `kitchen`
 command.
 
 ```shell
-$ bundle exec kitchen converge ubuntu-12.04
+$ bin/kitchen converge ubuntu-12.04
 ```
 
 Then login to the instance and build the project as described in the Usage
@@ -87,7 +86,7 @@ $ bundle exec kitchen login ubuntu-12.04
 [vagrant@ubuntu...] $ cd <%= config[:name] %>
 [vagrant@ubuntu...] $ bundle install
 [vagrant@ubuntu...] $ ...
-[vagrant@ubuntu...] $ ./bin/omnibus build project <%= config[:name] %>
+[vagrant@ubuntu...] $ bin/omnibus build <%= config[:name] %>
 ```
 
 For a complete list of all commands and platforms, run `kitchen list` or

data/lib/omnibus/{templates → generator_files}/project.rb.erb

@@ -3,7 +3,6 @@ name '<%= config[:name] %>'
 maintainer 'CHANGE ME'
 homepage 'CHANGEME.com'
 
-replaces        '<%= config[:name] %>'
 install_path    '<%= config[:install_path] %>'
 build_version   Omnibus::BuildVersion.new.semver
 build_iteration 1

data/lib/omnibus/generator_files/windows_msi/assets/LICENSE.rtf

@@ -0,0 +1,8 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
+{\fonttbl\f0\fmodern\fcharset0 CourierNewPSMT;}
+{\colortbl;\red255\green255\blue255;}
+\vieww12000\viewh15840\viewkind0
+\deftab720
+\pard\pardeftab720\qc
+
+\f0\fs20 \cf0 All Rights Reserved.}

data/lib/omnibus/generator_files/windows_msi/localization-en-us.wxl.erb

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <!-- http://wix.codeplex.com/SourceControl/changeset/view/792e101c5cf7#src%2fext%2fUIExtension%2fwixlib%2fWixUI_en-us.wxl -->
+  <String Id="LANG">1033</String>
+  <String Id="ProductName"><%= friendly_name %></String>
+  <String Id="ManufacturerName"><%= maintainer %></String>
+  <String Id="WelcomeDlgTitle">{\WixUI_Font_Bigger}Welcome to the [ProductName] Setup Wizard</String>
+
+  <String Id="LicenseAgreementDlgTitle">{\WixUI_Font_Title_White}End-User License Agreement</String>
+  <String Id="LicenseAgreementDlgDescription">{\WixUI_Font_Normal_White}Please read the following license agreement carefully</String>
+
+  <String Id="InstallDirDlgTitle">{\WixUI_Font_Title_White}Destination Folder</String>
+  <String Id="InstallDirDlgDescription">{\WixUI_Font_Normal_White}Click Next to install to the default folder or click Change to choose another.</String>
+
+  <String Id="ProgressDlgTitleInstalling">{\WixUI_Font_Title_White}Installing [ProductName]</String>
+
+  <String Id="VerifyReadyDlgInstallTitle">{\WixUI_Font_Title_White}Ready to install [ProductName]</String>
+
+  <String Id="FeatureMainName"><%= friendly_name %></String>
+</WixLocalization>

data/lib/omnibus/generator_files/windows_msi/parameters.wxi.erb

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <!--
+    Versioning. These have to be changed for upgrades.
+  -->
+  <?define VersionNumber="<%= @msi_version %>" ?>
+  <?define DisplayVersionNumber="<%= @msi_display_version %>" ?>
+  <?define UpgradeCode="92F92680-F445-400D-8A0A-225DC8FC8360" ?>
+</Include>

data/lib/omnibus/generator_files/windows_msi/source.wxs.erb

@@ -0,0 +1,74 @@
+<?xml version='1.0'?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <!-- This is how we include wxi files -->
+  <?include "parameters.wxi" ?>
+
+  <!--
+    Id="*" is to enable upgrading. * means that the product ID will be autogenerated on each build.
+    Name is made of localized product name and version number.
+  -->
+  <Product Id="*" Name="!(loc.ProductName) v$(var.DisplayVersionNumber)" Language="!(loc.LANG)"
+          Version="$(var.VersionNumber)" Manufacturer="!(loc.ManufacturerName)" UpgradeCode="$(var.UpgradeCode)">
+
+    <!--
+      Define the minimum supported installer version (2.0).
+      The install should be done for the whole machine not just the current user
+    -->
+    <Package InstallerVersion="200" InstallPrivileges="elevated"
+             Compressed="yes" InstallScope="perMachine" />
+
+    <Media Id="1" Cabinet="Project.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <!-- Major upgrade -->
+    <Upgrade Id="$(var.UpgradeCode)">
+      <UpgradeVersion OnlyDetect="yes" Minimum="$(var.VersionNumber)" IncludeMinimum="no" Property="NEWERVERSIONDETECTED" />
+      <UpgradeVersion Minimum="0.0.0.0" IncludeMinimum="yes" Maximum="$(var.VersionNumber)" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED" />
+    </Upgrade>
+
+    <InstallExecuteSequence>
+      <RemoveExistingProducts After="InstallValidate" />
+    </InstallExecuteSequence>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="WindowsVolume">
+        <!-- Service needs chef directory to be present. -->
+        <Directory Id="INSTALLLOCATION" Name="opt">
+          <Directory Id="PROJECTLOCATION" Name="<%= config[:name] %>">
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <!-- Set the components defined in our fragment files that will be used for our feature  -->
+    <Feature Id="ProjectFeature" Title="!(loc.FeatureMainName)" Absent="disallow" AllowAdvertise="no" Level="1" ConfigurableDirectory="INSTALLLOCATION">
+      <ComponentGroupRef Id="ProjectDir" />
+    </Feature>
+
+    <!--
+      UI Stuff
+    -->
+    <Icon Id="project.ico" SourceFile="Resources\assets\project_16x16.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="project.ico" />
+    <Property Id="ARPHELPLINK" Value="http://www.getchef.com/" />
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
+
+    <UIRef Id="ProjectUI_InstallDir"/>
+    <UI Id="ProjectUI_InstallDir">
+      <UIRef Id="WixUI_FeatureTree"/>
+      <TextStyle Id="WixUI_Font_Normal_White" FaceName="Tahoma" Size="8" Red="255" Green="255" Blue="255" />
+      <TextStyle Id="WixUI_Font_Bigger_White" FaceName="Tahoma" Size="12" Red="255" Green="255" Blue="255" />
+      <TextStyle Id="WixUI_Font_Title_White" FaceName="Tahoma" Size="9" Bold="yes" Red="255" Green="255" Blue="255" />
+    </UI>
+
+    <WixVariable Id="WixUILicenseRtf" Value="Resources\assets\LICENSE.rtf" />
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\assets\dialog_background.bmp" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\assets\banner_background.bmp" />
+
+    <WixVariable Id="WixUIExclamationIco" Value="Resources\assets\project_32x32.ico" />
+    <WixVariable Id="WixUIInfoIco" Value="Resources\assets\project_32x32.ico" />
+    <WixVariable Id="WixUINewIco" Value="Resources\assets\project_16x16.ico" />
+    <WixVariable Id="WixUIUpIco" Value="Resources\assets\project_16x16.ico" />
+
+  </Product>
+</Wix>

data/lib/omnibus/health_check.rb

@@ -1,6 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
+# Copyright 2012-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.
@@ -17,6 +16,8 @@
 
 module Omnibus
   class HealthCheck
+    include Logging
+
     WHITELIST_LIBS = [
       /ld-linux/,
       /libc\.so/,
@@ -66,7 +67,6 @@ module Omnibus
       /libcrypto.so/,
       /libcurses\.so/,
       /libdoor\.so/,
-      /libgcc_s\.so\.1/,
       /libgen\.so/,
       /libmd5\.so/,
       /libmd\.so/,
@@ -77,7 +77,6 @@ module Omnibus
       /libssl.so/,
       /libthread.so/,
       /libuutil\.so/,
-      /libz.so/,
       # solaris 11 libraries:
       /libc\.so\.1/,
       /libm\.so\.2/,
@@ -113,6 +112,7 @@ module Omnibus
       /libobjc\.A\.dylib/,
       /libSystem\.B\.dylib/,
       /CoreFoundation/,
+      /CoreServices/,
       /Tcl$/,
       /Cocoa$/,
       /Carbon$/,
@@ -135,12 +135,8 @@ module Omnibus
       /libutil\.so/,
     ]
 
-    def self.log(msg)
-      puts "[health_check] #{msg}"
-    end
-
     def self.run(install_dir, whitelist_files = [])
-      case OHAI.platform
+      case Ohai.platform
       when 'mac_os_x'
         bad_libs = health_check_otool(install_dir, whitelist_files)
       when 'aix'
@@ -166,37 +162,79 @@ module Omnibus
             end
           end
         end
-        log '*** Health Check Failed, Summary follows:'
+
+        log.warn(log_key) { 'Failed!' }
         bad_omnibus_libs, bad_omnibus_bins = bad_libs.keys.partition { |k| k.include? 'embedded/lib' }
-        log '*** The following Omnibus-built libraries have unsafe or unmet dependencies:'
-        bad_omnibus_libs.each { |lib| log "    --> #{lib}" }
-        log '*** The following Omnibus-built binaries have unsafe or unmet dependencies:'
-        bad_omnibus_bins.each { |bin| log "    --> #{bin}" }
+
+        log.warn(log_key) do
+          out = "The following libraries have unsafe or unmet dependencies:\n"
+
+          bad_omnibus_libs.each do |lib|
+            out << "    --> #{lib}\n"
+          end
+
+          out
+        end
+
+        log.warn(log_key) do
+          out = "The following binaries have unsafe or unmet dependencies:\n"
+
+          bad_omnibus_bins.each do |bin|
+            out << "    --> #{bin}\n"
+          end
+
+          out
+        end
+
         if unresolved.length > 0
-          log '*** The following requirements could not be resolved:'
-          unresolved.each { |lib| log "    --> #{lib}" }
+          log.warn(log_key) do
+            out = "The following requirements could not be resolved:\n"
+
+            unresolved.each do |lib|
+              out << "    --> #{lib}\n"
+            end
+
+            out
+          end
         end
+
         if unreliable.length > 0
-          log '*** The following libraries cannot be guaranteed to be on target systems:'
-          unreliable.each { |lib| log "    --> #{lib}" }
+          log.warn(log_key) do
+            out =  "The following libraries cannot be guaranteed to be on "
+            out << "target systems:\n"
+
+            unreliable.each do |lib|
+              out << "    --> #{lib}\n"
+            end
+
+            out
+          end
         end
-        log '*** The precise failures were:'
-        detail.each do |line|
-          item, dependency, location, count = line.split('|')
-          reason = location =~ /not found/ ? 'Unresolved dependency' : 'Unsafe dependency'
-          log "    --> #{item}"
-          log "    DEPENDS ON: #{dependency}"
-          log "      COUNT: #{count}"
-          log "      PROVIDED BY: #{location}"
-          log "      FAILED BECAUSE: #{reason}"
+
+        log.warn(log_key) do
+          out = "The precise failures were:\n"
+
+          detail.each do |line|
+            item, dependency, location, count = line.split('|')
+            reason = location =~ /not found/ ? 'Unresolved dependency' : 'Unsafe dependency'
+
+            out << "    --> #{item}\n"
+            out << "    DEPENDS ON: #{dependency}\n"
+            out << "      COUNT: #{count}\n"
+            out << "      PROVIDED BY: #{location}\n"
+            out << "      FAILED BECAUSE: #{reason}\n"
+          end
+
+          out
         end
-        fail 'Health Check Failed'
+
+        raise 'Health Check Failed'
       end
     end
 
     def self.health_check_otool(install_dir, whitelist_files)
       otool_cmd = "find #{install_dir}/ -type f | egrep '\.(dylib|bundle)$' | xargs otool -L > otool.out 2>/dev/null"
-      log "Executing `#{otool_cmd}`"
+      log.info(log_key) { "Executing: `#{otool_cmd}`" }
       shell = Mixlib::ShellOut.new(otool_cmd, timeout: 3600)
       shell.run_command
 
@@ -224,7 +262,7 @@ module Omnibus
     def self.check_for_bad_library(install_dir, bad_libs, whitelist_files, current_library, name, linked)
       safe = nil
 
-      whitelist_libs = case OHAI.platform
+      whitelist_libs = case Ohai.platform
                        when 'arch'
                          ARCH_WHITELIST_LIBS
                        when 'mac_os_x'
@@ -247,11 +285,11 @@ module Omnibus
         safe ||= true if reg.match(current_library)
       end
 
-      log "  --> Dependency: #{name}" if ARGV[0] == 'verbose'
-      log "  --> Provided by: #{linked}" if ARGV[0] == 'verbose'
+      log.debug(log_key) { "  --> Dependency: #{name}" }
+      log.debug(log_key) { "  --> Provided by: #{linked}" }
 
       if !safe && linked !~ Regexp.new(install_dir)
-        log "    -> FAILED: #{current_library} has unsafe dependencies" if ARGV[0] == 'verbose'
+        log.debug(log_key) { "    -> FAILED: #{current_library} has unsafe dependencies" }
         bad_libs[current_library] ||= {}
         bad_libs[current_library][name] ||= {}
         if bad_libs[current_library][name].key?(linked)
@@ -260,7 +298,7 @@ module Omnibus
           bad_libs[current_library][name][linked] = 1
         end
       else
-        log "    -> PASSED: #{name} is either whitelisted or safely provided." if ARGV[0] == 'verbose'
+        log.debug(log_key) { "    -> PASSED: #{name} is either whitelisted or safely provided." }
       end
 
       bad_libs
@@ -275,7 +313,7 @@ module Omnibus
       #
       ldd_cmd = "find #{install_dir}/ -type f | xargs file | grep \"RISC System\" | awk -F: '{print $1}' | xargs -n 1 ldd > ldd.out 2>/dev/null"
 
-      log "Executing `#{ldd_cmd}`"
+      log.info(log_key) { "Executing `#{ldd_cmd}`" }
       shell = Mixlib::ShellOut.new(ldd_cmd, timeout: 3600)
       shell.run_command
 
@@ -288,14 +326,14 @@ module Omnibus
         case line
         when /^(.+) needs:$/
           current_library = Regexp.last_match[1]
-          log "*** Analysing dependencies for #{current_library}" if ARGV[0] == 'verbose'
+          log.debug(log_key) { "Analyzing dependencies for #{current_library}" }
         when /^\s+(.+)$/
           name = Regexp.last_match[1]
           linked = Regexp.last_match[1]
           bad_libs = check_for_bad_library(install_dir, bad_libs, whitelist_files, current_library, name, linked)
         when /File is not an executable XCOFF file/ # ignore non-executable files
         else
-          log "*** Line did not match for #{current_library}\n#{line}"
+          log.warn(log_key) { "Line did not match for #{current_library}\n#{line}" }
         end
       end
 
@@ -312,7 +350,7 @@ module Omnibus
       #
       ldd_cmd = "find #{install_dir}/ -type f | xargs ldd > ldd.out 2>/dev/null"
 
-      log "Executing `#{ldd_cmd}`"
+      log.info(log_key) { "Executing `#{ldd_cmd}`" }
       shell = Mixlib::ShellOut.new(ldd_cmd, timeout: 3600)
       shell.run_command
 
@@ -325,7 +363,7 @@ module Omnibus
         case line
         when /^(.+):$/
           current_library = Regexp.last_match[1]
-          log "*** Analysing dependencies for #{current_library}" if ARGV[0] == 'verbose'
+          log.debug(log_key) { "Analyzing dependencies for #{current_library}" }
         when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
           name = Regexp.last_match[1]
           linked = Regexp.last_match[2]
@@ -342,7 +380,9 @@ module Omnibus
           next
         when /^\s+not a dynamic executable$/ # ignore non-executable files
         else
-          log "*** Line did not match for #{current_library}\n#{line}"
+          log.warn(log_key) do
+            "Line did not match for #{current_library}\n#{line}"
+          end
         end
       end