ohloh_scm 4.0.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9173a903d32cdd9d100594a9077f7528d473a8cb9c7f1dcf7172745184f2f2f0
-  data.tar.gz: d6b967d7648cb2bdbc5c594d8c119c8f533d945b3b608aaef87bd2f4b8c67322
+  metadata.gz: 0517dea873b5829d942367af3ec07ec0497b405d30a757791cfed1778a281cd8
+  data.tar.gz: fb5146be6537fa90b3fe611f37a48b34614768a4c5d52223ca72b83c1dbef717
 SHA512:
-  metadata.gz: 904efa77cf2a35d8de044afc5c8fb16f9266465e8d4fdf04ef403ccc093983a16fb76b0a40791f6033c4e767c2c598df0c79dfcb15f33e29e6fee4d00a3f9a6d
-  data.tar.gz: cd232f7a7bff3c4384160e04952cddf0ac54680d34c4e84ad44bc7874be6cec4d42d5007a8d41513a1e54afb1c3a1b9be8b32b021e76308b2a3992a8712ea7b4
+  metadata.gz: 93001e6affa4f9e2ae96767d6a23d29527f74f76d64b01c015f0ddb7689d187b6d62857f33c8961a316823cb283838e1ee65fab472102b9d0ef601d457b68d0c
+  data.tar.gz: a6fe592ecaf5e5d848d12684dbbd50b35a7657c22579932c0dc08c0613f9d6369ce314df730cbebd591e56c2ddba7bfbab63887981f9fe1a706812d6de9107fa

data/.rubocop.yml

@@ -1,12 +1,14 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
+  NewCops: enable
+  SuggestExtensions: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 99
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
 Style/RegexpLiteral:
@@ -14,3 +16,12 @@ Style/RegexpLiteral:
 
 Metrics/ClassLength:
   Enabled: false
+
+Lint/MissingSuper:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.6.9
+3.1.7

data/Dockerfile

@@ -1,11 +1,11 @@
 FROM ubuntu:22.04
-MAINTAINER OpenHub <info@openhub.net>
+LABEL maintainer="OpenHub <info@openhub.net>"
 
-ENV HOME /home
-ENV LC_ALL en_US.UTF-8
-ENV APP_HOME $HOME/app/ohloh_scm
-ENV DEBIAN_FRONTEND noninteractive
-ENV PATH $HOME/.rbenv/shims:$HOME/.rbenv/bin:$HOME/.rbenv/plugins/ruby-build/bin:$PATH
+ENV HOME=/home
+ENV LC_ALL=en_US.UTF-8
+ENV APP_HOME=$HOME/app/ohloh_scm
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PATH=$HOME/.rbenv/shims:$HOME/.rbenv/bin:$HOME/.rbenv/plugins/ruby-build/bin:$PATH
 
 RUN apt-get update
 RUN apt-get install -y build-essential software-properties-common locales ragel \
@@ -23,7 +23,7 @@ RUN cd $HOME \
   && echo 'eval "$(rbenv init -)"' >> $HOME/.bashrc \
   && echo 'gem: --no-rdoc --no-ri' >> $HOME/.gemrc \
   && echo 'export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:/home/.rbenv/plugins/ruby-build/bin:$PATH"' >> $HOME/.bash_profile \
-  && rbenv install 2.6.9 && rbenv global 2.6.9
+  && rbenv install 3.1.7 && rbenv global 3.1.7
 
 RUN git config --global --add safe.directory '*'
 
@@ -41,7 +41,7 @@ RUN ln -s /usr/bin/cvs /usr/bin/cvsnt
 # Run bundle install before copying source to keep this step cached.
 RUN mkdir -p $APP_HOME
 COPY Gemfile* $APP_HOME/
-RUN gem install rake bundler:1.17.3 \
+RUN gem install rake bundler:2.6.9 \
   && bundle config --global silence_root_warning 1 \
   && cd $APP_HOME && bundle install
 

data/Gemfile

@@ -8,7 +8,7 @@ group :development do
   gem 'mocha'
   gem 'nokogiri'
   gem 'rake'
-  gem 'rubocop', '~> 0.67'
+  gem 'rubocop', '>= 1.12.0'
   gem 'rubocop-performance'
   gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,41 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    byebug (11.0.1)
-    docile (1.3.1)
-    jaro_winkler (1.5.2)
-    json (2.2.0)
-    metaclass (0.0.4)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    mocha (1.8.0)
-      metaclass (~> 0.0.1)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.2.1)
-      ast (~> 2.4.0)
-    psych (3.1.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rubocop (0.67.2)
-      jaro_winkler (~> 1.5.1)
+    ast (2.4.3)
+    byebug (12.0.0)
+    docile (1.4.1)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    mocha (2.7.1)
+      ruby2_keywords (>= 0.0.5)
+    nokogiri (1.18.8)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    prism (1.4.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rubocop (1.75.8)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
-    ruby-progressbar (1.10.0)
-    simplecov (0.16.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.5.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby
@@ -46,9 +61,9 @@ DEPENDENCIES
   mocha
   nokogiri
   rake
-  rubocop (~> 0.67)
+  rubocop (>= 1.12.0)
   rubocop-performance
   simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.6.9

data/lib/ohloh_scm/activity.rb

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

data/lib/ohloh_scm/bzr/activity.rb

@@ -29,7 +29,7 @@ module OhlohScm
         # Unlike other SCMs, Bzr doesn't simply place the contents into dest_dir.
         # It actually *creates* dest_dir. Since it should already exist at this point,
         # first we have to delete it.
-        Dir.delete(dest_dir) if File.exist?(dest_dir)
+        FileUtils.rm_f(dest_dir)
 
         run "cd '#{url}' && bzr export --format=dir -r #{to_rev_param(token)} '#{dest_dir}'"
       end
@@ -45,7 +45,7 @@ module OhlohScm
         a = OhlohScm::BzrXmlParser.parse(log)
 
         if after && (i = a.index { |commit| commit.token == after })
-          a[(i + 1)..-1]
+          a[(i + 1)..]
         else
           a
         end
@@ -74,8 +74,8 @@ module OhlohScm
       end
 
       def head_token
-        run("bzr log --limit 1 --show-id #{url} 2> /dev/null"\
-            " | grep ^revision-id | cut -f2 -d' '").strip
+        run("bzr log --limit 1 --show-id #{url} 2> /dev/null " \
+            "| grep ^revision-id | cut -f2 -d' '").strip
       end
 
       def head
@@ -136,24 +136,24 @@ module OhlohScm
       # +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)
+        FileUtils.rm_f(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 @@ module OhlohScm
       # 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)

data/lib/ohloh_scm/bzr/validation.rb

@@ -11,7 +11,7 @@ module OhlohScm
       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

data/lib/ohloh_scm/commit.rb

@@ -24,9 +24,7 @@ module OhlohScm
     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 @@ module OhlohScm
     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

data/lib/ohloh_scm/core.rb

@@ -11,9 +11,10 @@ module OhlohScm
     def initialize(scm_type, url, branch_name, username, password)
       scm_opts = { core: self, url: url, branch_name: branch_name,
                    username: username, password: password }
+
       scm_class_name = scm_type.to_s.camelize
 
-      @scm = OhlohScm.const_get(scm_class_name)::Scm.new(scm_opts)
+      @scm = OhlohScm.const_get(scm_class_name)::Scm.new(**scm_opts)
       @activity = OhlohScm.const_get(scm_class_name)::Activity.new(self)
       @status = OhlohScm.const_get(scm_class_name)::Status.new(self)
       @validation = OhlohScm.const_get(scm_class_name)::Validation.new(self)

data/lib/ohloh_scm/cvs/activity.rb

@@ -5,79 +5,95 @@ module OhlohScm
     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.map do |tag_string|
+        run(cmd).split("\n").map do |tag_string|
           tag_name, version = tag_string.split(':')
           [tag_name.delete("\t"), version.strip]
         end
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def commits(opts = {})
-        after = opts[:after]
-        result = []
+        result = fetch_commits(opts)
+        # Nothing found; we're done here. || We requested everything, so just return everything.
+        return result if result.empty? || opts[:after].to_s.empty?
 
-        open_log_file(opts) do |io|
-          result = OhlohScm::CvsParser.parse(io)
-        end
+        filter_commits(result, opts[:after])
+      end
 
-        # Git converter needs a backpointer to the scm for each commit
-        result.each { |c| c.scm = scm }
+      def export_tag(dest_dir, tag_name = 'HEAD')
+        run "cvsnt -d #{url} export -d'#{dest_dir}' -r #{tag_name} '#{scm.branch_name}'"
+      end
 
-        return result if result.empty? # Nothing found; we're done here.
-        return result if after.to_s == '' # We requested everything, so just return everything.
+      # using :ext (ssh) protocol might trigger ssh to confirm accepting the host's
+      # ssh key. This causes the UI to hang asking for manual confirmation. To avoid
+      # this we pre-populate the ~/.ssh/known_hosts file with the host's key.
+      def ensure_host_key
+        return if protocol != :ext
 
-        # We must now remove any duplicates caused by timestamp fudge factors,
-        # and only return commits with timestamp > after.
+        ensure_key_file = "#{File.dirname(__FILE__)}/../../../../bin/ensure_key"
+        cmd = "#{ensure_key_file} '#{host}'"
+        run_with_err(cmd)
+      end
 
-        # If the first commit is newer than after,
-        # then the whole list is new and we can simply return.
-        return result if parse_time(result.first.token) > parse_time(after)
+      private
+
+      def fetch_commits(opts)
+        OhlohScm::CvsParser.parse(open_log_file(opts)).tap do |result|
+          # Git converter needs a backpointer to the scm for each commit
+          result.each { |c| c.scm = scm }
+        end
+      end
+
+      def filter_commits(commits, after)
+        return commits if first_commit_newer?(commits, after)
 
         # Walk the list of commits to find the first new one, throwing away all of the old ones.
 
         # I want to string-compare timestamps without converting to dates objects.
         # Some CVS servers print dates as 2006/01/02 03:04:05, others as 2006-01-02 03:04:05.
         # To work around this, we'll build a regex that matches either date format.
-        re = Regexp.new(after.gsub(/[\/-]/, '.'))
+        timestamp_regex = create_timestamp_regex(after)
+        match_index = find_match_index(commits, timestamp_regex)
 
-        result.each_index do |i|
-          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.
+        extract_new_commits(commits, match_index)
+      end
 
-          return result[i + 1..-1]
-        end
+      def first_commit_newer?(commits, after)
+        # We must now remove any duplicates caused by timestamp fudge factors,
+        # and only return commits with timestamp > after.
 
-        # Something bad is going on: 'after' does not match any timestamp in the rlog.
-        # This is very rare, but it can happen.
-        #
-        # Often this means that the *last* time we ran commits(), there was some kind of
-        # undetected problem (CVS was in an intermediate state?) so the list of timestamps we
-        # calculated last time does not match the list of timestamps we calculated this time.
-        #
-        # There's no work around for this condition here in the code, but there are some things
-        # you can try manually to fix the problem. Typically, you can try throwing way the
-        # commit associated with 'after' and fetching it again (git reset --hard HEAD^).
-        raise "token '#{after}' not found in rlog."
+        # If the first commit is newer than after,
+        # then the whole list is new and we can simply return.
+        parse_time(commits.first.token) > parse_time(after)
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-      def export_tag(dest_dir, tag_name = 'HEAD')
-        run "cvsnt -d #{url} export -d'#{dest_dir}' -r #{tag_name} '#{scm.branch_name}'"
+      def create_timestamp_regex(timestamp)
+        Regexp.new(timestamp.gsub(/[\/-]/, '.'))
       end
 
-      # using :ext (ssh) protocol might trigger ssh to confirm accepting the host's
-      # ssh key. This causes the UI to hang asking for manual confirmation. To avoid
-      # this we pre-populate the ~/.ssh/known_hosts file with the host's key.
-      def ensure_host_key
-        return if protocol != :ext
-
-        ensure_key_file = File.dirname(__FILE__) + '/../../../../bin/ensure_key'
-        cmd = "#{ensure_key_file} '#{host}'"
-        run_with_err(cmd)
+      def find_match_index(commits, timestamp_regex)
+        commits.index { |commit| commit.token&.match?(timestamp_regex) }
       end
 
-      private
+      def extract_new_commits(commits, match_index)
+        case match_index
+        when nil
+          # Something bad is going on: 'after' does not match any timestamp in the rlog.
+          # This is very rare, but it can happen.
+          #
+          # Often this means that the *last* time we ran commits(), there was some kind of
+          # undetected problem (CVS was in an intermediate state?) so the list of timestamps we
+          # calculated last time does not match the list of timestamps we calculated this time.
+          #
+          # There's no work around for this condition here in the code, but there are some things
+          # you can try manually to fix the problem. Typically, you can try throwing way the
+          # commit associated with 'after' and fetching it again (git reset --hard HEAD^).
+          raise 'token not found in rlog.'
+        when commits.size - 1
+          []
+        else
+          commits[match_index + 1..]
+        end
+      end
 
       # Gets the rlog of the repository and saves it in a temporary file.
       # If you pass a timestamp token, then only commits after the timestamp will be returned.
@@ -91,29 +107,27 @@ module OhlohScm
       # This means that the returned log might actually contain a few revisions
       # 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 }
+        run "cvsnt -d #{url} rlog #{opt_branch} #{opt_time(opts[:after])} '#{scm.branch_name}' " \
+            "| #{string_encoder_path} > #{rlog_filename}"
+        File.open(rlog_filename, 'r', &block)
       ensure
-        File.delete(rlog_filename) if File.exist?(rlog_filename)
+        FileUtils.rm_f(rlog_filename)
       end
-      # rubocop:enable Metrics/AbcSize
 
       def opt_time(after = nil)
         return '' unless after
 
         most_recent_time = parse_time(after) - 10
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         " -d '#{most_recent_time.strftime('%Y-%m-%d %H:%M:%S')}Z<#{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S')}Z' "
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       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 +142,9 @@ module OhlohScm
       # 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

data/lib/ohloh_scm/cvs/scm.rb

@@ -9,9 +9,14 @@ module OhlohScm
         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?
+          if rev.directories.empty?
+            # Brute force: get all updates
+            logger.warn("Revision #{rev.token} did not contain any directories.
+            Using brute force update of entire module.")
+            run "cd #{local_directory} && cvsnt update -d -R -C #{opt_d}"
+          else
             build_ordered_directory_list(rev.directories).each do |d|
               if d.empty?
                 run "cd #{local_directory} && cvsnt update -d -l -C #{opt_d} ."
@@ -19,18 +24,13 @@ module OhlohScm
                 run "cd #{local_directory} && cvsnt update -d -l -C #{opt_d} '#{d}'"
               end
             end
-          else
-            # Brute force: get all updates
-            logger.warn("Revision #{rev.token} did not contain any directories.
-            Using brute force update of entire module.")
-            run "cd #{local_directory} && cvsnt update -d -R -C #{opt_d}"
           end
         else
           # We do not have a local enlistment, so do a slow checkout to create one.
           # Silly cvsnt won't accept an absolute path.
           # We'll have to play some games and cd to the parent directory.
           parent_path, checkout_dir = File.split(local_directory)
-          FileUtils.mkdir_p(parent_path) unless File.exist?(parent_path)
+          FileUtils.mkdir_p(parent_path)
           run "cd #{parent_path} &&
           cvsnt -d #{url} checkout #{opt_d} -A -d'#{checkout_dir}' '#{branch_name}'"
         end
@@ -66,7 +66,7 @@ module OhlohScm
         # using cvs modules that are only a single directory deep when testing.
         # We'll check if the url begins with '/' to detect an integration test,
         # then return an empty string (ie, the default root directory) if so.
-        return [''] if url =~ /^\//
+        return [''] if /^\//.match?(url)
 
         list = []
         directories = directories.collect { |a| trim_directory(a.to_s).to_s }
@@ -105,7 +105,7 @@ module OhlohScm
         # 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 @@ module OhlohScm
       # 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 @@ module OhlohScm
 
       # 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

data/lib/ohloh_scm/cvs/status.rb

@@ -7,7 +7,7 @@ module OhlohScm
         run "timeout 2m cvsnt -q -d #{scm.url} rlog '#{scm.branch_name}'"
         false
       rescue StandardError => e
-        raise 'CVS lock has been found' if e.message =~ /waiting for.*lock in/
+        raise 'CVS lock has been found' if /waiting for.*lock in/.match?(e.message)
       end
     end
   end

data/lib/ohloh_scm/cvs/validation.rb

@@ -19,14 +19,14 @@ module OhlohScm
           [: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 @@ module OhlohScm
         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/'
 

data/lib/ohloh_scm/diff.rb

@@ -34,7 +34,7 @@ module OhlohScm
     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.

data/lib/ohloh_scm/factory.rb

@@ -4,7 +4,13 @@ module OhlohScm
   module Factory
     module_function
 
-    def get_core(scm_type: :git, url:, branch_name: nil, username: nil, password: nil)
+    def get_core(opts = {})
+      scm_type = opts.fetch(:scm_type, :git)
+      url = opts.fetch(:url) { raise ArgumentError, 'URL is required' }
+      branch_name = opts[:branch_name]
+      username = opts[:username]
+      password = opts[:password]
+
       OhlohScm::Core.new(scm_type, url, branch_name, username, password)
     end
   end