More omnibus def updates from Chef

Getting the file path right should fix the build failures

Signed-off-by: Tim Smith <tsmith@chef.io>

omnibus/.gitignore

@@ -2,11 +2,11 @@
 .bundle
 .cache/*
 .kitchen/
-.kitchen.local.yml
 vendor/bundle
 pkg/*
-.vagrant
+kitchen.local.yml
 bin/*
 files/**/cache/
 vendor/cookbooks
 Berksfile.lock
+Gemfile.local

omnibus/Gemfile

@@ -14,6 +14,12 @@ group :development do
 
   # Use Test Kitchen with Vagrant for converging the build environment
   gem 'kitchen-vagrant', '>= 1.3.1'
-  gem 'test-kitchen',    '>= 1.21'
+  gem 'test-kitchen', '>= 1.23'
   gem 'winrm-fs', '~> 1.0'
 end
+
+instance_eval(ENV['GEMFILE_MOD']) if ENV['GEMFILE_MOD']
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + '.local') if File.exist?(__FILE__ + '.local')

omnibus/config/projects/inspec.rb

@@ -38,7 +38,7 @@ build_version Inspec::VERSION
 build_iteration 1
 
 # Load dynamically updated overrides
-overrides_path = File.expand_path('../../../../omnibus_overrides.rb', current_file)
+overrides_path = File.expand_path('../../../../omnibus_overrides.rb', __FILE__)
 instance_eval(IO.read(overrides_path), overrides_path)
 
 dependency 'preparation'
@@ -58,10 +58,8 @@ dependency 'ruby-cleanup'
 
 package :rpm do
   signing_passphrase ENV['OMNIBUS_RPM_SIGNING_PASSPHRASE']
-  unless rhel? && platform_version.satisfies?('< 6')
-    compression_level 1
-    compression_type :xz
-  end
+  compression_level 1
+  compression_type :xz
 end
 
 package :deb do