jirametrics 2.22 → 2.27

data/lib/jirametrics/issue.rb

@@ -3,14 +3,15 @@
 require 'time'
 
 class Issue
-  attr_reader :changes, :raw, :subtasks, :board
-  attr_accessor :parent
+  attr_reader :changes, :raw, :subtasks, :board, :discarded_changes, :discarded_change_times
+  attr_accessor :parent, :github_prs
 
   def initialize raw:, board:, timezone_offset: '+00:00'
     @raw = raw
     @timezone_offset = timezone_offset
     @subtasks = []
     @changes = []
+    @github_prs = []
     @board = board
 
     # We only check for this here because if a board isn't passed in then things will fail much
@@ -212,6 +213,19 @@ class Issue
     first_time_in_status(*board.visible_columns.collect(&:status_ids).flatten)
   end
 
+  def reasons_not_visible_on_board
+    reasons = []
+    reasons << 'Not in an active sprint' if board.scrum? && sprints.none?(&:active?)
+    unless board.visible_columns.any? { |c| c.status_ids.include?(status.id) }
+      reasons << 'Status is not configured for any visible column on the board'
+    end
+    reasons
+  end
+
+  def visible_on_board?
+    reasons_not_visible_on_board.empty?
+  end
+
   # If this issue will ever be in an active sprint then return the time that it
   # was first added to that sprint, whether or not the sprint was active at that
   # time. Although it seems like an odd thing to calculate, it's a reasonable proxy
@@ -270,13 +284,19 @@ class Issue
     # First look in the actual sprints json. If any issues are in this sprint then it should
     # be here.
     sprint = board.sprints.find { |s| s.id == sprint_id }
-    return [sprint.start_time, sprint.completed_time] if sprint
+    if sprint
+      return [nil, nil] if sprint.future?
+
+      return [sprint.start_time, sprint.completed_time]
+    end
 
     # Then look at the sprints inside the issue. Even though the field id may be specified,
     # that custom field may not be present. This happens if it was in that sprint but was
     # then removed, whether or not that sprint had ever started.
     sprint_data = raw['fields'][change.field_id]&.find { |sd| sd['id'].to_i == sprint_id }
     if sprint_data
+      return [nil, nil] if sprint_data['state'] == 'future'
+
       start = parse_time(sprint_data['startDate'])
       stop = parse_time(sprint_data['completeDate'])
       return [start, stop]
@@ -388,21 +408,11 @@ class Issue
     results
   end
 
-  def blocked_stalled_statuses settings
-    blocked_statuses = settings['blocked_statuses']
-    stalled_statuses = settings['stalled_statuses']
-    unless blocked_statuses.is_a?(Array) && stalled_statuses.is_a?(Array)
-      raise "blocked_statuses(#{blocked_statuses.inspect}) and " \
-        "stalled_statuses(#{stalled_statuses.inspect}) must both be arrays"
-    end
-
-    [blocked_statuses, stalled_statuses]
-  end
-
   def blocked_stalled_changes end_time:, settings: nil
     settings ||= @board.project_config.settings
 
-    blocked_statuses, stalled_statuses = blocked_stalled_statuses(settings)
+    blocked_statuses = settings['blocked_statuses']
+    stalled_statuses = settings['stalled_statuses']
 
     blocked_link_texts = settings['blocked_link_text']
     stalled_threshold = settings['stalled_threshold_days']
@@ -415,7 +425,9 @@ class Issue
     previous_change_time = created
 
     blocking_status = nil
+    blocking_is_blocked = false
     flag = nil
+    flag_reason = nil
 
     # This mock change is to force the writing of one last entry at the end of the time range.
     # By doing this, we're able to eliminate a lot of duplicated code in charts.
@@ -430,11 +442,14 @@ class Issue
       )
 
       if change.flagged? && flagged_means_blocked
-        flag = change.value
-        flag = nil if change.value == ''
+        flag, flag_reason = blocked_stalled_changes_flag_logic change
       elsif change.status?
         blocking_status = nil
-        if blocked_statuses.include?(change.value) || stalled_statuses.include?(change.value)
+        blocking_is_blocked = false
+        if blocked_statuses.find_by_id(change.value_id)
+          blocking_status = change.value
+          blocking_is_blocked = true
+        elsif stalled_statuses.find_by_id(change.value_id)
           blocking_status = change.value
         end
       elsif change.link?
@@ -455,8 +470,9 @@ class Issue
 
       new_change = BlockedStalledChange.new(
         flagged: flag,
+        flag_reason: flag_reason,
         status: blocking_status,
-        status_is_blocking: blocking_status.nil? || blocked_statuses.include?(blocking_status),
+        status_is_blocking: blocking_status.nil? || blocking_is_blocked,
         blocking_issue_keys: (blocking_issue_keys.empty? ? nil : blocking_issue_keys.dup),
         time: change.time
       )
@@ -475,6 +491,7 @@ class Issue
       hack = result.pop
       result << BlockedStalledChange.new(
         flagged: hack.flag,
+        flag_reason: hack.flag_reason,
         status: hack.status,
         status_is_blocking: hack.status_is_blocking,
         blocking_issue_keys: hack.blocking_issue_keys,
@@ -486,6 +503,28 @@ class Issue
     result
   end
 
+  def blocked_stalled_changes_flag_logic change
+    flag = change.value
+    flag = nil if change.value == ''
+    if flag
+      # When the user is adding a comment to explain why a flag was set, the flag is set immediately
+      # and the comment is inserted after the user hits enter, which means that there is some time
+      # gap. If a comment happened shortly after the flag was set, we assume they're linked. This
+      # won't always be true and so there will be false positives, but it's a reasonable assumption.
+      max_seconds_between_flag_and_comment = 30
+      comment_change = changes.find do |c|
+        c.comment? && c.time >= change.time && (c.time - change.time) <= max_seconds_between_flag_and_comment
+      end
+      flag_reason = comment_change && @board.project_config.atlassian_document_format.to_text(comment_change.value)
+      # Newer Jira instances may add this extra text but older instances did not. Strip it out if found.
+      flag_reason = flag_reason&.sub(/\A:flag_on: Flag added\s*/m, '')&.strip
+      flag_reason = nil if flag_reason&.empty?
+    else
+      flag_reason = nil
+    end
+    [flag, flag_reason]
+  end
+
   def check_for_stalled change_time:, previous_change_time:, stalled_threshold:, blocking_stalled_changes:
     stalled_threshold_seconds = stalled_threshold * 60 * 60 * 24
 
@@ -521,7 +560,7 @@ class Issue
   # return [number of active seconds, total seconds] that this issue had up to the end_time.
   # It does not include data before issue start or after issue end
   def flow_efficiency_numbers end_time:, settings: @board.project_config.settings
-    issue_start, issue_stop = @board.cycletime.started_stopped_times(self)
+    issue_start, issue_stop = started_stopped_times
     return [0.0, 0.0] if !issue_start || issue_start > end_time
 
     value_add_time = 0.0
@@ -701,75 +740,7 @@ class Issue
   end
 
   def dump
-    result = +''
-    result << "#{key} (#{type}): #{compact_text summary, max: 200}\n"
-
-    assignee = raw['fields']['assignee']
-    result << "  [assignee] #{assignee['name'].inspect} <#{assignee['emailAddress']}>\n" unless assignee.nil?
-
-    raw['fields']['issuelinks']&.each do |link|
-      result << "  [link] #{link['type']['outward']} #{link['outwardIssue']['key']}\n" if link['outwardIssue']
-      result << "  [link] #{link['type']['inward']} #{link['inwardIssue']['key']}\n" if link['inwardIssue']
-    end
-    history = [] # time, type, detail
-
-    if board.cycletime
-      started_at, stopped_at = board.cycletime.started_stopped_times(self)
-      history << [started_at, nil, '↓↓↓↓ Started here ↓↓↓↓', true] if started_at
-      history << [stopped_at, nil, '↑↑↑↑ Finished here ↑↑↑↑', true] if stopped_at
-    else
-      result << "  Unable to determine start/end times as board #{board.id} has no cycletime specified\n"
-    end
-
-    @discarded_change_times&.each do |time|
-      history << [time, nil, '↑↑↑↑ Changes discarded ↑↑↑↑', true]
-    end
-
-    (changes + (@discarded_changes || [])).each do |change|
-      if change.status?
-        value = "#{change.value.inspect}:#{change.value_id.inspect}"
-        old_value = change.old_value ? "#{change.old_value.inspect}:#{change.old_value_id.inspect}" : nil
-      else
-        value = compact_text(change.value).inspect
-        old_value = change.old_value ? compact_text(change.old_value).inspect : nil
-      end
-
-      message = +''
-      message << "#{old_value} -> " unless old_value.nil? || old_value.empty?
-      message << value
-      if change.artificial?
-        message << ' (Artificial entry)' if change.artificial?
-      else
-        message << " (Author: #{change.author})"
-      end
-      history << [change.time, change.field, message, change.artificial?]
-    end
-
-    result << "  History:\n"
-    type_width = history.collect { |_time, type, _detail, _artificial| type&.length || 0 }.max
-    history.sort! do |a, b|
-      if a[0] == b[0]
-        if a[1].nil?
-          1
-        elsif b[1].nil?
-          -1
-        else
-          a[1] <=> b[1]
-        end
-      else
-        a[0] <=> b[0]
-      end
-    end
-    history.each do |time, type, detail, _artificial|
-      if type.nil?
-        type = '-' * type_width
-      else
-        type = (' ' * (type_width - type.length)) << type
-      end
-      result << "    #{time.strftime '%Y-%m-%d %H:%M:%S %z'} [#{type}] #{detail}\n"
-    end
-
-    result
+    IssuePrinter.new(self).to_s
   end
 
   def done?
@@ -782,10 +753,36 @@ class Issue
     end
   end
 
+  def started_stopped_times
+    board.cycletime.started_stopped_times(self)
+  end
+
+  def started_stopped_dates
+    board.cycletime.started_stopped_dates(self)
+  end
+
   def status_changes
     @changes.select { |change| change.status? }
   end
 
+  def status_resolution_at_done
+    done_time = started_stopped_times.last
+    return [nil, nil] if done_time.nil?
+
+    status_change = nil
+    resolution = nil
+
+    @changes.each do |change|
+      break if change.time > done_time
+
+      status_change = change if change.status?
+      resolution = change.value if change.resolution?
+    end
+
+    status = status_change ? find_or_create_status(id: status_change.value_id, name: status_change.value) : nil
+    [status, resolution]
+  end
+
   def sprints
     sprint_ids = []
 
@@ -806,13 +803,13 @@ class Issue
   def compact_text text, max: 60
     return '' if text.nil?
 
-    if text.is_a? Hash
-      # We can't effectively compact it but we can convert it into a string.
-      text = @board.project_config.atlassian_document_format.to_html(text)
-    else
-      text = text.gsub(/\s+/, ' ').strip
-      text = "#{text[0...max]}..." if text.length > max
-    end
+    text = if text.is_a? Hash
+             @board.project_config.atlassian_document_format.to_text(text)
+           else
+             text
+           end
+    text = text.gsub(/\s+/, ' ').strip
+    text = "#{text[0...max]}..." if text.length > max
     text
   end
 
@@ -823,6 +820,14 @@ class Issue
       created = parse_time(history['created'])
 
       history['items']&.each do |item|
+        if item['field'] == 'status' && item['to'].nil?
+          board.project_config.file_system.log(
+            "Issue #{key} has a status change without a 'to' id " \
+            "(from #{item['fromString'].inspect} to #{item['toString'].inspect}). Using id 0."
+          )
+          item = item.merge('to' => '0')
+        end
+
         @changes << ChangeItem.new(raw: item, time: created, author_raw: history['author'])
       end
     end

data/lib/jirametrics/issue_printer.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+class IssuePrinter
+  def initialize issue
+    @issue = issue
+  end
+
+  def to_s
+    issue = @issue
+    result = +''
+    result << "#{issue.key} (#{issue.type}): #{issue.compact_text issue.summary, max: 200}\n"
+
+    assignee = issue.raw['fields']['assignee']
+    result << "  [assignee] #{assignee['name'].inspect} <#{assignee['emailAddress']}>\n" unless assignee.nil?
+
+    issue.raw['fields']['issuelinks']&.each do |link|
+      result << "  [link] #{link['type']['outward']} #{link['outwardIssue']['key']}\n" if link['outwardIssue']
+      result << "  [link] #{link['type']['inward']} #{link['inwardIssue']['key']}\n" if link['inwardIssue']
+    end
+
+    history = [] # time, type, detail
+
+    if issue.board.cycletime
+      started_at, stopped_at = issue.started_stopped_times
+      history << [started_at, nil, 'vvvv Started here vvvv', true] if started_at
+      history << [stopped_at, nil, '^^^^ Finished here ^^^^', true] if stopped_at
+    else
+      result << "  Unable to determine start/end times as board #{issue.board.id} has no cycletime specified\n"
+    end
+
+    issue.discarded_change_times&.each do |time|
+      history << [time, nil, '^^^^ Changes discarded ^^^^', true]
+    end
+
+    (issue.changes + (issue.discarded_changes || [])).each do |change|
+      history << [change.time, change.field, create_change_message(change: change, issue: issue), change.artificial?]
+    end
+
+    result << "  History:\n"
+    type_width = history.collect { |_time, type, _detail, _artificial| type&.length || 0 }.max
+    sort_history!(history)
+    history.each do |time, type, detail, _artificial|
+      type = type.nil? ? '-' * type_width : type.rjust(type_width)
+      result << "    #{time.strftime '%Y-%m-%d %H:%M:%S %z'} [#{type}] #{detail}\n"
+    end
+
+    result
+  end
+
+  def create_change_message change:, issue:
+    value, old_value = format_change_values(change: change, issue: issue)
+
+    message = +''
+    message << "#{old_value} -> " unless old_value.nil? || old_value.empty?
+    message << value
+    if change.artificial?
+      message << ' (Artificial entry)'
+    else
+      message << " (Author: #{change.author})"
+    end
+    message
+  end
+
+  def format_change_values change:, issue:
+    if change.status?
+      value = "#{change.value.inspect}:#{change.value_id.inspect}"
+      old_value = change.old_value ? "#{change.old_value.inspect}:#{change.old_value_id.inspect}" : nil
+    elsif change.sprint?
+      added = change.value_id - change.old_value_id
+      removed = change.old_value_id - change.value_id
+      value = "#{change.value.inspect} #{change.value_id}"
+      value << " (added: #{added})" unless added.empty?
+      value << " (removed: #{removed})" unless removed.empty?
+      old_value = nil
+    else
+      value = issue.compact_text(change.value).inspect
+      old_value = change.old_value ? issue.compact_text(change.old_value).inspect : nil
+    end
+    [value, old_value]
+  end
+
+  def sort_history! history
+    history.sort! do |a, b|
+      if a[0] == b[0]
+        if a[1].nil?
+          1
+        elsif b[1].nil?
+          -1
+        else
+          a[1] <=> b[1]
+        end
+      else
+        a[0] <=> b[0]
+      end
+    end
+  end
+end

data/lib/jirametrics/jira_gateway.rb

@@ -28,9 +28,12 @@ class JiraGateway
 
     stdout, stderr, status = capture3(command, stdin_data: stdin_data)
     unless status.success?
-      @file_system.log "Failed call with exit status #{status.exitstatus}!"
-      @file_system.log "Returned (stdout): #{stdout.inspect}"
-      @file_system.log "Returned (stderr): #{stderr.inspect}"
+      @file_system.error "Failed call with exit status #{status.exitstatus}!"
+      @file_system.error "Returned (stdout): #{stdout.inspect}"
+      @file_system.error "Returned (stderr): #{stderr.inspect}"
+      if stderr.include?('401')
+        raise 'The request was not authorized. Verify that your authentication token hasn\'t expired'
+      end
       raise "Failed call with exit status #{status.exitstatus}. " \
         "See #{@file_system.logfile_name} for details"
     end