From d8d39f81bc4c187a2f87748aebe69278ffb7fea0 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 1 May 2019 10:47:18 -0700 Subject: [PATCH] Appbundler inspec-bin not inspec Signed-off-by: Tim Smith --- Gemfile.lock | 6 +++--- habitat/plan.sh | 2 +- omnibus/Gemfile.lock | 8 ++++---- omnibus/config/software/chef-dk.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2e209777..7fc0a6ff3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -695,9 +695,9 @@ GEM nokogiri (>= 1.8.1) nori (~> 2.4) wasabi (~> 3.4) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) semverse (3.0.0) serverspec (2.41.3) multi_json diff --git a/habitat/plan.sh b/habitat/plan.sh index 87e7f669b..3f46a198a 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -98,7 +98,7 @@ do_install() { bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin foodcritic bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin test-kitchen bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin berkshelf - bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin inspec + bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin inspec-bin bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin cookstyle bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin chef-apply bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin chef-vault diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4831622b2..350c69522 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -28,7 +28,7 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) aws-eventstream (1.0.3) @@ -280,9 +280,9 @@ GEM ruby-progressbar (1.10.0) rubyntlm (0.6.2) rubyzip (1.2.2) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) semverse (3.0.0) serverspec (2.41.3) multi_json diff --git a/omnibus/config/software/chef-dk.rb b/omnibus/config/software/chef-dk.rb index 2a719c7c7..98f1dd9c4 100644 --- a/omnibus/config/software/chef-dk.rb +++ b/omnibus/config/software/chef-dk.rb @@ -75,7 +75,7 @@ appbundle "chef", lockdir: project_dir, gem: "chef", without: %w{integration docgen maintenance ci travis}, env: env appbundle "foodcritic", lockdir: project_dir, gem: "foodcritic", without: %w{development}, env: env appbundle "test-kitchen", lockdir: project_dir, gem: "test-kitchen", without: %w{changelog debug docs}, env: env - appbundle "inspec", lockdir: project_dir, gem: "inspec", without: %w{deploy tools maintenance integration}, env: env + appbundle "inspec", lockdir: project_dir, gem: "inspec-bin", without: %w{deploy tools maintenance integration}, env: env %w{chef-dk chef-apply chef-vault ohai opscode-pushy-client cookstyle dco berkshelf}.each do |gem| appbundle gem, lockdir: project_dir, gem: gem, without: %w{changelog}, env: env