ohloh_scm 4.0.5 → 5.0.0

data/lib/ohloh_scm/parser/git_parser.rb

@@ -10,8 +10,8 @@ module OhlohScm
       end
 
       def format
-        "format:'__BEGIN_COMMIT__%nCommit: %H%nAuthor: %an%nAuthorEmail:"\
-          " %ae%nDate: %aD%n__BEGIN_COMMENT__%n%s%n%b%n__END_COMMENT__%n'"
+        "format:'__BEGIN_COMMIT__%nCommit: %H%nAuthor: %an%nAuthorEmail: " \
+          "%ae%nDate: %aD%n__BEGIN_COMMENT__%n%s%n%b%n__END_COMMENT__%n'"
       end
 
       ANONYMOUS = '(no author)' unless defined?(ANONYMOUS)
@@ -30,19 +30,21 @@ module OhlohScm
           # is missing for this commit,  and we need to fix up our state.
           state = :key_values if state == :diffs && line =~ /^Commit: ([a-z0-9]+)$/
 
-          if state == :key_values
-            if line =~ /^Commit: ([a-z0-9]+)$/
+          case state
+          when :key_values
+            case line
+            when /^Commit: ([a-z0-9]+)$/
               sha1 = Regexp.last_match(1)
               yield e if e
               e = build_commit(sha1)
-            elsif line =~ /^Author: (.+)$/
+            when /^Author: (.+)$/
               e.author_name = Regexp.last_match(1)
-            elsif line =~ /^Date: (.*)$/
+            when /^Date: (.*)$/
               # MUST be RFC2822 format to parse properly, else defaults to epoch time
               e.author_date = parse_date(Regexp.last_match(1))
-            elsif line == '__BEGIN_COMMENT__'
+            when '__BEGIN_COMMENT__'
               state = :message
-            elsif line =~ /^AuthorEmail: (.+)$/
+            when /^AuthorEmail: (.+)$/
               e.author_email = Regexp.last_match(1)
               # In the rare case that the Git repository does not contain any names,
               #   we use the email instead (see OpenEmbedded for example).
@@ -51,7 +53,7 @@ module OhlohScm
               end
             end
 
-          elsif state == :message
+          when :message
             if line == '__END_COMMENT__'
               state = :diffs
             elsif line != '<unknown>'
@@ -62,13 +64,14 @@ module OhlohScm
               end
             end
 
-          elsif state == :diffs
-            if line == '__BEGIN_COMMIT__'
+          when :diffs
+            case line
+            when '__BEGIN_COMMIT__'
               state = :key_values
             # Ref: https://git-scm.com/docs/git-diff-index#Documentation/git-diff-index.txt-git-diff-filesltpatterngt82308203
-            elsif line =~ /:([0-9]+) ([0-9]+) ([a-z0-9]+) ([a-z0-9]+) ([A-Z])\t"?(.+)"?$/
+            when /:([0-9]+) ([0-9]+) ([a-z0-9]+) ([a-z0-9]+) ([A-Z])\t"?(.+)"?$/
               add_generic_diff(e, Regexp.last_match)
-            elsif line =~ /:([0-9]+) ([0-9]+) ([a-z0-9]+) ([a-z0-9]+) (R[0-9]+)\t"?(.+)"?$/
+            when /:([0-9]+) ([0-9]+) ([a-z0-9]+) ([a-z0-9]+) (R[0-9]+)\t"?(.+)"?$/
               add_rename_edit_diff(e, Regexp.last_match)
             end
           else
@@ -92,7 +95,7 @@ module OhlohScm
       end
 
       def add_generic_diff(commit, match_data)
-        src_mode, dst_mode, parent_sha1, sha1, action, path = match_data[1..-1]
+        src_mode, dst_mode, parent_sha1, sha1, action, path = match_data[1..]
 
         return if path == '.gitmodules' # contains submodule path config.
         # Submodules have a file mode of '160000'(gitlink). We ignore submodules completely.
@@ -103,7 +106,7 @@ module OhlohScm
       end
 
       def add_rename_edit_diff(commit, match_data)
-        src_mode, dst_mode, parent_sha1, sha1, _, path = match_data[1..-1]
+        src_mode, dst_mode, parent_sha1, sha1, _, path = match_data[1..]
 
         return if src_mode == '160000' || dst_mode == '160000'
 

data/lib/ohloh_scm/parser/hg_parser.rb

@@ -23,14 +23,15 @@ module OhlohScm
 
         buffer.each_line do |line|
           next_state = state
-          if state == :data
+          case state
+          when :data
             case line
             when /^changeset:\s+([0-9a-f]+)/
               e = build_commit(Regexp.last_match(1))
             when /^user:\s+(.+?)(\s+<(.+)>)?$/
               e.committer_name = Regexp.last_match(1)
               e.committer_email = Regexp.last_match(3)
-            when /^date:\s+([\d\.]+)/
+            when /^date:\s+([\d.]+)/
               time = Regexp.last_match(1)
               e.committer_date = Time.at(time.to_f).utc
             when "__BEGIN_FILES__\n"
@@ -42,15 +43,16 @@ module OhlohScm
               e = nil
             end
 
-          elsif state == :files
-            if line == "__END_FILES__\n"
+          when :files
+            case line
+            when "__END_FILES__\n"
               next_state = :data
-            elsif line =~ /^([MAD]) (.+)$/
+            when /^([MAD]) (.+)$/
               e.diffs << OhlohScm::Diff.new(action: Regexp.last_match(1),
                                             path: Regexp.last_match(2))
             end
 
-          elsif state == :long_comment
+          when :long_comment
             if line == "__END_COMMENT__\n"
               next_state = :data
             elsif e.message

data/lib/ohloh_scm/parser/svn_parser.rb

@@ -14,7 +14,8 @@ module OhlohScm
         buffer.each_line do |l|
           l.chomp!
           next_state = state
-          if state == :data
+          case state
+          when :data
             if l =~ /^r(\d+) \| (.*) \| (\d+-\d+-\d+ .*) \(.*\) \| .*/
               yield e if e && block_given?
 
@@ -35,8 +36,8 @@ module OhlohScm
               e.message << l
             end
 
-          elsif state == :diffs
-            if l =~ /^   (\w) ([^\(\)]+)( \(from (.+):(\d+)\))?$/
+          when :diffs
+            if l =~ /^   (\w) ([^()]+)( \(from (.+):(\d+)\))?$/
               e.diffs ||= []
               e.diffs << OhlohScm::Diff.new(action: Regexp.last_match(1),
                                             path: Regexp.last_match(2),
@@ -51,12 +52,12 @@ module OhlohScm
           # confuses the parser. I am not sure whether only Wireshark does this, but I suspect it
           # happens because there is a tool out there somewhere to generate
           # these embedded log comments.
-          elsif state == :log_embedded_within_comment
+          when :log_embedded_within_comment
             e.message << "\n"
             e.message << l
-            next_state = :comment if l =~ /============================ .* log end =+/
+            next_state = :comment if /============================ .* log end =+/.match?(l)
 
-          elsif state == :comment
+          when :comment
             if /------------------------------------------------------------------------/.match?(l)
               next_state = :data
             elsif /============================ .* log start =+/.match?(l)

data/lib/ohloh_scm/py_bridge/hg_client.rb

@@ -13,7 +13,7 @@ module OhlohScm
       def cat_file(revision, file)
         send_command("CAT_FILE\t#{revision}\t#{file}")
       rescue RuntimeError => e
-        raise unless e.message =~ /not found in manifest/ # File does not exist.
+        raise unless /not found in manifest/.match?(e.message) # File does not exist.
       end
 
       def parent_tokens(revision)

data/lib/ohloh_scm/svn/activity.rb

@@ -16,25 +16,26 @@ module OhlohScm
       end
 
       def ls(path = nil, revision = 'HEAD')
-        stdout = run "svn ls --trust-server-cert --non-interactive -r #{revision} "\
-          "#{username_and_password_opts} "\
-          "'#{uri_encode(File.join(root.to_s, scm.branch_name.to_s, path.to_s))}@#{revision}'"
+        stdout = run "svn ls --trust-server-cert --non-interactive -r #{revision} " \
+                     "#{username_and_password_opts} " \
+                     "'#{uri_encode(File.join(root.to_s, scm.branch_name.to_s,
+                                              path.to_s))}@#{revision}'"
         collect_files(stdout)
       rescue StandardError => e
         logger.error(e.message) && nil
       end
 
       def export(dest_dir, commit_id = 'HEAD')
-        FileUtils.mkdir_p(File.dirname(dest_dir)) unless File.exist?(File.dirname(dest_dir))
-        run 'svn export --trust-server-cert --non-interactive --ignore-externals --force '\
-          "-r #{commit_id} '#{uri_encode(File.join(root.to_s, scm.branch_name.to_s))}'"\
-          " '#{dest_dir}'"
+        FileUtils.mkdir_p(File.dirname(dest_dir))
+        run 'svn export --trust-server-cert --non-interactive --ignore-externals --force ' \
+            "-r #{commit_id} '#{uri_encode(File.join(root.to_s, scm.branch_name.to_s))}' " \
+            "'#{dest_dir}'"
       end
 
       def export_tag(dest_dir, tag_name)
         tag_url = "#{base_path}/tags/#{tag_name}"
-        run 'svn export --trust-server-cert --non-interactive --ignore-externals --force'\
-              " '#{tag_url}' '#{dest_dir}'"
+        run 'svn export --trust-server-cert --non-interactive --ignore-externals --force ' \
+            "'#{tag_url}' '#{dest_dir}'"
       end
 
       # Svn root is not usable here since several projects are nested in subfolders.
@@ -42,9 +43,8 @@ module OhlohScm
       #      http://svn.apache.org/repos/asf/httpd/httpd/trunk
       #      http://svn.apache.org/repos/asf/maven/plugin-testing/trunk
       #      all have the same root value(https://svn.apache.org/repos/asf)
-      # rubocop:disable Metrics/AbcSize
       def tags
-        doc = Nokogiri::XML(`svn ls --xml #{ base_path}/tags`)
+        doc = Nokogiri::XML(`svn ls --xml #{base_path}/tags`)
         doc.xpath('//lists/list/entry').map do |entry|
           tag_name = entry.xpath('name').text
           revision = entry.xpath('commit').attr('revision').text
@@ -53,7 +53,6 @@ module OhlohScm
           [tag_name, revision, date_string]
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def head_token
         return unless info =~ /^Revision: (\d+)$/
@@ -73,18 +72,18 @@ module OhlohScm
       def info(path = nil, revision = 'HEAD')
         @info ||= {}
         uri = path ? File.join(root, scm.branch_name.to_s, path) : url
-        @info[[path, revision]] ||= run 'svn info --trust-server-cert --non-interactive -r '\
-          "#{revision} #{username_and_password_opts} '#{uri_encode(uri)}@#{revision}'"
+        @info[[path, revision]] ||=
+          run 'svn info --trust-server-cert --non-interactive -r ' \
+              "#{revision} #{username_and_password_opts} '#{uri_encode(uri)}@#{revision}'"
       end
 
       # Because uri(with branch) may have characters(e.g. space) that break the shell command.
       def uri_encode(uri)
         # URI.encode is declared obsolete, however we couldn't find an alternative.
-        # URI.encode('foo bar') => foo%20bar # `svn log svn://...foo%20bar` works.
         # CGI.escape('foo bar') => foo+bar   # `svn log svn://...foo+bar` won't work.
-        # rubocop:disable Lint/UriEscapeUnescape
-        URI.encode(uri)
-        # rubocop:enable Lint/UriEscapeUnescape
+        # URI.encode('foo bar') => foo%20bar # `svn log svn://...foo%20bar` works in ruby 2.x
+        # URI::DEFAULT_PARSER.escape('foo bar') => foo%20bar # This works in ruby 3.x
+        URI::DEFAULT_PARSER.escape(uri)
       end
 
       def base_path

data/lib/ohloh_scm/svn/scm.rb

@@ -17,10 +17,10 @@ module OhlohScm
       # From the given URL, determine which part of it is the root and
       # which part of it is the branch_name. The current branch_name is overwritten.
       def recalc_branch_name
-        @branch_name = url ? url[activity.root.length..-1] : branch_name
+        @branch_name = url ? url[activity.root.length..] : branch_name
       rescue RuntimeError => e
         pattern = /(svn:*is not a working copy|Unable to open an ra_local session to URL)/
-        @branch_name = '' if e.message =~ pattern # we have a file system
+        @branch_name = '' if e.message&.match?(pattern) # we have a file system
       ensure
         clean_branch_name
         branch_name
@@ -41,7 +41,6 @@ module OhlohScm
       #
       # The url and branch_name of this object will be updated with the selected location.
       # The url will be unmodified if there is a problem connecting to the server.
-      # rubocop:disable Metrics/AbcSize
       def restrict_url_to_trunk
         return url if url.match?(%r{/trunk/?$})
 
@@ -50,13 +49,12 @@ module OhlohScm
 
         if list.include? 'trunk/'
           update_url_and_branch_with_trunk
-        elsif list.size == 1 && list.first[-1..-1] == '/'
+        elsif list.size == 1 && list.first[-1..] == '/'
           update_url_and_branch_with_subdir(list)
           return restrict_url_to_trunk
         end
         url
       end
-      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -88,7 +86,7 @@ module OhlohScm
       def prefix_file_for_local_path(path)
         return if path.empty?
 
-        %r{://}.match?(url) ? url : 'file://' + File.expand_path(path)
+        %r{://}.match?(url) ? url : "file://#{File.expand_path(path)}"
       end
     end
   end

data/lib/ohloh_scm/svn/validation.rb

@@ -15,7 +15,7 @@ module OhlohScm
       end
 
       def public_url_regex
-        /^(http|https|svn):\/\/[A-Za-z0-9_\-\.]+(:\d+)?(\/[A-Za-z0-9_\-\.\/\+%^~ ]*)?$/
+        /^(http|https|svn):\/\/[A-Za-z0-9_\-.]+(:\d+)?(\/[A-Za-z0-9_\-.\/+%^~ ]*)?$/
       end
 
       # Subversion usernames have been relaxed from the abstract rules.
@@ -25,7 +25,7 @@ module OhlohScm
 
         if scm.username.length > 32
           [:username, 'The username must not be longer than 32 characters.']
-        elsif !scm.username.match?(/^\w[\w@\.\+\-]*$/)
+        elsif !scm.username.match?(/^\w[\w@.+\-]*$/)
           [:username, 'The username contains illegal characters.']
         end
       end

data/lib/ohloh_scm/system.rb

@@ -35,7 +35,7 @@ module OhlohScm
     class << self
       # Use a single logger instance.
       def logger
-        @logger ||= Logger.new(STDERR).tap do |log_obj|
+        @logger ||= Logger.new($stderr).tap do |log_obj|
           log_obj.level = ENV['SCM_LOG_LEVEL'].to_i
         end
       end

data/lib/ohloh_scm/validation.rb

@@ -33,7 +33,6 @@ module OhlohScm
     end
     # rubocop:enable Metrics/AbcSize
 
-    # rubocop:disable Metrics/AbcSize
     def url_errors
       error = if scm.url.nil? || scm.url.empty?
                 "The URL can't be blank."
@@ -45,12 +44,11 @@ module OhlohScm
 
       [:url, error] if error
     end
-    # rubocop:enable Metrics/AbcSize
 
     def branch_name_errors
       if scm.branch_name.length > 80
         [:branch_name, 'The branch name must not be longer than 80 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
@@ -67,7 +65,7 @@ module OhlohScm
     def password_errors
       if scm.password.length > 32
         [:password, 'The password must not be longer than 32 characters.']
-      elsif !scm.password.match?(/^[\w!@\#$%^&*\(\)\{\}\[\]\;\?\|\+\-\=]*$/)
+      elsif !scm.password.match?(/^[\w!@\#$%^&*(){}\[\];?|+\-=]*$/)
         [:password, 'The password contains illegal characters']
       end
     end

data/lib/ohloh_scm/version.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Version
-    STRING = '4.0.5'
+    STRING = '5.0.0'
     GIT = '2.34.1'
     SVN = '1.14.1'
     CVSNT = '1.12.13'

data/ohloh_scm.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.license       = 'GPL-2.0'
 
   gem.files         = `git ls-files -z`.split("\x0")
-  gem.test_files    = gem.files.grep(/^spec\//)
   gem.require_paths = %w[lib]
-  gem.post_install_message = "Ohloh SCM is depending on Git #{OhlohScm::Version::GIT}, "\
-                             "SVN #{OhlohScm::Version::SVN}, CVSNT #{OhlohScm::Version::CVSNT}, "\
-                             "Mercurial #{OhlohScm::Version::HG} and Bazaar "\
-                             "#{OhlohScm::Version::BZR}. If the installed version is different, "\
+  gem.required_ruby_version = '>= 3.0.0'
+  gem.post_install_message = "Ohloh SCM is depending on Git #{OhlohScm::Version::GIT}, " \
+                             "SVN #{OhlohScm::Version::SVN}, CVSNT #{OhlohScm::Version::CVSNT}, " \
+                             "Mercurial #{OhlohScm::Version::HG} and Bazaar " \
+                             "#{OhlohScm::Version::BZR}. If the installed version is different, " \
                              'Ohloh SCM may not operate as expected.'
 end

data/spec/.rubocop.yml

@@ -3,16 +3,13 @@ inherit_from: ../.rubocop.yml
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Metrics/AbcSize:
   Enabled: false
 
-ClassLength:
-  Enabled: false
-
-AbcSize:
+Metrics/ClassLength:
   Enabled: false
 
 Metrics/MethodLength:

data/spec/benchmarks/process_spawn_benchmark.rb

@@ -83,7 +83,7 @@ class ProcessSpawnBenchmark
   def benchmark_popen
     @reporter.report('IO.popen:') do
       @iterations.times do
-        IO.popen(@cmd).each {}
+        IO.popen(@cmd).each { |_line| } # consume output to avoid Lint/EmptyBlock
       end
     end
   end

data/spec/helpers/assert_scm_attr_helper.rb

@@ -8,24 +8,24 @@ module AssertScmAttrHelper
   def assert_url_error(scm_type, *urls)
     urls.each do |url|
       core = get_core(scm_type, url: url)
-      core.validation.send(:url_errors).wont_be :empty?
+      refute_empty core.validation.send(:url_errors)
     end
   end
 
   def assert_url_valid(scm_type, url)
     core = get_core(scm_type, url: url)
-    core.validation.send(:url_errors).must_be_nil
+    assert_nil core.validation.send(:url_errors)
   end
 
   def assert_branch_name_error(scm_type, *branches)
     branches.each do |branch_name|
       core = get_core(scm_type, url: ':pserver:cvs:cvs@cvs.test.org:/test', branch_name: branch_name)
-      core.validation.send(:branch_name_errors).wont_be :empty?
+      refute_empty core.validation.send(:branch_name_errors)
     end
   end
 
   def assert_branch_name_valid(scm_type, branch_name)
     core = get_core(scm_type, url: ':pserver:cvs:cvs@cvs.test.org:/test', branch_name: branch_name)
-    core.validation.send(:branch_name_errors).must_be_nil
+    assert_nil core.validation.send(:branch_name_errors)
   end
 end

data/spec/helpers/generic_helper.rb

@@ -1,5 +1,5 @@
 module GenericHelper
-  def tmpdir(prefix = 'oh_scm_repo_')
-    Dir.mktmpdir(prefix) { |path| yield path }
+  def tmpdir(prefix = 'oh_scm_repo_', &block)
+    Dir.mktmpdir(prefix, &block)
   end
 end

data/spec/helpers/repository_helper.rb

@@ -8,7 +8,7 @@ module RepositoryHelper
   end
 
   def with_git_repository(name, branch_name = 'master', &block)
-    with_repository('git', name, branch_name) { |core| block.call(core) }
+    with_repository('git', name, branch_name, &block)
   end
 
   private

data/spec/ohloh_scm/activity_spec.rb

@@ -8,14 +8,14 @@ describe 'Activity' do
       ENV['OHLOH_SCM_TEMP_FOLDER_PATH'] = nil
       core = get_core(:git)
       scm = OhlohScm::Activity.new(core)
-      scm.log_filename.must_equal "#{Dir.tmpdir}/foobar.log"
+      assert_equal scm.log_filename, "#{Dir.tmpdir}/foobar.log"
     end
 
     it 'should return temp folder path' do
       ENV['OHLOH_SCM_TEMP_FOLDER_PATH'] = '/test'
       core = get_core(:git)
       scm = OhlohScm::Activity.new(core)
-      scm.log_filename.must_equal '/test/foobar.log'
+      assert_equal scm.log_filename, '/test/foobar.log'
       ENV['OHLOH_SCM_TEMP_FOLDER_PATH'] = ''
     end
   end