jirametrics 2.17 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe52b964cb227f3dac580d4648a325d61fed7c342a7dd7d7bcb62dddd571af61
-  data.tar.gz: 59eec793880fafb6c5e53b7daf87feb78b53b7624390adfa86ed6ca0be8125f6
+  metadata.gz: 4e9534fd6ca22944557cfe40c63ebf5c30ff111458ec52dd3e35617246315ce8
+  data.tar.gz: 2feb93d3ae826f133902664751f3cee4e54de3512daaaa882ae78fed47605e65
 SHA512:
-  metadata.gz: a98b06c724a2fe57511382a952093d73a7dad414c493c5298c8d35c8e889117252a2a3a6d69eadd274ca6dd90ca03cf0231e23da7b18041752d60bbad9b2fc82
-  data.tar.gz: 90fc55a7e86358636797f00e6cd4fa4eb5268b3a993ed48ff3bc8aecd0e3ae7629d721a814f5e520b58feed72075858613d11faccdea1a0548ac4a7c19a31479
+  metadata.gz: 84942ea82c68aa66325299e5db0e5f5a4fe4af95eb909d1fde004435b53898c60ee7dde2251fec0e075f4b2db7ba2f1eade384795370f3b90d7230926e79d2b9
+  data.tar.gz: 9015a7c5ef2b60726dca272a0b5b07de9f62d76e076038e4c8d45cbae13facf37f7e8f45dac82639c72615bbee549de756d3fb4792d21345fb4d3dc3fb17a32e

data/lib/jirametrics/anonymizer.rb

@@ -2,11 +2,12 @@
 
 require 'random-word'
 
-class Anonymizer
+class Anonymizer < ChartBase
   # needed for testing
   attr_reader :project_config, :issues
 
   def initialize project_config:, date_adjustment: -200
+    super()
     @project_config = project_config
     @issues = @project_config.issues
     @all_boards = @project_config.all_boards
@@ -130,18 +131,19 @@ class Anonymizer
     end
   end
 
-  def shift_all_dates
-    @file_system.log "Shifting all dates by #{@date_adjustment} days"
+  def shift_all_dates date_adjustment: @date_adjustment
+    adjustment_in_seconds = 60 * 60 * 24 * date_adjustment
+    @file_system.log "Shifting all dates by #{label_days date_adjustment}"
     @issues.each do |issue|
       issue.changes.each do |change|
-        change.time = change.time + @date_adjustment
+        change.time = change.time + adjustment_in_seconds
       end
 
-      issue.raw['fields']['updated'] = (issue.updated + @date_adjustment).to_s
+      issue.raw['fields']['updated'] = (issue.updated + adjustment_in_seconds).to_s
     end
 
     range = @project_config.time_range
-    @project_config.time_range = (range.begin + @date_adjustment)..(range.end + @date_adjustment)
+    @project_config.time_range = (range.begin + date_adjustment)..(range.end + date_adjustment)
   end
 
   def random_name

data/lib/jirametrics/change_item.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class ChangeItem
-  attr_reader :field, :value_id, :old_value_id, :raw, :time, :author_raw
-  attr_accessor :value, :old_value
+  attr_reader :field, :value_id, :old_value_id, :raw, :author_raw
+  attr_accessor :value, :old_value, :time
 
   def initialize raw:, author_raw:, time:, artificial: false
     @raw = raw

data/lib/jirametrics/downloader.rb

@@ -350,32 +350,6 @@ class Downloader
     )
   end
 
-  def bulk_fetch_issues issue_datas:, board:, in_initial_query:
-    log "  Downloading #{issue_datas.size} issues", both: true
-    payload = {
-      'expand' => [
-        'changelog'
-      ],
-      'fields' => ['*all'],
-      'issueIdsOrKeys' => issue_datas.collect(&:key)
-    }
-    response = @jira_gateway.post_request(
-      relative_url: issue_bulk_fetch_api,
-      payload: JSON.generate(payload)
-    )
-    response['issues'].each do |issue_json|
-      issue_json['exporter'] = {
-        'in_initial_query' => in_initial_query
-      }
-      issue = Issue.new(raw: issue_json, board: board)
-      data = issue_datas.find { |d| d.key == issue.key }
-      data.up_to_date = true
-      data.last_modified = issue.updated
-      data.issue = issue
-    end
-    issue_datas
-  end
-
   def delete_issues_from_cache_that_are_not_in_server issue_data_hash:, path:
     # The gotcha with deleted issues is that they just stop being returned in queries
     # and we have no way to know that they should be removed from our local cache.

data/lib/jirametrics/downloader_for_cloud.rb

@@ -44,7 +44,71 @@ class DownloaderForCloud < Downloader
     hash
   end
 
-  def issue_bulk_fetch_api
-    '/rest/api/3/issue/bulkfetch'
+  def bulk_fetch_issues issue_datas:, board:, in_initial_query:
+    # We used to use the expand option to pull in the changelog directly. Unfortunately
+    # that only returns the "recent" changes, not all of them. So now we get the issue
+    # without changes and then make a second call for that changes. Then we insert it
+    # into the raw issue as if it had been there all along.
+    log "  Downloading #{issue_datas.size} issues", both: true
+    payload = {
+      'fields' => ['*all'],
+      'issueIdsOrKeys' => issue_datas.collect(&:key)
+    }
+    response = @jira_gateway.post_request(
+      relative_url: '/rest/api/3/issue/bulkfetch',
+      payload: JSON.generate(payload)
+    )
+
+    attach_changelog_to_issues issue_datas: issue_datas, issue_jsons: response['issues']
+
+    response['issues'].each do |issue_json|
+      issue_json['exporter'] = {
+        'in_initial_query' => in_initial_query
+      }
+      issue = Issue.new(raw: issue_json, board: board)
+      data = issue_datas.find { |d| d.key == issue.key }
+      data.up_to_date = true
+      data.last_modified = issue.updated
+      data.issue = issue
+    end
+
+    issue_datas
+  end
+
+  def attach_changelog_to_issues issue_datas:, issue_jsons:
+    max_results = 10_000 # The max jira accepts is 10K
+    payload = {
+      'issueIdsOrKeys' => issue_datas.collect(&:key),
+      'maxResults' => max_results
+    }
+    loop do
+      response = @jira_gateway.post_request(
+        relative_url: '/rest/api/3/changelog/bulkfetch',
+        payload: JSON.generate(payload)
+      )
+
+      response['issueChangeLogs'].each do |issue_change_log|
+        issue_id = issue_change_log['issueId']
+        json = issue_jsons.find { |json| json['id'] == issue_id }
+
+        unless json['changelog']
+          # If this is our first time in, there won't be a changelog section
+          json['changelog'] = {
+            'startAt' => 0,
+            'maxResults' => max_results,
+            'total' => 0,
+            'histories' => []
+          }
+        end
+
+        new_changes = issue_change_log['changeHistories']
+        json['changelog']['total'] += new_changes.size
+        json['changelog']['histories'] += new_changes
+      end
+
+      next_page_token = response['nextPageToken']
+      payload['nextPageToken'] = next_page_token
+      break if next_page_token.nil?
+    end
   end
 end

data/lib/jirametrics/downloader_for_data_center.rb

@@ -40,7 +40,29 @@ class DownloaderForDataCenter < Downloader
     hash
   end
 
-  def issue_bulk_fetch_api
-    '/rest/api/2/issue/bulkfetch'
+  def bulk_fetch_issues issue_datas:, board:, in_initial_query:
+    log "  Downloading #{issue_datas.size} issues", both: true
+    payload = {
+      'expand' => [
+        'changelog'
+      ],
+      'fields' => ['*all'],
+      'issueIdsOrKeys' => issue_datas.collect(&:key)
+    }
+    response = @jira_gateway.post_request(
+      relative_url: '/rest/api/2/issue/bulkfetch',
+      payload: JSON.generate(payload)
+    )
+    response['issues'].each do |issue_json|
+      issue_json['exporter'] = {
+        'in_initial_query' => in_initial_query
+      }
+      issue = Issue.new(raw: issue_json, board: board)
+      data = issue_datas.find { |d| d.key == issue.key }
+      data.up_to_date = true
+      data.last_modified = issue.updated
+      data.issue = issue
+    end
+    issue_datas
   end
 end

data/lib/jirametrics/exporter.rb

@@ -65,14 +65,14 @@ class Exporter
     puts "Full output from downloader in #{file_system.logfile_name}"
   end
 
-  def info keys, name_filter:
+  def info key, name_filter:
     selected = []
     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 keys.include? issue.key
+        selected << [project, issue] if key == issue.key
       end
     rescue => e # rubocop:disable Style/RescueStandardError
       # This happens when we're attempting to load an aggregated project because it hasn't been
@@ -81,7 +81,7 @@ class Exporter
     end
 
     if selected.empty?
-      file_system.log "No issues found to match #{keys.collect(&:inspect).join(', ')}"
+      file_system.log "No issues found to match #{key.inspect}"
     else
       selected.each do |project, issue|
         file_system.log "\nProject #{project.name}", also_write_to_stderr: true

data/lib/jirametrics/issue.rb

@@ -212,7 +212,11 @@ class Issue
   end
 
   def parse_time text
-    Time.parse(text).getlocal(@timezone_offset)
+    if text.is_a? String
+      Time.parse(text).getlocal(@timezone_offset)
+    else
+      Time.at(text / 1000).getlocal(@timezone_offset)
+    end
   end
 
   def created

data/lib/jirametrics/jira_gateway.rb

@@ -7,7 +7,7 @@ require 'open3'
 
 class JiraGateway
   attr_accessor :ignore_ssl_errors
-  attr_reader :jira_url, :settings
+  attr_reader :jira_url, :settings, :file_system
 
   def initialize file_system:, jira_config:, settings:
     @file_system = file_system
@@ -18,15 +18,23 @@ class JiraGateway
 
   def post_request relative_url:, payload:
     command = make_curl_command url: "#{@jira_url}#{relative_url}", method: 'POST'
+    log_entry = "  #{command.gsub(/\s+/, ' ')}"
+    log_entry = sanitize_message log_entry
+    @file_system.log log_entry
+
     stdout, stderr, status = Open3.capture3(command, stdin_data: payload)
-    @file_system.log "Error: #{stderr}" unless stderr == ''
-    raise 'no response' if stdout == ''
-    return parse_response(command: command, result: stdout) if status.success?
+    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}"
+      raise "Failed call with exit status #{status.exitstatus}. " \
+        "See #{@file_system.logfile_name} for details"
+    end
 
-    @file_system.log result
-    @file_system.log "Failed call with exit status #{status.exitstatus}."
-    raise "Failed call with exit status #{status.exitstatus}. " \
-      "See #{@file_system.logfile_name} for details"
+    @file_system.log "Returned (stderr): #{stderr}" unless stderr == ''
+    raise 'no response from curl on stdout' if stdout == ''
+
+    parse_response(command: command, result: stdout)
   end
 
   def call_url relative_url:
@@ -53,12 +61,12 @@ class JiraGateway
     token = @jira_api_token || @jira_personal_access_token
     raise 'Neither Jira API Token or personal access token has been set' unless token
 
-    message.gsub(@jira_api_token, '[API_TOKEN]')
+    message.gsub(token, '[API_TOKEN]')
   end
 
   def call_command command
     log_entry = "  #{command.gsub(/\s+/, ' ')}"
-    log_entry = sanitize_message log_entry if @jira_api_token
+    log_entry = sanitize_message log_entry
     @file_system.log log_entry
 
     result = `#{command}`

data/lib/jirametrics.rb

@@ -47,9 +47,9 @@ class JiraMetrics < Thor
 
   option :config
   desc 'info', 'Dump information about one issue'
-  def info keys
+  def info key
     load_config options[:config]
-    Exporter.instance.info(keys, name_filter: options[:name] || '*')
+    Exporter.instance.info(key, name_filter: options[:name] || '*')
   end
 
   no_commands do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jirametrics
 version: !ruby/object:Gem::Version
-  version: '2.17'
+  version: 2.17.1
 platform: ruby
 authors:
 - Mike Bowler
 bindir: bin
 cert_chain: []
-date: 2025-09-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: random-word
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Extract Jira metrics
 test_files: []