rubocop: autofix

Author: bastelfreak

.rubocop_todo.yml

@@ -93,6 +93,12 @@ Lint/NonAtomicFileOperation:
   Exclude:
     - 'lib/packaging/ship/artifactory.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/packaging/util/version.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowComments, AllowNil.
 Lint/SuppressedException:
@@ -772,14 +778,6 @@ Style/EmptyMethod:
   Exclude:
     - 'tasks/vendor_gems.rake'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: trailing_conditional, ternary
-Style/EmptyStringInsideInterpolation:
-  Exclude:
-    - 'lib/packaging/util/version.rb'
-
 # Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/EnvHome:

lib/packaging/paths.rb

@@ -2,7 +2,6 @@
 # This includes both reporting the correct path and divining the platform
 # tag associated with a variety of paths
 #
-# rubocop:disable Metrics/ModuleLength
 module Pkg::Paths
   include Pkg::Platforms
 

lib/packaging/util/net.rb

@@ -111,7 +111,7 @@ def remote_execute(target_host, command, user_options = {})
     ###
     ### Deprecated method implemented as a shim to the new `remote_execute` method
     ###
-    def remote_ssh_cmd(target, command, capture_output = false, extra_options = '', fail_fast = true, trace = false) # rubocop:disable Metrics/ParameterLists
+    def remote_ssh_cmd(target, command, capture_output = false, extra_options = '', fail_fast = true, trace = false)
       puts "Warn: \"remote_ssh_cmd\" call in packaging is deprecated. Use \"remote_execute\" instead."
       remote_execute(target, command, {
                        capture_output: capture_output,

lib/packaging/util/rake_utils.rb

@@ -36,9 +36,9 @@ def invoke_task(task, *)
     def add_dependency(depender, dependency)
       if using_rake?
         if !task_defined?(depender)
-          fail "Could not locate a Rake task named '#{depender.to_s}' to add a dependency of '#{dependency.to_s}' to"
+          fail "Could not locate a Rake task named '#{depender}' to add a dependency of '#{dependency}' to"
         elsif !task_defined?(dependency)
-          fail "Could not locate a Rake task named '#{dependency.to_s}' to add as a dependency of '#{depender.to_s}'"
+          fail "Could not locate a Rake task named '#{dependency}' to add as a dependency of '#{depender}'"
         else
           depender_task = Rake::Task[depender]
           depender_task.enhance([dependency])

lib/packaging/util/ship.rb

@@ -3,7 +3,7 @@
 module Pkg::Util::Ship
   module_function
 
-  def collect_packages(pkg_exts, excludes = []) # rubocop:disable Metrics/MethodLength
+  def collect_packages(pkg_exts, excludes = [])
     pkgs = pkg_exts.map { |ext| Dir.glob(ext) }.flatten
     return [] if pkgs.empty?
 
@@ -57,7 +57,6 @@ def reorganize_packages(pkgs, tmp, platform_independent = false, nonfinal = fals
   #   false (most paths will be platform dependent), but set to true for gems
   #   and tarballs since those just land directly under /opt/downloads/<project>
   #
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def ship_pkgs(pkg_exts, staging_server, remote_path, opts = {})
     options = {
       excludes: [],

lib/packaging/util/version.rb

@@ -80,7 +80,6 @@ def extended_dot_version
     # 5.3.0.rc4-1
     # 3.0.5.rc6.24.g431768c-1
     #
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def base_pkg_version(version = Pkg::Config.version)
       return "#{dot_version(version)}-#{Pkg::Config.release}".split('-') if final?(version) || Pkg::Config.vanagon_project
 
@@ -143,13 +142,11 @@ def final?(version = Pkg::Config.version)
     # with the intent that it never change the official source tree.
     #
     # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
     def versionbump(workdir = nil)
       version = ENV['VERSION'] || Pkg::Config.version.to_s.strip
       new_version = '"' + version + '"'
 
-      version_file = "#{workdir ? workdir + '/' : ''}#{Pkg::Config.version_file}"
+      version_file = "#{workdir + '/' if workdir}#{Pkg::Config.version_file}"
 
       # Read the previous version file in...
       contents = IO.read(version_file)
@@ -182,7 +179,7 @@ def versionbump(workdir = nil)
     # input json file and output if it "looks tagged" or not
     #
     # @param json_data [hash] json data hash containing the ref to check
-    def report_json_tags(json_data) # rubocop:disable Metrics/AbcSize
+    def report_json_tags(json_data)
       puts 'component: ' + File.basename(json_data['url'])
       puts 'ref: ' + json_data['ref'].to_s
       if Pkg::Util::Git.remote_tagged?(json_data['url'], json_data['ref'].to_s)

spec/lib/packaging/config_spec.rb

@@ -143,7 +143,7 @@
     Build_Params.each do |param|
       it "should have r/w accessors for #{param}" do
         Pkg::Config.should respond_to(param)
-        Pkg::Config.should respond_to("#{param.to_s}=")
+        Pkg::Config.should respond_to("#{param}=")
       end
     end
   end
@@ -563,7 +563,7 @@
           Pkg::Config.load_envvars
         end
       else
-        it "should set Pkg::Config##{v[:var]} to ENV[#{v[:envvar].to_s}]" do
+        it "should set Pkg::Config##{v[:var]} to ENV[#{v[:envvar]}]" do
           ENV[v[:envvar].to_s] = "FOO"
           Pkg::Util.stub(:boolean_value) { "FOO" }
           allow(Pkg::Config).to receive(:instance_variable_set)

spec/lib/packaging/util/git_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 require 'packaging/util/git'
 
-# rubocop:disable Metrics/BlockLength
 describe 'Pkg::Util::Git' do
   context '#commit_file' do
     let(:file) { 'thing.txt' }

spec/lib/packaging/util/version_spec.rb

@@ -3,7 +3,6 @@
 
 # Spec tests for Pkg::Util::Version
 #
-# rubocop:disable Metrics/BlockLength
 describe 'Pkg::Util::Version' do
   context '#versionbump' do
     let(:version_file) { 'thing.txt' }