Minor gem cleanup for chef-bin/chef-utils/chef-config

Add metadata to chef-config Update the descriptions for Chef Infra Move dev deps to the gemfiles so we're consistent in all the gems in this repo Just dep on rspec since rspec itself is mocks/expectations/core Add rake dep to chef-bin Nuke the unused .rspec file in chef-bin Signed-off-by: Tim Smith <[email protected]>
skillstream · Oct 20, 2020 · c65fb93 · c65fb93
1 parent ec3933f
commit c65fb93
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/chef-bin/.rspec b/chef-bin/.rspec
diff --git 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
diff --git 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
diff --git 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         = ["[email protected]"]
 
-  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/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
@@ -6,4 +6,4 @@ group(:development, :test) do
   gem "fauxhai-ng"
   gem "rake"
   gem "rspec"
-end
+end
diff --git 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         = ["[email protected]"]
 
-  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"
 
@@ -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