tractive 1.0.17 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ead46f0c5389125439e3e887de0c60205625d751c86737ba4477e9967c4ae46e
-  data.tar.gz: d93dd5f42054afe56f91cb9fbbb7d1dac9a0fcf42bca4307ab18097135809758
+  metadata.gz: 9f486ab9e712d09b64065d75d9a7f54eb6b7805e0a5aa14c90ec3094e36dd7d8
+  data.tar.gz: f7ec7b661d9f8a9210a3364f897443ab1d8e2969c74c36f7cf6271fe0003c465
 SHA512:
-  metadata.gz: e385bd618aa607da18e7fddb41c4ecedc5a91cf981332bc825a951c1267555f8c351ee83ba3481411e32fc809a0771b52248a3f4971ed6e281d23e477362153b
-  data.tar.gz: d3fcce3c20a4f5c004ed51d0548eb9f1b60f3bc70b78f8614fc02aa7fde2a47d522ec0e6afa410f7b6b4f02d6e4c73545167c44e53dc355bf4d27225cc8c2fc7
+  metadata.gz: 9355453a9074c3dd3b3a8aa7aed6326961b4193ec92c6d6dfe107ae1e6ee840a6709f95017f788ceee32e5edbb3fdb509301a378abe4dbdd64334879d9d1d151
+  data.tar.gz: 3faa452b99139fe2a688ab6cdd0a40a6403ccf7c457abee4e1c97aa424fc37ee06f0beed48d4e58bb15b8e3ba6fd410a3ddd3e90eab8424f025faf65e43d4df7

data/README.adoc

@@ -506,6 +506,8 @@ milestones:
 ==== Attachments migration configuration
 `ticket | wiki:`:: specifies the options for the tickets or wikis
 
+  `delete_mocked:`::: Whether to delete mocked tickets after migration or not
+
   `attachments:`::: specifies method of obtaining attachments from Trac.
 
     `url:`:::: URL to obtain Trac attachments from
@@ -517,9 +519,12 @@ milestones:
     `export_script:`:::: output of a script that utilizes `trac-admin` to download 
     all attachments from Trac.
 
+NOTE: To delete the issues, an organization owner must enable deleting an issue for the organization's repositories, and you must have admin or owner permissions in the repository. For more information, see "https://docs.github.com/en/issues/tracking-your-work-with-issues/deleting-an-issue[deleting an issue]". 
+
 [source,yaml]
 ----
 ticket:
+  delete_mocked: true
   attachments:
     url: https://abc.com/raw-attachment/ticket
     hashed: true

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

@@ -15,17 +15,17 @@ 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?
             minutes = retry_after / 60
             seconds = retry_after % 60
 
-            print "\rRate Limit Exceeded, Will retry in #{minutes} min #{seconds} sec"
+            $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,15 @@ module Migrator
 
         # replay all changes in chronological order:
         comments = changes.map { |x| ticket_change(@singlepost, x) }.select { |x| x }.to_a
+
+        curr_index = 0
+        changes.each_with_index do |change, index|
+          if change[:field] == "comment"
+            @comments_map[curr_index] = index
+            curr_index += 1
+          end
+        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.17"
+  VERSION = "1.0.20"
 end

metadata

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