omnibus 4.0.0.rc.1 → 4.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6839ae316c6146ee459f8acbd869d83d495d90c
-  data.tar.gz: 30a70eb80420dbab5e8196eb1a626b7b62c7b65f
+  metadata.gz: 67c9874074d2cec13ed5734f8e6f420ccfb157d7
+  data.tar.gz: 9fff24c7c26e8ef92175dac8c01b5c0883e2e2e1
 SHA512:
-  metadata.gz: 4b8c99b56cd409f5b4df98dea2e19ade09fdeac89e42ee53a3724cf0a1c6440430d9994fd41b36aecd68c1c9239709bf578590b46ad1602f4fc2a6fbb21e3ba4
-  data.tar.gz: d07dbc0bcab759ecc4f6017d71e662cd07d81ff7919854fd790fe4ec476eacdf11f8eb8a8163d2005808d8618d947d791df6f62da8e620f5cf009647bef685f9
+  metadata.gz: e2bbe215dd2606a272c04d1be03126d67cf0db748032616cfee7d699f355fef833f3d7b7bc29767c57bcd7e9c4dba8e1fde145d412ef8eb00b9d2eecbe53a9f0
+  data.tar.gz: 250b20df2e0c254335c29e0fb4490a764e8ce52044804e057c625b75034b638d868d3d91cb7b0593bf18742daf010187cb7f2e9b41a52b7a006fbe3c75d3129b

data/CHANGELOG.md

@@ -1,6 +1,32 @@
 Omnibus CHANGELOG
 =================
 
+v4.0.0.rc.2 (November 10, 2014)
+-------------------------------
+
+### New Features
+
+#### Platforms
+- Raspberry Pi platform support (currently Raspbian and Pidora)
+- AIX
+    - XL C is the default compiler on AIX.
+- FreeBSD 10
+    - Clang is the default compiler on FreeBSD 10+
+    - Add `libgcc` and `libelf` to the FreeBSD whitelist
+- Solaris
+    - Make compilation default `-static-libgcc`
+
+### Bugfixes
+
+- Set default values for `CXXFLAGS`.
+- Retrieve the correct path_key from the ENV on Windows.
+- openSUSE/SLES fixes for OHAI-339.
+- Properly truncate platform version on Arch Linux.
+- Ensure final `*.dmg` name matches actual `*.pkg` name.
+- Change `makeself` package extension back to `.sh`.
+- Generate a default `makeselfinst` which fires at following install.
+- Map `Omnibus::Project#replaces` to RPM Spec file's `Obsoletes:`.
+
 v4.0.0.rc.1 (September 23, 2014)
 --------------------------------
 

data/lib/omnibus/compressors/dmg.rb

@@ -248,7 +248,7 @@ module Omnibus
             -format UDZO \\
             -imagekey \\
             zlib-level=9 \\
-            -o "#{final_dmg}"
+            -o "#{package_path}"
           rm -rf "#{writable_dmg}"
         EOH
       end
@@ -271,17 +271,18 @@ module Omnibus
           DeRez -only icns "#{resource_path('icon.png')}" > tmp.rsrc
 
           # Append the icon reosurce to the DMG
-          Rez -append tmp.rsrc -o "#{final_dmg}"
+          Rez -append tmp.rsrc -o "#{package_path}"
 
           # Source the icon
-          SetFile -a C "#{final_dmg}"
+          SetFile -a C "#{package_path}"
         EOH
       end
     end
 
     # @see Base#package_name
     def package_name
-      "#{project.name}-#{project.build_version}-#{project.build_iteration}.dmg"
+      extname = File.extname(packager.package_name)
+      packager.package_name.sub(extname, '.dmg')
     end
 
     # The path to the writable dmg on disk.
@@ -291,14 +292,6 @@ module Omnibus
       File.expand_path("#{staging_dir}/#{project.name}-writable.dmg")
     end
 
-    # The path where the final dmg will be produced.
-    #
-    # @return [String]
-    def final_dmg
-      dmg_name = packager.package_name.sub('.pkg', '.dmg')
-      File.expand_path("#{Config.package_dir}/#{dmg_name}")
-    end
-
     #
     # The name of the volume to create. By defauly, this is the project's
     # friendly name.

data/lib/omnibus/generator_files/.kitchen.yml.erb

@@ -9,9 +9,25 @@ driver:
 
 provisioner:
   name: chef_zero
-  require_chef_omnibus: 11.14.6
+  require_chef_omnibus: 11.16.4
 
 platforms:
+  - name: centos-7.0
+    run_list: yum-epel::default
+  - name: centos-6.5
+    run_list: yum-epel::default
+  - name: centos-5.10
+    run_list: yum-epel::default
+  - name: debian-7.2.0
+    run_list: apt::default
+  - name: debian-6.0.8
+    run_list: apt::default
+  - name: freebsd-10.0
+    run_list: freebsd::portsnap
+  - name: freebsd-9.2
+    run_list:
+      - freebsd::portsnap
+      - freebsd::pkgng
   - name: ubuntu-14.04
     run_list: apt::default
   - name: ubuntu-12.04
@@ -20,14 +36,13 @@ platforms:
     run_list: apt::default
   - name: ubuntu-10.04
     run_list: apt::default
-  - name: centos-5.10
-  - name: centos-6.5
 
 suites:
   - name: default
     run_list: omnibus::default
     attributes:
       omnibus:
-        build_user:  vagrant
-        build_dir:   /home/vagrant/<%= config[:name] %>
-        install_dir: /opt/<%= config[:name] %>
+        build_user:          vagrant
+        build_user_group:    vagrant
+        build_user_password: vagrant
+        install_dir:         /opt/<%= config[:name] %>

data/lib/omnibus/generator_files/Berksfile.erb

@@ -1,10 +1,12 @@
 source 'https://api.berkshelf.com'
 
-# The apt cookbook is required to bring the apt cache up-to-date on Ubuntu
-# systems, since the cache can become stale on older boxes.
-cookbook 'apt', '~> 2.0'
-
 cookbook 'omnibus'
 
 # Uncomment to use the latest version of the Omnibus cookbook from GitHub
 # cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'
+
+group :integration do
+  cookbook 'apt',      '~> 2.3'
+  cookbook 'freebsd',  '~> 0.1'
+  cookbook 'yum-epel', '~> 0.3'
+end

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

@@ -39,6 +39,7 @@
 # ------------------------------
 # solaris_compiler 'gcc'
 # build_retries 5
+# fetcher_read_timeout 120
 
 # Load additional software
 # ------------------------------

data/lib/omnibus/health_check.rb

@@ -129,11 +129,13 @@ module Omnibus
 
     FREEBSD_WHITELIST_LIBS = [
       /libc\.so/,
+      /libgcc_s\.so/,
       /libcrypt\.so/,
       /libm\.so/,
       /librt\.so/,
       /libthr\.so/,
       /libutil\.so/,
+      /libelf\.so/,
     ].freeze
 
     class << self

data/lib/omnibus/metadata.rb

@@ -123,7 +123,6 @@ module Omnibus
 
       #
       # Platform name to be used when creating metadata for the artifact.
-      # rhel/centos become "el", all others are just platform
       #
       # @return [String]
       #   the platform family short name
@@ -131,6 +130,8 @@ module Omnibus
       def platform_shortname
         if Ohai['platform_family'] == 'rhel'
           'el'
+        elsif Ohai['platform'] == 'suse'
+          'sles'
         else
           Ohai['platform']
         end
@@ -152,15 +153,15 @@ module Omnibus
       #
       def truncate_platform_version(platform_version, platform)
         case platform
-        when 'centos', 'debian', 'el', 'fedora', 'freebsd', 'rhel', 'sles'
-          # Only want MAJOR (e.g. Debian 7)
+        when 'centos', 'debian', 'el', 'fedora', 'freebsd', 'omnios', 'pidora', 'raspbian', 'rhel', 'sles', 'suse', 'smartos'
+          # Only want MAJOR (e.g. Debian 7, OmniOS r151006, SmartOS 20120809T221258Z)
           platform_version.split('.').first
-        when 'aix', 'arch', 'gentoo', 'mac_os_x', 'openbsd', 'slackware', 'solaris2', 'suse', 'ubuntu'
+        when 'aix', 'gentoo', 'mac_os_x', 'openbsd', 'slackware', 'solaris2', 'opensuse', 'ubuntu'
           # Only want MAJOR.MINOR (e.g. Mac OS X 10.9, Ubuntu 12.04)
           platform_version.split('.')[0..1].join('.')
-        when 'omnios', 'smartos'
-          # Only want MAJOR (e.g OmniOS r151006, SmartOS 20120809T221258Z)
-          platform_version.split('.').first
+        when 'arch'
+          # Arch Linux does not have a platform_version ohai attribute, it is rolling release (lsb_release -r)
+          'rolling'
         when 'windows'
           # Windows has this really awesome "feature", where their version numbers
           # internally do not match the "marketing" name.

data/lib/omnibus/packagers/bff.rb

@@ -40,6 +40,9 @@ module Omnibus
     end
 
     build do
+      # Copy scripts
+      write_scripts
+
       # Render the gen template
       write_gen_template
 
@@ -49,7 +52,7 @@ module Omnibus
 
     # @see Base#package_name
     def package_name
-      "#{safe_base_package_name}.#{bff_version}.#{safe_architecture}.bff"
+      "#{safe_base_package_name}-#{project.build_version}-#{project.build_iteration}.#{safe_architecture}.bff"
     end
 
     #
@@ -124,13 +127,12 @@ module Omnibus
     #   Unconfiguration Script: /path/script
     #
     def write_gen_template
-      # Create a map of scripts that exist and install path
+      # Create a map of scripts that exist to inject into the template
       scripts = SCRIPT_MAP.inject({}) do |hash, (script, installp_key)|
         staging_path =  File.join(scripts_staging_dir, script.to_s)
-        install_path =  File.join(scripts_install_dir, script.to_s)
 
         if File.file?(staging_path)
-          hash[installp_key] = install_path
+          hash[installp_key] = staging_path
         end
 
         hash
@@ -163,16 +165,42 @@ module Omnibus
     # @return [void]
     #
     def create_bff_file
+      # We are making the assumption that sudo exists.
+      # Unforunately, the owner of the file in the staging directory is what
+      # will be on the target machine, and mkinstallp can't tell you if that
+      # is a bad thing (it usually is).
+      # The match is so we only pick the lowest level of the project dir.
+      # This implies that if we are in /tmp/staging/project/dir/things,
+      # we will chown from 'project' on, rather than 'project/dir', which leaves
+      # project owned by the build user (which is incorrect)
+      shellout!("sudo chown -R 0:0 #{staging_dir}/#{project.install_dir.match(/^\/?(\w+)/)}")
       log.info(log_key) { "Creating .bff file" }
 
-      shellout!("/usr/sbin/mkinstallp -d #{staging_dir} -T #{staging_dir}/gen.template")
+      # Since we want the owner to be root, we need to sudo the mkinstallp
+      # command, otherwise it will not have access to the previously chowned
+      # directory.
+      shellout!("sudo /usr/sbin/mkinstallp -d #{staging_dir} -T #{staging_dir}/gen.template")
 
       # Copy the resulting package up to the package_dir
       FileSyncer.glob("#{staging_dir}/tmp/*.bff").each do |bff|
-        copy_file(bff, Config.package_dir)
+        copy_file(bff, File.join(Config.package_dir, create_bff_file_name))
       end
     end
 
+    #
+    # Create bff file name
+    #
+    # +mkinstallp+ names the bff file according to the version specified in
+    # the template. We want to differentiate the build specific version
+    # correctly.
+    #
+    # @return [String]
+    #
+    def create_bff_file_name
+      "#{safe_base_package_name}-#{project.build_version}-#{project.build_iteration}.#{safe_architecture}.bff"
+    end
+
+
     #
     # Return the BFF-ready base package name, converting any invalid characters to
     # dashes (+-+).

data/lib/omnibus/packagers/deb.rb

@@ -383,6 +383,12 @@ module Omnibus
         'amd64'
       when 'i686'
         'i386'
+      when 'armv6l'
+        if Ohai['platform'] == 'raspbian'
+          'armhf'
+        else
+          'armv6l'
+        end
       else
         Ohai['kernel']['machine']
       end

data/lib/omnibus/packagers/makeself.rb

@@ -19,9 +19,7 @@ module Omnibus
     # @return [Hash]
     SCRIPT_MAP = {
       # Default Omnibus naming
-      postinst: 'makeselfinst',
-      # Default Makeself naming
-      makeselfinst: 'makeselfinst',
+      postinst: 'postinst',
     }.freeze
 
     id :makeself
@@ -38,13 +36,16 @@ module Omnibus
       # Write the scripts
       write_scripts
 
+      # Write the makeselfinst file
+      write_makeselfinst
+
       # Create the makeself archive
       create_makeself_package
     end
 
     # @see Base#package_name
     def package_name
-      "#{project.package_name}-#{project.build_version}_#{project.build_iteration}.#{safe_architecture}.run"
+      "#{project.package_name}-#{project.build_version}_#{project.build_iteration}.#{safe_architecture}.sh"
     end
 
     #
@@ -67,6 +68,24 @@ module Omnibus
       resource_path('makeself-header.sh')
     end
 
+    #
+    # Render a makeselfinst in the staging directory using the supplied ERB
+    # template. This file will be used to move the contents of the self-
+    # extracting archive into place following extraction.
+    #
+    # @return [void]
+    #
+    def write_makeselfinst
+      makeselfinst_staging_path = File.join(staging_dir, 'makeselfinst')
+      render_template(resource_path('makeselfinst.erb'),
+        destination: makeselfinst_staging_path,
+        variables: {
+          install_dir: project.install_dir,
+        }
+      )
+      FileUtils.chmod(0755, makeselfinst_staging_path)
+    end
+
     #
     # Copy all scripts in {Project#package_scripts_path} to the staging
     # directory.
@@ -105,7 +124,7 @@ module Omnibus
         EOH
       end
 
-      FileSyncer.glob("#{staging_dir}/*.run").each do |makeself|
+      FileSyncer.glob("#{staging_dir}/*.sh").each do |makeself|
         copy_file(makeself, Config.package_dir)
       end
     end

data/lib/omnibus/packagers/rpm.rb

@@ -449,7 +449,16 @@ module Omnibus
     # @return [String]
     #
     def safe_architecture
-      Ohai['kernel']['machine']
+      case Ohai['kernel']['machine']
+      when 'armv6l'
+        if Ohai['platform'] == 'pidora'
+          'armv6hl'
+        else
+          'armv6l'
+        end
+      else
+        Ohai['kernel']['machine']
+      end
     end
   end
 end

data/lib/omnibus/software.rb

@@ -431,27 +431,16 @@ module Omnibus
       compiler_flags =
         case Ohai['platform']
         when "aix"
-          cc_flags =
-            if opts[:aix] && opts[:aix][:use_gcc]
-              {
-                "CC" => "gcc -maix64",
-                "CXX" => "g++ -maix64",
-                "CFLAGS" => "-maix64 -O -I#{install_dir}/embedded/include",
-                "LDFLAGS" => "-L#{install_dir}/embedded/lib -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",
-              }
-            else
-              {
-                "CC" => "xlc -q64",
-                "CXX" => "xlC -q64",
-                "CFLAGS" => "-q64 -I#{install_dir}/embedded/include -O",
-                "LDFLAGS" => "-q64 -L#{install_dir}/embedded/lib -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",
-              }
-            end
-          cc_flags.merge({
+          {
+            "CC" => "xlc_r -q64",
+            "CXX" => "xlC_r -q64",
+            "CFLAGS" => "-q64 -I#{install_dir}/embedded/include -D_LARGE_FILES -O",
+            "CXXFLAGS" => "-q64 -I#{install_dir}/embedded/include -D_LARGE_FILES -O",
+            "LDFLAGS" => "-q64 -L#{install_dir}/embedded/lib -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",
             "LD" => "ld -b64",
             "OBJECT_MODE" => "64",
             "ARFLAGS" => "-X64 cru",
-          })
+          }
         when "mac_os_x"
           {
             "LDFLAGS" => "-L#{install_dir}/embedded/lib",
@@ -459,14 +448,25 @@ module Omnibus
           }
         when "solaris2"
           {
+            # this override is due to a bug in libtool documented here:
+            # 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",
           }
         when "freebsd"
-          {
-            "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
+          freebsd_flags = {
+            "LDFLAGS" => "-L#{install_dir}/embedded/lib",
             "CFLAGS" => "-I#{install_dir}/embedded/include",
           }
+          # Clang became the default compiler in FreeBSD 10+
+          if Ohai['os_version'].to_i >= 1000024
+            freebsd_flags.merge!(
+              "CC" => "clang",
+              "CXX" => "clang++",
+            )
+          end
+          freebsd_flags
         else
           {
             "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
@@ -496,7 +496,9 @@ module Omnibus
         # always want to favor pkg-config from embedded location to not hose
         # configure scripts which try to be too clever and ignore our explicit
         # CFLAGS and LDFLAGS in favor of pkg-config info
-        merge({"PKG_CONFIG_PATH" => "#{install_dir}/embedded/lib/pkgconfig"})
+        merge({"PKG_CONFIG_PATH" => "#{install_dir}/embedded/lib/pkgconfig"}).
+        # Set default values for CXXFLAGS.
+        merge('CXXFLAGS' => compiler_flags['CFLAGS'])
     end
     expose :with_standard_compiler_flags
 
@@ -809,7 +811,16 @@ module Omnibus
       # $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.
-      Ohai['platform'] == 'windows' ? 'Path' : 'PATH'
+      #
+      # 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
 
     #

data/lib/omnibus/util.rb

@@ -69,7 +69,7 @@ module Omnibus
       unless options[:environment].empty?
         log.public_send(log_level, log_key)  { 'Environment:' }
         options[:environment].sort.each do |key, value|
-          log.public_send(log_level, log_key)  { "  #{key.to_s.upcase}=#{value.inspect}" }
+          log.public_send(log_level, log_key)  { "  #{key}=#{value.inspect}" }
         end
       end
 

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '4.0.0.rc.1'
+  VERSION = '4.0.0.rc.2'
 end

data/resources/bff/gen.template.erb

@@ -15,9 +15,9 @@ Fileset
   Include license files in this package: N
   Requisites:
   ROOT Part: Y
-  ROOTFiles
+  USRFiles 
 <% files.each do |file| -%>
     <%= file %>
 <% end -%>
-  EOROOTFiles
+  EOUSRFiles
 EOFileset

data/resources/makeself/makeselfinst.erb

@@ -0,0 +1,35 @@
+#!/bin/sh
+# WARNING: REQUIRES /bin/sh
+#
+# - must run on /bin/sh on solaris 9
+# - must run on /bin/sh on AIX 6.x
+# - if you think you are a bash wizard, you probably do not understand
+#   this programming language.  do not touch.
+# - if you are under 40, get peer review from your elders.
+#
+
+#########################################################################
+# HELPERS
+#########################################################################
+error_exit()
+{
+  echo "${PROGNAME}: ${1:-"Unknown Error"}" 1>&2
+  exit 1
+}
+
+PROGNAME=`basename $0`
+EXTRACT_DIR=`dirname $0`
+INSTALL_DIR=<%= install_dir %>
+
+#########################################################################
+# MOVE SELF-EXTRACTING ARCHIVE FILES INTO PLACE
+#########################################################################
+rm -rf $INSTALL_DIR/* || error_exit "Cannot remove contents of $INSTALL_DIR"
+mkdir -p $INSTALL_DIR || error_exit "Cannot create $INSTALL_DIR"
+cp -R $EXTRACT_DIR $INSTALL_DIR || error_exit "Cannot install to $INSTALL_DIR"
+rm -f $INSTALL_DIR/$PROGNAME
+
+# Execute the optional postinst script
+if test -f "$INSTALL_DIR/postinst"; then
+  $INSTALL_DIR/postinst
+fi

data/resources/rpm/spec.erb

@@ -34,7 +34,7 @@ Requires: <%= name %>
 <% conflicts.each do |name| -%>
 Conflicts: <%= name %>
 <% end -%>
-<% conflicts.each do |name| -%>
+<% replaces.each do |name| -%>
 Obsoletes: <%= name %>
 <%- end -%>
 <% # RPM rejects descriptions with blank lines (even between content) -%>

data/spec/unit/compressors/dmg_spec.rb

@@ -266,9 +266,17 @@ module Omnibus
     end
 
     describe '#package_name' do
-      it 'includes the name, version, and build iteration' do
+      it 'reflects the packager\'s unmodified package_name' do
         expect(subject.package_name).to eq('project-1.2.3-2.dmg')
       end
+
+      it 'reflects the packager\'s modified package_name' do
+        package_basename = 'projectsub-1.2.3-3'
+        allow(project.packager).to receive(:package_name)
+          .and_return("#{package_basename}.pkg")
+
+        expect(subject.package_name).to eq("#{package_basename}.dmg")
+      end
     end
 
     describe '#writable_dmg' do

data/spec/unit/metadata_spec.rb

@@ -36,7 +36,12 @@ module Omnibus
         expect(described_class.platform_shortname).to eq('el')
       end
 
-      it 'returns .platform on non-rhel systems' do
+      it 'returns sles on suse' do
+        stub_ohai(platform: 'suse', version: '12.0')
+        expect(described_class.platform_shortname).to eq('sles')
+      end
+
+      it 'returns .platform on all other systems' do
         stub_ohai(platform: 'ubuntu', version: '12.04')
         expect(described_class.platform_shortname).to eq('ubuntu')
       end
@@ -56,26 +61,29 @@ module Omnibus
         end
       end
 
-      it_behaves_like 'a version manipulator', 'arch', '2009.02', '2009.02'
-      it_behaves_like 'a version manipulator', 'arch', '2014.06.01', '2014.06'
+      it_behaves_like 'a version manipulator', 'aix', '7.1', '7.1'
+      it_behaves_like 'a version manipulator', 'arch', 'rolling', 'rolling'
+      it_behaves_like 'a version manipulator', 'centos', '5.9.6', '5'
       it_behaves_like 'a version manipulator', 'debian', '7.1', '7'
       it_behaves_like 'a version manipulator', 'debian', '6.9', '6'
-      it_behaves_like 'a version manipulator', 'ubuntu', '10.04', '10.04'
-      it_behaves_like 'a version manipulator', 'ubuntu', '10.04.04', '10.04'
+      it_behaves_like 'a version manipulator', 'el', '6.5', '6'
       it_behaves_like 'a version manipulator', 'fedora', '11.5', '11'
       it_behaves_like 'a version manipulator', 'freebsd', '10.0', '10'
-      it_behaves_like 'a version manipulator', 'rhel', '6.5', '6'
-      it_behaves_like 'a version manipulator', 'el', '6.5', '6'
-      it_behaves_like 'a version manipulator', 'centos', '5.9.6', '5'
-      it_behaves_like 'a version manipulator', 'aix', '7.1', '7.1'
       it_behaves_like 'a version manipulator', 'gentoo', '2004.3', '2004.3'
       it_behaves_like 'a version manipulator', 'mac_os_x', '10.9.1', '10.9'
+      it_behaves_like 'a version manipulator', 'omnios', 'r151010', 'r151010'
       it_behaves_like 'a version manipulator', 'openbsd', '5.4.4', '5.4'
+      it_behaves_like 'a version manipulator', 'opensuse', '5.9', '5.9'
+      it_behaves_like 'a version manipulator', 'pidora', '11.5', '11'
+      it_behaves_like 'a version manipulator', 'raspbian', '7.1', '7'
+      it_behaves_like 'a version manipulator', 'rhel', '6.5', '6'
       it_behaves_like 'a version manipulator', 'slackware', '12.0.1', '12.0'
-      it_behaves_like 'a version manipulator', 'solaris2', '5.9', '5.9'
-      it_behaves_like 'a version manipulator', 'suse', '5.9', '5.9'
-      it_behaves_like 'a version manipulator', 'omnios', 'r151010', 'r151010'
+      it_behaves_like 'a version manipulator', 'sles', '11.2', '11'
+      it_behaves_like 'a version manipulator', 'suse', '12.0', '12'
       it_behaves_like 'a version manipulator', 'smartos', '20120809T221258Z', '20120809T221258Z'
+      it_behaves_like 'a version manipulator', 'solaris2', '5.9', '5.9'
+      it_behaves_like 'a version manipulator', 'ubuntu', '10.04', '10.04'
+      it_behaves_like 'a version manipulator', 'ubuntu', '10.04.04', '10.04'
       it_behaves_like 'a version manipulator', 'windows', '5.0.2195', '2000'
       it_behaves_like 'a version manipulator', 'windows', '5.1.2600', 'xp'
       it_behaves_like 'a version manipulator', 'windows', '5.2.3790', '2003r2'

data/spec/unit/packagers/bff_spec.rb

@@ -39,8 +39,8 @@ module Omnibus
         allow(subject).to receive(:safe_architecture).and_return('x86_64')
       end
 
-      it 'includes the name, version, and build iteration' do
-        expect(subject.package_name).to eq('project.1.2.3.2.x86_64.bff')
+      it 'includes the name and version' do
+        expect(subject.package_name).to eq('project-1.2.3-2.x86_64.bff')
       end
     end
 
@@ -109,8 +109,8 @@ module Omnibus
         expect(contents).to include("  Include license files in this package: N")
         expect(contents).to include("  Requisites:")
         expect(contents).to include("  ROOT Part: Y")
-        expect(contents).to include("  ROOTFiles")
-        expect(contents).to include("  EOROOTFiles")
+        expect(contents).to include("  USRFiles")
+        expect(contents).to include("  EOUSRFiles")
         expect(contents).to include("EOFileset")
       end
 
@@ -145,10 +145,10 @@ module Omnibus
           subject.write_gen_template
           contents = File.read(gen_file)
 
-          expect(contents).to include("    Pre-installation Script: #{subject.scripts_install_dir}/preinst")
-          expect(contents).to include("    Post-installation Script: #{subject.scripts_install_dir}/postinst")
-          expect(contents).to include("    Pre_rm Script: #{subject.scripts_install_dir}/prerm")
-          expect(contents).to include("    Unconfiguration Script: #{subject.scripts_install_dir}/postrm")
+          expect(contents).to include("    Pre-installation Script: #{subject.scripts_staging_dir}/preinst")
+          expect(contents).to include("    Post-installation Script: #{subject.scripts_staging_dir}/postinst")
+          expect(contents).to include("    Pre_rm Script: #{subject.scripts_staging_dir}/prerm")
+          expect(contents).to include("    Unconfiguration Script: #{subject.scripts_staging_dir}/postrm")
         end
       end
     end
@@ -192,6 +192,13 @@ module Omnibus
       end
     end
 
+    describe '#create_bff_file_name' do
+      it 'constructs the proper package name' do
+        expect(subject.create_bff_file_name).to eq('project-1.2.3-2.x86_64.bff')
+      end
+
+    end
+
     describe '#bff_version' do
       it 'returns the build version up with the build iteration' do
         expect(subject.bff_version).to eq('1.2.3.2')

data/spec/unit/packagers/deb_spec.rb

@@ -331,6 +331,21 @@ module Omnibus
           expect(subject.safe_architecture).to eq('i386')
         end
       end
+
+      context 'on Raspbian' do
+        before do
+          # There's no Raspbian in Fauxhai :(
+          stub_ohai(platform: 'debian', version: '7.6') do |data|
+            data['platform'] = 'raspbian'
+            data['platform_version'] = '7.6'
+            data['kernel']['machine'] = 'armv6l'
+          end
+        end
+
+        it 'returns armhf' do
+          expect(subject.safe_architecture).to eq('armhf')
+        end
+      end
     end
   end
 end

data/spec/unit/packagers/makeself_spec.rb

@@ -39,69 +39,42 @@ module Omnibus
       end
 
       it 'includes the name, version, and build iteration' do
-        expect(subject.package_name).to eq('project-1.2.3_2.x86_64.run')
+        expect(subject.package_name).to eq('project-1.2.3_2.x86_64.sh')
       end
     end
 
-    describe '#write_scripts' do
-      before do
-        create_file("#{project_root}/package-scripts/project/makeselfinst") { 'Contents of makeselfinst' }
-      end
-
-      it 'copies the scripts into the STAGING dir' do
-        subject.write_scripts
-        expect("#{staging_dir}/makeselfinst").to be_a_file
+    describe '#write_makeselfinst' do
+      it 'generates the executable file' do
+        subject.write_makeselfinst
+        expect("#{staging_dir}/makeselfinst").to be_an_executable
       end
 
       it 'has the correct content' do
-        subject.write_scripts
+        subject.write_makeselfinst
         contents = File.read("#{staging_dir}/makeselfinst")
 
-        expect(contents).to include('Contents of makeselfinst')
+        expect(contents).to include('INSTALL_DIR=/opt/project')
       end
     end
 
     describe '#write_scripts' do
-      context 'when scripts are given' do
-        let(:scripts) { %w( makeselfinst ) }
-        before do
-          scripts.each do |script_name|
-            create_file("#{project_root}/package-scripts/project/#{script_name}") do
-              "Contents of #{script_name}"
-            end
-          end
-        end
-
-        it 'writes the scripts into the staging dir' do
-          subject.write_scripts
-
-          scripts.each do |script_name|
-            script_file = "#{staging_dir}/#{script_name}"
-            contents = File.read(script_file)
-            expect(contents).to include("Contents of #{script_name}")
+      let(:default_scripts) { %w( postinst ) }
+      before do
+        default_scripts.each do |script_name|
+          create_file("#{project_root}/package-scripts/project/#{script_name}") do
+            "Contents of #{script_name}"
           end
         end
       end
 
-      context 'when scripts with default omnibus naming are given' do
-        let(:default_scripts) { %w( postinst ) }
-        before do
-          default_scripts.each do |script_name|
-            create_file("#{project_root}/package-scripts/project/#{script_name}") do
-              "Contents of #{script_name}"
-            end
-          end
-        end
-
-        it 'writes the scripts into the staging dir' do
-          subject.write_scripts
+      it 'writes the scripts into the staging dir' do
+        subject.write_scripts
 
-          default_scripts.each do |script_name|
-            mapped_name = Packager::Makeself::SCRIPT_MAP[script_name.to_sym]
-            script_file = "#{staging_dir}/#{mapped_name}"
-            contents = File.read(script_file)
-            expect(contents).to include("Contents of #{script_name}")
-          end
+        default_scripts.each do |script_name|
+          mapped_name = Packager::Makeself::SCRIPT_MAP[script_name.to_sym]
+          script_file = "#{staging_dir}/#{mapped_name}"
+          contents = File.read(script_file)
+          expect(contents).to include("Contents of #{script_name}")
         end
       end
     end

data/spec/unit/packagers/rpm_spec.rb

@@ -10,6 +10,7 @@ module Omnibus
         project.build_version('1.2.3')
         project.build_iteration('2')
         project.maintainer('Chef Software')
+        project.replace('old-project')
       end
     end
 
@@ -150,6 +151,7 @@ module Omnibus
         expect(contents).to include("Vendor: Omnibus <omnibus@getchef.com>")
         expect(contents).to include("URL: https://example.com")
         expect(contents).to include("Packager: Chef Software")
+        expect(contents).to include("Obsoletes: old-project")
       end
 
       context 'when scripts are given' do
@@ -338,6 +340,21 @@ module Omnibus
       it 'returns the value from Ohai' do
         expect(subject.safe_architecture).to eq('i386')
       end
+
+      context 'on Pidora' do
+        before do
+          # There's no Pidora in Fauxhai :(
+          stub_ohai(platform: 'fedora', version: '20') do |data|
+            data['platform'] = 'pidora'
+            data['platform_version'] = '20'
+            data['kernel']['machine'] = 'armv6l'
+          end
+        end
+
+        it 'returns armv6hl' do
+          expect(subject.safe_architecture).to eq('armv6hl')
+        end
+      end
     end
   end
 end

data/spec/unit/software_spec.rb

@@ -51,6 +51,7 @@ module Omnibus
           expect(subject.with_standard_compiler_flags).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -59,6 +60,7 @@ module Omnibus
           expect(subject.with_standard_compiler_flags('LDFLAGS'        => 'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -67,6 +69,16 @@ module Omnibus
           expect(subject.with_standard_compiler_flags('CFLAGS'=>'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+            'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
+          )
+        end
+        it 'ovesrride CXXFLAGS' do
+          expect(subject.with_standard_compiler_flags('CXXFLAGS'=>'foo')).to eq(
+            'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
+            'CFLAGS'          => '-I/opt/project/embedded/include',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -76,6 +88,7 @@ module Omnibus
             'numberwang'      => 4,
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -92,8 +105,10 @@ module Omnibus
 
         it 'sets the defaults' do
           expect(subject.with_standard_compiler_flags).to eq(
+            'CC'              => 'gcc -static-libgcc',
             'LDFLAGS'         => '-R/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc',
             'CFLAGS'          => '-I/opt/project/embedded/include',
+            "CXXFLAGS"        => "-I/opt/project/embedded/include",
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'LD_OPTIONS'      => '-R/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
@@ -108,6 +123,7 @@ module Omnibus
           expect(subject.with_standard_compiler_flags).to eq(
             'LDFLAGS'         => '-L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
+            "CXXFLAGS"        => "-I/opt/project/embedded/include",
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -124,9 +140,10 @@ module Omnibus
 
         it 'sets the defaults' do
           expect(subject.with_standard_compiler_flags).to eq(
-            'CC'              => 'xlc -q64',
-            'CXX'             => 'xlC -q64',
-            'CFLAGS'          => '-q64 -I/opt/project/embedded/include -O',
+            'CC'              => 'xlc_r -q64',
+            'CXX'             => 'xlC_r -q64',
+            'CFLAGS'          => '-q64 -I/opt/project/embedded/include -D_LARGE_FILES -O',
+            "CXXFLAGS"        => "-q64 -I/opt/project/embedded/include -D_LARGE_FILES -O",
             'LDFLAGS'         => '-q64 -L/opt/project/embedded/lib -Wl,-blibpath:/opt/project/embedded/lib:/usr/lib:/lib',
             'LD'              => 'ld -b64',
             'OBJECT_MODE'     => '64',
@@ -137,62 +154,81 @@ module Omnibus
         end
       end
 
-      context 'on aix with gcc' do
+      context 'on freebsd' do
         before do
-          # There's no AIX in Fauxhai :(
-          stub_ohai(platform: 'solaris2', version: '5.11') do |data|
-            data['platform'] = 'aix'
-          end
+          stub_ohai(platform: 'freebsd', version: '9.2')
         end
 
         it 'sets the defaults' do
-          expect(subject.with_standard_compiler_flags(nil, aix: { use_gcc: true })).to eq(
-            'CC'              => 'gcc -maix64',
-            'CXX'             => 'g++ -maix64',
-            'CFLAGS'          => '-maix64 -O -I/opt/project/embedded/include',
-            'LDFLAGS'         => '-L/opt/project/embedded/lib -Wl,-blibpath:/opt/project/embedded/lib:/usr/lib:/lib',
-            'LD'              => 'ld -b64',
-            'OBJECT_MODE'     => '64',
-            'ARFLAGS'         => '-X64 cru',
-            'LD_RUN_PATH'     => '/opt/project/embedded/lib',
-            'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
+          expect(subject.with_standard_compiler_flags).to eq(
+            'CFLAGS'  => '-I/opt/project/embedded/include',
+            'CXXFLAGS'  => '-I/opt/project/embedded/include',
+            'LDFLAGS' => '-L/opt/project/embedded/lib',
+            'LD_RUN_PATH' => '/opt/project/embedded/lib',
+            'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
           )
         end
+
+        context 'on freebsd' do
+          before do
+            stub_ohai(platform: 'freebsd', version: '10.0')
+          end
+
+          it 'Clang as the default compiler' do
+            expect(subject.with_standard_compiler_flags).to eq(
+              'CC'              => 'clang',
+              'CXX'             => 'clang++',
+              'CFLAGS'          => '-I/opt/project/embedded/include',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include',
+              'LDFLAGS'         => '-L/opt/project/embedded/lib',
+              'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+              'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
+            )
+          end
+        end
       end
+
     end
 
     describe 'path helpers' do
+
       before do
         stub_const('File::PATH_SEPARATOR', separator)
         stub_env('PATH', path)
+        allow(project).to receive(:install_dir).and_return(install_dir)
       end
 
-      context 'on *NIX' do
+      let(:prepended_path) do
+        ["#{install_dir}/bin", separator, "#{install_dir}/embedded/bin", separator, path].join
+      end
+
+      context 'on *Nix' do
         let(:separator) { ':' }
         let(:path) { '/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin' }
+        let(:install_dir) { '/opt/project' }
 
         it 'prepends a path to PATH' do
           expect(subject.prepend_path('/foo/bar')).to eq(
-            '/foo/bar:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin'
+            ['/foo/bar', separator, path].join
           )
         end
 
         it 'prepends the embedded bin to PATH' do
           expect(subject.with_embedded_path).to eq(
-            'PATH' => '/opt/project/bin:/opt/project/embedded/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin'
+            'PATH' => prepended_path
           )
         end
 
         it 'with_embedded_path merges with a hash argument' do
           expect(subject.with_embedded_path('numberwang' => 4)).to eq(
             'numberwang' => 4,
-            'PATH' => '/opt/project/bin:/opt/project/embedded/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin'
+            'PATH' => prepended_path
           )
         end
 
         it 'prepends multiple paths to PATH' do
           expect(subject.prepend_path('/foo/bar', '/foo/baz')).to eq(
-            '/foo/bar:/foo/baz:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin'
+            ['/foo/bar', separator, '/foo/baz', separator, path].join
           )
         end
       end
@@ -200,37 +236,31 @@ module Omnibus
       context 'on Windows' do
         before do
           stub_ohai(platform: 'windows', version: '2012')
-          allow(project).to receive(:install_dir).and_return('c:/opt/project')
-          stub_env('Path', windows_path)
         end
 
         let(:separator) { ';' }
         let(:path) { 'c:/Ruby193/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem' }
-        let(:windows_path) { 'c:/Ruby999/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem' }
-
-        it "prepends a path to PATH" do
-          expect(subject.prepend_path('c:/foo/bar')).to eq(
-            'c:/foo/bar;c:/Ruby999/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem'
-          )
-        end
+        let(:install_dir) { 'c:/opt/project' }
 
-        it 'prepends the embedded bin to PATH' do
-          expect(subject.with_embedded_path).to eq(
-            'Path' => 'c:/opt/project/bin;c:/opt/project/embedded/bin;c:/Ruby999/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem'
-          )
-        end
+        context '`Path` exists in the environment' do
+          before do
+            stub_env('Path', path)
+            allow(ENV).to receive(:keys).and_return(%w( Path PATH ))
+          end
 
-        it 'with_embedded_path merges with a hash argument' do
-          expect(subject.with_embedded_path('numberwang' => 4)).to eq(
-            'numberwang' => 4,
-            'Path' => 'c:/opt/project/bin;c:/opt/project/embedded/bin;c:/Ruby999/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem'
-          )
+          it 'returns a path key of `Path`' do
+            expect(subject.with_embedded_path).to eq(
+              'Path' => prepended_path
+            )
+          end
         end
 
-        it 'prepends multiple paths to PATH' do
-          expect(subject.prepend_path('c:/foo/bar', 'c:/foo/baz')).to eq(
-            'c:/foo/bar;c:/foo/baz;c:/Ruby999/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem'
-          )
+        context '`Path` does not exist in the environment' do
+          it 'returns a path key of `PATH`' do
+            expect(subject.with_embedded_path).to eq(
+              'PATH' => prepended_path
+            )
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc.1
+  version: 4.0.0.rc.2
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -320,6 +320,7 @@ files:
 - resources/dmg/icon.png
 - resources/makeself/makeself-header.sh
 - resources/makeself/makeself.sh
+- resources/makeself/makeselfinst.erb
 - resources/msi/assets/LICENSE.rtf
 - resources/msi/assets/banner_background.bmp
 - resources/msi/assets/dialog_background.bmp