jirametrics 1.5 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc425ec4e1efcb78c2e12facdbfb0109383c379c1e08a83f46e3587dceabda7a
-  data.tar.gz: aa98dca9360bec6250a423790f7e1d54d5d3c102804b514468aad220c4913cad
+  metadata.gz: eb163ed079209739994cb9a963533c6afaddc6ca987bf9c428aeee94945ecf40
+  data.tar.gz: 571d3d09cde660cd7038d7d996e0c5e44cb7dfe21fdf892a931ef51db84fb9cf
 SHA512:
-  metadata.gz: 7ad6615bf254963dabe4557e907f6bacb0340562d9120c9fc3d5ca722b88709531b3e58148d1957707931e88512950053be04c49ace5d531c2990e99cb6e4254
-  data.tar.gz: 06b0af0ce2512d028bb0d11771610c75d88246113a0bc3cb789a348f4d3e24c745d419802248f4ad25caebf845e682ecabd7aa24b1aa39a911164fe0332d111a
+  metadata.gz: 3212ef8b2d1a2d8eb2be8e614534aa4b614e8f8003f94d0b8cd0239839fbca90c30f8ce062effede748567f53c01c4235ec179d53fd04f01f9f0bd7a288ddb9b
+  data.tar.gz: f25bc331a72956f24dac94205630db7cff9d98a933ccd76f2ddff1132702dfd284c9ad526518c6e91169fb3cc41e604695d1c792f2b2496b870e93a6ff165684

data/bin/jirametrics

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'jirametrics'
 JiraMetrics.start(ARGV)

data/lib/jirametrics/aggregate_config.rb

@@ -48,7 +48,7 @@ class AggregateConfig
     @project_config.jira_url = project.jira_url if @project_config.jira_url.nil?
     unless @project_config.jira_url == project.jira_url
       raise 'Not allowed to aggregate projects from different Jira instances: ' \
-        "#{@project_config.jira_url.inspect} and #{project.jira_url.inspect}"
+        "#{@project_config.jira_url.inspect} and #{project.jira_url.inspect}. For project #{project_name}"
     end
 
     @included_projects << project
@@ -93,6 +93,7 @@ class AggregateConfig
     end
 
     raise "Can't calculate range" if earliest.nil? || latest.nil?
+
     earliest..latest
   end
 end

data/lib/jirametrics/aging_work_bar_chart.rb

@@ -185,14 +185,14 @@ class AgingWorkBarChart < ChartBase
   end
 
   def data_set_by_block(
-    issue:, issue_label:, title_label:, stack:, color:, start_date:, end_date: date_range.end, &block
+    issue:, issue_label:, title_label:, stack:, color:, start_date:, end_date: date_range.end
   )
     started = nil
     ended = nil
     data = []
 
     (start_date..end_date).each do |day|
-      if block.call(day)
+      if yield(day)
         started = day if started.nil?
         ended = day
       elsif ended
@@ -225,7 +225,7 @@ class AgingWorkBarChart < ChartBase
   end
 
   def calculate_percent_line percentage: 85
-    days = completed_issues_in_range.collect { |issue| issue.board.cycletime.cycletime(issue) }.compact.sort
+    days = completed_issues_in_range.filter_map { |issue| issue.board.cycletime.cycletime(issue) }.sort
     return nil if days.empty?
 
     days[days.length * percentage / 100]

data/lib/jirametrics/aging_work_in_progress_chart.rb

@@ -67,7 +67,7 @@ class AgingWorkInProgressChart < ChartBase
       {
         'type' => 'line',
         'label' => rules.label,
-        'data' => rules_to_issues[rules].collect do |issue|
+        'data' => rules_to_issues[rules].filter_map do |issue|
             age = issue.board.cycletime.age(issue, today: date_range.end)
             column = column_for issue: issue
             next if column.nil?
@@ -76,7 +76,7 @@ class AgingWorkInProgressChart < ChartBase
               'x' => column.name,
               'title' => ["#{issue.key} : #{issue.summary} (#{label_days age})"]
             }
-          end.compact,
+          end,
         'fill' => false,
         'showLine' => false,
         'backgroundColor' => rules.color
@@ -101,16 +101,16 @@ class AgingWorkInProgressChart < ChartBase
 
   def accumulated_status_ids_per_column
     accumulated_status_ids = []
-    @board_columns.reverse.collect do |column|
+    @board_columns.reverse.filter_map do |column|
       next if column == @fake_column
 
       accumulated_status_ids += column.status_ids
       [column.name, accumulated_status_ids.dup]
-    end.compact.reverse
+    end.reverse
   end
 
   def ages_of_issues_that_crossed_column_boundary issues:, status_ids:
-    issues.collect do |issue|
+    issues.filter_map do |issue|
       stop = issue.first_time_in_status(*status_ids)
       start = issue.board.cycletime.started_time(issue)
 
@@ -119,7 +119,7 @@ class AgingWorkInProgressChart < ChartBase
       next if stop < start
 
       (stop.to_date - start.to_date).to_i + 1
-    end.compact
+    end
   end
 
   def column_for issue:

data/lib/jirametrics/anonymizer.rb

@@ -28,7 +28,7 @@ class Anonymizer
     # just try again. In every case we've seen, it's worked on the second attempt, but we'll be
     # cautious and try five times.
     5.times do |i|
-      return RandomWord.phrases.next.gsub(/_/, ' ')
+      return RandomWord.phrases.next.tr('_', ' ')
     rescue # rubocop:disable Style/RescueStandardError We don't care what exception was thrown.
       puts "Random word blew up on attempt #{i + 1}"
     end
@@ -45,7 +45,7 @@ class Anonymizer
 
       issue.issue_links.each do |link|
         other_issue = link.other_issue
-        next if other_issue.key =~ /^ANON-\d+$/ # Already anonymized?
+        next if other_issue.key.match?(/^ANON-\d+$/) # Already anonymized?
 
         other_issue.raw['key'] = "ANON-#{counter += 1}"
         other_issue.raw['fields']['summary'] = random_phrase
@@ -179,7 +179,7 @@ class Anonymizer
   end
 
   def anonymize_board_names
-    @all_boards.values.each do |board|
+    @all_boards.each_value do |board|
       board.raw['name'] = "#{random_phrase} board"
     end
   end

data/lib/jirametrics/blocked_stalled_change.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require 'jirametrics/value_equality'
+
 class BlockedStalledChange
+  include ValueEquality
   attr_reader :time, :blocking_issue_keys, :flag, :status, :stalled_days, :status_is_blocking
 
   def initialize time:, flagged: nil, status: nil, status_is_blocking: true, blocking_issue_keys: nil, stalled_days: nil
@@ -16,16 +19,8 @@ class BlockedStalledChange
   def stalled? = @stalled_days || stalled_by_status?
   def active? = !blocked? && !stalled?
 
-  def blocked_by_status? = (@status && @status_is_blocking)
-  def stalled_by_status? = (@status && !@status_is_blocking)
-
-  def ==(other)
-    (other.class == self.class) && (other.state == state)
-  end
-
-  def state
-    instance_variables.map { |variable| instance_variable_get variable }
-  end
+  def blocked_by_status? = @status && @status_is_blocking
+  def stalled_by_status? = @status && !@status_is_blocking
 
   def reasons
     result = []

data/lib/jirametrics/board.rb

@@ -17,15 +17,10 @@ class Board
     # visible on the board. If the board is configured to have a kanban backlog then it will have
     # statuses matched to it and otherwise, there will be no statuses.
     if kanban?
-      assert_jira_behaviour_true(columns[0]['name'] == 'Backlog') do
-        "Expected first column to be called Backlog: #{raw}"
-      end
-
       @backlog_statuses = @possible_statuses.expand_statuses(status_ids_from_column columns[0]) do |unknown_status|
-        # Yet another "theoretically impossible and yet we've seen it in production" moment
-        puts "Status #{unknown_status.inspect} is defined as being in the backlog for board #{name.inspect}:#{id} " \
-          'and yet it\'s not defined in the list of possible statuses available to the project. Check your Jira ' \
-          'configuration'
+        # There is a status defined as being 'backlog' that is no longer being returned in statuses.
+        # We used to display a warning for this but honestly, there is nothing that anyone can do about it
+        # so now we just quietly ignore it.
       end
       columns = columns[1..]
     else
@@ -33,10 +28,10 @@ class Board
       @backlog_statuses = []
     end
 
-    @visible_columns = columns.collect do |column|
+    @visible_columns = columns.filter_map do |column|
       # It's possible for a column to be defined without any statuses and in this case, it won't be visible.
       BoardColumn.new column unless status_ids_from_column(column).empty?
-    end.compact
+    end
   end
 
   def server_url_prefix
@@ -51,7 +46,7 @@ class Board
   end
 
   def status_ids_from_column column
-    column['statuses'].collect { |status| status['id'].to_i }
+    column['statuses']&.collect { |status| status['id'].to_i } || []
   end
 
   def status_ids_in_or_right_of_column column_name
@@ -65,7 +60,7 @@ class Board
     end
 
     unless found_it
-      column_names = @visible_columns.collect(&:name).collect(&:inspect).join(', ')
+      column_names = @visible_columns.collect { |c| c.name.inspect }.join(', ')
       raise "No visible column with name: #{column_name.inspect} Possible options are: #{column_names}"
     end
     status_ids
@@ -84,7 +79,10 @@ class Board
   end
 
   def project_id
-    @raw['location']&.[]('id')
+    location = @raw['location']
+    return nil unless location
+
+    location['id'] if location['type'] == 'project'
   end
 
   def name

data/lib/jirametrics/chart_base.rb

@@ -46,7 +46,7 @@ class ChartBase
 
   # Render the file and then wrap it with standard headers and quality checks.
   def wrap_and_render caller_binding, file
-    result = String.new
+    result = +''
     result << "<h1>#{@header_text}</h1>" if @header_text
     result << ERB.new(@description_text).result(caller_binding) if @description_text
     result << render(caller_binding, file)
@@ -74,7 +74,7 @@ class ChartBase
       type: 'bar',
       label: label,
       data: date_issues_list.collect do |date, issues|
-        issues.sort! { |a, b| a.key_as_i <=> b.key_as_i }
+        issues.sort_by!(&:key_as_i)
         title = "#{label} (#{label_issues issues.size})"
         {
           x: date,
@@ -189,7 +189,7 @@ class ChartBase
     begin
       statuses = board.possible_statuses.expand_statuses([name_or_id])
     rescue RuntimeError => e
-      return "<span style='color: red'>#{name_or_id}</span>" if e.message =~ /^Status not found:/
+      return "<span style='color: red'>#{name_or_id}</span>" if e.message.match?(/^Status not found:/)
 
       throw e
     end
@@ -212,7 +212,7 @@ class ChartBase
   end
 
   def random_color
-    "\##{Random.bytes(3).unpack1('H*')}"
+    "##{Random.bytes(3).unpack1('H*')}"
   end
 
   def canvas width:, height:, responsive: true
@@ -233,7 +233,7 @@ class ChartBase
     @issues = issues
     return unless @filter_issues_block
 
-    @issues = issues.collect { |i| @filter_issues_block.call(i) }.compact.uniq
+    @issues = issues.filter_map { |i| @filter_issues_block.call(i) }.uniq
     puts @issues.collect(&:key).join(', ')
   end
 end

data/lib/jirametrics/cycletime_histogram.rb

@@ -58,7 +58,7 @@ class CycletimeHistogram < ChartBase
     {
       type: 'bar',
       label: label,
-      data: keys.sort.collect do |key|
+      data: keys.sort.filter_map do |key|
         next if histogram_data[key].zero?
 
         {
@@ -66,7 +66,7 @@ class CycletimeHistogram < ChartBase
           y: histogram_data[key],
           title: "#{histogram_data[key]} items completed in #{label_days key}"
         }
-      end.compact,
+      end,
       backgroundColor: color,
       borderRadius: 0
     }

data/lib/jirametrics/cycletime_scatterplot.rb

@@ -61,7 +61,7 @@ class CycletimeScatterplot < ChartBase
       label = rules.label
       color = rules.color
       percent_line = calculate_percent_line completed_issues_by_type
-      data = completed_issues_by_type.collect { |issue| data_for_issue(issue) }.compact
+      data = completed_issues_by_type.filter_map { |issue| data_for_issue(issue) }
       data_sets << {
         label: "#{label} (85% at #{label_days(percent_line)})",
         data: data,
@@ -88,7 +88,10 @@ class CycletimeScatterplot < ChartBase
 
     # The trend calculation works with numbers only so convert Time to an int and back
     calculator = TrendLineCalculator.new(points)
-    data_points = calculator.chart_datapoints range: time_range.begin.to_i..time_range.end.to_i, max_y: @highest_cycletime
+    data_points = calculator.chart_datapoints(
+      range: time_range.begin.to_i..time_range.end.to_i,
+      max_y: @highest_cycletime
+    )
     data_points.each do |point_hash|
       point_hash[:x] = chart_format Time.at(point_hash[:x])
     end

data/lib/jirametrics/daily_wip_chart.rb

@@ -50,7 +50,7 @@ class DailyWipChart < ChartBase
   def select_possible_rules issue_rules_by_active_date
     possible_rules = []
     issue_rules_by_active_date.each_pair do |_date, issues_rules_list|
-      issues_rules_list.each do |_issue, rules|
+      issues_rules_list.each do |_issue, rules| # rubocop:disable Style/HashEachMethods
         possible_rules << rules unless possible_rules.any? { |r| r.group == rules.group }
       end
     end

data/lib/jirametrics/data_quality_report.rb

@@ -83,7 +83,7 @@ class DataQualityReport < ChartBase
   end
 
   def initialize_entries
-    @entries = @issues.collect do |issue|
+    @entries = @issues.filter_map do |issue|
       cycletime = issue.board.cycletime
       started = cycletime.started_time(issue)
       stopped = cycletime.stopped_time(issue)
@@ -91,7 +91,7 @@ class DataQualityReport < ChartBase
       next if started && started > time_range.end
 
       Entry.new started: started, stopped: stopped, issue: issue
-    end.compact
+    end
 
     @entries.sort! do |a, b|
       a.issue.key =~ /.+-(\d+)$/
@@ -107,11 +107,11 @@ class DataQualityReport < ChartBase
   def scan_for_completed_issues_without_a_start_time entry:
     return unless entry.stopped && entry.started.nil?
 
-    status_names = entry.issue.changes.collect do |change|
+    status_names = entry.issue.changes.filter_map do |change|
       next unless change.status?
 
       format_status change.value, board: entry.issue.board
-    end.compact
+    end
 
     entry.report(
       problem_key: :completed_but_not_started,

data/lib/jirametrics/dependency_chart.rb

@@ -78,7 +78,7 @@ class DependencyChart < ChartBase
   end
 
   def make_dot_link issue_link:, link_rules:
-    result = String.new
+    result = +''
     result << issue_link.origin.key.inspect
     result << ' -> '
     result << issue_link.other_issue.key.inspect
@@ -91,11 +91,11 @@ class DependencyChart < ChartBase
   end
 
   def make_dot_issue issue:, issue_rules:
-    result = String.new
+    result = +''
     result << issue.key.inspect
     result << '['
     label = issue_rules.label || "#{issue.key}|#{issue.type}"
-    label = label.inspect unless label =~ /^<.+>$/
+    label = label.inspect unless label.match?(/^<.+>$/)
     result << "label=#{label}"
     result << ',shape=Mrecord'
     tooltip = "#{issue.key}: #{issue.summary}"
@@ -160,6 +160,7 @@ class DependencyChart < ChartBase
     dot_graph << '}'
 
     return nil if visible_issues.empty?
+
     dot_graph
   end
 
@@ -205,7 +206,7 @@ class DependencyChart < ChartBase
       line.gsub!(/[{<]/, '[')
       line.gsub!(/[}>]/, ']')
       line.gsub!(/\s*&\s*/, ' and ')
-      line.gsub!('|', '')
+      line.delete!('|')
 
       if line.length > max_width
         line.gsub(/(.{1,#{max_width}})(\s+|$)/, "\\1#{separator}").strip

data/lib/jirametrics/download_config.rb

@@ -15,25 +15,6 @@ class DownloadConfig
     instance_eval(&@block)
   end
 
-  def project_key _key = nil
-    raise 'project, filter, and jql directives are no longer supported. See ' \
-      'https://github.com/mikebowler/jira-export/wiki/Deprecated#project-filter-and-jql-are-no-longer-supported-in-the-download-section'
-  end
-
-  def board_ids *ids
-    deprecated message: 'board_ids in the download block are deprecated. See https://github.com/mikebowler/jira-export/wiki/Deprecated'
-    @board_ids = ids unless ids.empty?
-    @board_ids
-  end
-
-  def filter_name _filter = nil
-    project_key
-  end
-
-  def jql _query = nil
-    project_key
-  end
-
   def rolling_date_count count = nil
     @rolling_date_count = count unless count.nil?
     @rolling_date_count

data/lib/jirametrics/downloader.rb

@@ -2,21 +2,22 @@
 
 require 'cgi'
 require 'json'
-require 'English'
 
 class Downloader
   CURRENT_METADATA_VERSION = 4
 
-  attr_accessor :metadata, :quiet_mode, :logfile, :logfile_name
+  attr_accessor :metadata, :quiet_mode
+  attr_reader :file_system
 
   # For testing only
   attr_reader :start_date_in_query
 
-  def initialize download_config:, json_file_loader: JsonFileLoader.new
+  def initialize download_config:, file_system:, jira_gateway:
     @metadata = {}
     @download_config = download_config
     @target_path = @download_config.project_config.target_path
-    @json_file_loader = json_file_loader
+    @file_system = file_system
+    @jira_gateway = jira_gateway
     @board_id_to_filter_id = {}
 
     @issue_keys_downloaded_in_current_run = []
@@ -27,7 +28,7 @@ class Downloader
     log '', both: true
     log @download_config.project_config.name, both: true
 
-    load_jira_config(@download_config.project_config.jira_config)
+    init_gateway
     load_metadata
 
     if @metadata['no-download']
@@ -47,60 +48,23 @@ class Downloader
     save_metadata
   end
 
+  def init_gateway
+    @jira_gateway.load_jira_config(@download_config.project_config.jira_config)
+    @jira_gateway.ignore_ssl_errors = @download_config.project_config.settings['ignore_ssl_errors']
+  end
+
   def log text, both: false
-    @logfile&.puts text
+    @file_system.log text
     puts text if both
   end
 
   def find_board_ids
     ids = @download_config.project_config.board_configs.collect(&:id)
-    if ids.empty?
-      deprecated message: 'board_ids in the download block have been deprecated. See https://github.com/mikebowler/jira-export/wiki/Deprecated'
-      ids = @download_config.board_ids
-    end
     raise 'Board ids must be specified' if ids.empty?
 
     ids
   end
 
-  def load_jira_config jira_config
-    @jira_url = jira_config['url']
-    @jira_email = jira_config['email']
-    @jira_api_token = jira_config['api_token']
-    @jira_personal_access_token = jira_config['personal_access_token']
-
-    raise 'When specifying an api-token, you must also specify email' if @jira_api_token && !@jira_email
-
-    if @jira_api_token && @jira_personal_access_token
-      raise "You can't specify both an api-token and a personal-access-token. They don't work together."
-    end
-
-    @cookies = (jira_config['cookies'] || []).collect { |key, value| "#{key}=#{value}" }.join(';')
-  end
-
-  def call_command command
-    log "  #{command.gsub(/\s+/, ' ')}"
-    result = `#{command}`
-    log result unless $CHILD_STATUS.success?
-    return result if $CHILD_STATUS.success?
-
-    log "Failed call with exit status #{$CHILD_STATUS.exitstatus}. See #{@logfile_name} for details", both: true
-    exit $CHILD_STATUS.exitstatus
-  end
-
-  def make_curl_command url:
-    command = 'curl'
-    command += ' -s'
-    command += ' -k' if @download_config.project_config.settings['ignore_ssl_errors']
-    command += " --cookie #{@cookies.inspect}" unless @cookies.empty?
-    command += " --user #{@jira_email}:#{@jira_api_token}" if @jira_api_token
-    command += " -H \"Authorization: Bearer #{@jira_personal_access_token}\"" if @jira_personal_access_token
-    command += ' --request GET'
-    command += ' --header "Accept: application/json"'
-    command += " --url \"#{url}\""
-    command
-  end
-
   def download_issues board_id:
     log "  Downloading primary issues for board #{board_id}", both: true
     path = "#{@target_path}#{@download_config.project_config.file_prefix}_issues/"
@@ -136,10 +100,9 @@ class Downloader
     start_at = 0
     total = 1
     while start_at < total
-      command = make_curl_command url: "#{@jira_url}/rest/api/2/search" \
+      json = @jira_gateway.call_url relative_url: '/rest/api/2/search' \
         "?jql=#{escaped_jql}&maxResults=#{max_results}&startAt=#{start_at}&expand=changelog&fields=*all"
 
-      json = JSON.parse call_command(command)
       exit_if_call_failed json
 
       json['issues'].each do |issue_json|
@@ -148,7 +111,8 @@ class Downloader
         }
         identify_other_issues_to_be_downloaded issue_json
         file = "#{issue_json['key']}-#{board_id}.json"
-        write_json(issue_json, File.join(path, file))
+
+        @file_system.save_json(json: issue_json, filename: File.join(path, file))
       end
 
       total = json['total'].to_i
@@ -193,24 +157,24 @@ class Downloader
 
   def download_statuses
     log '  Downloading all statuses', both: true
-    command = make_curl_command url: "\"#{@jira_url}/rest/api/2/status\""
-    json = JSON.parse call_command(command)
+    json = @jira_gateway.call_url relative_url: "/rest/api/2/status"
 
-    write_json json, "#{@target_path}#{@download_config.project_config.file_prefix}_statuses.json"
+    @file_system.save_json(
+      json: json, 
+      filename: "#{@target_path}#{@download_config.project_config.file_prefix}_statuses.json"
+    )
   end
 
   def download_board_configuration board_id:
     log "  Downloading board configuration for board #{board_id}", both: true
-    command = make_curl_command url: "#{@jira_url}/rest/agile/1.0/board/#{board_id}/configuration"
-
-    json = JSON.parse call_command(command)
+    json = @jira_gateway.call_url relative_url: "/rest/agile/1.0/board/#{board_id}/configuration"
     exit_if_call_failed json
 
     @board_id_to_filter_id[board_id] = json['filter']['id'].to_i
     # @board_configuration = json if @download_config.board_ids.size == 1
 
     file_prefix = @download_config.project_config.file_prefix
-    write_json json, "#{@target_path}#{file_prefix}_board_#{board_id}_configuration.json"
+    @file_system.save_json json: json, filename: "#{@target_path}#{file_prefix}_board_#{board_id}_configuration.json"
 
     download_sprints board_id: board_id if json['type'] == 'scrum'
   end
@@ -223,34 +187,28 @@ class Downloader
     is_last = false
 
     while is_last == false
-      command = make_curl_command url: "#{@jira_url}/rest/agile/1.0/board/#{board_id}/sprint?" \
+      json = @jira_gateway.call_url relative_url: "/rest/agile/1.0/board/#{board_id}/sprint?" \
         "maxResults=#{max_results}&startAt=#{start_at}"
-      json = JSON.parse call_command(command)
       exit_if_call_failed json
 
-      write_json json, "#{@target_path}#{file_prefix}_board_#{board_id}_sprints_#{start_at}.json"
+      @file_system.save_json(
+        json: json,
+        filename: "#{@target_path}#{file_prefix}_board_#{board_id}_sprints_#{start_at}.json"
+      )
       is_last = json['isLast']
       max_results = json['maxResults']
       start_at += json['values'].size
     end
   end
 
-  def write_json json, filename
-    file_path = File.dirname(filename)
-    FileUtils.mkdir_p file_path unless File.exist?(file_path)
-
-    File.write(filename, JSON.pretty_generate(json))
-  end
-
   def metadata_pathname
     "#{@target_path}#{@download_config.project_config.file_prefix}_meta.json"
   end
 
   def load_metadata
     # If we've never done a download before then this file won't be there. That's ok.
-    return unless File.exist? metadata_pathname
-
-    hash = JSON.parse(File.read metadata_pathname)
+    hash = file_system.load_json(metadata_pathname, fail_on_error: false)
+    return if hash.nil?
 
     # Only use the saved metadata if the version number is the same one that we're currently using.
     # If the cached data is in an older format then we're going to throw most of it away.
@@ -283,13 +241,13 @@ class Downloader
 
     @metadata['jira_url'] = @jira_url
 
-    write_json @metadata, metadata_pathname
+    @file_system.save_json json: @metadata, filename: metadata_pathname
   end
 
   def remove_old_files
     file_prefix = @download_config.project_config.file_prefix
     Dir.foreach @target_path do |file|
-      next unless file =~ /^#{file_prefix}_\d+\.json$/
+      next unless file.match?(/^#{file_prefix}_\d+\.json$/)
 
       File.unlink "#{@target_path}#{file}"
     end
@@ -301,7 +259,7 @@ class Downloader
     return unless File.exist? path
 
     Dir.foreach path do |file|
-      next unless file =~ /\.json$/
+      next unless file.match?(/\.json$/)
 
       File.unlink File.join(path, file)
     end