Rubocop fixes after enabling new cops

Author: Priya5

.rubocop.yml

@@ -2,6 +2,7 @@ require: rubocop-performance
 
 AllCops:
   TargetRubyVersion: 3.0
+  NewCops: enable
 
 Layout/LineLength:
   Max: 99
@@ -14,3 +15,9 @@ Style/RegexpLiteral:
 
 Metrics/ClassLength:
   Enabled: false
+
+Lint/MissingSuper:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false

lib/ohloh_scm/activity.rb

@@ -12,7 +12,7 @@ def initialize(core)
     end
 
     def log_filename
-      File.join(temp_folder, url.gsub(/\W/, '') + '.log')
+      File.join(temp_folder, "#{url.gsub(/\W/, '')}.log")
     end
 
     def tags; end

lib/ohloh_scm/bzr/activity.rb

@@ -45,7 +45,7 @@ def commits(opts = {})
         a = OhlohScm::BzrXmlParser.parse(log)
 
         if after && (i = a.index { |commit| commit.token == after })
-          a[(i + 1)..-1]
+          a[(i + 1)..]
         else
           a
         end
@@ -136,24 +136,24 @@ def rev_list_command(opts = {})
       # +after+. However, bzr doesn't work that way; it returns
       # everything after and INCLUDING +after+. Therefore, consumers
       # of this file should check for and reject the duplicate commit.
-      def safe_open_log_file(opts = {})
+      def safe_open_log_file(opts = {}, &block)
         return '' if opts[:after] && opts[:after] == head_token
 
-        open_log_file(opts) { |io| yield io }
+        open_log_file(opts, &block)
       end
 
-      def open_log_file(opts = {})
+      def open_log_file(opts = {}, &block)
         cmd = "#{rev_list_command(opts)} -v > #{log_filename}"
         run cmd
-        File.open(log_filename, 'r') { |io| yield io }
+        File.open(log_filename, 'r', &block)
       ensure
         File.delete(log_filename) if File.exist?(log_filename)
       end
 
       # Ohloh tracks only files, not directories. This function removes directories
       # from the commit diffs.
       def remove_directories(commit)
-        commit.diffs.delete_if { |d| d.path[-1..-1] == '/' }
+        commit.diffs.delete_if { |d| d.path[-1..] == '/' }
         commit
       end
 
@@ -164,11 +164,11 @@ def cat(revision, path)
       # Bzr doesn't like it when the filename includes a colon
       # Also, fix the case where the filename includes a single quote
       def escape(path)
-        path.gsub(/[:]/) { |c| '\\' + c }.gsub("'", "''")
+        path.gsub(/:/) { |c| "\\#{c}" }.gsub("'", "''")
       end
 
       def tag_strings
-        run("cd '#{url}' && bzr tags").split(/\n/)
+        run("cd '#{url}' && bzr tags").split("\n")
       end
 
       def time_string(rev)

lib/ohloh_scm/bzr/validation.rb

@@ -11,7 +11,7 @@ def validate_server_connection
       end
 
       def public_url_regex
-        %r{^(((http|https|bzr)://(\w+@)?[\w\-\.]+(:\d+)?/)|(lp:[\w\-\.\~]))[\w\-\./\~\+]*$}
+        %r{^(((http|https|bzr)://(\w+@)?[\w\-.]+(:\d+)?/)|(lp:[\w\-.~]))[\w\-./~+]*$}
       end
     end
   end

lib/ohloh_scm/commit.rb

@@ -24,9 +24,7 @@ class Commit
     attr_accessor :author_name, :author_email, :author_date,
                   :committer_name, :committer_email, :committer_date
 
-    attr_accessor :message
-
-    attr_accessor :diffs
+    attr_accessor :message, :diffs
 
     # The token is used to uniquely identify a commit, and can be any type of
     # adapter-specific data.
@@ -46,7 +44,7 @@ class Commit
     attr_accessor :directories
 
     def initialize(params = {})
-      params.each { |k, v| send(k.to_s + '=', v) if respond_to?(k.to_s + '=') }
+      params.each { |k, v| send("#{k}=", v) if respond_to?("#{k}=") }
     end
   end
 end

lib/ohloh_scm/cvs/activity.rb

@@ -5,7 +5,7 @@ module Cvs
     class Activity < OhlohScm::Activity
       def tags
         cmd = "cvs -Q -d #{url} rlog -h #{scm.branch_name} | awk -F\"[.:]\" '/^\\t/&&$(NF-1)!=0'"
-        tag_strings = run(cmd).split(/\n/)
+        tag_strings = run(cmd).split("\n")
         tag_strings.map do |tag_string|
           tag_name, version = tag_string.split(':')
           [tag_name.delete("\t"), version.strip]
@@ -45,7 +45,7 @@ def commits(opts = {})
           next unless result[i].token&.match?(re) # We found the match for after
           return [] if i == result.size - 1 # There aren't any new commits.
 
-          return result[i + 1..-1]
+          return result[i + 1..]
         end
 
         # Something bad is going on: 'after' does not match any timestamp in the rlog.
@@ -72,7 +72,7 @@ def export_tag(dest_dir, tag_name = 'HEAD')
       def ensure_host_key
         return if protocol != :ext
 
-        ensure_key_file = File.dirname(__FILE__) + '/../../../../bin/ensure_key'
+        ensure_key_file = "#{File.dirname(__FILE__)}/../../../../bin/ensure_key"
         cmd = "#{ensure_key_file} '#{host}'"
         run_with_err(cmd)
       end
@@ -92,12 +92,12 @@ def ensure_host_key
       # that predate the requested time.
       # That's better than missing revisions completely! Just be sure to check for duplicates.
       # rubocop:disable Metrics/AbcSize
-      def open_log_file(opts = {})
+      def open_log_file(opts = {}, &block)
         ensure_host_key
         status.lock?
         run "cvsnt -d #{url} rlog #{opt_branch} #{opt_time(opts[:after])} '#{scm.branch_name}'"\
               " | #{string_encoder_path} > #{rlog_filename}"
-        File.open(rlog_filename, 'r') { |file| yield file }
+        File.open(rlog_filename, 'r', &block)
       ensure
         File.delete(rlog_filename) if File.exist?(rlog_filename)
       end
@@ -113,7 +113,7 @@ def opt_time(after = nil)
       end
 
       def rlog_filename
-        File.join(temp_folder, (url + scm.branch_name.to_s).gsub(/\W/, '') + '.rlog')
+        File.join(temp_folder, "#{(url + scm.branch_name.to_s).gsub(/\W/, '')}.rlog")
       end
 
       # Converts a CVS time string to a Ruby Time object
@@ -128,9 +128,9 @@ def parse_time(token)
       # returns the host this adapter is connecting to
       def host
         @host ||= begin
-                    url =~ /@([^:]*):/
-                    Regexp.last_match(1)
-                  end
+          url =~ /@([^:]*):/
+          Regexp.last_match(1)
+        end
       end
 
       # returns the protocol this adapter connects with

lib/ohloh_scm/cvs/scm.rb

@@ -9,7 +9,7 @@ def checkout(rev, local_directory)
         opt_d = rev.token ? "-D'#{rev.token}Z'" : ''
 
         activity.ensure_host_key
-        if File.exist?(local_directory + '/CVS/Root')
+        if File.exist?("#{local_directory}/CVS/Root")
           # We already have a local enlistment, so do a quick update.
           if !rev.directories.empty?
             build_ordered_directory_list(rev.directories).each do |d|
@@ -105,7 +105,7 @@ def trim_directory(dir)
         # For example, if url = ':pserver:anonymous:@moodle.cvs.sourceforge.net:/cvsroot/moodle'
         # and module = 'contrib', then the directory prefix = '/cvsroot/moodle/contrib/'
         # If not remote, just leave the directory name as-is
-        root ? dir[root.length..-1] : dir
+        root ? dir[root.length..] : dir
       end
 
       def root
@@ -126,7 +126,7 @@ def root
       # found in the :pserver: url is assigned to both.
       def sync_pserver_username_password
         # Do nothing unless pserver connection string is well-formed.
-        return unless url =~ /:pserver:([\w\-\_]*)(:([\w\-\_]*))?@(.*)$/
+        return unless url =~ /:pserver:([\w\-_]*)(:([\w\-_]*))?@(.*)$/
 
         pserver_username = Regexp.last_match(1)
         pserver_password = Regexp.last_match(3)
@@ -140,7 +140,7 @@ def sync_pserver_username_password
 
       # Based on the URL, take a guess about which forge this code is hosted on.
       def guess_forge
-        return unless url =~ /.*(pserver|ext).*@(([^\.]+\.)?(cvs|dev)\.)?([^:]+):\//i
+        return unless url =~ /.*(pserver|ext).*@(([^.]+\.)?(cvs|dev)\.)?([^:]+):\//i
 
         Regexp.last_match(5).downcase
       end

lib/ohloh_scm/cvs/validation.rb

@@ -19,14 +19,14 @@ def branch_name_errors
           [:branch_name, "The branch name can't be blank."]
         elsif scm.branch_name.length > 200
           [:branch_name, 'The branch name must not be longer than 200 characters.']
-        elsif !scm.branch_name.match?(/^[\w\-\+\.\/\ ]+$/)
+        elsif !scm.branch_name.match?(/^[\w\-+.\/\ ]+$/)
           [:branch_name, "The branch name may contain only letters,
           numbers, spaces, and the special characters '_', '-', '+', '/', and '.'"]
         end
       end
 
       def public_url_regex
-        /^:(pserver|ext):[\w\-\+\_]*(:[\w\-\+\_]*)?@[\w\-\+\.]+:[0-9]*\/[\w\-\+\.\/]*$/
+        /^:(pserver|ext):[\w\-+_]*(:[\w\-+_]*)?@[\w\-+.]+:[0-9]*\/[\w\-+.\/]*$/
       end
 
       # Returns an array of file and directory names from the remote server.
@@ -56,7 +56,7 @@ def get_filenames(output)
         files = []
         output.each_line do |s|
           s.strip!
-          s = Regexp.last_match(1) + '/' if s =~ /^D\/(.*)\/\/\/\/$/
+          s = "#{Regexp.last_match(1)}/" if s =~ /^D\/(.*)\/\/\/\/$/
           s = Regexp.last_match(1) if s =~ /^\/(.*)\/.*\/.*\/.*\/$/
           next if s == 'CVSROOT/'
 

lib/ohloh_scm/diff.rb

@@ -34,7 +34,7 @@ class Diff
     attr_accessor :from_path, :from_revision
 
     def initialize(params = {})
-      params.each { |k, v| send(k.to_s + '=', v) if respond_to?(k.to_s + '=') }
+      params.each { |k, v| send("#{k}=", v) if respond_to?("#{k}=") }
     end
 
     # eql?() and hash() are implemented so that [].uniq() will work on an array of Diffs.

lib/ohloh_scm/git/activity.rb

@@ -10,7 +10,7 @@ def tags
         return [] if no_tags?
 
         flags = "--format='%(creatordate:iso-strict) %(objectname) %(refname)'"
-        tag_strings = run("cd #{url} && git tag #{flags} | sed 's/refs\\/tags\\///'").split(/\n/)
+        tag_strings = run("cd #{url} && git tag #{flags} | sed 's/refs\\/tags\\///'").split("\n")
         tag_strings.map do |tag_string|
           timestamp_string, commit_hash, tag_name = tag_string.split(/\s/)
           [tag_name, dereferenced_sha(tag_name) || commit_hash, time_object(timestamp_string)]
@@ -176,22 +176,22 @@ def get_commit_tree(token = 'HEAD')
         run("cd #{url} && git cat-file commit #{token} | grep '^tree' | cut -d ' ' -f 2").strip
       end
 
-      def safe_open_log_file(opts = {})
+      def safe_open_log_file(opts = {}, &block)
         return '' unless status.branch?
         return '' if opts[:after] && opts[:after] == head_token
 
-        open_log_file(opts) { |io| yield io }
+        open_log_file(opts, &block)
       end
 
-      def open_log_file(opts)
+      def open_log_file(opts, &block)
         cmd = if ENV['EXPENSIVE_COMMIT_COUNT'] && commit_count(opts) > ENV['EXPENSIVE_COMMIT_COUNT'].to_i
                 "#{rev_list_command(opts)} > #{log_filename}"
               else
                 "#{rev_list_command(opts)} | xargs -n 1 #{OhlohScm::GitParser.whatchanged}"\
                       " | #{string_encoder_path} > #{log_filename}"
               end
         run(cmd)
-        File.open(log_filename, 'r') { |io| yield io }
+        File.open(log_filename, 'r', &block)
       ensure
         File.delete(log_filename) if File.exist?(log_filename)
       end
@@ -218,7 +218,7 @@ def dtag_sha_and_names
       def dereferenced_tag_strings
         # Pattern: b6e9220c3cabe53a4ed7f32952aeaeb8a822603d refs/tags/v1.0.0^{}
         run("cd #{url} && git show-ref --tags -d | grep '\\^{}' | sed 's/\\^{}//'"\
-              " | sed 's/refs\\/tags\\///'").split(/\n/)
+              " | sed 's/refs\\/tags\\///'").split("\n")
       end
 
       def time_object(timestamp_string)