tractive 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb568a67bbfcc96cca6de822691aeeb5209a063317d58a824e67776cd5fe9cb9
-  data.tar.gz: e5870f1b8715a509ff8ec03c8c478d6894ce2e53d0ca704bb40f1aa1e439b880
+  metadata.gz: 9f7da399b45e9e780b66e3da4ed52181b94f9d5ec6c98293d9dc590688f4aa99
+  data.tar.gz: 5e64a51c2cae40d501e02144c2acf0c72076bc04b4344b51fb46f92610a4e3c3
 SHA512:
-  metadata.gz: 96ea4aef128a8084e0905b2f787ba70270ea1dc8651451cbdb08a9e0e792975a1d18b7ee2042aa4ec5ea0ac5cb9e075e1c4c4cd82eb355bdf09b767377fbdae8
-  data.tar.gz: 51a5011d41d626e5e9a6ecbd7cf9c096e172fe4539523777ddafa3d1132e5919a8285db1048f7594b7e559f50f25437315584425936774d29ccb536ce0356714
+  metadata.gz: f112048a0c429f2f1e901c713dd610dc72955ff0b8eab97d463816ede7a57f3406541ef7c4ad1ae024be5d2ddf33f06d0385a9b54cc446fa4d8fbdae00656b04
+  data.tar.gz: 30da24854a6b49bb38d5075740fc13d5c5a22b53ceca315595b955d63c1450ba93f0fa2509789e6a69186d4cd204033de21fcdec3e39e855c4a18270be40a594

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tractive (1.0.1)
+    tractive (1.0.2)
       mysql2
       ox
       rest-client

data/README.adoc

@@ -194,15 +194,17 @@ user interface.
 
 | `--svn-url`
 |
-(required) SVN repository URL that should be used in RevMap generation.
-The URL must start with the `http://` or `https://` prefix (not the `svn://`
-prefix).
+(required unless `--svn-local-path` set)
+SVN repository URL that should be used in RevMap generation. The URL must start
+with the `http://` or `https://` prefix (not the `svn://` prefix).
 | String
 
 | `--svn-local-path`
-| SVN local repository path that should be used in RevMap generation. You can clone
-the svn repo locally and provide its local path if the svn repository is offline. (`--svn-url` is not
-required if this option is given).
+|
+(required unless `-svn-url` set)
+SVN local repository path that should be used in RevMap generation. You can
+clone the svn repo locally and provide its local path if the svn repository is
+offline.
 | String
 
 | `--rev-timestamp-file`

data/exe/tractive

@@ -5,6 +5,8 @@ require_relative "../lib/tractive"
 
 class TractiveCommand < Thor
   default_command :migrate
+  class_option "logfile", type: :string, aliases: ["-L", "--log-file"],
+                          desc: "Name of the logfile to output logs to."
 
   desc "<OPTIONS>", "Migrate Trac instances to modern Git management platforms like GitHub and GitLab"
   method_option "attachmentexporter", type: :string, aliases: ["-A", "--attachment-exporter"],
@@ -33,8 +35,6 @@ class TractiveCommand < Thor
                                   desc: "Import issues from a json file"
   method_option "info", type: :boolean, aliases: ["-i", "--info"],
                         desc: "Reports existing labels and users in the database"
-  method_option "logfile", type: :string, aliases: ["-L", "--log-file"],
-                           desc: "Name of the logfile to output logs to."
   method_option "mockdeleted", type: :boolean, aliases: ["-M", "--mockup"],
                                desc: "Import from 0 and mocking tickets deleted on trac"
   method_option "openedonly", type: :boolean, aliases: ["-o", "--opened-only"],
@@ -64,6 +64,7 @@ class TractiveCommand < Thor
   def generate_revmap
     verify_revmap_generator_options!(options)
 
+    Tractive::Utilities.setup_logger(output_stream: options[:log_file] || $stderr, verbose: options[:verbose])
     Tractive::RevmapGenerator.new(
       options["revtimestampfile"],
       options["svnurl"],

data/lib/tractive/revmap_generator.rb

@@ -11,6 +11,7 @@ module Tractive
       @duplicate_message_commits = {}
       @last_revision = nil
       @pinwheel = %w[| / - \\]
+      @skipped = []
       @output_file = output_file
     end
 
@@ -20,6 +21,7 @@ module Tractive
 
       File.open(@output_file, "w+") do |file|
         File.foreach(@input_file) do |line|
+          i += 1
           info = extract_info_from_line(line)
           next if @last_revision == info[:revision]
 
@@ -29,9 +31,10 @@ module Tractive
           percent = ((i.to_f / line_count) * 100).round(2)
           progress = "=" * (percent.to_i / 2) unless i < 2
           printf("\rProgress: [%<progress>-50s] %<percent>.2f%% %<spinner>s", progress: progress, percent: percent, spinner: @pinwheel.rotate!.first)
-          i += 1
         end
       end
+
+      $logger.info "\n\nFollowing revisions are skipped because they don't have a corresponding git commit. #{@skipped}"
     end
 
     private
@@ -52,11 +55,13 @@ module Tractive
       # get sha from git api
       commits = git_commits(info)
 
-      if commits.count == 1
-        file.puts "#{info[:revision]} | #{commits.values[0].join(",")}"
+      if commits.empty?
+        @skipped << info[:revision]
+      elsif commits.count == 1
+        file.puts "#{info[:revision]} | #{commits.values[0]&.join(",")}"
       else
         message = commit_message_from_svn(info[:revision])
-        file.puts "#{info[:revision]} | #{@duplicate_commits[info[:timestamp]][message].join(",")}"
+        file.puts "#{info[:revision]} | #{@duplicate_commits[info[:timestamp]][message]&.join(",")}"
       end
     end
 
@@ -91,16 +96,24 @@ module Tractive
     end
 
     def commits_from_git_repo(info)
-      command = "git rev-list --after=#{info[:timestamp]} --until=#{info[:timestamp]} --committer=#{info[:author]} --all --format='%cd|%h~|~%s' --date=format:'%Y-%m-%dT%H:%M:%SZ'"
+      shas_command = "git rev-list --after=#{info[:timestamp]} --until=#{info[:timestamp]} --committer=#{info[:author]} --all"
+      shas = Dir.chdir(@git_local_repo_path) do
+        `#{shas_command}`
+      end
+
+      commits_command = "git rev-list --after=#{info[:timestamp]} --until=#{info[:timestamp]} --committer=#{info[:author]} --all --format='medium'"
       commits = Dir.chdir(@git_local_repo_path) do
-        `#{command}`
+        `#{commits_command}`
       end
 
+      regex = /#{shas.split("\n").map { |sha| "(?=commit #{sha})" }.join "|"}/
+
       commits_arr = []
-      commits.split("\n").each_slice(2) do |sha_hash, commit_info|
+      commits.split(regex).each do |commit_info|
         commit_hash = {}
-        commit_hash[:sha] = sha_hash.split.last
-        commit_hash[:short_sha], commit_hash[:message] = commit_info.split("~|~")
+        info = commit_info.split("\n", 4)
+        commit_hash[:sha] = info[0].split.last
+        commit_hash[:message] = info.last.strip.gsub("\n", "").gsub(/\s+/, " ")
 
         commits_arr << commit_hash
       end

data/lib/tractive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2