Merge pull request #82 from chef/bundler_deprecated_warning

Replace deprecated --without flag with bundle config
chef · Aug 31, 2021 · 4c61491 · 4c61491
2 parents f6bdb0f + 87e9ad5
commit 4c61491
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -51,7 +51,8 @@ steps:
 
 - label: "run specs :windows:"
   command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
+    - bundle config set --local without docs debug
+    - bundle install --jobs=7 --retry=3
     - bundle exec rake spec
   expeditor:
     executor:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,4 +11,4 @@ StackOverflow discussions that are relevant]
 
 - [ ] New functionality includes tests
 - [ ] All tests pass
-- [ ] All commits have been signed-off for the Developer Certificate of Origin. See <https://github.com/chef/chef/blob/master/CONTRIBUTING.md#developer-certification-of-origin-dco>
+- [ ] All commits have been signed-off for the Developer Certificate of Origin. See <https://github.com/chef/chef/blob/main/CONTRIBUTING.md#developer-certification-of-origin-dco>
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ end
 group(:development, :test) do
   gem "rake"
   # for testing new chefstyle rules
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main"
 end
 
 group :debug do

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # win32-certstore
-[![Build status](https://badge.buildkite.com/ba68b9ac04486e2ddf6587b35c1eac00260d4216829c289ce6.svg?branch=master)](https://buildkite.com/chef-oss/chef-win32-certstore-master-verify)
+[![Build status](https://badge.buildkite.com/ba68b9ac04486e2ddf6587b35c1eac00260d4216829c289ce6.svg?branch=main)](https://buildkite.com/chef-oss/chef-win32-certstore-main-verify)
 [![Gem Version](https://badge.fury.io/rb/win32-certstore.svg)](https://badge.fury.io/rb/win32-certstore)
 
 Ruby library for accessing the certificate store on Microsoft Windows:
@@ -205,7 +205,7 @@ Ruby 2.5+ is required.
 
 ## Contributing
 
-For information on contributing to this project see https://github.com/chef/chef/blob/master/CONTRIBUTING.md
+For information on contributing to this project see https://github.com/chef/chef/blob/main/CONTRIBUTING.md
 
 More information on the contribution process for Chef projects can be found in the [Chef Contributions document](http://docs.chef.io/community_contributions.html).
 

diff --git a/lib/win32/certstore/mixin/assertions.rb b/lib/win32/certstore/mixin/assertions.rb
@@ -82,7 +82,7 @@ def lookup_error(failed_operation = nil)
         # ROOT -> Root certificates.
         # SPC -> Software Publisher Certificate.
         def valid_store_name
-          %w{MY CA ROOT AUTHROOT DISALLOWED SPC TRUST TRUSTEDPEOPLE TRUSTEDPUBLISHER CLIENTAUTHISSUER TRUSTEDDEVICES SMARTCARDROOT WEBHOSTING REMOTE\ DESKTOP}
+          ["MY", "CA", "ROOT", "AUTHROOT", "DISALLOWED", "SPC", "TRUST", "TRUSTEDPEOPLE", "TRUSTEDPUBLISHER", "CLIENTAUTHISSUER", "TRUSTEDDEVICES", "SMARTCARDROOT", "WEBHOSTING", "REMOTE DESKTOP"]
         end
       end
     end