ohloh_scm 4.0.5 → 5.0.0

data/lib/ohloh_scm/git/activity.rb

@@ -10,7 +10,7 @@ module OhlohScm
         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)]
@@ -42,39 +42,16 @@ module OhlohScm
 
       # Yields each commit in the repository following the commit with SHA1 'after'.
       # These commits are populated with diffs.
-      def each_commit(opts = {})
-        # Bug fix (hack) follows.
-        #
-        # git-whatchanged emits a merge commit multiple times, once for each parent, giving the
-        # delta to each parent in turn.
-        #
-        # This causes us to emit too many commits, with repeated merge commits.
-        #
-        # To fix this, we track the previous commit, and emit a new commit only if it is distinct
-        # from the previous.
-        #
-        # This means that the diffs for a merge commit yielded by this method will be the diffs
-        # vs. the first parent only, and diffs vs. other parents are lost.
-        # For OpenHub, this is fine because OpenHub ignores merge diffs anyway.
-        previous = nil
+      def each_commit(opts = {}, &block)
         safe_open_log_file(opts) do |io|
-          if ENV['EXPENSIVE_COMMIT_COUNT'] && commit_count(opts) > ENV['EXPENSIVE_COMMIT_COUNT'].to_i
-            io.each do |commit_sha|
-              yield verbose_commit(commit_sha.chomp)
-            end
-          else
-            OhlohScm::GitParser.parse(io) do |e|
-              yield fixup_null_merge(e) unless previous && previous.token == e.token
-              previous = e
-            end
-          end
+          process_commits(io, opts, &block)
         end
       end
 
       # Returns a single commit, including its diffs
       def verbose_commit(token)
-        cmd = "cd '#{url}' && #{OhlohScm::GitParser.whatchanged} #{token}"\
-              " | #{string_encoder_path}"
+        cmd = "cd '#{url}' && #{OhlohScm::GitParser.whatchanged} #{token} " \
+              "| #{string_encoder_path}"
         commit = OhlohScm::GitParser.parse(run(cmd)).first
         fixup_null_merge(commit)
       end
@@ -118,7 +95,7 @@ module OhlohScm
 
       def branches
         cmd = "cd '#{url}' && git branch | #{string_encoder_path}"
-        run(cmd).split.select { |branch_name| branch_name =~ /\b(.+)$/ }
+        run(cmd).split.grep(/\b(.+)$/)
       end
 
       # Commit all changes in the working directory, using metadata from the passed commit.
@@ -159,6 +136,35 @@ module OhlohScm
 
       private
 
+      def process_commits(io, opts, &block)
+        return process_expensive_commits(io, opts, &block) if expensive_commits?(opts)
+
+        process_standard_commits(io, &block)
+      end
+
+      def expensive_commits?(opts)
+        ENV.fetch('EXPENSIVE_COMMIT_COUNT',
+                  nil) && commit_count(opts) > ENV['EXPENSIVE_COMMIT_COUNT'].to_i
+      end
+
+      def process_expensive_commits(io, _opts)
+        io.each do |commit_sha|
+          yield verbose_commit(commit_sha.chomp)
+        end
+      end
+
+      def process_standard_commits(io)
+        previous = nil
+        OhlohScm::GitParser.parse(io) do |e|
+          yield fixup_null_merge(e) unless duplicate_commit?(previous, e)
+          previous = e
+        end
+      end
+
+      def duplicate_commit?(previous, current)
+        previous && previous.token == current.token
+      end
+
       def cat(sha1)
         return '' if sha1 == NULL_SHA1
 
@@ -175,24 +181,50 @@ module OhlohScm
         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)
-        if ENV['EXPENSIVE_COMMIT_COUNT'] && commit_count(opts) > ENV['EXPENSIVE_COMMIT_COUNT'].to_i
-          cmd = "#{rev_list_command(opts)} > #{log_filename}"
-        else
-          cmd = "#{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 }
+      def open_log_file(opts, &block)
+        prepare_log_file(opts)
+        process_log_file(&block)
       ensure
-        File.delete(log_filename) if File.exist?(log_filename)
+        cleanup_log_file
+      end
+
+      def prepare_log_file(opts)
+        cmd = select_log_command(opts)
+        run(cmd)
+      end
+
+      def select_log_command(opts)
+        return expensive_log_command(opts) if expensive_commits?(opts)
+
+        standard_log_command(opts)
+      end
+
+      def expensive_commit_processing?(expensive_count, opts)
+        expensive_count && commit_count(opts) > expensive_count.to_i
+      end
+
+      def expensive_log_command(opts)
+        "#{rev_list_command(opts)} > #{log_filename}"
+      end
+
+      def standard_log_command(opts)
+        "#{rev_list_command(opts)} | xargs -n 1 #{OhlohScm::GitParser.whatchanged} " \
+          "| #{string_encoder_path} > #{log_filename}"
+      end
+
+      def process_log_file(&block)
+        File.open(log_filename, 'r', &block)
+      end
+
+      def cleanup_log_file
+        FileUtils.rm_f(log_filename)
       end
 
       def rev_list_command(opts = {})
@@ -216,8 +248,8 @@ module OhlohScm
 
       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/)
+        run("cd #{url} && git show-ref --tags -d | grep '\\^{}' | sed 's/\\^{}//' " \
+            "| sed 's/refs\\/tags\\///'").split("\n")
       end
 
       def time_object(timestamp_string)
@@ -239,30 +271,54 @@ module OhlohScm
         # This is a one-off fix for DrJava, which includes some escape characters
         # in one of its Subversion messages. This might lead to a more generalized
         # cleanup of message text, but for now...
-        commit.message = commit.message&.gsub(/\\027/, '')
+        commit.message = commit.message&.gsub('\\027', '')
 
         # Git requires a non-empty message
         commit.message = '[no message]' if commit.message.nil? || commit.message =~ /\A\s*\z/
 
         # We need to store the message in a file in case it contains crazy characters
         #    that would corrupt a bash command line.
-        File.open(message_filename, 'w') do |f|
-          f.write commit.message
-        end
+        File.write(message_filename, commit.message)
         message_filename
       end
 
       def configure_git_environment_variables(commit)
-        ENV['GIT_COMMITTER_NAME'] = commit.committer_name || '[anonymous]'
-        ENV['GIT_AUTHOR_NAME'] = commit.author_name || ENV['GIT_COMMITTER_NAME']
+        configure_committer_details(commit)
+        configure_author_details(commit)
+        configure_commit_dates(commit)
+      end
 
-        ENV['GIT_COMMITTER_EMAIL'] = commit.committer_email || ENV['GIT_COMMITTER_NAME']
-        ENV['GIT_AUTHOR_EMAIL'] = commit.author_email || ENV['GIT_AUTHOR_NAME']
+      def configure_committer_details(commit)
+        ENV['GIT_COMMITTER_NAME'] = fallback_committer_name(commit)
+        ENV['GIT_COMMITTER_EMAIL'] = fallback_committer_email(commit)
+      end
+
+      def configure_author_details(commit)
+        ENV['GIT_AUTHOR_NAME'] = fallback_author_name(commit)
+        ENV['GIT_AUTHOR_EMAIL'] = fallback_author_email(commit)
+      end
 
+      def configure_commit_dates(commit)
         ENV['GIT_COMMITTER_DATE'] = commit.committer_date.to_s
         ENV['GIT_AUTHOR_DATE'] = (commit.author_date || commit.committer_date).to_s
       end
 
+      def fallback_committer_name(commit)
+        commit.committer_name || '[anonymous]'
+      end
+
+      def fallback_committer_email(commit)
+        commit.committer_email || ENV.fetch('GIT_COMMITTER_NAME', nil)
+      end
+
+      def fallback_author_name(commit)
+        commit.author_name || ENV.fetch('GIT_COMMITTER_NAME', nil)
+      end
+
+      def fallback_author_email(commit)
+        commit.author_email || ENV.fetch('GIT_AUTHOR_NAME', nil)
+      end
+
       # By hiding the message file inside the .git directory, we
       #    avoid it being found by the commit-all.
       def message_filename
@@ -271,7 +327,7 @@ module OhlohScm
 
       # True if there are pending changes to commit.
       def anything_to_commit?
-        /nothing to commit/.match?(run("cd '#{url}' && git status | tail -1")) ? false : true
+        !/nothing to commit/.match?(run("cd '#{url}' && git status | tail -1"))
       end
 
       # Ensures that the repository directory exists, and that the git db has been initialized.
@@ -295,6 +351,7 @@ module OhlohScm
         end
       end
 
+      # rubocop:disable Lint/LiteralAsCondition
       def check_if_ignored(gitignore_filename, filespec)
         File.open(gitignore_filename, File::CREAT | File::RDONLY) do |io|
           io.readlines.each do |l|
@@ -302,6 +359,7 @@ module OhlohScm
           end
         end
       end
+      # rubocop:enable Lint/LiteralAsCondition
 
       def token_filename
         'ohloh_token'
@@ -316,9 +374,7 @@ module OhlohScm
       def write_token(token)
         return unless token && !token.to_s.empty?
 
-        File.open(token_path, 'w') do |f|
-          f.write token.to_s
-        end
+        File.write(token_path, token.to_s)
       end
     end
   end

data/lib/ohloh_scm/git/scm.rb

@@ -47,8 +47,8 @@ module OhlohScm
       end
 
       def fetch_new_commits(remote_scm)
-        run "cd '#{url}' && git fetch --tags --force --update-head-ok "\
-              "'#{remote_scm.url}' #{branch_name}:#{branch_name}"
+        run "cd '#{url}' && git fetch --tags --force --update-head-ok " \
+            "'#{remote_scm.url}' #{branch_name}:#{branch_name}"
       end
 
       def clone_and_create_tracking_branch(remote_scm)
@@ -61,7 +61,6 @@ module OhlohScm
       end
 
       # We need very high reliability and this sequence gets the job done every time.
-      # rubocop:disable Metrics/AbcSize
       def clean_and_checkout_branch
         return unless status.scm_dir_exist?
 
@@ -72,13 +71,12 @@ module OhlohScm
         run "cd '#{url}' && git checkout #{branch_name} --"
         run "cd '#{url}' && git reset --hard heads/#{branch_name} --"
       end
-      # rubocop:enable Metrics/AbcSize
 
       def create_tracking_branch(branch_name)
         return if branch_name.to_s.empty?
         return if activity.branches.include?(branch_name)
 
-        run("cd '#{url}' && git remote update && "\
+        run("cd '#{url}' && git remote update && " \
             "git branch -f #{branch_name} origin/#{branch_name}")
       end
 
@@ -86,9 +84,9 @@ module OhlohScm
       def clean_up_disk
         return unless Dir.exist?(url)
 
-        run "cd #{url} && "\
-              "find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0"\
-              ' | xargs -0 rm -rf --'
+        run "cd #{url} && " \
+            "find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0 " \
+            '| xargs -0 rm -rf --'
       end
 
       def convert_to_git(remote_scm, callback)

data/lib/ohloh_scm/git/status.rb

@@ -4,7 +4,7 @@ module OhlohScm
   module Git
     class Status < OhlohScm::Status
       def branch?(name = scm.branch_name)
-        return unless scm_dir_exist?
+        return false unless scm_dir_exist?
 
         activity.branches.include?(name)
       end

data/lib/ohloh_scm/git/validation.rb

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

data/lib/ohloh_scm/git_svn/activity.rb

@@ -23,8 +23,8 @@ module OhlohScm
         git_svn_log(cmd: cmd, oneline: false).split.map(&:to_i)
       end
 
-      def each_commit(opts = {})
-        commits(opts).each { |commit| yield commit }
+      def each_commit(opts = {}, &block)
+        commits(opts).each(&block)
       end
 
       def head_token
@@ -46,14 +46,14 @@ module OhlohScm
 
       private
 
-      def open_log_file(opts = {})
+      def open_log_file(opts = {}, &block)
         cmd = "-v #{after_revision(opts)} | #{string_encoder_path} > #{log_filename}"
         git_svn_log(cmd: cmd, oneline: false)
-        File.open(log_filename, 'r') { |io| yield io }
+        File.open(log_filename, 'r', &block)
       end
 
       def log_filename
-        File.join(temp_folder, url.gsub(/\W/, '') + '.log')
+        File.join(temp_folder, "#{url.gsub(/\W/, '')}.log")
       end
 
       def after_revision(opts)

data/lib/ohloh_scm/git_svn/scm.rb

@@ -49,8 +49,8 @@ module OhlohScm
         prepare_dest_dir
         accept_certificate_if_prompted
 
-        cmd = "#{password_prompt} git svn clone --quiet #{username_opts}"\
-                " '#{@source_scm.url}' '#{url}'"
+        cmd = "#{password_prompt} git svn clone --quiet #{username_opts} " \
+              "'#{@source_scm.url}' '#{url}'"
         run(cmd)
       end
 
@@ -88,9 +88,9 @@ module OhlohScm
       def clean_up_disk
         return unless  File.exist?(url)
 
-        run "cd #{url} && "\
-              "find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0"\
-              ' | xargs -0 rm -rf --'
+        run "cd #{url} && " \
+            "find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0 " \
+            '| xargs -0 rm -rf --'
       end
     end
   end

data/lib/ohloh_scm/hg/activity.rb

@@ -40,8 +40,8 @@ module OhlohScm
 
       # Returns a single commit, including its diffs
       def verbose_commit(token)
-        cmd = "cd '#{url}' && hg log -v -r #{token} "\
-              " --style #{OhlohScm::HgParser.verbose_style_path} | #{string_encoder_path}"
+        cmd = "cd '#{url}' && hg log -v -r #{token}  " \
+              "--style #{OhlohScm::HgParser.verbose_style_path} | #{string_encoder_path}"
         OhlohScm::HgParser.parse(run(cmd)).first
       end
 
@@ -67,13 +67,13 @@ module OhlohScm
 
         # Hg leaves a little cookie crumb in the export directory. Remove it.
         file_path = File.join(dest_dir, '.hg_archival.txt')
-        File.delete(file_path) if File.exist?(file_path)
+        FileUtils.rm_f(file_path)
       end
 
       def tags
-        tag_strings = run("cd '#{url}' && hg tags").split(/\n/)
+        tag_strings = run("cd '#{url}' && hg tags").split("\n")
         tag_strings.map do |tag_string|
-          parsed_str = tag_string.split(' ')
+          parsed_str = tag_string.split
           rev_number_and_hash = parsed_str.pop
           tag_name = parsed_str.join(' ')
           rev = rev_number_and_hash.slice(/\A\d+/)
@@ -99,7 +99,7 @@ module OhlohScm
 
         # Recent versions of Hg now somtimes append a '+' char to the token.
         # Strip the trailing '+', if any.
-        token = token[0..-2] if token[-1..-1] == '+'
+        token = token[0..-2] if token[-1..] == '+'
 
         token
       end
@@ -117,11 +117,11 @@ module OhlohScm
       # Our standards require +opts={ after: ... }+ to include everything AFTER +after+.
       # However, hg returns everything after and INCLUDING +after+.
       # Therefore, consumers of this endpoint must check for and reject the duplicate commit.
-      def open_log_file(opts = {})
+      def open_log_file(opts = {}, &block)
         get_hg_log(opts)
-        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
 
       def get_hg_log(opts)
@@ -131,9 +131,9 @@ module OhlohScm
           #  just create an empty file rather than fetch a log we know will be empty.
           File.write(log_filename, '')
         else
-          cmd = "cd '#{url}' && #{hg_log_with_opts}"\
-                " --style #{OhlohScm::HgParser.verbose_style_path} | #{string_encoder_path}"\
-                " > #{log_filename}"
+          cmd = "cd '#{url}' && #{hg_log_with_opts} " \
+                "--style #{OhlohScm::HgParser.verbose_style_path} | #{string_encoder_path} " \
+                "> #{log_filename}"
           run cmd
         end
       end
@@ -144,7 +144,7 @@ module OhlohScm
 
       def cat(revision, path)
         out, err = run_with_err("cd '#{url}' && hg cat -r #{revision} #{escape(path)}")
-        return if err =~ /No such file in rev/i
+        return if /No such file in rev/i.match?(err)
         raise err unless err&.empty?
 
         out

data/lib/ohloh_scm/hg/scm.rb

@@ -48,9 +48,9 @@ module OhlohScm
       def clean_up_disk
         return unless FileTest.exist?(url)
 
-        run "cd #{url} && "\
-              "find . -maxdepth 1 -not -name .hg -not -name '*.nfs*' -not -name . -print0"\
-              ' | xargs -0 rm -rf --'
+        run "cd #{url} && " \
+            "find . -maxdepth 1 -not -name .hg -not -name '*.nfs*' -not -name . -print0 " \
+            '| xargs -0 rm -rf --'
       end
     end
   end

data/lib/ohloh_scm/hg/validation.rb

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

data/lib/ohloh_scm/parser/branch_number.rb

@@ -20,11 +20,12 @@ module OhlohScm
         # b and a have the same number of branch events.
         # If either one inherits from the other then they
         # are on the same line.
-        return (inherits_from?(branch_number) || branch_number.inherits_from?(self))
+        return inherits_from?(branch_number) || branch_number.inherits_from?(self)
       end
+
       # b has not been branched as often as this object.
       # That's OK if b is an ancestor of this object.
-      return inherits_from?(branch_number) if b.size < @num.size
+      inherits_from?(branch_number) if b.size < @num.size
     end
 
     def to_a
@@ -35,7 +36,7 @@ module OhlohScm
 
     # Returns true if <branch_number> is an ancestor of this object.
     # Also returns true if <branch_number> is the same as this object.
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize
     def inherits_from?(branch_number)
       b = branch_number.to_a
 
@@ -51,13 +52,13 @@ module OhlohScm
       end
       true
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
 
     private
 
     def descendant?(branch_number)
-      return true if branch_number[0] > @num[0] ||
-                     ((branch_number[0] == @num[0]) && (branch_number[1] > @num[1]))
+      true if branch_number[0] > @num[0] ||
+              ((branch_number[0] == @num[0]) && (branch_number[1] > @num[1]))
     end
   end
 end

data/lib/ohloh_scm/parser/bzr_xml_parser.rb

@@ -17,7 +17,7 @@ module OhlohScm
       @authors = []
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
     def tag_start(name, attrs)
       case name
       when 'log'
@@ -38,7 +38,7 @@ module OhlohScm
         @authors = []
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
     def tag_end(name)
@@ -76,7 +76,7 @@ module OhlohScm
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
 
-    # rubocop:disable Style/TrivialAccessors # Cannot use attr_writer; we need cdata not cdata=.
+    # # Cannot use attr_writer; we need cdata not cdata=.
     def cdata(data)
       @cdata = data
     end
@@ -84,7 +84,6 @@ module OhlohScm
     def text(text)
       @text = text
     end
-    # rubocop:enable Style/TrivialAccessors
 
     private
 
@@ -116,7 +115,7 @@ module OhlohScm
     # rubocop:enable Metrics/MethodLength
 
     def strip_trailing_asterisk(path)
-      path[-1..-1] == '*' ? path[0..-2] : path
+      path[-1..] == '*' ? path[0..-2] : path
     end
 
     def remove_dupes(diffs)
@@ -125,7 +124,7 @@ module OhlohScm
   end
 
   class BzrXmlParser < Parser
-    NAME_REGEX = /^(.+?)(\s+<(.+)>\s*)?$/.freeze
+    NAME_REGEX = /^(.+?)(\s+<(.+)>\s*)?$/
     def self.internal_parse(buffer, _)
       buffer = '<?xml?>' if buffer.is_a?(StringIO) && buffer.length < 2
       REXML::Document.parse_stream(buffer,
@@ -138,21 +137,22 @@ module OhlohScm
       'bzr'
     end
 
-    # rubocop:disable Metrics/AbcSize
     def self.remove_dupes(diffs)
-      # Bazaar may report that a file was added and modified in a single commit.
-      # Reduce these cases to a single 'A' action.
-      diffs.delete_if do |d|
-        d.action == 'M' && diffs.select { |x| x.path == d.path && x.action == 'A' }.any?
-      end
-
+      remove_modified_after_added!(diffs)
       # Bazaar may report that a file was both deleted and added in a single commit.
       # Reduce these cases to a single 'M' action.
       diffs.each do |d|
-        d.action = 'M' if diffs.select { |x| x.path == d.path }.size > 1
+        d.action = 'M' if diffs.count { |x| x.path == d.path } > 1
       end.uniq
     end
-    # rubocop:enable Metrics/AbcSize
+
+    # Bazaar may report that a file was added and modified in a single commit.
+    # Reduce these cases to a single 'A' action.
+    def self.remove_modified_after_added!(diffs)
+      diffs.delete_if do |d|
+        d.action == 'M' && diffs.any? { |x| x.path == d.path && x.action == 'A' }
+      end
+    end
 
     # Bazaar expects committer/author to be specified in this format
     # Name <email>, or John Doe <jdoe@example.com>

data/lib/ohloh_scm/parser/cvs_parser.rb

@@ -7,7 +7,7 @@ module OhlohScm
       # commits (developer/date/message).
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      def internal_parse(io, _opts)
+      def internal_parse(io, _opts, &block)
         commits = {}
 
         read_files(io) do |c|
@@ -25,7 +25,7 @@ module OhlohScm
           # a number of separate times, we may end up with several timestamps for
           # that combination.
 
-          key = c.committer_name + ':' + c.message
+          key = "#{c.committer_name}:#{c.message}"
           if commits.key? key
             # We have already seen this developer/message combination
             match = false
@@ -61,7 +61,7 @@ module OhlohScm
           result.delete_at(i) if result[i].committer_date == result[i - 1].committer_date
         end
 
-        result.each { |r| yield r } if block_given?
+        result.each(&block) if block
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -86,9 +86,10 @@ module OhlohScm
       def read_file(io, filename, &block)
         branch_number = nil
         io.each_line do |l|
-          if l =~ /^head: ([\d\.]+)/
+          case l
+          when /^head: ([\d.]+)/
             branch_number = BranchNumber.new(Regexp.last_match(1))
-          elsif /^----------------------------/.match?(l)
+          when /^----------------------------/
             read_commits(io, branch_number, filename, &block)
           end
         end
@@ -125,7 +126,7 @@ module OhlohScm
       def build_commit(committer_date, committer_name, message, filename)
         commit = OhlohScm::Commit.new
         commit.token = committer_date[0..18]
-        commit.committer_date = Time.parse(committer_date[0..18] + ' +0000').utc
+        commit.committer_date = Time.parse("#{committer_date[0..18]} +0000").utc
         commit.committer_name = committer_name
         commit.message = message
         commit.directories = [File.dirname(filename).intern]