From 1bfd17de1a24efad1265e2dde64a7c3eef2dfdbd Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Thu, 6 Jun 2019 19:05:04 -0700
Subject: Pull Chefstyle from rubygems again

If we want to push out new rules let's fiddle with things only on chef/chef

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .rubocop.yml | 5 +----
 Gemfile      | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 489eaaa..f3a8913 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,4 @@ Lint/UnderscorePrefixedVariableName:
 # Configuration parameters: ContextCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
-    - 'lib/mixlib/shellout/windows/core_ext.rb'
-
-Style/HashSyntax:
-  Enabled: true
+    - 'lib/mixlib/shellout/windows/core_ext.rb'
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 1e5f5f3..cf88be8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,8 @@ group :docs do
 end
 
 group :test do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
   gem "rspec_junit_formatter"
+  gem "chefstyle"
   gem "rspec", "~> 3.0"
   gem "rake"
 end
-- 
cgit v1.2.1


From 2da2d788113f82ea5f7e0a4ce6b285bb591333fe Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Thu, 6 Jun 2019 19:06:34 -0700
Subject: Skip installing gems we need for CI

We don't need dev/docs.

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .expeditor/verify.pipeline.yml | 6 +++---
 Gemfile                        | 1 -
 appveyor.yml                   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index e55244b..0295f34 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -4,7 +4,7 @@ steps:
   command:
     - asdf local ruby 2.4.5
     - export USER="root"
-    - bundle install --jobs=7 --retry=3
+    - bundle install --jobs=7 --retry=3 --without docs development
     - bundle exec rake
   expeditor:
     executor:
@@ -13,7 +13,7 @@ steps:
 - label: run-lint-and-specs-ruby-2.5
   command:
     - asdf local ruby 2.5.5
-    - bundle install --jobs=7 --retry=3
+    - bundle install --jobs=7 --retry=3 --without docs development
     - export USER="root"
     - bundle exec rake
   expeditor:
@@ -24,7 +24,7 @@ steps:
   command:
     - asdf local ruby 2.6.3
     - export USER="root"
-    - bundle install --jobs=7 --retry=3
+    - bundle install --jobs=7 --retry=3 --without docs development
     - bundle exec rake
   expeditor:
     executor:
diff --git a/Gemfile b/Gemfile
index cf88be8..a013bb2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,6 @@ group :docs do
 end
 
 group :test do
-  gem "rspec_junit_formatter"
   gem "chefstyle"
   gem "rspec", "~> 3.0"
   gem "rake"
diff --git a/appveyor.yml b/appveyor.yml
index 168be7a..d332737 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,7 +39,7 @@ install:
   - bundler --version
 
 build_script:
-  - bundle install
+  - bundle install --jobs=7 --retry=3 --without docs development
 
 test_script:
   - bundle exec rspec
-- 
cgit v1.2.1