[DO NOT MERGE] PLEASE USE chef/chefspec for new pull requests

.expeditor/config.yml

@@ -0,0 +1,51 @@
+# Documentation available at https://expeditor.chef.io/docs/getting-started/
+---
+
+# Slack channel in Chef Software slack to send notifications about build failures, etc
+slack:
+  notify_channel: chef-ws-notify
+
+# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
+rubygems:
+  - chefspec
+
+github:
+  # This deletes the GitHub PR branch after successfully merged into the release branch
+  delete_branch_on_merge: true
+  # The tag format to use (e.g. v1.0.0)
+  version_tag_format: "v{{version}}"
+  # allow bumping the minor release via label
+  minor_bump_labels:
+    - "Expeditor: Bump Version Minor"
+  # allow bumping the major release via label
+  major_bump_labels:
+    - "Expeditor: Bump Version Major"
+
+changelog:
+  rollup_header: Changes not yet released to rubygems.org
+
+subscriptions:
+  # These actions are taken, in order they are specified, anytime a Pull Request is merged.
+  - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:*
+    actions:
+      - built_in:bump_version:
+          ignore_labels:
+            - "Expeditor: Skip Version Bump"
+            - "Expeditor: Skip All"
+      - bash:.expeditor/update_version.sh:
+          only_if: built_in:bump_version
+      - built_in:update_changelog:
+          ignore_labels:
+            - "Expeditor: Skip Changelog"
+            - "Expeditor: Skip All"
+      - built_in:build_gem:
+          only_if: built_in:bump_version
+  - workload: project_promoted:{{agent_id}}:*
+    actions:
+      - built_in:rollover_changelog
+      - built_in:publish_rubygems
+
+pipelines:
+  - verify:
+      description: Pull Request validation tests
+      public: true

.expeditor/run_linux_tests.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# setups up the bundler to caching, then run the script
+
+set -ue
+
+export USER="root"
+export LANG=C.UTF-8 LANGUAGE=C.UTF-8
+
+echo "--- bundle install"
+
+bundle config --local path vendor/bundle
+bundle install --jobs=7 --retry=3
+
+echo "+++ bundle exec task"
+bundle exec $@

.expeditor/update_version.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file.
+# It then executes this file to update any other files/components with that new version.
+#
+
+set -evx
+
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" lib/chefspec/version.rb
+
+# Once Expeditor finishes executing this script, it will commit the changes and push
+# the commit as a new tag corresponding to the value in the VERSION file.

.expeditor/verify.pipeline.yml

@@ -0,0 +1,10 @@
+---
+expeditor:
+  cached_folders:
+    - vendor
+  defaults:
+    buildkite:
+      retry:
+        automatic:
+          limit: 1
+      timeout_in_minutes: 30

.gitignore

@@ -14,3 +14,4 @@ bin
 binstubs
 vendor
 .rspec
+.DS_Store

CHANGELOG.md

@@ -1,4 +1,27 @@
-# CHANGELOG for ChefSpec
+<!-- latest_release -->
+<!-- latest_release -->
+
+<!-- release_rollup -->
+<!-- release_rollup -->
+<!-- latest_stable_release -->
+## [v9.3.7](https://github.com/chef/chefspec/tree/v9.3.7) (2024-02-07)
+
+#### Merged Pull Requests
+- Pin rspec-expectations due to private API change [#6](https://github.com/chef/chefspec/pull/6) ([joshuariojas](https://github.com/joshuariojas))
+<!-- latest_stable_release -->
+
+## [v9.3.6](https://github.com/chef/chefspec/tree/v9.3.6) (2023-05-08)
+
+#### Merged Pull Requests
+- Restore rubygem reference  [#3](https://github.com/chef/chefspec/pull/3) ([vkarve-chef](https://github.com/vkarve-chef))
+- Restore gemspec file name [#4](https://github.com/chef/chefspec/pull/4) ([vkarve-chef](https://github.com/vkarve-chef))
+
+## [v9.3.4](https://github.com/chef/chefspec/tree/v9.3.4) (2023-03-02)
+
+## [v9.3.4](https://github.com/chef/chefspec/tree/v9.3.4) (2022-06-14)
+
+#### Merged Pull Requests
+- Remove space from EOF [#2](https://github.com/chef/chefspec/pull/2) ([sanjain-progress](https://github.com/sanjain-progress))
 
 ## 9.3.3 (Feb 22, 2022)
 
@@ -883,4 +906,4 @@ Initial version.
 [@sethvargo]: https://github.com/sethvargo "Seth Vargo GitHub"
 [@ssimeonov]: https://github.com/ssimeonov "Simeon Simeonov's GitHub"
 [@student]: https://github.com/student "Nathan Zook's GitHub"
-[@tmatilai]: https://github.com/tmatilai "Teemu Matilainen's GitHub"
+[@tmatilai]: https://github.com/tmatilai "Teemu Matilainen's GitHub"

VERSION

@@ -0,0 +1 @@
+9.3.7

chefspec.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
                     "ChefSpec makes it easy to write examples and get fast " \
                     "feedback on cookbook changes without the need for " \
                     "virtual machines or cloud servers."
-  s.homepage      = "https://github.com/chefspec/chefspec"
+  s.homepage      = "https://github.com/chef/chefspec"
   s.license       = "MIT"
 
   # Packaging
@@ -25,6 +25,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef", ">= 15"
   s.add_dependency "chef-cli"
-  s.add_dependency "fauxhai-ng", ">= 7.5"
+  s.add_dependency "fauxhai-chef", ">= 9.3"
   s.add_dependency "rspec",   "~> 3.0"
+
+  # temporary restriction to a version of rspec-expectations that includes the 
+  # `RSpec::Matchers::ExpectedsForMultipleDiffs` class (renamed in 3.12.4)
+  s.add_dependency "rspec-expectations", "<= 3.12.3"
 end

lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = "9.3.3".freeze
+  VERSION = "9.3.7".freeze
 end