omnibus 3.2.0.rc.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f4a2b6643628a27e2deb75bce09e814bc8123f37
-  data.tar.gz: 85427f574979495b58b8877bd3cce27934faab20
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDQ2ZjE2OWViMWMxZGQ1NjIyOGRkZTc5ZGVmNTVlMTVlYmY4Njk0MQ==
+  data.tar.gz: !binary |-
+    MmM1ODJlYTM0MzU2M2Y4NzI0ZmVlNTQ0NjFkMDExNDE3ODg2M2FjMA==
 SHA512:
-  metadata.gz: 70a83fbaaf120dfb4d1fffa18e915a1a53d56866836f43878a2726d2f01e664a66995a0b42ab298e878f76d543d50d717eb5c823c0ddf4492d374549cdf784e4
-  data.tar.gz: c7c17973cb801f25c2870522f723431aa875510798810384c1cdb9783fd4b25c6169ada1b0dbb7b428b281089456e541fff1164f855ec9fce1472fb3eaafa60f
+  metadata.gz: !binary |-
+    ZDQzMjQ2MDk0MDU5NmFhMDczZDNiZTYwZjk3NDE3ZGY5NDU3MjYxYmVhNzUw
+    ZGQxNGQ3YWE2NjFiNWFhYzUxOTM4ZjEwYzcxMjVmY2U2NmU0ZTNjODYwOGZj
+    NTdhNzAxMjZhNjcyNjQzMWU0ZjVkODAzM2M4ZTRjMTU0ZWIxNTQ=
+  data.tar.gz: !binary |-
+    NTdiYmVlYmExNzk2NTg4ODAwYjQxNGQ4YWZkOGZiNDlhZmNiZjMwNjA0MTI0
+    OWE4NzljZmI3MTM2MTllZDgyMGM4ZGJmNTdiMzhkNTNjMWMwOTFkYmU0Zjdm
+    ZTdlOWZmYTY4OWY5NjAzYTg0MGY2NjdjNTA0MzA5Y2Y5NDIzNTk=

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 Omnibus Ruby CHANGELOG
 ======================
 
-v3.2.0.rc.3 (July 21, 2014)
----------------------------
+v3.2.0 (July 23, 2014)
+----------------------
 - Make build commands output during `log.info` instead of `log.debug`
 - Refactor Chef Sugar into an includable module, permitting DSL methods in both Software and Project definitions
 - Refactor `omnibus release` into a non-S3-specific backend "publisher"
@@ -48,7 +48,7 @@ v3.2.0.rc.3 (July 21, 2014)
 - Add `with_embedded_path` to software
 - Add `with_standard_compiler_flags` to software
 - Add `package_scripts_path` to project
-- Add builder DSL methods for `mkdir`, `touch`, `delete`, `copy`, `move`, and `link`
+- Add builder DSL methods for `mkdir`, `touch`, `delete`, `copy`, `move`, `link`, and `sync`
 
 ### Bug fixes
 - Fix a small typo in the project generator (come -> some)
@@ -70,6 +70,7 @@ v3.2.0.rc.3 (July 21, 2014)
 - Require `net/http`, `net/https`, and `net/ftp` in the base fetcher module
 - Use -R, not -W1 on FreeBSD's compile flags
 - Expand all paths relative to the project_root
+- Unset all Ruby, Bundler, amd Gem-related environment variables before shelling out
 - Various documentation fixes and updates
 
 ### Potentially breaking changes
@@ -80,6 +81,7 @@ v3.2.0.rc.3 (July 21, 2014)
 - Remove the ability to use an overrides file - this was for internal use only and was never exposed as a public API. However, if you dug into the code and found it, it has now been removed. For BC purposes, the value still exists in the configuration object, but is essentially a no-op
 - Move project loading from INFO to DEBUG
 - Truncate platforms to short versions
+- All paths are represented internally as Unix-style paths - previously Omnibus would try to intelligently build your paths differently on Windows for the purposes of shelling out to the system. This proved to be unmaintainable and makes Ruby very unhappy in most circumsatances. As such, we have exposed the `windows_safe_path` method in the Builder DSL that will convert a string to a "Windows-safe path". This is only needed when shelling out to the system.
 
 
 v3.1.1 (May 20, 2014)
@@ -321,22 +323,22 @@ BUG FIXES:
 - The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#63]: https://github.com/opscode/omnibus-ruby/issues/63
-[#67]: https://github.com/opscode/omnibus-ruby/issues/67
-[#70]: https://github.com/opscode/omnibus-ruby/issues/70
-[#71]: https://github.com/opscode/omnibus-ruby/issues/71
-[#72]: https://github.com/opscode/omnibus-ruby/issues/72
-[#73]: https://github.com/opscode/omnibus-ruby/issues/73
-[#74]: https://github.com/opscode/omnibus-ruby/issues/74
-[#77]: https://github.com/opscode/omnibus-ruby/issues/77
-[#78]: https://github.com/opscode/omnibus-ruby/issues/78
-[#79]: https://github.com/opscode/omnibus-ruby/issues/79
-[#80]: https://github.com/opscode/omnibus-ruby/issues/80
-[#81]: https://github.com/opscode/omnibus-ruby/issues/81
-[#82]: https://github.com/opscode/omnibus-ruby/issues/82
-[#83]: https://github.com/opscode/omnibus-ruby/issues/83
-[#85]: https://github.com/opscode/omnibus-ruby/issues/85
-[#86]: https://github.com/opscode/omnibus-ruby/issues/86
+[#63]: https://github.com/opscode/omnibus/issues/63
+[#67]: https://github.com/opscode/omnibus/issues/67
+[#70]: https://github.com/opscode/omnibus/issues/70
+[#71]: https://github.com/opscode/omnibus/issues/71
+[#72]: https://github.com/opscode/omnibus/issues/72
+[#73]: https://github.com/opscode/omnibus/issues/73
+[#74]: https://github.com/opscode/omnibus/issues/74
+[#77]: https://github.com/opscode/omnibus/issues/77
+[#78]: https://github.com/opscode/omnibus/issues/78
+[#79]: https://github.com/opscode/omnibus/issues/79
+[#80]: https://github.com/opscode/omnibus/issues/80
+[#81]: https://github.com/opscode/omnibus/issues/81
+[#82]: https://github.com/opscode/omnibus/issues/82
+[#83]: https://github.com/opscode/omnibus/issues/83
+[#85]: https://github.com/opscode/omnibus/issues/85
+[#86]: https://github.com/opscode/omnibus/issues/86
 [@benjaminws]: https://github.com/benjaminws
 [@christophergeers]: https://github.com/christophergeers
 [@christophermaier]: https://github.com/christophermaier

data/README.md

@@ -1,10 +1,10 @@
 ![Omnibus Icon](lib/omnibus/assets/README-logo.png) Omnibus
 ===========================================================
 [![Gem Version](http://img.shields.io/gem/v/omnibus.svg)][gem]
-[![Build Status](http://img.shields.io/travis/opscode/omnibus-ruby.svg)][travis]
+[![Build Status](http://img.shields.io/travis/opscode/omnibus.svg)][travis]
 
 [gem]: https://rubygems.org/gems/omnibus
-[travis]: http://travis-ci.org/opscode/omnibus-ruby
+[travis]: http://travis-ci.org/opscode/omnibus
 
 Easily create full-stack installers for your project across a variety of platforms.
 
@@ -81,7 +81,7 @@ s3_secret_key  ENV['S3_SECRET_KEY']
 s3_bucket      ENV['S3_BUCKET']
 ```
 
-For more information, please see the [`Config` documentation](http://rubydoc.info/github/opscode/omnibus-ruby/Omnibus/Config).
+For more information, please see the [`Config` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Config).
 
 You can tell Omnibus to load a difference configuration file by passing the `--config` option to any command:
 
@@ -122,7 +122,7 @@ Some DSL methods available include:
 | `build_iteration` | The package iteration number                |
 | `dependency`      | An Omnibus software-defined component to include in this package |
 
-For more information, please see the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus-ruby/Omnibus/Project).
+For more information, please see the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Project).
 
 
 ### Software
@@ -183,7 +183,7 @@ end
 
 Since the software definitions are simply ruby code, you can conditionally execute anything by wrapping it with pure Ruby that tests for the version number.
 
-For more DSL methods, please consult the [`Software` documentation](http://rubydoc.info/github/opscode/omnibus-ruby/Omnibus/Software).
+For more DSL methods, please consult the [`Software` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Software).
 
 #### Sharing software definitions
 The easiest way to share organization-wide software is via bundler and Rubygems. For an example software repository, look at Chef's [omnibus-software](https://github.com/opscode/omnibus-software). For more information, please see the [Rubygems documentation](http://guides.rubygems.org/publishing/).

data/lib/omnibus/builder.rb

@@ -15,11 +15,15 @@
 #
 
 require 'fileutils'
-require 'ostruct'
 require 'mixlib/shellout'
+require 'ostruct'
+require 'pathname'
 
 module Omnibus
   class Builder
+    # Files to be ignored during a directory globbing
+    IGNORED_FILES = %w(. ..).freeze
+
     include Cleanroom
     include Digestable
     include Instrumentation
@@ -152,6 +156,30 @@ module Omnibus
     end
     expose :max_build_jobs
 
+    #
+    # Convert the given path to be appropiate for shelling out on Windows. Most
+    # internal calls will wrap paths automatically, but the +command+ method is
+    # unable to do so.
+    #
+    # @example
+    #   command "#{windows_safe_path(install_dir)}\\embedded\\bin\\gem"
+    #
+    # @param [String, Array<String>] pieces
+    #   the pieces of the path to join and fix
+    # @return [String]
+    #   the path with applied changes
+    #
+    def windows_safe_path(*pieces)
+      path = File.join(*pieces)
+
+      if File::ALT_SEPARATOR
+        path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+      else
+        path
+      end
+    end
+    expose :windows_safe_path
+
     #
     # @!endgroup
     # --------------------------------------------------
@@ -354,7 +382,8 @@ module Omnibus
     expose :mkdir
 
     #
-    # Touch the given filepath at runtime.
+    # Touch the given filepath at runtime. This method will also ensure the
+    # containing directory exists first.
     #
     # @param [String] file
     #   the path of the file to touch
@@ -365,6 +394,9 @@ module Omnibus
     def touch(file, options = {})
       build_commands << BuildCommand.new("touch `#{file}'") do
         Dir.chdir(software.install_dir) do
+          parent = File.dirname(file)
+          FileUtils.mkdir_p(parent) unless File.directory?(parent)
+
           FileUtils.touch(file, options)
         end
       end
@@ -373,7 +405,8 @@ module Omnibus
 
     #
     # Delete the given file or directory on the system. This method uses the
-    # equivalent of +rm -rf+.
+    # equivalent of +rm -rf+, so you may pass in a specific file or a glob of
+    # files.
     #
     # @param [String] path
     #   the path of the file to delete
@@ -384,14 +417,17 @@ module Omnibus
     def delete(path, options = {})
       build_commands << BuildCommand.new("delete `#{path}'") do
         Dir.chdir(software.install_dir) do
-          FileUtils.rm_rf(path, options)
+          glob(path).each do |file|
+            FileUtils.rm_rf(file, options)
+          end
         end
       end
     end
     expose :delete
 
     #
-    # Copy the given source to the destination.
+    # Copy the given source to the destination. This method accepts a single
+    # file or a file pattern to match.
     #
     # @param [String] source
     #   the path on disk to copy from
@@ -404,14 +440,17 @@ module Omnibus
     def copy(source, destination, options = {})
       build_commands << BuildCommand.new("copy `#{source}' to `#{destination}'") do
         Dir.chdir(software.install_dir) do
-          FileUtils.cp_r(source, destination, options)
+          glob(source).each do |file|
+            FileUtils.cp_r(file, destination, options)
+          end
         end
       end
     end
     expose :copy
 
     #
-    # Copy the given source to the destination.
+    # Copy the given source to the destination. This method accepts a single
+    # file or a file pattern to match
     #
     # @param [String] source
     #   the path on disk to move from
@@ -424,14 +463,17 @@ module Omnibus
     def move(source, destination, options = {})
       build_commands << BuildCommand.new("move `#{source}' to `#{destination}'") do
         Dir.chdir(software.install_dir) do
-          FileUtils.mv(source, destination, options)
+          glob(source).each do |file|
+            FileUtils.mv(file, destination, options)
+          end
         end
       end
     end
     expose :move
 
     #
-    # Link the given source to the destination.
+    # Link the given source to the destination. This method accepts a single
+    # file or a file pattern to match
     #
     # @param [String] source
     #   the path on disk to link from
@@ -444,12 +486,88 @@ module Omnibus
     def link(source, destination, options = {})
       build_commands << BuildCommand.new("link `#{source}' to `#{destination}'") do
         Dir.chdir(software.install_dir) do
-          FileUtils.ln_s(source, destination, options)
+          glob(source).each do |file|
+            FileUtils.ln_s(file, destination, options)
+          end
         end
       end
     end
     expose :link
 
+    #
+    # Copy the files from +source+ to +destination+, while removing any files
+    # in +destination+ that are not present in +source+.
+    #
+    # You can pass the option +:exclude+ option to ignore files and folders that
+    # match the given pattern(s). Note the exclude pattern behaves on paths
+    # relative to the given source. If you want to exclude a nested directory,
+    # you will need to use something like +**/directory+.
+    #
+    # @example
+    #   sync "#{project_dir}/**/*.rb", "#{install_dir}/ruby_files"
+    #
+    # @example
+    #   sync project_dir, "#{install_dir}/files", exclude: '.git'
+    #
+    # @param [String] source
+    #   the path on disk to sync from
+    # @param [String] destination
+    #   the path on disk to sync to
+    #
+    # @option options [String, Array<String>] :exclude
+    #   a file, folder, or globbing pattern of files to ignore when syncing
+    #
+    # @return (see #command)
+    #
+    def sync(source, destination, options = {})
+      build_commands << BuildCommand.new("sync `#{source}' to `#{destination}'") do
+        Dir.chdir(software.install_dir) do
+          # The source must be a destination in the sync command
+          unless File.directory?(source)
+            raise ArgumentError, "`source' must be a directory, but was a " \
+              "`#{File.ftype(source)}'! If you just want to sync a file, use " \
+              "the `copy' method instead."
+          end
+
+          # Reject any files that match the excludes pattern
+          excludes = Array(options[:exclude]).map do |exclude|
+            [exclude, "#{exclude}/*"]
+          end.flatten
+
+          source_files = all_files(source)
+          source_files = source_files.reject do |source_file|
+            basename = relative_path_for(source_file, source)
+            excludes.any? { |exclude| File.fnmatch?(exclude, basename, File::FNM_DOTMATCH) }
+          end
+
+          # Ensure the destination directory exists
+          FileUtils.mkdir_p(destination) unless File.directory?(destination)
+
+          # Copy over the filtered source files
+          FileUtils.cp_r(source_files, destination)
+
+          # Remove any files in the destination that are not in the source files
+          destination_files = all_files(destination)
+
+          # Calculate the relative paths of files so we can compare to the
+          # source.
+          relative_source_files = source_files.map do |file|
+            relative_path_for(file, source)
+          end
+          relative_destination_files = destination_files.map do |file|
+            relative_path_for(file, destination)
+          end
+
+          # Remove any extra files that are present in the destination, but are
+          # not in the source list
+          extra_files = relative_destination_files - relative_source_files
+          extra_files.each do |file|
+            FileUtils.rm_rf(File.join(destination, file))
+          end
+        end
+      end
+    end
+
     #
     # @!endgroup
     # --------------------------------------------------
@@ -701,6 +819,38 @@ module Omnibus
       [candidate_paths, file]
     end
 
+    #
+    # Get all the regular files and directories at the given path. It is assumed
+    # this path is a fully-qualified path and/or executed from a proper relative
+    # path.
+    #
+    # @param [String] path
+    #   the path to get all files from
+    #
+    # @return [Array<String>]
+    #   the list of all files
+    #
+    def all_files(path)
+      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject do |file|
+        basename = File.basename(file)
+        IGNORED_FILES.include?(basename)
+      end
+    end
+
+    #
+    # The relative path of the given +path+ to the +parent+.
+    #
+    # @param [String] path
+    #   the path to get relative with
+    # @param [String] parent
+    #   the parent where the path is contained (hopefully)
+    #
+    # @return [String]
+    #
+    def relative_path_for(path, parent)
+      Pathname.new(path).relative_path_from(Pathname.new(parent)).to_s
+    end
+
     #
     # The log key for this class, overriden to incorporate the software name.
     #
@@ -710,6 +860,23 @@ module Omnibus
       @log_key ||= "#{super}: #{software.name}"
     end
 
+    #
+    # Glob across the given pattern, accounting for dotfiles, removing Ruby's
+    # dumb idea to include +'.'+ and +'..'+ as entries.
+    #
+    # @param [String] path
+    #   the path to get all files from
+    #
+    # @return [Array<String>]
+    #   the list of all files
+    #
+    def glob(pattern)
+      Dir.glob(pattern, File::FNM_DOTMATCH).reject do |file|
+        basename = File.basename(file)
+        IGNORED_FILES.include?(basename)
+      end
+    end
+
     #
     # This is an internal wrapper around a command executed on the system. The
     # block could contain a Ruby command (such as +FileUtils.rm_rf('/')+), or it

data/lib/omnibus/config.rb

@@ -120,7 +120,7 @@ module Omnibus
     # @return [String]
     default(:base_dir) do
       if Ohai['platform'] == 'windows'
-        'C:\\omnibus-ruby'
+        'C:/omnibus-ruby'
       else
         '/var/cache/omnibus'
       end
@@ -130,7 +130,7 @@ module Omnibus
     # code will be cached.
     #
     # @return [String]
-    default(:cache_dir) { windows_safe_path(base_dir, 'cache') }
+    default(:cache_dir) { File.join(base_dir, 'cache') }
 
     # The absolute path to the directory on the virtual machine where
     # git caching will occur and software's will be progressively cached.
@@ -140,7 +140,7 @@ module Omnibus
       if defined?(@install_path_cache_dir)
         @install_path_cache_dir
       else
-        windows_safe_path(base_dir, 'cache', 'git_cache')
+        File.join(base_dir, 'cache', 'git_cache')
       end
     end
 
@@ -159,19 +159,19 @@ module Omnibus
     # source code will be downloaded.
     #
     # @return [String]
-    default(:source_dir) { windows_safe_path(base_dir, 'src') }
+    default(:source_dir) { File.join(base_dir, 'src') }
 
     # The absolute path to the directory on the virtual machine where
     # software will be built.
     #
     # @return [String]
-    default(:build_dir) { windows_safe_path(base_dir, 'build') }
+    default(:build_dir) { File.join(base_dir, 'build') }
 
     # The absolute path to the directory on the virtual machine where
     # packages will be constructed.
     #
     # @return [String]
-    default(:package_dir) { windows_safe_path(base_dir, 'pkg') }
+    default(:package_dir) { File.join(base_dir, 'pkg') }
 
     # The absolute path to the directory on the virtual machine where
     # packagers will store intermediate packaging products. Some packaging
@@ -179,7 +179,7 @@ module Omnibus
     # use this setting.
     #
     # @return [String]
-    default(:package_tmp) { windows_safe_path(base_dir, 'pkg-tmp') }
+    default(:package_tmp) { File.join(base_dir, 'pkg-tmp') }
 
     # The relative path of the directory containing {Omnibus::Project}
     # DSL files.  This is relative to {#project_root}.
@@ -298,6 +298,15 @@ module Omnibus
       raise MissingConfigOption.new(:artifactory_password, "'password'")
     end
 
+    # The base path artifacts are published to. This is usually maps to
+    # the artifacts's organization. AKA `orgPath` in the Artifactory
+    # world.
+    #
+    # @return [String]
+    default(:artifactory_base_path) do
+      raise MissingConfigOption.new(:artifactory_base_path, "'com/mycompany'")
+    end
+
     # The path on disk to an SSL pem file to sign requests with.
     #
     # @return [String, nil]

data/lib/omnibus/exceptions.rb

@@ -244,20 +244,6 @@ EOH
     end
   end
 
-  class OldMetadata < Error
-    def initialize(path)
-      @path = path
-    end
-
-    def to_s
-      <<-EOH
-The metadata at '#{@path}'
-was generated by an older version of Omnibus. Please regenerate the package with
-this version of Omnibus and retry.
-EOH
-    end
-  end
-
   class InsufficientSpecification < Error
     def initialize(key, package)
       @key, @package = key, package

data/lib/omnibus/package.rb

@@ -60,6 +60,11 @@ module Omnibus
           data = File.read(path_for(package))
           hash = JSON.parse(data, symbolize_names: true)
 
+           # Ensure Platform version has been truncated
+           if hash[:platform_version] && hash[:platform]
+             hash[:platform_version] = truncate_platform_version(hash[:platform_version], hash[:platform])
+           end
+
           # Ensure an interation exists
           hash[:iteration] ||= 1
 
@@ -89,6 +94,33 @@ module Omnibus
           Ohai['kernel']['machine']
         end
 
+        #
+        # Platform version to be used in package metadata.
+        #
+        # @return [String]
+        #   the platform version
+        #
+        def platform_version
+          truncate_platform_version(Ohai['platform_version'], platform_shortname)
+        end
+
+        #
+        # 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
+        #
+        def platform_shortname
+          if Ohai['platform_family'] == 'rhel'
+            'el'
+          else
+            Ohai['platform']
+          end
+        end
+
+        private
+
         #
         # On certain platforms we don't care about the full MAJOR.MINOR.PATCH platform
         # version. This method will properly truncate the version down to a more human
@@ -101,17 +133,17 @@ module Omnibus
         #   the platform shortname. this might be an Ohai-returned platform or
         #   platform family but it also might be a shortname like `el`
         #
-        def platform_version
-          case platform_shortname
+        def truncate_platform_version(platform_version, platform)
+          case platform
           when 'centos', 'debian', 'fedora', 'freebsd', 'rhel', 'el'
             # Only want MAJOR (e.g. Debian 7)
-            Ohai['platform_version'].split('.').first
+            platform_version.split('.').first
           when 'aix', 'arch', 'gentoo', 'mac_os_x', 'openbsd', 'slackware', 'solaris2', 'suse', 'ubuntu'
             # Only want MAJOR.MINOR (e.g. Mac OS X 10.9, Ubuntu 12.04)
-            Ohai['platform_version'].split('.')[0..1].join('.')
+            platform_version.split('.')[0..1].join('.')
           when 'omnios', 'smartos'
             # Only want MAJOR (e.g OmniOS r151006, SmartOS 20120809T221258Z)
-            Ohai['platform_version'].split('.').first
+            platform_version.split('.').first
           when 'windows'
             # Windows has this really awesome "feature", where their version numbers
             # internally do not match the "marketing" name.
@@ -126,7 +158,7 @@ module Omnibus
             #
             #  http://www.jrsoftware.org/ishelp/index.php?topic=winvernotes
             #
-            case Ohai['platform_version']
+            case platform_version
             when '5.0.2195', '2000'   then '2000'
             when '5.1.2600', 'xp'     then 'xp'
             when '5.2.3790', '2003r2' then '2003r2'
@@ -138,31 +170,16 @@ module Omnibus
             # version is the same as Windows 8. It's only here for completeness and
             # documentation.
             when '6.2.9200', '2012'   then '2012'
-            when '6.3.9200', '8.1'    then '8.1'
+            when /6\.3\.\d+/, '8.1' then '8.1'
             # The following `when` will never match since Windows 2012R2's platform
             # version is the same as Windows 8.1. It's only here for completeness
             # and documentation.
-            when '6.3.9200', '2012r2' then '2012r2'
+            when /6\.3\.\d+/, '2012r2' then '2012r2'
             else
-              raise UnknownPlatformVersion.new(platform_shortname, Ohai['platform_version'])
+              raise UnknownPlatformVersion.new(platform, platform_version)
             end
           else
-            raise UnknownPlatform.new(platform_shortname)
-          end
-        end
-
-        #
-        # 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
-        #
-        def platform_shortname
-          if Ohai['platform_family'] == 'rhel'
-            'el'
-          else
-            Ohai['platform']
+            raise UnknownPlatform.new(platform)
           end
         end
       end

data/lib/omnibus/project.rb

@@ -185,7 +185,7 @@ module Omnibus
       if null?(val)
         @install_dir || raise(MissingProjectConfiguration.new('install_dir', '/opt/chef'))
       else
-        @install_dir = File.expand_path(windows_safe_path(val))
+        @install_dir = File.expand_path(val, Config.project_root)
       end
     end
     expose :install_dir