omnibus 3.2.2 → 4.0.0.beta.1

data/resources/deb/md5sums.erb

@@ -0,0 +1,3 @@
+<% md5sums.each do |path, checksum| -%>
+<%= checksum %> <%= path %>
+<% end -%>

data/resources/dmg/create_dmg.osascript.erb

@@ -0,0 +1,17 @@
+tell application "Finder"
+  tell disk "<%= volume_name %>"
+    open
+    set current view of container window to icon view
+    set toolbar visible of container window to false
+    set statusbar visible of container window to false
+    set the bounds of container window to {<%= window_bounds %>}
+    set theViewOptions to the icon view options of container window
+    set arrangement of theViewOptions to not arranged
+    set icon size of theViewOptions to 72
+    set background picture of theViewOptions to file ".support:background.png"
+    delay 5
+    set position of item "<%= pkg_name %>" of container window to {<%= pkg_position %>}
+    update without registering applications
+    delay 5
+  end tell
+end tell

data/{lib/omnibus/generator_files/package_scripts/makeselfinst.erb → resources/makeself/post_extract.sh.erb}

@@ -1,12 +1,12 @@
 #!/bin/bash
 #
-# Install a full <%= config[:name] %>
+# Installs <%= friendly_name %>
 #
 
 PROGNAME=`basename $0`
 INSTALLER_DIR=`dirname $0`
-DEST_DIR=<%= config[:install_dir] %>
-CONFIG_DIR=/etc/<%= config[:name] %>
+DEST_DIR=<%= install_dir %>
+CONFIG_DIR=/etc/<%= name %>
 USAGE="usage: $0"
 
 error_exit()
@@ -22,6 +22,6 @@ cp -R $INSTALLER_DIR $DEST_DIR || error_exit "Cannot install to $DEST_DIR"
 rm -f $DEST_DIR/$PROGNAME
 
 # You may want to symlink your packages bin files into /usr/bin
-# ln -sf $DEST_DIR/bin/<%= config[:name] %> /usr/bin || error_exit "Cannot link <%= config[:name] %> to /usr/bin"
+# ln -sf $DEST_DIR/bin/<%= name %> /usr/bin || error_exit "Cannot link <%= name %> to /usr/bin"
 
 exit 0

data/{spec/fixtures/sample/files/windows_msi/Resources/localization-en-us.wxl → resources/msi/localization-en-us.wxl.erb}

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <!-- http://wix.codeplex.com/SourceControl/changeset/view/792e101c5cf7#src%2fext%2fUIExtension%2fwixlib%2fWixUI_en-us.wxl -->
   <String Id="LANG">1033</String>
-  <String Id="ProductName">Sample</String>
-  <String Id="ManufacturerName">Chef</String>
+  <String Id="ProductName"><%= friendly_name %></String>
+  <String Id="ManufacturerName"><%= maintainer %></String>
   <String Id="WelcomeDlgTitle">{\WixUI_Font_Bigger}Welcome to the [ProductName] Setup Wizard</String>
 
   <String Id="LicenseAgreementDlgTitle">{\WixUI_Font_Title_White}End-User License Agreement</String>
@@ -16,5 +15,5 @@
 
   <String Id="VerifyReadyDlgInstallTitle">{\WixUI_Font_Title_White}Ready to install [ProductName]</String>
 
-  <String Id="FeatureMainName">Sample</String>
+  <String Id="FeatureMainName"><%= friendly_name %></String>
 </WixLocalization>

data/resources/msi/parameters.wxi.erb

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?define VersionNumber="<%= version %>" ?>
+  <?define DisplayVersionNumber="<%= display_version %>" ?>
+  <?define UpgradeCode="<%= upgrade_code %>" ?>
+<% parameters.each do |key, value| -%>
+  <?define <%= key %>="<%= value %>" ?>
+<% end -%>
+</Include>

data/{lib/omnibus/generator_files/windows_msi → resources/msi}/source.wxs.erb

@@ -15,15 +15,14 @@
       Define the minimum supported installer version (2.0).
       The install should be done for the whole machine not just the current user
     -->
-    <Package InstallerVersion="200" InstallPrivileges="elevated"
-             Compressed="yes" InstallScope="perMachine" />
+    <Package InstallerVersion="200" InstallPrivileges="elevated" Compressed="yes" InstallScope="perMachine" />
 
     <Media Id="1" Cabinet="Project.cab" EmbedCab="yes" CompressionLevel="high" />
 
     <!-- Major upgrade -->
     <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion OnlyDetect="yes" Minimum="$(var.VersionNumber)" IncludeMinimum="no" Property="NEWERVERSIONDETECTED" />
-      <UpgradeVersion Minimum="0.0.0.0" IncludeMinimum="yes" Maximum="$(var.VersionNumber)" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED" />
+      <UpgradeVersion Minimum="0.0.0.0" IncludeMinimum="yes" Maximum="$(var.VersionNumber)" IncludeMaximum="yes" Property="OLDERVERSIONBEINGUPGRADED" />
     </Upgrade>
 
     <InstallExecuteSequence>
@@ -31,27 +30,28 @@
     </InstallExecuteSequence>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="WindowsVolume">
-        <!-- Service needs chef directory to be present. -->
-        <Directory Id="INSTALLLOCATION" Name="opt">
-          <Directory Id="PROJECTLOCATION" Name="<%= config[:name] %>">
-          </Directory>
-        </Directory>
+      <Directory Id="WINDOWSVOLUME">
+<% hierarchy.each.with_index do |(name, id), index| -%>
+        <%= '  '*index %><Directory Id="<%= id %>" Name="<%= name %>">
+<% end -%>
+<% hierarchy.keys.each.with_index do |_, index| -%>
+        <%= '  '*(hierarchy.size - index-1) %></Directory>
+<% end -%>
       </Directory>
     </Directory>
 
+    <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
+
     <!-- Set the components defined in our fragment files that will be used for our feature  -->
-    <Feature Id="ProjectFeature" Title="!(loc.FeatureMainName)" Absent="disallow" AllowAdvertise="no" Level="1" ConfigurableDirectory="INSTALLLOCATION">
+    <Feature Id="ProjectFeature" Title="!(loc.FeatureMainName)" Absent="disallow" AllowAdvertise="no" Level="1" ConfigurableDirectory="<%= wix_install_dir %>">
       <ComponentGroupRef Id="ProjectDir" />
     </Feature>
 
-    <!--
-      UI Stuff
-    -->
+    <!-- UI Stuff -->
     <Icon Id="project.ico" SourceFile="Resources\assets\project_16x16.ico"/>
     <Property Id="ARPPRODUCTICON" Value="project.ico" />
     <Property Id="ARPHELPLINK" Value="http://www.getchef.com/" />
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
+    <Property Id="WIXUI_INSTALLDIR" Value="<%= wix_install_dir %>" />
 
     <UIRef Id="ProjectUI_InstallDir"/>
     <UI Id="ProjectUI_InstallDir">
@@ -69,6 +69,5 @@
     <WixVariable Id="WixUIInfoIco" Value="Resources\assets\project_32x32.ico" />
     <WixVariable Id="WixUINewIco" Value="Resources\assets\project_16x16.ico" />
     <WixVariable Id="WixUIUpIco" Value="Resources\assets\project_16x16.ico" />
-
   </Product>
 </Wix>

data/resources/pkg/distribution.xml.erb

@@ -0,0 +1,21 @@
+<?xml version="1.0" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+  <title><%= friendly_name %></title>
+  <background file="background.png" alignment="bottomleft" mime-type="image/png"/>
+  <welcome file="welcome.html" mime-type="text/html"/>
+  <license file="license.html" mime-type="text/html"/>
+
+  <!-- Generated by productbuild - - synthesize -->
+  <pkg-ref id="<%= identifier %>"/>
+  <options customize="never" require-scripts="false"/>
+  <choices-outline>
+    <line choice="default">
+      <line choice="<%= identifier %>"/>
+    </line>
+  </choices-outline>
+  <choice id="default"/>
+  <choice id="<%= identifier %>" visible="false">
+    <pkg-ref id="<%= identifier %>"/>
+  </choice>
+  <pkg-ref id="<%= identifier %>" version="<%= version %>" onConclusion="none"><%= component_pkg %></pkg-ref>
+</installer-gui-script>

data/resources/pkg/license.html.erb

@@ -0,0 +1,3 @@
+All Rights Reserved
+
+This is a generic Omnibus license file for <%= friendly_name %>. If you are building Mac OS X packages, you should generate a custom license file and description to suit your needs.

data/resources/pkg/welcome.html.erb

@@ -0,0 +1,7 @@
+This will install <%= friendly_name %> on your Mac.
+
+--------------------------------------------------
+
+This is a generic Omnibus welcome message. If you are building Mac OS X packages, you should generate a custom welcome file to suit your needs.
+
+If you are not the creator of <%= friendly_name %>, the presence of this message is likely a bug and should be reported to the creator.

data/resources/rpm/rpmmacros.erb

@@ -0,0 +1,3 @@
+%_signature gpg
+%_gpg_path <%= gpg_path %>
+%_gpg_name <%= gpg_name %>

data/resources/rpm/signing.erb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+unless (rpm_cmd = ARGV[0])
+  STDERR.puts 'Usage: sign-rpm RPM_COMMAND'
+  exit 1
+end
+
+password = '<%= passphrase %>'
+
+require 'pty'
+
+puts rpm_cmd
+PTY.spawn(rpm_cmd) do |r, w, pid|
+  prompt = r.read(19)
+
+  # match the expected prompt exactly, since that's the only way we know if
+  # something went wrong.
+  unless prompt == 'Enter pass phrase: '
+    STDERR.puts "unexpected output from `#{rpm_cmd}`: '#{prompt}'"
+    Process.kill(:KILL, pid)
+    exit 1
+  end
+
+  STDOUT.puts prompt
+  w.write("#{password}\n")
+
+  # Keep printing output unti the command exits
+  loop do
+    begin
+      line = r.gets
+      puts line
+      if line =~ /failed/
+        STDERR.puts 'RPM signing failure'
+        exit 1
+      end
+    rescue Errno::EIO
+      break
+    end
+  end
+end

data/resources/rpm/spec.erb

@@ -0,0 +1,70 @@
+# Disable any shell actions, replace them with simply 'true'
+%define __spec_prep_post true
+%define __spec_prep_pre true
+%define __spec_build_post true
+%define __spec_build_pre true
+%define __spec_install_post true
+%define __spec_install_pre true
+%define __spec_clean_post true
+%define __spec_clean_pre true
+
+# Use md5
+%define _binary_filedigest_algorithm 1
+
+# Use gzip payload compression
+%define _binary_payload w9.gzdio
+
+# Metadata
+Name: <%= name %>
+Version: <%= version %>
+Release: <%= iteration %>
+Summary:  <%= description.split("\n").first.empty? ? "_" : description.split("\n").first %>
+BuildArch: <%= architecture %>
+AutoReqProv: no
+BuildRoot: %buildroot
+Prefix: /
+Group: <%= category %>
+License: <%= license %>
+Vendor: <%= vendor %>
+URL: <%= homepage %>
+Packager: <%= maintainer %>
+<% dependencies.each do |name| -%>
+Requires: <%= name %>
+<% end -%>
+<% conflicts.each do |name| -%>
+Conflicts: <%= name %>
+<% end -%>
+<% conflicts.each do |name| -%>
+Obsoletes: <%= name %>
+<%- end -%>
+<% # RPM rejects descriptions with blank lines (even between content) -%>
+%description
+<%= description.gsub(/^\s*$/, " .") %>
+
+%prep
+# noop
+
+%build
+# noop
+
+%install
+# noop
+
+%clean
+# noop
+
+<% scripts.each do |name, contents| -%>
+%<%= name %>
+<%= contents %>
+<% end -%>
+
+%files
+%defattr(-,<%= user %>,<%= group %>,-)
+<% # Output config files and then regular files -%>
+<% config_files.each do |file| -%>
+%config(noreplace) <%= file %>
+<% end -%>
+<% # List all files -%>
+<% files.each do |file| -%>
+<%= file %>
+<% end -%>

data/spec/functional/builder_spec.rb

@@ -2,14 +2,7 @@ require 'spec_helper'
 
 module Omnibus
   describe Builder do
-    let(:software) do
-      double(Software,
-        name: 'chefdk',
-        install_dir: File.join(tmp_path, 'chefdk'),
-        project_dir: File.join(tmp_path, 'chefdk', 'cache'),
-        overridden?: false,
-      )
-    end
+    include_examples 'a software'
 
     #
     # Fakes the embedded bin path to whatever exists in bundler. This is useful
@@ -17,28 +10,12 @@ module Omnibus
     # a real Ruby just for functional tests.
     #
     def fake_embedded_bin(name)
-      bin = File.join(software.install_dir, 'embedded', 'bin')
-
-      FileUtils.mkdir_p(bin)
-      FileUtils.ln_s(Bundler.which(name), File.join(bin, name))
+      create_directory(bin_dir)
+      create_link(Bundler.which(name), File.join(bin_dir, name))
     end
 
     subject { described_class.new(software) }
 
-    before do
-      Config.project_root(tmp_path)
-      Config.build_retries(0)
-      Config.use_git_caching(false)
-      Config.software_gems(nil)
-
-      # Make the directories
-      FileUtils.mkdir_p(software.install_dir)
-      FileUtils.mkdir_p(software.project_dir)
-      FileUtils.mkdir_p(File.join(tmp_path, 'config', 'software'))
-      FileUtils.mkdir_p(File.join(tmp_path, 'config', 'patches'))
-      FileUtils.mkdir_p(File.join(tmp_path, 'config', 'templates'))
-    end
-
     describe '#command' do
       it 'executes the command' do
         path = File.join(software.install_dir, 'file.txt')
@@ -49,10 +26,15 @@ module Omnibus
       end
     end
 
+    describe '#make' do
+      it 'is waiting for a good samaritan to write tests' do
+        skip
+      end
+    end
+
     describe '#patch' do
       it 'applies the patch' do
-        configure = File.join(tmp_path, 'chefdk', 'cache', 'configure')
-        FileUtils.mkdir_p(File.dirname(configure))
+        configure = File.join(project_dir, 'configure')
         File.open(configure, 'w') do |f|
           f.write <<-EOH.gsub(/^ {12}/, '')
             THING="-e foo"
@@ -60,8 +42,7 @@ module Omnibus
           EOH
         end
 
-        patch = File.join(tmp_path, 'config', 'patches', 'chefdk', 'apply.patch')
-        FileUtils.mkdir_p(File.dirname(patch))
+        patch = File.join(patches_dir, 'apply.patch')
         File.open(patch, 'w') do |f|
           f.write <<-EOH.gsub(/^ {12}/, '')
             --- a/configure
@@ -80,8 +61,7 @@ module Omnibus
 
     describe '#ruby' do
       it 'executes the command as the embdedded ruby' do
-        ruby = File.join(tmp_path, 'chefdk', 'scripts', 'setup.rb')
-        FileUtils.mkdir_p(File.dirname(ruby))
+        ruby = File.join(scripts_dir, 'setup.rb')
         File.open(ruby, 'w') do |f|
           f.write <<-EOH.gsub(/^ {12}/, '')
             File.write("#{software.install_dir}/test.txt", 'This is content!')
@@ -94,7 +74,7 @@ module Omnibus
         subject.build
 
         path = "#{software.install_dir}/test.txt"
-        expect(File.exist?(path)).to be_truthy
+        expect(path).to be_a_file
         expect(File.read(path)).to eq('This is content!')
       end
     end
@@ -118,7 +98,7 @@ module Omnibus
         fake_embedded_bin('gem')
 
         subject.gem("build #{gemspec}")
-        subject.gem("install #{tmp_path}/chefdk/cache/example-1.0.0.gem")
+        subject.gem("install #{project_dir}/example-1.0.0.gem")
         output = capture_logging { subject.build }
 
         expect(output).to include('gem build')
@@ -186,14 +166,13 @@ module Omnibus
         output = capture_logging { subject.build }
 
         expect(output).to include('A complex operation')
-        expect(File.exist?("#{software.project_dir}/bacon")).to be_truthy
+        expect("#{software.project_dir}/bacon").to be_a_file
       end
     end
 
     describe '#erb' do
       it 'renders the erb' do
-        erb = File.join(tmp_path, 'config', 'templates', 'chefdk', 'example.erb')
-        FileUtils.mkdir_p(File.dirname(erb))
+        erb = File.join(templates_dir, 'example.erb')
         File.open(erb, 'w') do |f|
           f.write <<-EOH.gsub(/^ {12}/, '')
             <%= a %>
@@ -210,7 +189,7 @@ module Omnibus
         )
         subject.build
 
-        expect(File.exist?(destination)).to be_truthy
+        expect(destination).to be_a_file
         expect(File.read(destination)).to eq("foo\nbar\n")
       end
     end
@@ -218,24 +197,24 @@ module Omnibus
     describe '#mkdir' do
       it 'creates the directory' do
         path = File.join(tmp_path, 'scratch')
-        FileUtils.rm_rf(path)
+        remove_directory(path)
 
         subject.mkdir(path)
         subject.build
 
-        expect(File.directory?(path)).to be_truthy
+        expect(path).to be_a_directory
       end
     end
 
     describe '#touch' do
       it 'creates the file' do
         path = File.join(tmp_path, 'file')
-        FileUtils.rm_rf(path)
+        remove_file(path)
 
         subject.touch(path)
         subject.build
 
-        expect(File.file?(path)).to be_truthy
+        expect(path).to be_a_file
       end
 
       it 'creates the containing directory' do
@@ -245,29 +224,29 @@ module Omnibus
         subject.touch(path)
         subject.build
 
-        expect(File.file?(path)).to be_truthy
+        expect(path).to be_a_file
       end
     end
 
     describe '#delete' do
       it 'deletes the directory' do
         path = File.join(tmp_path, 'scratch')
-        FileUtils.mkdir_p(path)
+        create_directory(path)
 
         subject.delete(path)
         subject.build
 
-        expect(File.exist?(path)).to be_falsey
+        expect(path).to_not be_a_directory
       end
 
       it 'deletes the file' do
         path = File.join(tmp_path, 'file')
-        FileUtils.touch(path)
+        create_file(path)
 
         subject.delete(path)
         subject.build
 
-        expect(File.exist?(path)).to be_falsey
+        expect(path).to_not be_a_file
       end
 
       it 'accepts a glob pattern' do
@@ -279,8 +258,8 @@ module Omnibus
         subject.delete("#{tmp_path}/**/file_*")
         subject.build
 
-        expect(File.exist?(path_a)).to be_falsey
-        expect(File.exist?(path_b)).to be_falsey
+        expect(path_a).to_not be_a_file
+        expect(path_b).to_not be_a_file
       end
     end
 
@@ -288,12 +267,12 @@ module Omnibus
       it 'copies the file' do
         path_a = File.join(tmp_path, 'file1')
         path_b = File.join(tmp_path, 'file2')
-        FileUtils.touch(path_a)
+        create_file(path_a)
 
         subject.copy(path_a, path_b)
         subject.build
 
-        expect(File.file?(path_b)).to be_truthy
+        expect(path_b).to be_a_file
         expect(File.read(path_b)).to eq(File.read(path_a))
       end
 
@@ -311,9 +290,9 @@ module Omnibus
         subject.copy(directory, destination)
         subject.build
 
-        expect(File.exist?(destination)).to be_truthy
-        expect(File.exist?("#{destination}/file_a")).to be_truthy
-        expect(File.exist?("#{destination}/file_b")).to be_truthy
+        expect(destination).to be_a_directory
+        expect("#{destination}/file_a").to be_a_file
+        expect("#{destination}/file_b").to be_a_file
       end
 
       it 'accepts a glob pattern' do
@@ -331,9 +310,9 @@ module Omnibus
         subject.copy("#{directory}/*", destination)
         subject.build
 
-        expect(File.exist?(destination)).to be_truthy
-        expect(File.exist?("#{destination}/file_a")).to be_truthy
-        expect(File.exist?("#{destination}/file_b")).to be_truthy
+        expect(destination).to be_a_directory
+        expect("#{destination}/file_a").to be_a_file
+        expect("#{destination}/file_b").to be_a_file
       end
     end
 
@@ -341,13 +320,13 @@ module Omnibus
       it 'moves the file' do
         path_a = File.join(tmp_path, 'file1')
         path_b = File.join(tmp_path, 'file2')
-        FileUtils.touch(path_a)
+        create_file(path_a)
 
         subject.move(path_a, path_b)
         subject.build
 
-        expect(File.file?(path_b)).to be_truthy
-        expect(File.file?(path_a)).to be_falsey
+        expect(path_b).to be_a_file
+        expect(path_a).to_not be_a_file
       end
 
       it 'moves the directory and entries' do
@@ -364,11 +343,11 @@ module Omnibus
         subject.move(directory, destination)
         subject.build
 
-        expect(File.exist?(destination)).to be_truthy
-        expect(File.exist?("#{destination}/file_a")).to be_truthy
-        expect(File.exist?("#{destination}/file_b")).to be_truthy
+        expect(destination).to be_a_directory
+        expect("#{destination}/file_a").to be_a_file
+        expect("#{destination}/file_b").to be_a_file
 
-        expect(File.exist?(directory)).to be_falsey
+        expect(directory).to_not be_a_directory
       end
 
       it 'accepts a glob pattern' do
@@ -386,11 +365,11 @@ module Omnibus
         subject.move("#{directory}/*", destination)
         subject.build
 
-        expect(File.exist?(destination)).to be_truthy
-        expect(File.exist?("#{destination}/file_a")).to be_truthy
-        expect(File.exist?("#{destination}/file_b")).to be_truthy
+        expect(destination).to be_a_directory
+        expect("#{destination}/file_a").to be_a_file
+        expect("#{destination}/file_b").to be_a_file
 
-        expect(File.exist?(directory)).to be_truthy
+        expect(directory).to be_a_directory
       end
     end
 
@@ -398,12 +377,12 @@ module Omnibus
       it 'links the file' do
         path_a = File.join(tmp_path, 'file1')
         path_b = File.join(tmp_path, 'file2')
-        FileUtils.touch(path_a)
+        create_file(path_a)
 
         subject.link(path_a, path_b)
         subject.build
 
-        expect(File.symlink?(path_b)).to be_truthy
+        expect(path_b).to be_a_symlink
       end
 
       it 'links the directory' do
@@ -414,7 +393,7 @@ module Omnibus
         subject.link(directory, destination)
         subject.build
 
-        expect(File.symlink?(destination)).to be_truthy
+        expect(destination).to be_a_symlink
       end
 
       it 'accepts a glob pattern' do
@@ -432,8 +411,8 @@ module Omnibus
         subject.link("#{directory}/*", destination)
         subject.build
 
-        expect(File.symlink?("#{destination}/file_a")).to be_truthy
-        expect(File.symlink?("#{destination}/file_b")).to be_truthy
+        expect("#{destination}/file_a").to be_a_symlink
+        expect("#{destination}/file_b").to be_a_symlink
       end
     end
 
@@ -464,13 +443,13 @@ module Omnibus
           subject.sync(source, destination)
           subject.build
 
-          expect(File.file?("#{destination}/file_a")).to be_truthy
-          expect(File.file?("#{destination}/file_b")).to be_truthy
-          expect(File.file?("#{destination}/file_c")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
-          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_truthy
-          expect(File.file?("#{destination}/.file_g")).to be_truthy
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder/file_f").to be_a_file
+          expect("#{destination}/.file_g").to be_a_file
         end
       end
 
@@ -486,18 +465,18 @@ module Omnibus
           subject.sync(source, destination)
           subject.build
 
-          expect(File.file?("#{destination}/file_a")).to be_truthy
-          expect(File.file?("#{destination}/file_b")).to be_truthy
-          expect(File.file?("#{destination}/file_c")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
-          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_truthy
-          expect(File.file?("#{destination}/.file_g")).to be_truthy
-
-          expect(File.exist?("#{destination}/existing_folder")).to be_falsey
-          expect(File.exist?("#{destination}/.existing_folder")).to be_falsey
-          expect(File.exist?("#{destination}/existing_file")).to be_falsey
-          expect(File.exist?("#{destination}/.existing_file")).to be_falsey
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder/file_f").to be_a_file
+          expect("#{destination}/.file_g").to be_a_file
+
+          expect("#{destination}/existing_folder").to_not be_a_directory
+          expect("#{destination}/.existing_folder").to_not be_a_directory
+          expect("#{destination}/existing_file").to_not be_a_file
+          expect("#{destination}/.existing_file").to_not be_a_file
         end
       end
 
@@ -506,14 +485,14 @@ module Omnibus
           subject.sync(source, destination, exclude: '.dot_folder')
           subject.build
 
-          expect(File.file?("#{destination}/file_a")).to be_truthy
-          expect(File.file?("#{destination}/file_b")).to be_truthy
-          expect(File.file?("#{destination}/file_c")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
-          expect(File.exist?("#{destination}/.dot_folder")).to be_falsey
-          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_falsey
-          expect(File.file?("#{destination}/.file_g")).to be_truthy
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder").to_not be_a_directory
+          expect("#{destination}/.dot_folder/file_f").to_not be_a_file
+          expect("#{destination}/.file_g").to be_a_file
         end
 
         it 'removes existing files and folders in destination' do
@@ -525,17 +504,17 @@ module Omnibus
           subject.sync(source, destination, exclude: '.dot_folder')
           subject.build
 
-          expect(File.file?("#{destination}/file_a")).to be_truthy
-          expect(File.file?("#{destination}/file_b")).to be_truthy
-          expect(File.file?("#{destination}/file_c")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
-          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
-          expect(File.exist?("#{destination}/.dot_folder")).to be_falsey
-          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_falsey
-          expect(File.file?("#{destination}/.file_g")).to be_truthy
-
-          expect(File.exist?("#{destination}/existing_folder")).to be_falsey
-          expect(File.exist?("#{destination}/existing_file")).to be_falsey
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder").to_not be_a_directory
+          expect("#{destination}/.dot_folder/file_f").to_not be_a_file
+          expect("#{destination}/.file_g").to be_a_file
+
+          expect("#{destination}/existing_folder").to_not be_a_directory
+          expect("#{destination}/existing_file").to_not be_a_file
         end
       end
     end