jirametrics 2.17.1 → 2.18pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e9534fd6ca22944557cfe40c63ebf5c30ff111458ec52dd3e35617246315ce8
-  data.tar.gz: 2feb93d3ae826f133902664751f3cee4e54de3512daaaa882ae78fed47605e65
+  metadata.gz: 71833b8102c5a57b1b36fcc86f023c768b81680a64d24c851f40641d0c6bdeb8
+  data.tar.gz: 8dade5e4c90dcdb32e90fb97931da7f2d6ea734b27f988af455dd9414af54545
 SHA512:
-  metadata.gz: 84942ea82c68aa66325299e5db0e5f5a4fe4af95eb909d1fde004435b53898c60ee7dde2251fec0e075f4b2db7ba2f1eade384795370f3b90d7230926e79d2b9
-  data.tar.gz: 9015a7c5ef2b60726dca272a0b5b07de9f62d76e076038e4c8d45cbae13facf37f7e8f45dac82639c72615bbee549de756d3fb4792d21345fb4d3dc3fb17a32e
+  metadata.gz: e873d82bd16d851d8ccc382ed05cf352699686019f0bfcc5e5c1a2d63fffe74c1a62cb81b08566f3d6cdb6b1ef89e0e9aa0f725b7b8f1d5b47f4c06231b3f50f
+  data.tar.gz: bf4bdccb8f78bf2b594dc6131611777d7148d5aa5556317518fe975c41a08699df73528f6ee87ce1d2a19dd7da6a1ab45b480f782f55227e666a4b25a1059fb0

data/lib/jirametrics/downloader.rb

@@ -350,6 +350,32 @@ 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,71 +44,7 @@ class DownloaderForCloud < Downloader
     hash
   end
 
-  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
+  def issue_bulk_fetch_api
+    '/rest/api/3/issue/bulkfetch'
   end
 end

data/lib/jirametrics/downloader_for_data_center.rb

@@ -40,29 +40,7 @@ class DownloaderForDataCenter < Downloader
     hash
   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: '/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
+  def issue_bulk_fetch_api
+    '/rest/api/2/issue/bulkfetch'
   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 key, name_filter:
+  def info keys, 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 key == issue.key
+        selected << [project, issue] if keys.include? 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 #{key.inspect}"
+      file_system.log "No issues found to match #{keys.collect(&:inspect).join(', ')}"
     else
       selected.each do |project, issue|
         file_system.log "\nProject #{project.name}", also_write_to_stderr: true

data/lib/jirametrics/issue.rb

@@ -212,11 +212,7 @@ class Issue
   end
 
   def parse_time text
-    if text.is_a? String
-      Time.parse(text).getlocal(@timezone_offset)
-    else
-      Time.at(text / 1000).getlocal(@timezone_offset)
-    end
+    Time.parse(text).getlocal(@timezone_offset)
   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, :file_system
+  attr_reader :jira_url, :settings
 
   def initialize file_system:, jira_config:, settings:
     @file_system = file_system
@@ -18,23 +18,15 @@ 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)
-    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 "Returned (stderr): #{stderr}" unless stderr == ''
-    raise 'no response from curl on stdout' if stdout == ''
+    @file_system.log "Error: #{stderr}" unless stderr == ''
+    raise 'no response' if stdout == ''
+    return parse_response(command: command, result: stdout) if status.success?
 
-    parse_response(command: command, result: stdout)
+    @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"
   end
 
   def call_url relative_url:
@@ -61,12 +53,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(token, '[API_TOKEN]')
+    message.gsub(@jira_api_token, '[API_TOKEN]')
   end
 
   def call_command command
     log_entry = "  #{command.gsub(/\s+/, ' ')}"
-    log_entry = sanitize_message log_entry
+    log_entry = sanitize_message log_entry if @jira_api_token
     @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 key
+  def info keys
     load_config options[:config]
-    Exporter.instance.info(key, name_filter: options[:name] || '*')
+    Exporter.instance.info(keys, 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.1
+  version: 2.18pre1
 platform: ruby
 authors:
 - Mike Bowler
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-09-26 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.7.2
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Extract Jira metrics
 test_files: []