omnibus 4.1.0 → 5.0.0

data/lib/omnibus/packagers/rpm.rb

@@ -282,27 +282,27 @@ module Omnibus
       render_template(resource_path('spec.erb'),
         destination: spec_file,
         variables: {
-          name:           safe_base_package_name,
-          version:        safe_version,
-          iteration:      safe_build_iteration,
-          vendor:         vendor,
-          license:        license,
-          dist_tag:       dist_tag,
-          architecture:   safe_architecture,
-          maintainer:     project.maintainer,
-          homepage:       project.homepage,
-          description:    project.description,
-          priority:       priority,
-          category:       category,
-          conflicts:      project.conflicts,
-          replaces:       project.replaces,
-          dependencies:   project.runtime_dependencies,
-          user:           project.package_user,
-          group:          project.package_group,
-          scripts:        scripts,
-          config_files:   config_files,
-          files:          files,
-          build_dir:      build_dir,
+          name:            safe_base_package_name,
+          version:         safe_version,
+          iteration:       safe_build_iteration,
+          vendor:          vendor,
+          license:         license,
+          dist_tag:        dist_tag,
+          maintainer:      project.maintainer,
+          homepage:        project.homepage,
+          description:     project.description,
+          priority:        priority,
+          category:        category,
+          conflicts:       project.conflicts,
+          replaces:        project.replaces,
+          dependencies:    project.runtime_dependencies,
+          user:            project.package_user,
+          group:           project.package_group,
+          scripts:         scripts,
+          config_files:    config_files,
+          files:           files,
+          build_dir:       build_dir,
+          platform_family: Ohai['platform_family']
         }
       )
     end
@@ -316,6 +316,7 @@ module Omnibus
     #
     def create_rpm_file
       command =  %|fakeroot rpmbuild|
+      command << %| --target #{safe_architecture}|
       command << %| -bb|
       command << %| --buildroot #{staging_dir}/BUILD|
       command << %| --define '_topdir #{staging_dir}'|
@@ -494,16 +495,27 @@ module Omnibus
       #   http://rpm.org/ticket/56
       #
       if version =~ /\-/
-        converted = version.gsub('-', '~')
-
-        log.warn(log_key) do
-          "Tildes hold special significance in the RPM package versions. " \
-          "They mark a version as lower priority in RPM's version compare " \
-          "logic. We'll replace all dashes (-) with tildes (~) so pre-release" \
-          "versions get sorted earlier then final versions. Converting" \
-          "`#{project.build_version}' to `#{converted}'."
+        if Ohai['platform_family'] == 'wrlinux'
+          converted = version.gsub('-', '_') #WRL has an elderly RPM version
+          log.warn(log_key) do
+            "Omnibus replaces dashes (-) with tildes (~) so pre-release " \
+            "versions get sorted earlier than final versions.  However, the " \
+            "version of rpmbuild on Wind River Linux does not support this. " \
+            "All dashes will be replaced with underscores (_). Converting " \
+            "`#{project.build_version}' to `#{converted}'."
+          end
+        else
+          converted = version.gsub('-', '~')
+          log.warn(log_key) do
+            "Tildes hold special significance in the RPM package versions. " \
+            "They mark a version as lower priority in RPM's version compare " \
+            "logic. We'll replace all dashes (-) with tildes (~) so pre-release" \
+            "versions get sorted earlier then final versions. Converting" \
+            "`#{project.build_version}' to `#{converted}'."
+          end
         end
 
+
         version = converted
       end
 

data/lib/omnibus/packagers/solaris.rb

@@ -14,29 +14,32 @@
 # limitations under the License.
 #
 
+require 'socket'
+
 module Omnibus
   class Packager::Solaris < Packager::Base
+    # @return [Hash]
+    SCRIPT_MAP = {
+      # Default Omnibus naming
+      postinst:  'postinstall',
+      postrm: 'postremove',
+      # Default Solaris naming
+      postinstall:  'postinstall',
+      postremove: 'postremove',
+    }.freeze
+
     id :solaris
 
     build do
-      shellout! "cd #{install_dirname} && find #{install_basename} -print > #{staging_dir_path('files')}"
-      
-
-      write_prototype_content
-
-      write_pkginfo_content
-
-      copy_file("#{project.package_scripts_path}/postinst", staging_dir_path('postinstall'))
-      copy_file("#{project.package_scripts_path}/postrm", staging_dir_path('postremove'))
-
-      shellout! "pkgmk -o -r #{install_dirname} -d #{staging_dir} -f #{staging_dir_path('Prototype')}"
-      shellout! "pkgchk -vd #{staging_dir} #{project.package_name}"
-      shellout! "pkgtrans #{staging_dir} #{package_path} #{project.package_name}"
+      write_scripts
+      write_prototype_file
+      write_pkginfo_file
+      create_solaris_file
     end
 
     # @see Base#package_name
     def package_name
-      "#{project.package_name}-#{pkgmk_version}.#{Ohai['kernel']['machine']}.solaris"
+      "#{project.package_name}-#{pkgmk_version}.#{safe_architecture}.solaris"
     end
 
     def pkgmk_version
@@ -50,24 +53,42 @@ module Omnibus
     def install_basename
       File.basename(project.install_dir)
     end
-    
+
     def staging_dir_path(file_name)
       File.join(staging_dir, file_name)
     end
 
+    #
+    # Copy all scripts in {Project#package_scripts_path} to the control
+    # directory of this repo.
+    #
+    # @return [void]
+    #
+    def write_scripts
+      SCRIPT_MAP.each do |source, destination|
+        source_path = File.join(project.package_scripts_path, source.to_s)
+
+        if File.file?(source_path)
+          destination_path = staging_dir_path(destination)
+          log.debug(log_key) { "Adding script `#{source}' to `#{destination_path}'" }
+          copy_file(source_path, destination_path)
+        end
+      end
+    end
+
     #
     # Generate a Prototype file for solaris build
     #
-    def write_prototype_content
-      prototype_content = <<-EOF.gsub(/^ {8}/, '')
-        i pkginfo
-        i postinstall
-        i postremove
-      EOF
+    def write_prototype_file
+      shellout! "cd #{install_dirname} && find #{install_basename} -print > #{staging_dir_path('files')}"
 
       # generate list of control files
       File.open staging_dir_path('Prototype'), 'w+' do |f|
-        f.write prototype_content
+        f.write <<-EOF.gsub(/^ {10}/, '')
+          i pkginfo
+          i postinstall
+          i postremove
+        EOF
       end
 
       # generate the prototype's file list
@@ -80,7 +101,10 @@ module Omnibus
     #
     # Generate a pkginfo file for solaris build
     #
-    def write_pkginfo_content
+    def write_pkginfo_file
+      hostname = Socket.gethostname
+
+      # http://docs.oracle.com/cd/E19683-01/816-0219/6m6njqbat/index.html
       pkginfo_content = <<-EOF.gsub(/^ {8}/, '')
         CLASSES=none
         TZ=PST
@@ -88,17 +112,44 @@ module Omnibus
         BASEDIR=#{install_dirname}
         PKG=#{project.package_name}
         NAME=#{project.package_name}
-        ARCH=#{`uname -p`.chomp}
+        ARCH=#{safe_architecture}
         VERSION=#{pkgmk_version}
         CATEGORY=application
         DESC=#{project.description}
         VENDOR=#{project.maintainer}
         EMAIL=#{project.maintainer}
-        PSTAMP=#{`hostname`.chomp + Time.now.utc.iso8601}
+        PSTAMP=#{hostname}#{Time.now.utc.iso8601}
       EOF
       File.open staging_dir_path('pkginfo'), 'w+' do |f|
         f.write pkginfo_content
       end
     end
+
+    #
+    # Generate the Solaris file using +pkg*+.
+    #
+    # @return [void]
+    #
+    def create_solaris_file
+      shellout! "pkgmk -o -r #{install_dirname} -d #{staging_dir} -f #{staging_dir_path('Prototype')}"
+      shellout! "pkgchk -vd #{staging_dir} #{project.package_name}"
+      shellout! "pkgtrans #{staging_dir} #{package_path} #{project.package_name}"
+    end
+
+    #
+    # The architecture for this Solaris package.
+    #
+    # @return [String]
+    #
+    def safe_architecture
+      # The #i386? and #intel? helpers come from chef-sugar
+      if intel?
+        'i386'
+      elsif sparc?
+        'sparc'
+      else
+        Ohai['kernel']['machine']
+      end
+    end
   end
 end

data/lib/omnibus/publisher.rb

@@ -112,6 +112,10 @@ module Omnibus
           publish_packages.concat(build_packages)
         end
 
+        if publish_packages.empty?
+          log.info(log_key) { 'No packages found, skipping publish' }
+        end
+
         publish_packages
       end
     end

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -38,10 +38,7 @@ module Omnibus
             artifact_for(package).upload(
               repository,
               remote_path_for(package),
-              metadata_for(package).merge(
-                'build.name'   => package.metadata[:name],
-                'build.number' => package.metadata[:version],
-              ),
+              default_properties.merge(metadata_properties_for(package)),
             )
           end
         rescue Artifactory::Error::HTTPError => e
@@ -120,11 +117,11 @@ module Omnibus
           name: 'omnibus',
           version: Omnibus::VERSION,
         },
-        properties: {
+        properties: default_properties.merge(
           'omnibus.project' => name,
           'omnibus.version' => manifest.build_version,
           'omnibus.version_manifest' => manifest.to_json,
-        },
+        ),
         modules: [
           {
             # com.getchef:chef-server:12.0.0
@@ -188,8 +185,8 @@ module Omnibus
     #
     # @return [Hash<String, String>]
     #
-    def metadata_for(package)
-      {
+    def metadata_properties_for(package)
+      metadata = {
         'omnibus.project'          => package.metadata[:name],
         'omnibus.platform'         => package.metadata[:platform],
         'omnibus.platform_version' => package.metadata[:platform_version],
@@ -201,6 +198,20 @@ module Omnibus
         'omnibus.sha256'           => package.metadata[:sha256],
         'omnibus.sha512'           => package.metadata[:sha512],
       }
+      metadata.merge!(
+        'build.name'   => package.metadata[:name],
+        'build.number' => package.metadata[:version],
+      ) if build_record?
+      metadata
+    end
+
+    #
+    # Properties to attach to published artifacts (and build record).
+    #
+    # @return [Hash<String, String>]
+    #
+    def default_properties
+      @properties ||= @options[:properties] || {}
     end
 
     #

data/lib/omnibus/sugarable.rb

@@ -30,6 +30,11 @@ require 'chef/sugar/vagrant'
 
 module Omnibus
   module Sugarable
+    def self.extended(base)
+      base.send(:extend, Chef::Sugar::DSL)
+      base.send(:extend, Omnibus::Sugar)
+    end
+
     def self.included(base)
       base.send(:include, Chef::Sugar::DSL)
       base.send(:include, Omnibus::Sugar)

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '4.1.0'
+  VERSION = '5.0.0'
 end

data/omnibus.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.description    = gem.summary
   gem.homepage       = 'https://github.com/opscode/omnibus'
 
-  gem.required_ruby_version = '>= 1.9.1'
+  gem.required_ruby_version = '>= 2'
 
   gem.files = `git ls-files`.split($/)
   gem.bindir = 'bin'

data/resources/msi/localization-en-us.wxl.erb

@@ -16,4 +16,8 @@
   <String Id="VerifyReadyDlgInstallTitle">{\WixUI_Font_Title_White}Ready to install [ProductName]</String>
 
   <String Id="FeatureMainName"><%= friendly_name %></String>
+
+  <String Id="MinimumOSVersionMessage">This package requires minimum OS version: Windows 7/Windows Server 2008 R2 or greater.</String>
+  <String Id="DowngradeErrorMessage">A newer version of [ProductName] is already installed.</String>
+  <String Id="FileExtractionProgress">Extracting files, please wait...</String>  
 </WixLocalization>

data/resources/msi/source.wxs.erb

@@ -12,23 +12,60 @@
           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
+      Minimum installer version (2.0) - Window XP and above.
+      The install scope is per machine, not the current user
     -->
-    <Package InstallerVersion="200" InstallPrivileges="elevated" Compressed="yes" InstallScope="perMachine" />
+    <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="yes" Property="OLDERVERSIONBEINGUPGRADED" />
-    </Upgrade>
+    <!--
+      Uncomment launch condition below to check for minimum OS
+      601 = Windows 7/Server 2008R2.
+    -->
+    <!-- Condition Message="!(loc.MinimumOSVersionMessage)">
+      <![CDATA[Installed OR VersionNT >= 601]]>
+    </Condition -->
+
+    <!-- We always do Major upgrades -->
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />
+
+    <!--
+      If fastmsi is set, custom actions will be invoked during install to unzip
+      project files, and during uninstall to remove the project folder
+    -->
+    <% if fastmsi %>
+    <SetProperty Id="FastUnzip"
+                 Value="FASTZIPDIR=[INSTALLLOCATION];FASTZIPAPPNAME=chefdk"
+                 Sequence="execute"
+                 Before="FastUnzip" />
+
+    <CustomAction Id="FastUnzip"
+                  BinaryKey="CustomActionFastMsiDLL"
+                  DllEntry="FastUnzip"
+                  Execute="deferred"
+                  Return="check" />
+
+    <Binary Id="CustomActionFastMsiDLL"
+            SourceFile="CustomActionFastMsi.CA.dll" />
+
+    <CustomAction Id="Cleanup"
+                  Directory="INSTALLLOCATION"
+                  ExeCommand="cmd /C &quot;rd /S /Q chefdk&quot;"
+                  Execute="deferred"
+                  Return="ignore" />
 
     <InstallExecuteSequence>
-      <RemoveExistingProducts After="InstallValidate" />
+      <Custom Action="FastUnzip" After="InstallFiles">NOT Installed</Custom>
+      <Custom Action="Cleanup" After="RemoveFiles">REMOVE~="ALL"</Custom>
     </InstallExecuteSequence>
 
+    <UI>
+      <ProgressText Action="FastUnzip">!(loc.FileExtractionProgress)</ProgressText>
+    </UI>
+    <% end %>
+
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="WINDOWSVOLUME">
 <% hierarchy.each.with_index do |(name, id), index| -%>

data/resources/rpm/spec.erb

@@ -19,7 +19,6 @@ Name: <%= name %>
 Version: <%= version %>
 Release: <%= iteration %><%= dist_tag %>
 Summary:  <%= description.split("\n").first.empty? ? "_" : description.split("\n").first %>
-BuildArch: <%= architecture %>
 AutoReqProv: no
 BuildRoot: %buildroot
 Prefix: /

data/spec/functional/builder_spec.rb

@@ -15,18 +15,94 @@ module Omnibus
     # manner similar to one that omnibus provides, we would need to emulate
     # the fixup steps here as well, which is a pain the ass.
     #
-    # So just don't run those tests on windows.
+    # Instead we write batch files that redirect to the batch files
+    # corresponding to the system installation and hope it all works out.
     def fake_embedded_bin(name)
-      create_directory(embedded_bin_dir)
-      name = 'ruby.exe' if windows? && name == 'ruby'
-      create_link(Bundler.which(name), File.join(embedded_bin_dir, name))
+      if windows?
+        ext = (name == 'ruby') ? '.exe' : '.bat'
+        source = Bundler.which(name + ext)
+        raise "Could not find #{name} in bundler environment" unless source
+        File.open(File.join(embedded_bin_dir, name + '.bat'), 'w') do |f|
+          f.write <<-EOH.gsub(/^ {12}/, '')
+            @"#{source}" %*
+          EOH
+        end
+      else
+        source = Bundler.which(name)
+        raise "Could not find #{name} in bundler environment" unless source
+
+        target = File.join(embedded_bin_dir, name)
+        create_link(source, target) unless File.exists?(target)
+      end
+    end
+
+    def shellout_opts(subject)
+      # Pass GEM_HOME and GEM_PATH to subprocess so our fake bin works
+      options = {}
+      options[:env] = {
+          'GEM_HOME' => ENV['GEM_HOME'],
+          'GEM_PATH' => ENV['GEM_PATH'],
+      }
+      options[:env].merge!(subject.with_embedded_path)
+      options
+    end
+
+
+    def make_gemspec()
+      gemspec = File.join(project_dir, "#{project_name}.gemspec")
+      File.open(gemspec, 'w') do |f|
+        f.write <<-EOH.gsub(/^ {12}/, '')
+            Gem::Specification.new do |gem|
+              gem.name           = '#{project_name}'
+              gem.version        = '1.0.0'
+              gem.author         = 'Chef Software, Inc.'
+              gem.email          = 'info@getchef.com'
+              gem.description    = 'Installs a thing'
+              gem.summary        = gem.description
+            end
+        EOH
+      end
+      gemspec
+    end
+
+    def make_gemfile()
+      gemfile = File.join(project_dir, 'Gemfile')
+      File.open(gemfile, 'w') do |f|
+        f.write <<-EOH.gsub(/^ {12}/, '')
+            gemspec
+        EOH
+      end
+      gemfile
+    end
+
+    def make_gemfile_lock()
+      gemfile_lock = File.join(project_dir, 'Gemfile.lock')
+      File.open(gemfile_lock, 'w') do |f|
+        f.write <<-EOH.gsub(/^ {12}/, '')
+            PATH
+              remote: .
+              specs:
+                #{project_name} (1.0.0)
+
+            GEM
+              specs:
+
+            PLATFORMS
+              ruby
+
+            DEPENDENCIES
+              #{project_name}!
+        EOH
+      end
+      gemfile_lock
     end
 
     subject { described_class.new(software) }
+    let(:project_name) { 'example' }
+    let(:project_dir) { File.join(source_dir, project_name) }
 
     describe '#command' do
       it 'executes the command' do
-        path = File.join(software.install_dir, 'file.txt')
         subject.command("echo 'Hello World!'")
 
         output = capture_logging { subject.build }
@@ -78,7 +154,7 @@ module Omnibus
 
         fake_embedded_bin('ruby')
 
-        subject.ruby(ruby)
+        subject.ruby(ruby, env: subject.with_embedded_path)
         subject.build
 
         path = "#{software.install_dir}/test.txt"
@@ -87,140 +163,60 @@ module Omnibus
       end
     end
 
-    describe '#gem', :not_supported_on_windows do
+    describe '#gem' do
       it 'executes the command as the embedded gem' do
-        gemspec = File.join(tmp_path, 'example.gemspec')
-        File.open(gemspec, 'w') do |f|
-          f.write <<-EOH.gsub(/^ {12}/, '')
-            Gem::Specification.new do |gem|
-              gem.name           = 'example'
-              gem.version        = '1.0.0'
-              gem.author         = 'Chef Software, Inc.'
-              gem.email          = 'info@getchef.com'
-              gem.description    = 'Installs a thing'
-              gem.summary        = gem.description
-            end
-          EOH
-        end
-
+        make_gemspec
         fake_embedded_bin('gem')
+        gem_file = "#{project_name}-1.0.0.gem"
 
-        subject.gem("build #{gemspec}")
-        subject.gem("install #{project_dir}/example-1.0.0.gem")
+        subject.gem("build #{project_name}.gemspec", shellout_opts(subject))
+        subject.gem("install #{gem_file}", shellout_opts(subject))
         output = capture_logging { subject.build }
 
+        expect(File.join(project_dir, gem_file)).to be_a_file
         expect(output).to include('gem build')
         expect(output).to include('gem install')
+
       end
     end
 
-    describe '#bundler', :not_supported_on_windows do
+    describe '#bundler' do
       it 'executes the command as the embedded bundler' do
-        gemspec = File.join(tmp_path, 'example.gemspec')
-        File.open(gemspec, 'w') do |f|
-          f.write <<-EOH.gsub(/^ {12}/, '')
-            Gem::Specification.new do |gem|
-              gem.name           = 'example'
-              gem.version        = '1.0.0'
-              gem.author         = 'Chef Software, Inc.'
-              gem.email          = 'info@getchef.com'
-              gem.description    = 'Installs a thing'
-              gem.summary        = gem.description
-            end
-          EOH
-        end
-
-        gemfile = File.join(tmp_path, 'Gemfile')
-        File.open(gemfile, 'w') do |f|
-          f.write <<-EOH.gsub(/^ {12}/, '')
-            gemspec
-          EOH
-        end
-
+        make_gemspec
+        make_gemfile
         fake_embedded_bin('bundle')
 
-        # Pass GEM_HOME and GEM_PATH to subprocess so our fake bin works
-        options = {}
-        options[:env] = {
-          'GEM_HOME' => ENV['GEM_HOME'],
-          'GEM_PATH' => ENV['GEM_PATH'],
-        }
-
-        subject.bundle('install', options)
+        subject.bundle('install', shellout_opts(subject))
         output = capture_logging { subject.build }
 
+        expect(File.join(project_dir, 'Gemfile.lock')).to be_a_file
         expect(output).to include('bundle install')
       end
     end
 
-    describe '#appbundle', :not_supported_on_windows do
+    describe '#appbundle' do
       it 'executes the command as the embedded appbundler' do
+        make_gemspec
+        make_gemfile
+        make_gemfile_lock
 
-        source_dir       = "#{Omnibus::Config.source_dir}/example"
-        embedded_app_dir = "#{software.install_dir}/embedded/apps/example"
-        bin_dir          = "#{software.install_dir}/bin"
-
-        FileUtils.mkdir(source_dir)
-
-        gemspec = File.join(source_dir, 'example.gemspec')
-        File.open(gemspec, 'w') do |f|
-          f.write <<-EOH.gsub(/^ {12}/, '')
-            Gem::Specification.new do |gem|
-              gem.name           = 'example'
-              gem.version        = '1.0.0'
-              gem.author         = 'Chef Software, Inc.'
-              gem.email          = 'info@getchef.com'
-              gem.description    = 'Installs a thing'
-              gem.summary        = gem.description
-            end
-          EOH
-        end
-
-        gemfile      = File.join(source_dir, 'Gemfile')
-        File.open(gemfile, 'w') do |f|
-          f.write <<-EOH.gsub(/^ {12}/, '')
-            gemspec
-          EOH
-        end
-
-        gemfile_lock = File.join(source_dir, 'Gemfile.lock')
-        File.open(gemfile_lock, 'w') do |f|
-          f.write <<-EOH.gsub(/^ {12}/, '')
-            PATH
-              remote: .
-              specs:
-                example (1.0.0)
-
-            GEM
-              specs:
-
-            PLATFORMS
-              ruby
-
-            DEPENDENCIES
-              example!
-          EOH
-        end
-
+        fake_embedded_bin('gem')
         fake_embedded_bin('appbundler')
 
-        # Pass GEM_HOME and GEM_PATH to subprocess so our fake bin works
-        options = {}
-        options[:env] = {
-          'GEM_HOME' => ENV['GEM_HOME'],
-          'GEM_PATH' => ENV['GEM_PATH'],
-        }
-
-        subject.appbundle('example', options)
+        subject.gem("build #{project_name}.gemspec", shellout_opts(subject))
+        subject.gem("install #{project_name}-1.0.0.gem", shellout_opts(subject))
+        subject.appbundle(project_name, shellout_opts(subject))
         output = capture_logging { subject.build }
 
-        expect(output).to include("/opt/chefdk/embedded/bin/appbundler '#{embedded_app_dir}' '#{bin_dir}'")
+        appbundler_path = File.join(embedded_bin_dir, 'appbundler')
+        appbundler_path.gsub!(/\//,'\\') if windows?
+        expect(output).to include("#{appbundler_path} '#{project_dir}' '#{bin_dir}'")
       end
     end
 
-    describe '#rake', :not_supported_on_windows do
+    describe '#rake' do
       it 'executes the command as the embedded rake' do
-        rakefile = File.join(tmp_path, 'Rakefile')
+        rakefile = File.join(project_dir, 'Rakefile')
         File.open(rakefile, 'w') do |f|
           f.write <<-EOH.gsub(/^ {12}/, '')
             task(:foo) {  }
@@ -229,8 +225,8 @@ module Omnibus
 
         fake_embedded_bin('rake')
 
-        subject.rake('-T')
-        subject.rake('foo')
+        subject.rake('-T', shellout_opts(subject))
+        subject.rake('foo', shellout_opts(subject))
         output = capture_logging { subject.build }
 
         expect(output).to include('rake -T')