Merge branch 'master' into jgarud/whitelist_libs

CHANGELOG.md

@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
 
-<!-- latest_release 8.1.10 -->
-## [8.1.10](https://github.com/chef/omnibus/tree/8.1.10) (2021-04-30)
+<!-- latest_release 8.1.11 -->
+## [8.1.11](https://github.com/chef/omnibus/tree/8.1.11) (2021-06-23)
 
 #### Merged Pull Requests
-- Upgrade to GitHub-native Dependabot [#1012](https://github.com/chef/omnibus/pull/1012) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+- Updating aruba version from 0.5 to 1.1 [#1019](https://github.com/chef/omnibus/pull/1019) ([skeshari12](https://github.com/skeshari12))
 <!-- latest_release -->
 <!-- release_rollup since=8.0.15 -->
 ### Changes not yet released to rubygems.org
 
 #### Merged Pull Requests
+- Updating aruba version from 0.5 to 1.1 [#1019](https://github.com/chef/omnibus/pull/1019) ([skeshari12](https://github.com/skeshari12)) <!-- 8.1.11 -->
 - Upgrade to GitHub-native Dependabot [#1012](https://github.com/chef/omnibus/pull/1012) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 8.1.10 -->
 - Revert &quot;argument changes to support ruby 3&quot; [#1016](https://github.com/chef/omnibus/pull/1016) ([tas50](https://github.com/tas50)) <!-- 8.1.9 -->
 - Add Ruby 3 testing [#1006](https://github.com/chef/omnibus/pull/1006) ([tas50](https://github.com/tas50)) <!-- 8.1.8 -->

VERSION

@@ -1 +1 @@
-8.1.10
+8.1.11

features/support/env.rb

@@ -1,6 +1,6 @@
 require "aruba"
 require "aruba/cucumber"
-require "aruba/in_process"
+require "aruba/processes/in_process"
 
 require "omnibus/cli"
 

lib/omnibus/builder.rb

@@ -373,11 +373,16 @@ def bundle(command, options = {})
     # @param (see #command)
     # @return (see #command)
     #
-    def appbundle(software_name, lockdir: nil, gem: nil, without: nil, extra_bin_files: nil , **options)
+    def appbundle(software_name, options = {})
       build_commands << BuildCommand.new("appbundle `#{software_name}'") do
         bin_dir            = "#{install_dir}/bin"
         appbundler_bin     = embedded_bin("appbundler")
 
+        lockdir = options[:lockdir]
+        gem = options[:gem]
+        without = options[:without]
+        extra_bin_files = options[:extra_bin_files]
+
         lockdir ||=
           begin
             app_software = project.softwares.find do |p|
@@ -535,7 +540,7 @@ def erb(options = {})
     def mkdir(directory, options = {})
       build_commands << BuildCommand.new("mkdir `#{directory}'") do
         Dir.chdir(software.project_dir) do
-          FileUtils.mkdir_p(directory, options)
+          FileUtils.mkdir_p(directory, **options)
         end
       end
     end
@@ -557,7 +562,7 @@ def touch(file, options = {})
           parent = File.dirname(file)
           FileUtils.mkdir_p(parent) unless File.directory?(parent)
 
-          FileUtils.touch(file, options)
+          FileUtils.touch(file, **options)
         end
       end
     end
@@ -578,7 +583,7 @@ def delete(path, options = {})
       build_commands << BuildCommand.new("delete `#{path}'") do
         Dir.chdir(software.project_dir) do
           FileSyncer.glob(path).each do |file|
-            FileUtils.rm_rf(file, options)
+            FileUtils.rm_rf(file, **options)
           end
         end
       end
@@ -629,7 +634,7 @@ def copy(source, destination, options = {})
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.cp_r(file, destination, options)
+              FileUtils.cp_r(file, destination, **options)
             end
           end
         end
@@ -658,7 +663,7 @@ def move(source, destination, options = {})
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.mv(file, destination, options)
+              FileUtils.mv(file, destination, **options)
             end
           end
         end
@@ -690,7 +695,7 @@ def link(source, destination, options = {})
               log.warn(log_key) { "no matched files for glob #{command}" }
             else
               files.each do |file|
-                FileUtils.ln_s(file, destination, options)
+                FileUtils.ln_s(file, destination, **options)
               end
             end
           end

lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "8.1.10".freeze
+  VERSION = "8.1.11".freeze
 end

omnibus.gemspec

@@ -29,12 +29,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_dependency "thor",             ">= 0.18", "< 2.0"
   gem.add_dependency "license_scout",    "~> 1.0"
+  gem.add_dependency "contracts",        ">= 0.16.0", "< 0.17.0"
 
   gem.add_dependency "mixlib-versioning"
   gem.add_dependency "pedump"
 
   gem.add_development_dependency "artifactory", "~> 3.0"
-  gem.add_development_dependency "aruba",       "~> 0.5"
+  gem.add_development_dependency "aruba",       "~> 1.1"
   gem.add_development_dependency "chefstyle",   "= 1.7.5"
   gem.add_development_dependency "fauxhai-ng",  ">= 7.5"
   gem.add_development_dependency "rspec",       "~> 3.0"

spec/functional/fetchers/net_fetcher_spec.rb

@@ -127,17 +127,8 @@ def stub_ohai(options = {}, &block); end
         end
       end
 
-      context "when the source has read-only files" do
-        let(:source_url) { "http://dl.bintray.com/oneclick/OpenKnapsack/x86/openssl-1.0.0q-x86-windows.tar.lzma" }
-        let(:source_md5) { "577dbe528415c6f178a9431fd0554df4" }
-
-        it "extracts the asset without crashing" do
-          subject.clean
-          expect(extracted).to_not be_a_file
-          subject.clean
-          expect(extracted).to_not be_a_file
-        end
-      end
+      # we need to find a new test fixture because this one no longer exists
+      # context "when the source has read-only files"
 
       context "when the source has broken symlinks" do
         let(:source_url) { "http://www.openssl.org/source/openssl-1.0.1q.tar.gz" }
@@ -255,7 +246,7 @@ def stub_ohai(options = {}, &block); end
 
       context "when the file is less than 10240 bytes" do
         let(:source_url) { "https://downloads.chef.io/packages-chef-io-public.key" }
-        let(:source_md5) { "369efc3a19b9118cdf51c7e87a34f266" }
+        let(:source_md5) { "012a2c4e2a8edb86b2c072f02eea9f40" }
 
         it "downloads the file" do
           fetch!