tractive 1.0.19 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64173c9e70060c2641b5022f266c5ef5af43fb56ba4bdb2e9453079e14ec2c0
-  data.tar.gz: 2df9974ae895cff4d0a9a1c2c4acae81a1e6cdbc0f062edeb37f4d4ac7f7e782
+  metadata.gz: 14ab65ca5e13687a2134222c4b6cf0317c0e41d4c7b995bce2d132c58ba835a7
+  data.tar.gz: e51c4df4366cfb597d65b0b193c7faf544a6d6608fccf36abc5bfd6b37fec857
 SHA512:
-  metadata.gz: 51169ab9fe1e28040eb2d6cfe5e311b7c8c34a2c5d8d8c754724ee352974d523ef1f9602e2378f3269cc55fea599c4ee3ccae1770fb02b810e9ae7735c923a23
-  data.tar.gz: abb9a23e369b87413212238c60e28fb5ea7fb680e844e1abd53d38af3e87bc28cc744bfc2a7fa2efebbfc1eadf72734d4e88383790adc433f389a99f0667ad89
+  metadata.gz: 90046baa72cf0faa7b58e7b439924fc04b1a9447da7565ab84eb678ef6dbe841bee98412d06b332f6d21136e75ba8e4bf5299c7385ad4f87064363ec3fed2b51
+  data.tar.gz: ad5480e82c6d0f1b1b3119e33a624fc6b31991d1783796dc05240fc796ff3039e9e4488c614f1d84c6e25518636dbecdc10282ab6cc4c474f8d77e1762ea832a

data/lib/tractive/http/client/request.rb

@@ -25,7 +25,7 @@ module Http
             $logger.info "Rate Limit Exceeded, Will retry in #{minutes} min #{seconds} sec"
             sleep(1)
 
-            retry_after = e.http_headers[:x_ratelimit_reset].to_i - Time.now.to_i
+            retry_after = e.http_headers[:x_ratelimit_reset].to_i - Time.now.to_i + 5
           end
           retry if retries <= @max_retries
         end

data/lib/tractive/migrator/converter/trac_to_github.rb

@@ -3,7 +3,11 @@
 module Migrator
   module Converter
     class TracToGithub
+      attr_reader :comments_map
+
       def initialize(args)
+        @comments_map = {}
+
         @trac_ticket_base_url = args[:cfg]["trac"]["ticketbaseurl"]
         @attachurl            = args[:opts][:attachurl] || args[:cfg].dig("ticket", "attachments", "url")
         @changeset_base_url   = args[:cfg]["trac"]["changeset_base_url"] || ""
@@ -70,6 +74,27 @@ module Migrator
 
         # replay all changes in chronological order:
         comments = changes.map { |x| ticket_change(@singlepost, x) }.select { |x| x }.to_a
+
+        index = 0
+        curr_index = 0
+        changes.each do |change|
+          kind = change[:field] || "attachment"
+
+          next if %w[cc reporter version].include?(kind)
+
+          if kind == "comment" && (change[:newvalue].nil? || change[:newvalue].lstrip.empty?)
+            curr_index += 1
+            next
+          end
+
+          if kind == "comment"
+            @comments_map[curr_index] = index
+            curr_index += 1
+          end
+
+          index += 1
+        end
+
         if @singlepost
           body += comments.map { |x| x["body"] }.join("\n")
           comments = []

data/lib/tractive/migrator/engine/migrate_from_db.rb

@@ -53,7 +53,8 @@ module Migrator
 
           $logger.info(%{creating issue for trac #{ticket[:id]} "#{ticket[:summary]}" (#{ticket[:reporter]})})
           # API details: https://gist.github.com/jonmagic/5282384165e0f86ef105
-          request = Migrator::Converter::TracToGithub.new(@config).compose(ticket)
+          converter = Migrator::Converter::TracToGithub.new(@config)
+          request = converter.compose(ticket)
 
           response = @client.create_issue(@repo, request)
 
@@ -76,7 +77,7 @@ module Migrator
 
             $logger.info("created issue ##{issue_id} for trac ticket #{ticket[:id]}")
 
-            update_comment_ref(issue_id) if request.to_s.include?("Replying to [comment:")
+            update_comment_ref(issue_id, converter.comments_map) if request.to_s.include?("Replying to [comment:")
 
             # assert correct issue number
             if issue_id != ticket[:id]

data/lib/tractive/migrator/engine.rb

@@ -112,20 +112,21 @@ module Migrator
       }
     end
 
-    def update_comment_ref(issue_id)
+    def update_comment_ref(issue_id, comments_map)
       comments = @client.issue_comments(@repo, issue_id)
       comments.each do |comment|
         next unless comment["body"].include?("Replying to [comment:")
 
-        updated_comment_body = create_update_comment_params(comment, comments, issue_id)
+        updated_comment_body = create_update_comment_params(comment, comments, issue_id, comments_map)
         @client.update_issue_comment(@repo, comment["id"], updated_comment_body)
       end
     end
 
-    def create_update_comment_params(comment, comments, issue_id)
+    def create_update_comment_params(comment, comments, issue_id, comments_map)
       body = comment["body"]
       matcher = body.match(/Replying to \[comment:(?<comment_number>\d+).*\]/)
-      matched_comment = comments[matcher[:comment_number].to_i - 1]
+      comment_number = comments_map[matcher[:comment_number].to_i - 1]
+      matched_comment = comments[comment_number]
       body.gsub!(/Replying to \[comment:(\d+).*\]/, "Replying to [#{@repo}##{issue_id} (comment:\\1)](#{matched_comment["html_url"]})")
 
       body

data/lib/tractive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tractive
-  VERSION = "1.0.19"
+  VERSION = "1.0.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.22
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql