jirametrics 2.29.2 → 2.29.3pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b85b61821add760ea7d427236007207fa161d5e2f80c04f99b8dda1c9bc6118
-  data.tar.gz: 6afeded710d46ba016e28500ff771a8c6c16f99f68ae40d7cc4435a193261958
+  metadata.gz: c97a5f29dfdbcd35bb1f57afbe46122f68fcf91d1eba479aba591d1ae7d5f37d
+  data.tar.gz: 761a96ce629f7800fddb4b828a962ca4379b5ac8a8b9c1665b0f0b131d44d5b7
 SHA512:
-  metadata.gz: 7fb8fd29609fb8a4f5a13c0dee6167322d91072ef7dbd438455f2cb24181aad6e5a62d226eef6e6f4787173b8ce0cd756535c6eccf94587f2675c5a3509d81c8
-  data.tar.gz: 5875777fcb72109e91646e0346cf7a6b192061fe752dc818533225421cf82d5182ddd8d644c57a183d6b3fb938aff341c5849b43116c1728048d2f75e5bab9b9
+  metadata.gz: dc69c58ff1e5eb6d54ca9f2d2fddc0ce121c3dc80e2af36389a9ddeeefee4a627662aab7516ae72500e81a2538673b966dc7d9b536229736e394afe51df1b386
+  data.tar.gz: 2120a9ec7a7ef3b28885dc9d04cec559331a4ce294c342b62eaf8dcda9d2554993221eeb1d36ddd34ad23142800a58baad52bd000a2f93b8694e68243fcaeb8c

data/lib/jirametrics/downloader_for_data_center.rb

@@ -25,7 +25,7 @@ class DownloaderForDataCenter < Downloader
       keys_to_request = @issue_keys_pending_download[0..99]
       @issue_keys_pending_download.reject! { |key| keys_to_request.include? key }
       jql = "key in (#{keys_to_request.join(', ')})"
-      jira_search_by_jql(jql: jql, initial_query: false, board: board, path: path)
+      jira_search_by_jql(jql: jql, initial_query: true, board: board, path: path)
     end
   end
 

data/lib/jirametrics/exporter.rb

@@ -10,6 +10,7 @@ class Exporter
     logfile_name = 'jirametrics.log'
     logfile = File.open(logfile_name, 'w')
   rescue Errno::EACCES
+    # FileSystem can't be used here — it hasn't been created yet (it depends on this logfile).
     warn "Error: Cannot write to #{File.expand_path(logfile_name)}. " \
       'Please ensure the current directory is writable.'
     exit 1
@@ -72,18 +73,23 @@ class Exporter
 
   def info key, name_filter:
     selected = []
+    file_system.log_only = true
     each_project_config(name_filter: name_filter) do |project|
       project.evaluate_next_level
 
       project.run load_only: true
       project.issues.each do |issue|
         selected << [project, issue] if key == issue.key
+        issue.subtasks.each do |subtask|
+          selected << [project, subtask] if key == subtask.key
+        end
       end
     rescue => e # rubocop:disable Style/RescueStandardError
       # This happens when we're attempting to load an aggregated project because it hasn't been
       # properly initialized. Since we don't care about aggregated projects, we just ignore it.
       raise unless e.message.start_with? 'This is an aggregated project and issues should have been included'
     end
+    file_system.log_only = false
 
     if selected.empty?
       file_system.log "No issues found to match #{key.inspect}"

data/lib/jirametrics/file_config.rb

@@ -65,22 +65,20 @@ class FileConfig
   # most common usecase - the Team Dashboard from FocusedObjective.com. The rule for that one
   # is that all empty values in the first column should be at the bottom.
   def sort_output all_lines
-    all_lines.sort do |a, b|
-      result = nil
-      if a[0] == b[0]
-        result = a[1..] <=> b[1..]
+    all_lines.each_with_index.sort do |(a, a_idx), (b, b_idx)|
+      result = if a[0] == b[0]
+        a[1..] <=> b[1..]
       elsif a[0].nil?
-        result = 1
+        1
       elsif b[0].nil?
-        result = -1
+        -1
       else
-        result = a[0] <=> b[0]
+        a[0] <=> b[0]
       end
 
-      # This will only happen if one of the objects isn't comparable. Seen in production.
-      result = -1 if result.nil?
-      result
-    end
+      # When objects aren't comparable, preserve original order for a stable sort.
+      result.nil? || result.zero? ? a_idx <=> b_idx : result
+    end.map(&:first)
   end
 
   def columns &block

data/lib/jirametrics/issue.rb

@@ -905,11 +905,20 @@ class Issue
 
       history['items']&.each do |item|
         if item['field'] == 'status' && item['to'].nil?
-          board.project_config.file_system.log(
+          to_name = item['toString']
+          matches = board.possible_statuses.find_all_by_name(to_name)
+          guessed_id, id_note = if matches.length == 1
+            [matches.first.id.to_s, "Guessed id #{matches.first.id} from status name."]
+          elsif matches.length > 1
+            ['0', "Multiple statuses named #{to_name.inspect} exist (ids: #{matches.map(&:id).join(', ')}); cannot disambiguate. Using id 0."]
+          else
+            ['0', "No known status named #{to_name.inspect}. Using id 0."]
+          end
+          board.project_config.file_system.warning(
             "Issue #{key} has a status change without a 'to' id " \
-            "(from #{item['fromString'].inspect} to #{item['toString'].inspect}). Using id 0."
+            "(from #{item['fromString'].inspect} to #{to_name.inspect}). #{id_note}"
           )
-          item = item.merge('to' => '0')
+          item = item.merge('to' => guessed_id)
         end
 
         @changes << ChangeItem.new(raw: item, time: created, author_raw: history['author'])

data/lib/jirametrics/jira_gateway.rb

@@ -9,6 +9,10 @@ class JiraGateway
   attr_accessor :ignore_ssl_errors
   attr_reader :jira_url, :settings, :file_system
 
+  RETRYABLE_EXIT_CODES = [7, 28, 35, 56].freeze
+  MAX_RETRIES = 3
+  RETRY_DELAY_SECONDS = 5
+
   def initialize file_system:, jira_config:, settings:
     @file_system = file_system
     load_jira_config(jira_config)
@@ -26,8 +30,23 @@ class JiraGateway
     log_entry = sanitize_message log_entry
     @file_system.log log_entry
 
-    stdout, stderr, status = capture3(command, stdin_data: stdin_data)
-    unless status.success?
+    retries = 0
+    loop do
+      stdout, stderr, status = capture3(command, stdin_data: stdin_data)
+
+      if status.success?
+        @file_system.log "Returned (stderr): #{stderr.inspect}" unless stderr == ''
+        raise 'no response from curl on stdout' if stdout == ''
+        return parse_response(command: command, result: stdout)
+      end
+
+      if RETRYABLE_EXIT_CODES.include?(status.exitstatus) && retries < MAX_RETRIES
+        retries += 1
+        @file_system.log "Transient network error (exit #{status.exitstatus}), retrying in #{RETRY_DELAY_SECONDS}s (attempt #{retries}/#{MAX_RETRIES})..."
+        sleep_between_retries
+        next
+      end
+
       @file_system.error "Failed call with exit status #{status.exitstatus}!"
       @file_system.error "Returned (stdout): #{stdout.inspect}"
       @file_system.error "Returned (stderr): #{stderr.inspect}"
@@ -37,11 +56,6 @@ class JiraGateway
       raise "Failed call with exit status #{status.exitstatus}. " \
         "See #{@file_system.logfile_name} for details"
     end
-
-    @file_system.log "Returned (stderr): #{stderr.inspect}" unless stderr == ''
-    raise 'no response from curl on stdout' if stdout == ''
-
-    parse_response(command: command, result: stdout)
   end
 
   def capture3 command, stdin_data:
@@ -49,6 +63,11 @@ class JiraGateway
     Open3.capture3(command, stdin_data: stdin_data)
   end
 
+  def sleep_between_retries
+    # In its own method so we can mock it out in tests
+    sleep RETRY_DELAY_SECONDS
+  end
+
   def call_url relative_url:
     command = make_curl_command url: "#{@jira_url}#{relative_url}"
     exec_and_parse_response command: command, stdin_data: nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirametrics
 version: !ruby/object:Gem::Version
-  version: 2.29.2
+  version: 2.29.3pre4
 platform: ruby
 authors:
 - Mike Bowler