Merge pull request #9231 from tvpartytonight/PUP-11767

(PUP-11767) Enable more style cops

Author: mhashizume

.rubocop.yml

@@ -208,3 +208,27 @@ Style/CaseEquality:
 
 Style/CaseLikeIf:
   Enabled: true
+
+Style/ClassCheck:
+  Enabled: true
+
+Style/ClassEqualityComparison:
+  Enabled: true
+
+Style/ClassMethods:
+  Enabled: true
+
+Style/CollectionCompact:
+  Enabled: true
+
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/CombinableLoops:
+  Enabled: true
+
+Style/ColonMethodDefinition:
+  Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true

.rubocop_todo.yml

@@ -341,7 +341,10 @@ Style/CommentedKeyword:
 Style/ConditionalAssignment:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
+# Enabling this would require reworking Puppet's use of DateTime's #rfc2822, #httptime, and _strptime
+Style/DateTime:
+  Enabled: false
+
 Style/DefWithParentheses:
   Enabled: false
 

lib/puppet/application.rb

@@ -372,7 +372,7 @@ def app_defaults
   # Initialize application defaults. It's usually not necessary to override this method.
   # @return [void]
   # @api public
-  def initialize_app_defaults()
+  def initialize_app_defaults
     Puppet.settings.initialize_app_defaults(app_defaults)
   end
 

lib/puppet/application/apply.rb

@@ -366,7 +366,7 @@ def apply_catalog(catalog)
 
   # Returns facts or nil
   #
-  def get_facts()
+  def get_facts
     facts = nil
     unless Puppet[:node_name_fact].empty?
       # Collect our facts.
@@ -381,7 +381,7 @@ def get_facts()
 
   # Returns the node or raises and error if node not found.
   #
-  def get_node()
+  def get_node
     node = Puppet::Node.indirection.find(Puppet[:node_name_value])
     raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] } unless node
 
@@ -390,7 +390,7 @@ def get_node()
 
   # Returns either a manifest (filename) or nil if apply should use content of Puppet[:code]
   #
-  def get_manifest()
+  def get_manifest
     manifest = nil
     # Set our code or file to use.
     if options[:code] or command_line.args.length == 0

lib/puppet/daemon.rb

@@ -58,7 +58,7 @@ def daemonize
 
   # Close stdin/stdout/stderr so that we can finish our transition into 'daemon' mode.
   # @return nil
-  def self.close_streams()
+  def self.close_streams
     Puppet.debug("Closing streams for daemon mode")
     begin
       $stdin.reopen "/dev/null"
@@ -68,15 +68,15 @@ def self.close_streams()
       Puppet.debug("Finished closing streams for daemon mode")
     rescue => detail
       Puppet.err "Could not start #{Puppet.run_mode.name}: #{detail}"
-      Puppet::Util::replace_file("/tmp/daemonout", 0644) do |f|
+      Puppet::Util.replace_file("/tmp/daemonout", 0644) do |f|
         f.puts "Could not start #{Puppet.run_mode.name}: #{detail}"
       end
       exit(12)
     end
   end
 
   # Convenience signature for calling Puppet::Daemon.close_streams
-  def close_streams()
+  def close_streams
     Puppet::Daemon.close_streams
   end
 

lib/puppet/face/generate.rb

@@ -58,7 +58,7 @@
         raise ArgumentError, _("The output directory '%{outputdir}' exists and is not a directory") % { outputdir: outputdir }
       end
 
-      Puppet::FileSystem::mkpath(outputdir)
+      Puppet::FileSystem.mkpath(outputdir)
 
       generator.generate(inputs, outputdir, options[:force])
 

lib/puppet/face/help.rb

@@ -160,7 +160,7 @@ def legacy_applications
   # @return [Array] An Array of Arrays.  The outer array contains one entry per application; each
   #  element in the outer array is a pair whose first element is a String containing the application
   #  name, and whose second element is a String containing the summary for that application.
-  def all_application_summaries()
+  def all_application_summaries
     available_application_names_special_sort().inject([]) do |result, appname|
       next result if exclude_from_docs?(appname)
 
@@ -196,7 +196,7 @@ def all_application_summaries()
   COMMON = 'Common:'
   SPECIALIZED = 'Specialized:'
   BLANK = "\n"
-  def available_application_names_special_sort()
+  def available_application_names_special_sort
     full_list = Puppet::Application.available_application_names
     a_list = full_list & %w{apply agent config help lookup module resource}
     a_list = a_list.sort

lib/puppet/file_bucket/file.rb

@@ -125,7 +125,7 @@ def checksum_data(base_method)
     end
 
     def to_binary
-      Puppet::FileSystem::binread(@path)
+      Puppet::FileSystem.binread(@path)
     end
   end
 end

lib/puppet/file_system/windows.rb

@@ -115,7 +115,7 @@ def chmod(mode, path)
 
   def read_preserve_line_endings(path)
     contents = path.read(:mode => 'rb', :encoding => 'bom|utf-8')
-    contents = path.read(:mode => 'rb', :encoding => "bom|#{Encoding::default_external.name}") unless contents.valid_encoding?
+    contents = path.read(:mode => 'rb', :encoding => "bom|#{Encoding.default_external.name}") unless contents.valid_encoding?
     contents = path.read unless contents.valid_encoding?
 
     contents

lib/puppet/functions/break.rb

@@ -37,7 +37,7 @@
   dispatch :break_impl do
   end
 
-  def break_impl()
+  def break_impl
     # get file, line if available, else they are set to nil
     file, line = Puppet::Pops::PuppetStack.top_of_stack