tractive 1.0.11 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ebb8048967ee1732b68d54ed6c10798e0959d533e7ed9744a843f1a129f764d
-  data.tar.gz: 4799587764dcaa848e76971b50df220e72ffa914a5f1bc7c3cad20ef2e5de83d
+  metadata.gz: 8cde84b7e5731a9be33bbbdecc11abacca397665fa29e4734c01bc50c1823c46
+  data.tar.gz: e38bd03de9ed35f8bde8c371c30789815f9fbecbe9b5cb8535c1585ad9f2e4e5
 SHA512:
-  metadata.gz: 0c052a1f936f6e4d4749e4fd9f8ec9fcab3042f4220e2c4f10e6a7ed127f2c1ee8a856f49a58ae8b960a38f12ffdc35d9097a55361142b39bfa605a269ea2d1b
-  data.tar.gz: 6d0025c7682c74526aa3a0fb8a4d93d4f46fad4cab5e560898e3b2c504e8981cffe10203e59afb7c8d818d3598efe3729b854c2939d7b8ca64105846de55f131
+  metadata.gz: 8e5fd7afc6dfab34b8514a3fa0d12eec6d98d697938a500f7142891c33fc5a4d5f32442da7503be59b112c361d7010e617fb6dab9f9f90b65d0917a98bded050
+  data.tar.gz: 2c0247ec8af3ac372f4244d9c8ac0c2b2dc0a1358f5be3d7619507640404b8db088b03e9c884fa3c4612ae160bfa97828fa41992c2d31e7470a45cdb736342dd

data/.rubocop.yml

@@ -18,6 +18,7 @@ Metrics/ClassLength:
 
 Metrics/BlockLength:
   Max: 500
+  IgnoredMethods: ['describe']
 
 Style/Documentation:
   Enabled: false
@@ -35,7 +36,10 @@ Metrics/MethodLength:
   Enabled: false
 
 Metrics/ModuleLength:
-  Max: 150
+  Max: 250
+
+Metrics/ParameterLists:
+  Max: 6
 
 Security/Open:
   Enabled: false

data/README.adoc

@@ -802,6 +802,14 @@ If attachment files are reachable via a URL we reference this here.
 | Path to config file.
 | String
 
+| `-e`, `--wiki-extensions`
+| Space separated list of extensions or filenames (if the file don't have an extension). This is required to convert file SVN source links to Github links. This is used to determine if a path belongs to a file or a directory.
+| Array
+
+| `-f`, `--source-folders`
+| Space separated list of non standard folders in SVN that are used to find if a path is complete or partial.
+| Array
+
 |===
 
 

data/exe/command_base.rb

@@ -7,5 +7,7 @@ class CommandBase < Thor
                           desc: "Name of the logfile to output logs to."
   class_option "config", type: :string, default: "tractive.config.yaml", banner: "<PATH>", aliases: "-c",
                          desc: "Set the configuration file"
+  class_option "git-token", type: :string,
+                            desc: "The access token for Github actions."
   class_option "verbose", type: :boolean, aliases: ["-v", "--verbose"], desc: "Verbose mode"
 end

data/exe/tractive

@@ -47,6 +47,8 @@ class TractiveCommand < CommandBase
                               desc: "Put all issue comments in the first message."
   method_option "start", type: :numeric, aliases: ["-s", "--start-at"], banner: "<ID>",
                          desc: "Start migration from ticket with number <ID>"
+  method_option "make-owners-labels", type: :boolean,
+                                      desc: "If true, this will make a tag like `owner:<owner name>` and add it to the issue."
   def migrate_tickets
     Tractive::Main.new(options).run
   end
@@ -58,6 +60,12 @@ class TractiveCommand < CommandBase
                                       desc: "Full path of the Trac sqlite3 database export file"
   method_option "repo-path", type: :string, aliases: ["-r"], banner: "/GIT/ROOT/DIR",
                              desc: "Full path to the root of the git-repository that is our destination"
+  method_option "home-page-name", type: :string, aliases: ["-h"], default: "WikiStart",
+                                  desc: "Name of the SVN wiki to map to the home page in Github wiki"
+  method_option "wiki-extensions", type: :array, aliases: ["-e"], default: [".py", "changelog", "expire-ids"],
+                                   desc: "Array of strings to determinte whether a given path is a file path or a directory in wiki"
+  method_option "source-folders", type: :array, aliases: ["-f"], default: ["personal", "attic", "sprint", "branch/hawk"],
+                                  desc: "Array of strings to figure out if a path is complete or partial"
   def migrate_wikis
     Tractive::Main.new(options).migrate_wikis
   end

data/lib/tractive/attachment_exporter.rb

@@ -53,9 +53,10 @@ module Tractive
         $logger.info "Saving attachments of ticket #{attachment.id}... "
         FileUtils.mkdir_p "#{output_dir}/#{attachment.id}"
 
-        File.open("#{output_dir}/#{attachment.id}/#{attachment.filename}", "wb") do |file|
-          file.write URI.open(uri_parser.escape("#{trac_url}/#{attachment.id}/#{attachment.filename}")).read
-        end
+        File.binwrite(
+          "#{output_dir}/#{attachment.id}/#{attachment.filename}",
+          URI.open(uri_parser.escape("#{trac_url}/#{attachment.id}/#{attachment.filename}")).read
+        )
       end
     end
   end

data/lib/tractive/github_api/graph_ql_client/issues.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module GithubApi
+  class GraphQlClient
+    # Methods for the Issues API
+    module Issues
+      DELETE_ISSUE_QUERY = <<~QUERY
+        mutation ($input: DeleteIssueInput!) {
+          deleteIssue(input: $input) {
+            repository {
+              name
+              url
+            }
+          }
+        }
+      QUERY
+
+      def delete_issue(issue_id)
+        variables = {
+          "input" => {
+            "issueId" => issue_id
+          }
+        }
+
+        Client.query(DeleteIssueQuery, variables: variables)
+      end
+    end
+  end
+end

data/lib/tractive/github_api/graph_ql_client.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative "graph_ql_client/issues"
+
+require "graphql/client"
+require "graphql/client/http"
+
+# Service to perform github actions
+module GithubApi
+  class GraphQlClient
+    include GithubApi::GraphQlClient::Issues
+
+    HttpAdapter = GraphQL::Client::HTTP.new("https://api.github.com/graphql") do
+      attr_writer :token
+
+      def headers(_context)
+        {
+          "Authorization" => "bearer #{@token}"
+        }
+      end
+    end
+
+    def self.add_constants(token)
+      HttpAdapter.token = token
+
+      GithubApi::GraphQlClient.const_set("Schema", GraphQL::Client.load_schema(HttpAdapter))
+      GithubApi::GraphQlClient.const_set("Client", GraphQL::Client.new(schema: Schema, execute: HttpAdapter))
+      GithubApi::GraphQlClient.const_set("DeleteIssueQuery", Client.parse(DELETE_ISSUE_QUERY))
+    end
+  end
+end

data/lib/tractive/github_api.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require_relative "github_api/client"
+require_relative "github_api/graph_ql_client"

data/lib/tractive/info.rb

@@ -29,12 +29,25 @@ module Tractive
       priorities  = Ticket.distinct.select(:priority).select_map(:priority).compact
       tracstates  = Ticket.distinct.select(:status).select_map(:status).compact
 
+      keywords    = Ticket.distinct
+                          .select(:keywords)
+                          .select_map(:keywords)
+                          .map do |keyword|
+                            keyword&.split(",")&.map do |k|
+                              k.strip.gsub(" ", "_")
+                            end
+                          end
+                          .flatten
+                          .uniq
+                          .compact
+
       {
         "users" => Utilities.make_each_hash(users, %w[email name username]),
         "milestones" => milestones,
         "labels" => {
           "type" => Utilities.make_hash("type_", types),
           "resolution" => Utilities.make_hash("resolution_", resolutions),
+          "keywords" => Utilities.make_hash("keyword_", keywords),
           "component" => Utilities.make_each_hash(components, %w[name color], "component: "),
           "severity" => Utilities.make_each_hash(severity, %w[name color]),
           "priority" => Utilities.make_each_hash(priorities, %w[name color]),

data/lib/tractive/main.rb

@@ -8,6 +8,11 @@ module Tractive
       @opts = opts
       @cfg  = YAML.load_file(@opts[:config])
 
+      @cfg["github"] ||= {}
+      @cfg["github"]["token"] = @opts["git-token"] if @opts["git-token"]
+
+      GithubApi::GraphQlClient.add_constants(@cfg["github"]["token"]) unless @opts[:info]
+
       Tractive::Utilities.setup_logger(output_stream: @opts[:logfile] || $stderr, verbose: @opts[:verbose])
       @db = Tractive::Utilities.setup_db!(@opts["trac-database-path"] || @cfg["trac"]["database"])
     rescue Sequel::DatabaseConnectionError, Sequel::AdapterNotFound, URI::InvalidURIError, Sequel::DatabaseError => e

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

@@ -16,6 +16,7 @@ module Migrator
         @client               = GithubApi::Client.new(access_token: args[:cfg]["github"]["token"])
         @wiki_attachments_url = args[:cfg].dig("wiki", "attachments", "url")
         @revmap_file_path     = args[:opts][:revmapfile] || args[:cfg]["revmap_path"]
+        @make_owners_label    = args[:opts]["make-owners-labels"] || args[:cfg]["make_owners_labels"]
         @attachment_options   = {
           url: @attachurl,
           hashed: args[:cfg].dig("ticket", "attachments", "hashed")
@@ -33,7 +34,8 @@ module Migrator
           @attachment_options,
           @changeset_base_url,
           @wiki_attachments_url,
-          @revmap_file_path
+          @revmap_file_path,
+          git_repo: @repo, home_page_name: args[:opts]["home-page-name"]
         )
       end
 
@@ -100,14 +102,11 @@ module Migrator
 
         labels.delete(nil)
 
-        keywords = ticket[:keywords]
-        if keywords
-          if ticket[:keywords].downcase == "discuss"
-            labels.add(@labels_cfg.fetch("keywords", {})[ticket[:keywords].downcase])
-          else
-            badges.add(@labels_cfg.fetch("keywords", {})[ticket[:keywords]])
-          end
+        keywords = ticket[:keywords]&.split(",") || []
+        keywords.each do |keyword|
+          badges.add(@labels_cfg.fetch("keywords", {})[keyword.strip])
         end
+
         # If the field is not set, it will be nil and generate an unprocessable json
 
         milestone = @milestonemap[ticket[:milestone]]
@@ -120,6 +119,14 @@ module Migrator
 
         github_assignee = map_assignee(ticket[:owner])
 
+        unless github_assignee.nil? || github_assignee.empty?
+          if @make_owners_label
+            labels.add("name" => "owner:#{github_assignee}")
+          else
+            badges.add("owner:#{github_assignee}")
+          end
+        end
+
         badges     = badges.to_a.compact.sort
         badgetable = badges.map { |i| %(`#{i}`) }.join(" ")
         badgetable += begin
@@ -131,8 +138,6 @@ module Migrator
 
         # compose body
         body = [badgetable, body, footer].join("\n\n___\n")
-
-        labels.add("name" => "owner:#{github_assignee}") unless github_assignee.nil? || github_assignee.empty?
         labels = labels.map { |label| label["name"] }
 
         issue = {
@@ -264,7 +269,7 @@ module Migrator
         end
 
         case kind
-        when "owner", "status", "title", "resolution", "priority", "component", "type", "severity", "platform", "milestone"
+        when "owner", "status", "title", "resolution", "priority", "component", "type", "severity", "platform", "milestone", "keywords"
           old = meta[:oldvalue]
           new = meta[:newvalue]
           if old && new
@@ -280,7 +285,7 @@ module Migrator
           # text += "created the issue\n\n"
           if body && !body.lstrip.empty?
             # text += "\n___\n" if not append
-            text += @twf_to_markdown.convert(body)
+            text += @twf_to_markdown.convert(body, id: meta[:ticket])
           end
 
         when "comment"
@@ -294,7 +299,7 @@ module Migrator
                   end
 
           text += "\n___\n" unless append
-          text += @twf_to_markdown.convert(body) if body
+          text += @twf_to_markdown.convert(body, id: meta[:ticket]) if body
 
         when "attachment"
           text += "_uploaded file "
@@ -344,7 +349,7 @@ module Migrator
       end
 
       def interested_in_change?(kind, newvalue)
-        !(%w[keywords cc reporter version].include?(kind) ||
+        !(%w[cc reporter version].include?(kind) ||
           (kind == "comment" && (newvalue.nil? || newvalue.lstrip.empty?)))
       end
 

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

@@ -1,27 +1,41 @@
 # frozen_string_literal: true
 
+require "cgi"
+
 module Migrator
   module Converter
     # twf => Trac wiki format
     class TwfToMarkdown
-      def initialize(base_url, attachment_options, changeset_base_url, wiki_attachments_url, revmap_file_path)
+      def initialize(base_url, attachment_options, changeset_base_url, wiki_attachments_url, revmap_file_path, options = {})
         @base_url = base_url
         @attach_url = attachment_options[:url]
         @attach_hashed = attachment_options[:hashed]
         @changeset_base_url = changeset_base_url
         @wiki_attachments_url = wiki_attachments_url
         @revmap = load_revmap_file(revmap_file_path)
+
+        @git_repo = options[:git_repo]
+        @home_page_name = options[:home_page_name]
+        @wiki_extensions = options[:wiki_extensions]
+        @source_folders = options[:source_folders]
       end
 
-      def convert(str)
+      def convert(str, image_options = {})
+        # Fix 'Windows EOL' to 'Linux EOL'
+        str.gsub!("\r\n", "\n")
+
+        convert_tables(str)
         convert_newlines(str)
+        convert_comments(str)
+        convert_html_snippets(str)
         convert_code_snippets(str)
         convert_headings(str)
-        convert_links(str)
+        convert_links(str, @git_repo)
         convert_font_styles(str)
         convert_changeset(str, @changeset_base_url)
-        convert_image(str, @base_url, @attach_url, @wiki_attachments_url)
+        convert_image(str, @base_url, @attach_url, @wiki_attachments_url, image_options)
         convert_ticket(str, @base_url)
+        revert_intermediate_references(str)
 
         str
       end
@@ -46,18 +60,12 @@ module Migrator
         revmap
       end
 
-      # CommitTicketReference
-      def convert_ticket_reference(str)
-        str.gsub!(/\{\{\{\n(#!CommitTicketReference .+?)\}\}\}/m, '\1')
-        str.gsub!(/#!CommitTicketReference .+\n/, "")
-      end
-
       # Ticket
       def convert_ticket(str, base_url)
         # replace a full ticket id with the github short refrence
         if base_url
           baseurlpattern = base_url.gsub("/", "\\/")
-          str.gsub!(%r{#{baseurlpattern}/(\d+)}) { "ticket:#{Regexp.last_match[1]}" }
+          str.gsub!(%r{#{baseurlpattern}/(\d+)}, '#\1')
         end
 
         # Ticket
@@ -80,16 +88,35 @@ module Migrator
         str.gsub!("\r\n", "\n")
       end
 
+      # Comments
+      def convert_comments(str)
+        str.gsub!(/\{\{\{(?>((?!(?:}}}|{{{)).+?|\g<0>))*\}\}\}/m) do |str_match|
+          str_match.gsub(/\{\{\{\s*#!comment(\s*)(.*)\}\}\}/m, '<!--\1\2\1-->')
+        end
+      end
+
+      # HTML Snippets
+      def convert_html_snippets(str)
+        str.gsub!(/\{\{\{#!html(.*?)\}\}\}/m, '\1')
+      end
+
+      # CommitTicketReference
+      def convert_ticket_reference(str)
+        str.gsub!(/\{\{\{\n(#!CommitTicketReference .+?)\}\}\}/m, '\1')
+        str.gsub!(/#!CommitTicketReference .+\n/, "")
+      end
+
       # Code
       def convert_code_snippets(str)
         str.gsub!(/\{\{\{([^\n]+?)\}\}\}/, '`\1`')
+        str.gsub!(/\{\{\{#!(.*?)\n(.+?)\}\}\}/m, "```\\1\n\\2\n```")
         str.gsub!(/\{\{\{(.+?)\}\}\}/m, '```\1```')
         str.gsub!(/(?<=```)#!/m, "")
       end
 
       # Changeset
       def convert_changeset(str, changeset_base_url)
-        str.gsub!(%r{#{Regexp.quote(changeset_base_url)}/(\d+)/?}, '[changeset:\1]') if changeset_base_url
+        str.gsub!(%r{#{Regexp.quote(changeset_base_url)}/(\d+)/?}, '[changeset:\1]') if changeset_base_url && !changeset_base_url.empty?
         str.gsub!(/\[changeset:"r(\d+)".*\]/, '[changeset:\1]')
         str.gsub!(/\[changeset:r(\d+)\]/, '[changeset:\1]')
         str.gsub!(/\br(\d+)\b/) { Tractive::Utilities.map_changeset(Regexp.last_match[1], @revmap, changeset_base_url) }
@@ -103,44 +130,216 @@ module Migrator
       def convert_font_styles(str)
         str.gsub!(/'''(.+?)'''/, '**\1**')
         str.gsub!(/''(.+?)''/, '*\1*')
-        str.gsub!(%r{[^:]//(.+?[^:])//}, '_\1_')
+        str.gsub!(%r{([^:])//(.+?[^:])//}, '\1_\2_')
+      end
+
+      # Tables
+      def convert_tables(str)
+        str.gsub!(/^( *\|\|[^\n]+\|\| *[^\n|]+$)+$/, '\1 ||')
+
+        str.gsub!(/(?:^( *\|\|[^\n]+\|\| *)\n?)+/) do |match_result|
+          rows = match_result.gsub("||", "|").split("\n")
+          rows.insert(1, "| #{"--- | " * (rows[0].split("|").size - 1)}".strip)
+
+          "#{rows.join("\n")}\n"
+        end
       end
 
       # Links
-      def convert_links(str)
-        str.gsub!(/\[(http[^\s\[\]]+)\s([^\[\]]+)\]/, '[\2](\1)')
+      def convert_links(str, git_repo)
+        convert_camel_case_links(str, git_repo)
+        convert_double_bracket_wiki_links(str, git_repo)
+        convert_single_bracket_wiki_links(str, git_repo)
+
+        str.gsub!(/(^!)\[(http[^\s\[\]]+)\s([^\[\]]+)\]/, '[\2](\1)')
         str.gsub!(/!(([A-Z][a-z0-9]+){2,})/, '\1')
       end
 
-      def convert_image(str, base_url, attach_url, wiki_attachments_url)
+      def convert_single_bracket_wiki_links(str, git_repo)
+        str.gsub!(/(!?)\[((?:wiki|source):)?([^\s\]]*) ?(.*?)\]/) do |match_result|
+          source = Regexp.last_match[2]
+          path = Regexp.last_match[3]
+          name = Regexp.last_match[4]
+
+          formatted_link(
+            match_result,
+            git_repo,
+            { source: source, path: path, name: name }
+          )
+        end
+      end
+
+      def convert_double_bracket_wiki_links(str, git_repo)
+        str.gsub!(/(!?)\[\[((?:wiki|source):)?([^|\n]*)\|?(.*?)\]\]/) do |match_result|
+          source = Regexp.last_match[2]
+          path = Regexp.last_match[3]
+          name = Regexp.last_match[4]
+
+          formatted_link(
+            match_result,
+            git_repo,
+            { source: source, path: path, name: name }
+          )
+        end
+      end
+
+      def formatted_link(unformatted_text, git_repo, url_options = {})
+        return unformatted_text.gsub("!", "{~") if unformatted_text.start_with?("!")
+
+        if url_options[:source] == "wiki:"
+          link, internal_link = url_options[:path].split("#")
+          link = "Home" if link == @home_page_name
+          internal_link = Tractive::Utilities.dasharize(internal_link) if internal_link
+          url_options[:name] = link if url_options[:name].empty?
+          "{{#{url_options[:name]}}}(https://github.com/#{git_repo}/wiki/#{link}##{internal_link})"
+        elsif url_options[:source] == "source:"
+          url_options[:name] = url_options[:path] if url_options[:name].empty?
+          "{{#{url_options[:name]}}}(https://github.com/#{git_repo}/#{source_git_path(url_options[:path])})"
+        elsif url_options[:path].start_with?("http")
+          url_options[:name] = url_options[:path] if url_options[:name].empty?
+          "{{#{url_options[:name]}}}(#{url_options[:path]})"
+        else
+          unformatted_text
+        end
+      end
+
+      def source_git_path(trac_path)
+        trac_path = trac_path.gsub("trunk/", "main/")
+        trac_path = trac_path.delete_prefix("/").delete_suffix("/")
+
+        return "" if trac_path.empty?
+
+        uri = URI.parse(trac_path)
+
+        trac_path = uri.path
+        line_number = uri.fragment
+        trac_path, revision = trac_path.split("@")
+
+        if trac_path.split("/").count <= 1
+          wiki_path(trac_path)
+        else
+          unless trac_path.start_with?("tags")
+            params = CGI.parse(uri.query || "")
+            revision ||= params["rev"].first
+
+            # TODO: Currently @ does not work with file paths except for main branch
+            sha = @revmap[revision]&.strip
+
+            trac_path = if sha && file?(trac_path)
+                          trac_path.gsub("main/", "#{sha}/")
+                        else
+                          sha || trac_path
+                        end
+          end
+
+          wiki_path(trac_path.delete_prefix("tags/"), line_number)
+        end
+      end
+
+      def index_paths
+        @index_paths ||= {
+          "tags" => "tags",
+          "tags/" => "tags",
+          "branch" => "branches/all"
+        }
+      end
+
+      def file?(trac_path)
+        return false unless trac_path
+
+        @wiki_extensions&.any? { |extension| trac_path.end_with?(extension) }
+      end
+
+      def wiki_path(path, line_number = "")
+        # TODO: This will not work for folders given in the source_folder parameter and
+        # will not work for subfolders paths like `personal/rjs` unless given in the parameters.
+        return "branches/all?query=#{path}" if @source_folders&.any? { |folder| folder == path }
+        return index_paths[path] if index_paths[path]
+
+        prefix = if file?(path)
+                   "blob"
+                 else
+                   "tree"
+                 end
+
+        "#{prefix}/#{path}#{"#" unless line_number.to_s.empty?}#{line_number}"
+      end
+
+      # CamelCase page names follow these rules:
+      #   1. The name must consist of alphabetic characters only;
+      #      no digits, spaces, punctuation or underscores are allowed.
+      #   2. A name must have at least two capital letters.
+      #   3. The first character must be capitalized.
+      #   4. Every capital letter must be followed by one or more lower-case letters.
+      #   5. The use of slash ( / ) is permitted in page names, where it typically represents a hierarchy.
+      def convert_camel_case_links(str, git_repo)
+        name_regex = %r{(^| )(!?)(/?[A-Z][a-z]+(/?[A-Z][a-z]+)+/?)}
+        wiki_pages_names = Tractive::Wiki.select(:name).distinct.map(:name)
+        str.gsub!(name_regex) do
+          start = Regexp.last_match[2]
+          name = Regexp.last_match[3]
+
+          wiki_link = if start != "!" && wiki_pages_names.include?(name)
+                        make_wiki_link(name, git_repo)
+                      else
+                        name
+                      end
+
+          "#{Regexp.last_match[1]}#{wiki_link}"
+        end
+      end
+
+      def make_wiki_link(wiki_name, git_repo)
+        wiki_name = "Home" if wiki_name == @home_page_name
+        "[#{wiki_name}](https://github.com/#{git_repo}/wiki/#{wiki_name})"
+      end
+
+      def convert_image(str, base_url, attach_url, wiki_attachments_url, options = {})
         # https://trac.edgewall.org/wiki/WikiFormatting#Images
         # [[Image(picture.gif)]] Current page (Ticket, Wiki, Comment)
         # [[Image(wiki:WikiFormatting:picture.gif)]] (referring to attachment on another page)
         # [[Image(ticket:1:picture.gif)]] (file attached to a ticket)
 
         image_regex = /\[\[Image\((?:(?<module>(?:source|wiki)):)?(?<path>[^)]+)\)\]\]/
-        d = image_regex.match(str)
-        return if d.nil?
-
-        path = d[:path]
-        mod = d[:module]
-
-        image_path = if mod == "source"
-                       "![#{path.split("/").last}](#{base_url}#{path})"
-                     elsif mod == "wiki"
-                       id, file = path.split(":")
-                       upload_path = "#{wiki_attachments_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
-                       "![#{file}](#{upload_path})"
-                     elsif path.start_with?("http")
-                       # [[Image(http://example.org/s.jpg)]]
-                       "![#{d[:path]}](#{d[:path]})"
-                     else
-                       _, id, file = path.split(":")
-                       file_path = "#{attach_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
-                       "![#{d[:path]}](#{file_path})"
-                     end
-
-        str.gsub!(image_regex, image_path)
+
+        str.gsub!(image_regex) do
+          path = Regexp.last_match[:path]
+          mod = Regexp.last_match[:module]
+
+          converted_image = if mod == "source"
+                              "!{{#{path.split("/").last}}}(#{base_url}#{path})"
+                            elsif mod == "wiki"
+                              id, file = path.split(":")
+                              upload_path = "#{wiki_attachments_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
+                              "!{{#{file}}}(#{upload_path})"
+                            elsif path.start_with?("http")
+                              # [[Image(http://example.org/s.jpg)]]
+                              "!{{#{path}}}(#{path})"
+                            else
+                              tmp = path.split(":")
+                              id, file = case tmp.size
+                                         when 3
+                                           [tmp[1], tmp[2]]
+                                         when 2
+                                           tmp
+                                         else
+                                           [options[:id].to_s, tmp[0]]
+                                         end
+                              file_path = "#{attach_url}/#{Tractive::Utilities.attachment_path(id, file, hashed: @attach_hashed)}"
+                              "!{{#{path}}}(#{file_path})"
+                            end
+
+          # There are also ticket references in the format of ticket:1 so
+          # changing this now and will revert it at the end again
+          converted_image.gsub(/ticket:(\d+)/, 'ImageTicket~\1')
+        end
+      end
+
+      def revert_intermediate_references(str)
+        str.gsub!(/ImageTicket~(\d)/, 'ticket:\1')
+        str.gsub!("{{", "[")
+        str.gsub!("}}", "]")
+        str.gsub!(/(\{~)*/, "")
       end
     end
   end

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

@@ -23,6 +23,7 @@ module Migrator
         begin
           lasttracid = tractickets.last[:id]
         rescue StandardError
+          delete_mocked_tickets if can_delete_mocked_tickets?
           raise("trac has no ticket #{start_ticket}")
         end
 
@@ -89,6 +90,46 @@ module Migrator
 
           @last_created_issue = ticket[:id]
         end
+
+        delete_mocked_tickets if can_delete_mocked_tickets?
+      end
+
+      def can_delete_mocked_tickets?
+        @delete_mocked_tickets
+      end
+
+      def delete_mocked_tickets
+        page = 1
+        issues = @client.issues(@repo, { filter: "all",
+                                         state: "closed",
+                                         page: page })
+
+        until issues.empty?
+          deleted = false
+
+          issues.each do |issue|
+            next if issue["title"] != "Placeholder issue #{issue["number"]} created to align Github issue and trac ticket numbers during migration."
+
+            response = @graph_ql_client.delete_issue(issue["node_id"])
+
+            if response.data.errors.any?
+              error_message = response.data
+                                      .errors
+                                      .messages
+                                      .map { |k, v| "#{k}: #{v}" }
+                                      .join(", ")
+              raise StandardError, error_message
+            end
+
+            deleted = true
+            puts "Successfully deleted issue ##{issue["number"]}, Title: #{issue["title"]}"
+          end
+
+          page += 1 unless deleted
+          issues = @client.issues(@repo, { filter: "all",
+                                           state: "closed",
+                                           page: page })
+        end
       end
     end
   end

data/lib/tractive/migrator/engine.rb

@@ -32,6 +32,7 @@ module Migrator
       @trac  = Tractive::Trac.new(db)
       @repo  = github["repo"]
       @client = GithubApi::Client.new(access_token: github["token"])
+      @graph_ql_client = GithubApi::GraphQlClient.new
 
       if input_file_name
         @from_file = input_file_name
@@ -62,6 +63,7 @@ module Migrator
       @safetychecks     = safetychecks
       @start_ticket     = (start_ticket || (@last_created_issue + 1)).to_i
       @filter_closed    = filter_closed
+      @delete_mocked_tickets = args[:cfg]["ticket"]["delete_mocked"]
     end
 
     def migrate

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

@@ -13,12 +13,17 @@ module Migrator
         @authors_map = @config["users"].to_h
 
         @tracticketbaseurl    = @config["trac"]["ticketbaseurl"]
+        @git_repo             = @config["github"]["repo"]
         @changeset_base_url   = @config["trac"]["changeset_base_url"] || ""
-        @wiki_attachments_url = @options["attachment-base-url"] || @config.dig("wiki", "attachments", "url") || ""
-        @repo_path            = @options["repo-path"] || ""
         @revmap_path          = @config["revmap_path"]
         @attachments_hashed   = @config.dig("wiki", "attachments", "hashed")
 
+        @wiki_attachments_url = @options["attachment-base-url"] || @config.dig("wiki", "attachments", "url") || ""
+        @repo_path            = @options["repo-path"] || ""
+        @home_page_name       = @options["home-page-name"]
+        @wiki_extensions      = @options["wiki-extensions"]
+        @source_folders       = @options["source-folders"]
+
         @attachment_options   = {
           hashed: @attachments_hashed
         }
@@ -26,7 +31,17 @@ module Migrator
         verify_options
         verify_locations
 
-        @twf_to_markdown = Migrator::Converter::TwfToMarkdown.new(@tracticketbaseurl, @attachment_options, @changeset_base_url, @wiki_attachments_url, @revmap_path)
+        @twf_to_markdown = Migrator::Converter::TwfToMarkdown.new(
+          @tracticketbaseurl,
+          @attachment_options,
+          @changeset_base_url,
+          @wiki_attachments_url,
+          @revmap_path,
+          git_repo: @git_repo,
+          home_page_name: @home_page_name,
+          wiki_extensions: @wiki_extensions,
+          source_folders: @source_folders
+        )
       end
 
       def migrate_wikis
@@ -43,11 +58,12 @@ module Migrator
                         wiki[:comment].gsub('"', '\"')
                       end
 
-            file_name = "#{cleanse_filename(wiki[:name])}.md"
+            file_name = filename_for_wiki(wiki)
+
             $logger.info("Working with file [#{file_name}]")
             $logger.debug("Object: #{wiki}")
 
-            wiki_markdown_text = @twf_to_markdown.convert(wiki[:text])
+            wiki_markdown_text = @twf_to_markdown.convert(wiki[:text], id: wiki[:name])
             wiki_markdown_text += wiki_attachments(wiki)
 
             # Create file with content
@@ -75,6 +91,12 @@ module Migrator
 
       private
 
+      def filename_for_wiki(wiki)
+        return "Home.md" if @home_page_name == wiki[:name]
+
+        "#{cleanse_filename(wiki[:name])}.md"
+      end
+
       def verify_options
         $logger.info("Verifying options...")
 

data/lib/tractive/utilities.rb

@@ -36,6 +36,10 @@ module Tractive
         db
       end
 
+      def dasharize(str)
+        str.gsub(/([a-z\d])([A-Z])/, '\1-\2').downcase
+      end
+
       def attachment_path(id, filename, options = {})
         return "#{id}/#{filename}" unless options[:hashed]
 

data/lib/tractive/version.rb

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

data/tractive.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "graphql-client"
   spec.add_dependency "mysql2"
   spec.add_dependency "ox"
   spec.add_dependency "rest-client"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.15
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: graphql-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,8 @@ files:
 - lib/tractive/github_api/client/issues.rb
 - lib/tractive/github_api/client/labels.rb
 - lib/tractive/github_api/client/milestones.rb
+- lib/tractive/github_api/graph_ql_client.rb
+- lib/tractive/github_api/graph_ql_client/issues.rb
 - lib/tractive/graceful_quit.rb
 - lib/tractive/http/client.rb
 - lib/tractive/http/client/request.rb