(MAINT) Rubocop - (lib) fixes for tasks

Author: chelnak

lib/puppet-strings/tasks/generate.rb

@@ -5,7 +5,7 @@
 # Implements the strings:generate task.
 namespace :strings do
   desc 'Generate Puppet documentation with YARD.'
-  task :generate, [:patterns, :debug, :backtrace, :markup, :json, :markdown, :yard_args] do |t, args|
+  task :generate, [:patterns, :debug, :backtrace, :markup, :json, :markdown, :yard_args] do |_t, args|
     patterns = args[:patterns]
     patterns = patterns.split if patterns
     patterns ||= PuppetStrings::DEFAULT_SEARCH_PATTERNS
@@ -16,7 +16,7 @@
       markup: args[:markup] || 'markdown',
     }
 
-    raise("Error: Both JSON and Markdown output have been selected. Please select one.") if args[:json] == 'true' && args[:markdown] == 'true'
+    raise('Error: Both JSON and Markdown output have been selected. Please select one.') if args[:json] == 'true' && args[:markdown] == 'true'
 
     # rubocop:disable Style/PreferredHashMethods
     # Because of Ruby, true and false from the args are both strings and both true. Here,
@@ -28,16 +28,14 @@
     # @param [Symbol] possible format option
     # @return nil
     def parse_format_option(args, options, format)
-      if args.has_key? format
-        options[format] = args[format] == 'false' || args[format].empty? ? false : true
-        if options[format]
-          options[:path] = args[format] == 'true' ? nil : args[format]
-        end
-      end
+      return unless args.has_key? format
+      options[format] = args[format] == 'false' || args[format].empty? ? false : true
+      return unless options[format]
+      options[:path] = args[format] == 'true' ? nil : args[format]
     end
     # rubocop:enable Style/PreferredHashMethods
 
-    %i[json markdown].each { |format| parse_format_option(args, options, format) }
+    [:json, :markdown].each { |format| parse_format_option(args, options, format) }
 
     warn('yard_args behavior is a little dodgy, use at your own risk') if args[:yard_args]
     options[:yard_args] = args[:yard_args].split if args.key? :yard_args
@@ -47,7 +45,7 @@ def parse_format_option(args, options, format)
 
   namespace :generate do
     desc 'Generate Puppet Reference documentation.'
-    task :reference, [:patterns, :debug, :backtrace] do |t, args|
+    task :reference, [:patterns, :debug, :backtrace] do |_t, args|
       Rake::Task['strings:generate'].invoke(args[:patterns], args[:debug], args[:backtrace], nil, 'false', 'true')
     end
   end

lib/puppet-strings/tasks/gh_pages.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
 
+require 'English'
 require 'puppet-strings/tasks'
 
 namespace :strings do
   namespace :gh_pages do
     task :checkout do
       if Dir.exist?('doc')
-        fail "The 'doc' directory (#{File.expand_path('doc')}) is not a Git repository! Remove it and run the Rake task again." unless Dir.exist?('doc/.git')
+        raise "The 'doc' directory (#{File.expand_path('doc')}) is not a Git repository! Remove it and run the Rake task again." unless Dir.exist?('doc/.git')
 
         Dir.chdir('doc') do
           system 'git checkout gh-pages'
           system 'git pull --rebase origin gh-pages'
         end
       else
         git_uri = `git config --get remote.origin.url`.strip
-        fail "Could not determine the remote URL for origin: ensure the current directory is a Git repro with a remote named 'origin'." unless $?.success?
+        raise "Could not determine the remote URL for origin: ensure the current directory is a Git repro with a remote named 'origin'." unless $CHILD_STATUS.success?
 
         Dir.mkdir('doc')
         Dir.chdir('doc') do
@@ -29,15 +30,15 @@
     task :configure do
       unless File.exist?(File.join('doc', '_config.yml'))
         Dir.chdir('doc') do
-          File.open('_config.yml', 'w+') {|f| f.write("include: _index.html") }
+          File.open('_config.yml', 'w+') { |f| f.write('include: _index.html') }
         end
       end
     end
 
     task :push do
       output = `git describe --long 2>/dev/null`
       # If a project has never been tagged, fall back to latest SHA
-      output.empty? ? git_sha = `git log --pretty=format:'%H' -n 1` : git_sha = output
+      git_sha = output.empty? ? `git log --pretty=format:'%H' -n 1` : output
 
       Dir.chdir('doc') do
         system 'git add .'
@@ -47,7 +48,7 @@
     end
 
     desc 'Update docs on the gh-pages branch and push to GitHub.'
-    task :update => [
+    task update: [
       :checkout,
       :'strings:generate',
       :configure,

lib/puppet-strings/tasks/validate.rb

@@ -6,7 +6,7 @@
 namespace :strings do
   namespace :validate do
     desc 'Validate the reference is up to date'
-    task :reference, [:patterns, :debug, :backtrace] do |t, args|
+    task :reference, [:patterns, :debug, :backtrace] do |_t, args|
       filename = 'REFERENCE.md'
 
       unless File.exist?(filename)