tractive 1.0.18 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e08becfcae314c82bdc793b7eb6bc2f7b52f9a7be040b7141da825753a9f1af2
-  data.tar.gz: 51385bdf7fcf7b12b110c852b9d0b9dc277240abf0b8c2f94b68b77db2839c32
+  metadata.gz: 7a10eeb2f828d2d135d48f0f6437f669c939104e17ef1b777e42d29e59aac5dc
+  data.tar.gz: df20934dfee4b890c9f633df93955f60d237987743c48f12a95a4bb8cb1b8806
 SHA512:
-  metadata.gz: ad89e67997dd07cb3b6d65c5baca788033991122d8a10a73a64b09df79695ed8e2488b033dfaaa5fdd07d4a65c4ee5b4230121f3f7f094c8286bce352bcd6118
-  data.tar.gz: 04f60f8190dbc644367c3095f28e4f7fddba04dfa5140a820dfbced58430fb3b1df1bb9c72dd10dadba6e4f66e1cfe9a2ea57f647bbf982452643824e87622f8
+  metadata.gz: 8dbc73bbf823c89b05267fb42991401f33c6e1097488b0e49bd4ec87a3c457ddfa500d6d16fd88793a6bb9ccd4a2c27514a74b1ca3e5c10786184284d691ae7f
+  data.tar.gz: ca6165b8852a0c5609737f5794683e8bb82c522934f861d59eb798a2475d8662b95742a76cd19c585a45980aa4a12cfaf3a35f169235c74ae2adb43851b667e4

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

@@ -15,7 +15,7 @@ module Http
           retries += 1
           RestClient::Request.execute(@args, &block)
         rescue RestClient::Forbidden => e
-          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
           raise e if retry_after.negative? || retries > @max_retries
 
           while retry_after.positive?
@@ -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,22 @@ 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 unless interested_in_change?(kind, change[:newvalue])
+
+          if kind == "comment" || (kind == "attachment" && change[:description] != "")
+            @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.18"
+  VERSION = "1.0.21"
 end

metadata

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