Merge pull request #94 from chef/new_cops

Enable Style/Encoding cop
chef · Jul 14, 2020 · e82027e · e82027e
2 parents 1bb8489 + 38363b8
commit e82027e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1,2 @@
+Style/FrozenStringLiteralComment:
+  Enabled: true
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in chefstyle.gemspec

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
 
 upstream = Gem::Specification.find_by_name("rubocop")

diff --git a/bin/chefstyle b/bin/chefstyle
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
-
+# frozen_string_literal: true
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w{.. lib})
 
 require "chefstyle"

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

diff --git a/config/chefstyle.yml b/config/chefstyle.yml
@@ -482,11 +482,15 @@ Style/WhileUntilModifier:
 Style/WordArray:
   Enabled: true
 
+# we are ruby > 2.0 only so we can remove encoding comments for utf-8
+Style/Encoding:
+  Enabled: true
+
 #
 # Disabled Style
 #
 
-# FIXME: we need to enable this
+# reduces memory usage, but isn't a simple autocorrect so we need to do this one project at a time
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -529,10 +533,6 @@ Style/FormatString:
 Style/IfUnlessModifier:
   Enabled: false
 
-# we are ruby > 2.0 only so can disable the Encoding cop
-Style/Encoding:
-  Enabled: false
-
 # Dan is -1 on this one: https://github.com/chef/chef/pull/4526#issuecomment-179950045
 Layout/IndentFirstHashElement:
   Enabled: false

diff --git a/lib/chefstyle.rb b/lib/chefstyle.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "chefstyle/version"
 
 # ensure the desired target version of RuboCop is gem activated

diff --git a/lib/chefstyle/version.rb b/lib/chefstyle/version.rb
@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 module Chefstyle
-  VERSION = "1.1.3".freeze
-  RUBOCOP_VERSION = "0.87.1".freeze
+  VERSION = "1.1.3"
+  RUBOCOP_VERSION = "0.87.1"
 end