Merge pull request #285 from bastelfreak/rubocop2

rubocop: Fix Style/FrozenStringLiteralComment
voxpupuli · May 17, 2024 · f52b2c1 · f52b2c1
2 parents 2617d3c + 9fddb86
commit f52b2c1
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 12 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -100,13 +100,6 @@ Style/FetchEnvVar:
   Exclude:
     - 'lib/modulesync/git_service.rb'
 
-# Offense count: 34
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?

diff --git a/.simplecov b/.simplecov
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleCov.start do
   if ENV['SIMPLECOV_ROOT']
     SimpleCov.root(ENV['SIMPLECOV_ROOT'])

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/clean'
 require 'cucumber/rake/task'
 require 'rubocop/rake_task'

diff --git a/bin/msync b/bin/msync
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if ENV['COVERAGE']
   # This block allow us to grab code coverage when running this script.

diff --git a/features/step_definitions/git_steps.rb b/features/step_definitions/git_steps.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../spec/helpers/faker/puppet_module_remote_repo'
 
 Given 'a basic setup with a puppet module {string} from {string}' do |name, namespace|

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 
 SimpleCov.command_name 'Cucumber'

diff --git a/lib/modulesync.rb b/lib/modulesync.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 require 'fileutils'
 require 'pathname'

diff --git a/lib/modulesync/cli.rb b/lib/modulesync/cli.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 require 'modulesync'

diff --git a/lib/modulesync/cli/thor.rb b/lib/modulesync/cli/thor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'modulesync/cli'
 

diff --git a/lib/modulesync/constants.rb b/lib/modulesync/constants.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ModuleSync
   module Constants
-    MODULE_FILES_DIR     = 'moduleroot/'.freeze
-    CONF_FILE            = 'config_defaults.yml'.freeze
-    MODULE_CONF_FILE     = '.sync.yml'.freeze
-    MODULESYNC_CONF_FILE = 'modulesync.yml'.freeze
-    HOOK_FILE            = '.git/hooks/pre-push'.freeze
+    MODULE_FILES_DIR     = 'moduleroot/'
+    CONF_FILE            = 'config_defaults.yml'
+    MODULE_CONF_FILE     = '.sync.yml'
+    MODULESYNC_CONF_FILE = 'modulesync.yml'
+    HOOK_FILE            = '.git/hooks/pre-push'
     GLOBAL_DEFAULTS_KEY  = :global
   end
 end
diff --git a/lib/modulesync/git_service.rb b/lib/modulesync/git_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   class Error < StandardError; end
 

diff --git a/lib/modulesync/git_service/base.rb b/lib/modulesync/git_service/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   module GitService
     # Generic class for git services

diff --git a/lib/modulesync/git_service/factory.rb b/lib/modulesync/git_service/factory.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   module GitService
     # Git service's factory

diff --git a/lib/modulesync/git_service/github.rb b/lib/modulesync/git_service/github.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync/git_service'
 require 'modulesync/git_service/base'
 require 'octokit'

diff --git a/lib/modulesync/git_service/gitlab.rb b/lib/modulesync/git_service/gitlab.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gitlab'
 require 'modulesync/git_service'
 require 'modulesync/git_service/base'

diff --git a/lib/modulesync/hook.rb b/lib/modulesync/hook.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 
 module ModuleSync

diff --git a/lib/modulesync/puppet_module.rb b/lib/modulesync/puppet_module.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet_blacksmith'
 
 require 'modulesync/source_code'

diff --git a/lib/modulesync/renderer.rb b/lib/modulesync/renderer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'find'
 

diff --git a/lib/modulesync/repository.rb b/lib/modulesync/repository.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git'
 
 module ModuleSync

diff --git a/lib/modulesync/settings.rb b/lib/modulesync/settings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   # Encapsulate a configs for a module, providing easy access to its parts
   # All configs MUST be keyed by the relative target filename

diff --git a/lib/modulesync/source_code.rb b/lib/modulesync/source_code.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 require 'modulesync/git_service'
 require 'modulesync/git_service/factory'

diff --git a/lib/modulesync/util.rb b/lib/modulesync/util.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module ModuleSync

diff --git a/lib/monkey_patches.rb b/lib/monkey_patches.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   module LibMonkeyPatch
     # Monkey patch set_custom_git_env_variables due to our ::Git::GitExecuteError handling.

diff --git a/modulesync.gemspec b/modulesync.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 

diff --git a/spec/helpers/faker.rb b/spec/helpers/faker.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   # Faker is a top-level module to keep global faker config
   module Faker

diff --git a/spec/helpers/faker/puppet_module_remote_repo.rb b/spec/helpers/faker/puppet_module_remote_repo.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 require_relative '../faker'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 
 require 'modulesync'
diff --git a/spec/unit/module_sync/git_service/factory_spec.rb b/spec/unit/module_sync/git_service/factory_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 require 'modulesync/git_service/factory'
 

diff --git a/spec/unit/module_sync/git_service/github_spec.rb b/spec/unit/module_sync/git_service/github_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'modulesync/git_service/github'

diff --git a/spec/unit/module_sync/git_service/gitlab_spec.rb b/spec/unit/module_sync/git_service/gitlab_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'modulesync/git_service/gitlab'

diff --git a/spec/unit/module_sync/git_service_spec.rb b/spec/unit/module_sync/git_service_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 require 'modulesync/git_service'
 

diff --git a/spec/unit/module_sync/settings_spec.rb b/spec/unit/module_sync/settings_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ModuleSync::Settings do

diff --git a/spec/unit/module_sync/source_code_spec.rb b/spec/unit/module_sync/source_code_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ModuleSync::SourceCode do

diff --git a/spec/unit/module_sync_spec.rb b/spec/unit/module_sync_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ModuleSync do