Fix autocorrect in the comment cops + linting

.travis.yml

@@ -1,9 +1,9 @@
-sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.3.5
-  - 2.4.2
+  - 2.4.5
+  - 2.5.5
+  - 2.6.3
   - ruby-head
 matrix:
   allow_failures:

lib/rubocop/chef/cookbook_only.rb

@@ -19,7 +19,7 @@ module Chef
     #
     module CookbookOnly
       DEFAULT_CONFIGURATION = CONFIG.fetch('AllCops')
-      COOKBOOK_SEGMENTS = %w{attributes definitions libraries metadata providers recipes resources}
+      COOKBOOK_SEGMENTS = %w(attributes definitions libraries metadata providers recipes resources).freeze
 
       def relevant_file?(file)
         cookbook_pattern =~ file && super
@@ -62,7 +62,7 @@ def included(klass)
       extend ClassMethods
     end
 
-    def self.CookbookOnly(segments)
+    def self.CookbookOnly(segments) # rubocop: disable Naming/MethodName
       Module.new do |mod|
         mod.define_singleton_method(:included) do |klass|
           super(klass)

lib/rubocop/cop/chef/attribute_keys.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright:: 2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ def autocorrect(node)
                                 key_string.to_sym.inspect
                               else # strings
                                 key_string.inspect
-            end
+                              end
             corrector.replace(node.loc.expression, key_replacement)
           end
         end

lib/rubocop/cop/chef/comments_copyright_format.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Tim Smith
+# Copyright:: 2016, Tim Smith
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,13 +51,13 @@ def investigate(processed_source)
           end
         end
 
-        private
-
         def autocorrect(comment)
           correct_comment = "# Copyright:: #{copyright_date_range(comment)}, #{copyright_holder(comment)}"
           ->(corrector) { corrector.replace(comment.loc.expression, correct_comment) }
         end
 
+        private
+
         def copyright_date_range(comment)
           dates = comment.text.scan(/([0-9]{4})/)
 

lib/rubocop/cop/chef/comments_format.rb

@@ -51,8 +51,6 @@ def investigate(processed_source)
           end
         end
 
-        private
-
         def autocorrect(comment)
           # Extract the type and the actual value. Strip out "Name" or "File"
           # 'Cookbook Name' should be 'Cookbook'. Also skip a :: if present
@@ -63,6 +61,8 @@ def autocorrect(comment)
           ->(corrector) { corrector.replace(comment.loc.expression, correct_comment) }
         end
 
+        private
+
         def invalid_comment?(comment)
           comment_types = %w(Author Cookbook Library Attribute Copyright Recipe Resource Definition License)
           comment_types.any? do |comment_type|

lib/rubocop/cop/chef/file_mode.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright:: 2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,22 +37,22 @@ class FileMode < Cop
 
         def on_send(node)
           resource_mode?(node) do |mode_int|
-            add_offense(mode_int, location: :expression, message: MSG, severity: is_octal?(mode_int) ? :warning : :error)
+            add_offense(mode_int, location: :expression, message: MSG, severity: octal?(mode_int) ? :warning : :error)
           end
         end
 
         def autocorrect(node)
           lambda do |corrector|
             # If it was an octal literal, make sure we write out the right number.
-            replacement_base = is_octal?(node) ? 8 : 10
+            replacement_base = octal?(node) ? 8 : 10
             replacement_mode = node.children.first.to_s(replacement_base)
             corrector.replace(node.loc.expression, replacement_mode.inspect)
           end
         end
 
         private
 
-        def is_octal?(node)
+        def octal?(node)
           node.source =~ /^0o?\d+/i
         end
       end

lib/rubocop/cop/chef/service_resource.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Chris Henry
+# Copyright:: 2016, Chris Henry
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ def starts_service?(cmd)
           (cmd_str.include?('/etc/init.d') || ['service ', '/sbin/service ',
                                                'start ', 'stop ', 'invoke-rc.d '].any? do |service_cmd|
              cmd_str.start_with?(service_cmd)
-           end) && %w[start stop restart reload].any? { |a| cmd_str.include?(a) }
+           end) && %w(start stop restart reload).any? { |a| cmd_str.include?(a) }
         end
       end
     end