Solaris builds are failing because bundler-audit depends on Thor, which has a filename with a space in it. Bundler-audit is only needed for Travis so putting it into its own gem group and excluding it from the omnibus build.

3 files changed, 8 insertions, 4 deletions

diff --git a/Gemfile b/Gemfile
index 0c9a7314b6..2c37e6c7d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,8 +32,6 @@ group(:development, :test) do
 
   gem "ruby-shadow", platforms: :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
 
-  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
-
   # For external tests
   #  gem 'chef-zero', github: 'chef/chef-zero'
   #  gem 'cheffish', github: 'chef/cheffish'
@@ -48,6 +46,11 @@ group(:development, :test) do
   #  gem 'chef-rewind'
 end
 
+group(:travis) do
+  # See `bundler-audit` in .travis.yml
+  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
+end
+
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 12001d1c17..8b2d627972 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "omnibus", github: "chef/omnibus"
-gem "omnibus-software", github: "chef/omnibus-software"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "tball/no_more_thor"
 
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 93b0a2016b..98ba98bcb4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,7 @@
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: e9675680662c8420b980d2d6067a93212d898f67
+  revision: 2d3bebe8b83666564ecbb93d9f1a0d23ba62f9ee
+  branch: tball/no_more_thor
   specs:
     omnibus-software (4.0.0)