Merge pull request #10539 from chef/gem_cleanup

Signed-off-by: Tim Smith <tsmith@chef.io>

6 files changed, 21 insertions, 16 deletions

diff --git a/chef-bin/.rspec b/chef-bin/.rspec
deleted file mode 100644
index eb3ef03653..0000000000
--- a/chef-bin/.rspec
+++ /dev/null
@@ -1,2 +0,0 @@
---color
--fd
diff --git a/chef-bin/Gemfile b/chef-bin/Gemfile
index 96ab544690..05b93d9230 100644
--- a/chef-bin/Gemfile
+++ b/chef-bin/Gemfile
@@ -2,3 +2,7 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in chef-config.gemspec
 gemspec
+
+group(:development, :test) do
+  gem "rake"
+end
\ No newline at end of file
diff --git a/chef-config/Gemfile b/chef-config/Gemfile
index c3d90e5e6c..7881fe6fd8 100644
--- a/chef-config/Gemfile
+++ b/chef-config/Gemfile
@@ -2,5 +2,9 @@ source "https://rubygems.org"
 
 gem "chef-utils", path: File.expand_path("../chef-utils", __dir__) if File.exist?(File.expand_path("../chef-utils", __dir__))
 
-# Specify your gem's dependencies in chef-config.gemspec
 gemspec
+
+group(:development, :test) do
+  gem "rake"
+  gem "rspec", "~> 3.2"
+end
\ No newline at end of file
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 9ff3b43f44..08086ff25b 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -8,12 +8,20 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Adam Jacob"]
   spec.email         = ["adam@chef.io"]
 
-  spec.summary       = %q{Chef's default configuration and config loading}
+  spec.summary       = %q{Chef Infra's default configuration and config loading library}
   spec.homepage      = "https://github.com/chef/chef"
   spec.license       = "Apache-2.0"
 
   spec.required_ruby_version = ">= 2.6.0"
 
+  spec.metadata = {
+    "bug_tracker_uri" => "https://github.com/chef/chef/issues",
+    "changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/chef/chef/tree/master/chef-config/README.md",
+    "homepage_uri" => "https://github.com/chef/chef/tree/master/chef-config",
+    "source_code_uri" => "https://github.com/chef/chef/tree/master/chef-config",
+  }
+
   spec.require_paths = ["lib"]
 
   spec.add_dependency "chef-utils", "= #{ChefConfig::VERSION}"
@@ -23,12 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "tomlrb", "~> 1.2"
 
-  spec.add_development_dependency "rake"
-
-  %w{rspec-core rspec-expectations rspec-mocks}.each do |rspec|
-    spec.add_development_dependency(rspec, "~> 3.2")
-  end
-
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 
diff --git a/chef-utils/Gemfile b/chef-utils/Gemfile
index 65cb76c2b5..87fa3df1f2 100644
--- a/chef-utils/Gemfile
+++ b/chef-utils/Gemfile
@@ -6,4 +6,4 @@ group(:development, :test) do
   gem "fauxhai-ng"
   gem "rake"
   gem "rspec"
-end
+end
\ No newline at end of file
diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec
index b64cc4dc18..c601938245 100644
--- a/chef-utils/chef-utils.gemspec
+++ b/chef-utils/chef-utils.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Chef Software, Inc"]
   spec.email         = ["oss@chef.io"]
 
-  spec.summary       = %q{Basic utility functions for Core Chef development}
+  spec.summary       = %q{Basic utility functions for Core Chef Infra development}
   spec.homepage      = "https://github.com/chef/chef/tree/master/chef-utils"
   spec.license       = "Apache-2.0"
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
-    "changelog_uri" => "https://github.com/chef/chef/CHANGELOG.md",
+    "changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
     "documentation_uri" => "https://github.com/chef/chef/tree/master/chef-utils/README.md",
     "homepage_uri" => "https://github.com/chef/chef/tree/master/chef-utils",
     "source_code_uri" => "https://github.com/chef/chef/tree/master/chef-utils",
@@ -42,7 +42,4 @@ Gem::Specification.new do |spec|
 
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
-
-  spec.bindir        = "bin"
-  spec.executables   = []
 end