Merge pull request #102 from chef/more_cops

Signed-off-by: Tim Smith <tsmith@chef.io>
chef · Sep 17, 2020 · 1f200d4 · 1f200d4
2 parents 1fe8123 + a2ac654
commit 1f200d4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/bin/chefstyle b/bin/chefstyle
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w{.. lib})
+$LOAD_PATH.unshift File.join(__dir__, %w{.. lib})
 
 require "chefstyle"
 

diff --git a/chefstyle.gemspec b/chefstyle.gemspec
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "chefstyle/version"
 

diff --git a/config/chefstyle.yml b/config/chefstyle.yml
@@ -637,6 +637,34 @@ Lint/DeprecatedOpenSSLConstant:
 Lint/Syntax:
   Enabled: true
 
+# remove extra requires like 'thread'
+Lint/RedundantRequireStatement:
+  Enabled: true
+
+# simplify stripping strings
+Style/Strip:
+  Enabled: true
+
+# simplify getting min/max
+Style/RedundantSort:
+  Enabled: true
+
+# no need for .rb in requires
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+# more code you don't need
+Style/RedundantCondition:
+  Enabled: true
+
+# Use  __dir__ to simplify things
+Style/Dir:
+  Enabled: true
+
+# Use __FILE__ or __dir__ to simplify expand_paths
+Style/ExpandPathArguments:
+  Enabled: true
+
 ChefRuby/Ruby27KeywordArgumentWarnings:
   Description: Pass options to shell_out helpers without the brackets to avoid Ruby 2.7 deprecation warnings.
   Enabled: true

diff --git a/lib/chefstyle.rb b/lib/chefstyle.rb
@@ -9,7 +9,7 @@ module RuboCop
   class ConfigLoader
     RUBOCOP_HOME.gsub!(
       /^.*$/,
-      File.realpath(File.join(File.dirname(__FILE__), ".."))
+      File.realpath(File.join(__dir__, ".."))
     )
 
     DEFAULT_FILE.gsub!(
@@ -31,7 +31,7 @@ def self.config
 require_relative "rubocop/chef"
 
 # Chef custom cops
-Dir.glob(File.dirname(__FILE__) + "/rubocop/cop/chef/**/*.rb") do |file|
+Dir.glob(__dir__ + "/rubocop/cop/chef/**/*.rb") do |file|
   next if File.directory?(file)
 
   require_relative file # not actually relative but require_relative is faster