Merge branch 'facebook:main' into main

.rubocop.yml

@@ -1,2 +1,10 @@
 inherit_from:
-  - https://raw.githubusercontent.com/facebook/chef-cookbooks/main/.rubocop_55.yml
+  - https://raw.githubusercontent.com/facebook/chef-cookbooks/main/.rubocop.yml
+
+# TODO - ratchet lint into place
+Style/GlobalStdStream:
+  Enabled: false
+
+# TODO - ratchet lint into place
+Gemspec/RequiredRubyVersion:
+  Enabled: false

CHANGELOG.md

@@ -19,9 +19,9 @@
 * Fix the 'run' subcommand - no longer errors out and streams correclty
 * Fix the 'debug' command given to users when SSH fails with Jump hosts
 * Significant improvements to SSH tunnel handling
-  * Tunnel will last as long as the test
-  * Tunnel is torn down properly regardless of mode
-  * Tunnel removal is syslogged if 'logger' is available
+   * Tunnel will last as long as the test
+   * Tunnel is torn down properly regardless of mode
+   * Tunnel removal is syslogged if 'logger' is available
 * License in gemspec if a proper shortname for Apache 2.0
 
 ## 0.0.15

Gemfile

@@ -6,8 +6,9 @@ group :test, :development do
   gem 'between_meals', :git => 'https://github.com/facebook/between-meals'
   gem 'chef-zero'
   gem 'knife-solo'
+  gem 'mdl'
   gem 'rspec-core', '~> 3.0'
   gem 'rspec-expectations', '~> 3.0'
   gem 'rspec-mocks', '~> 3.0'
-  gem 'rubocop', '~> 0.55.0'
+  gem 'rubocop', '= 1.3.1'
 end