tractive 1.0.21 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a10eeb2f828d2d135d48f0f6437f669c939104e17ef1b777e42d29e59aac5dc
-  data.tar.gz: df20934dfee4b890c9f633df93955f60d237987743c48f12a95a4bb8cb1b8806
+  metadata.gz: 8a7508c99649ff11344e9456302900a4aa7fbadbb69eeadd722b55051bd22986
+  data.tar.gz: d6b909e3870a8078dedd18f5ee07f47464661ee2eec12638d1ae48b877246b75
 SHA512:
-  metadata.gz: 8dbc73bbf823c89b05267fb42991401f33c6e1097488b0e49bd4ec87a3c457ddfa500d6d16fd88793a6bb9ccd4a2c27514a74b1ca3e5c10786184284d691ae7f
-  data.tar.gz: ca6165b8852a0c5609737f5794683e8bb82c522934f861d59eb798a2475d8662b95742a76cd19c585a45980aa4a12cfaf3a35f169235c74ae2adb43851b667e4
+  metadata.gz: daf2cfe63bba64235429e51e53e4b1bb89e67fd13aff56794c89104f049fe4465173bc2519ee99198443730036f8112e22cf8e2a09a805019a070595404f2300
+  data.tar.gz: b43eb5f2fed5b47397052936027b7a0de60b5cde6dfe4ad685969291aa88c26a03c22a99e6c209840c1f746565640a37a7f2d939640463dd7e464c3225955e70

data/Gemfile

@@ -5,6 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in tractive.gemspec
 gemspec
 
+gem "pry"
+
 gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"

data/lib/tractive/github_api/graph_ql_client.rb

@@ -26,6 +26,8 @@ module GithubApi
       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))
+    rescue KeyError
+      raise ::StandardError, "Github access token is incorrect or does not have sufficent permissions to access the Github API"
     end
   end
 end

data/lib/tractive/main.rb

@@ -8,16 +8,21 @@ module Tractive
       @opts = opts
       @cfg  = YAML.load_file(@opts[:config])
 
+      Tractive::Utilities.setup_logger(output_stream: @opts[:logfile] || $stderr, verbose: @opts[:verbose])
+
+      verify_config!(@cfg, @opts)
+
       @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
       $logger.error e.message
       exit 1
+    rescue StandardError => e
+      warn_and_exit(e.message, 1)
     end
 
     def run
@@ -56,6 +61,15 @@ module Tractive
 
     private
 
+    def verify_config!(config, options)
+      database_path_missing_error = <<~DATABASE_PATH_MISSING_ERROR
+        Missing path for trac database which can be set using `--trac-database-path` or can
+        be set in config file (see https://github.com/ietf-ribose/tractive#trac-configuration)
+      DATABASE_PATH_MISSING_ERROR
+
+      warn_and_exit(database_path_missing_error, 1) if !options["trac-database-path"] && !(config["trac"] && config["trac"]["database"])
+    end
+
     def verify_options!(options)
       verify_config_options!(options)
       verify_filter_options!(options)

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

@@ -80,9 +80,14 @@ module Migrator
         changes.each do |change|
           kind = change[:field] || "attachment"
 
-          next unless interested_in_change?(kind, change[:newvalue])
+          next if %w[cc reporter version].include?(kind)
 
-          if kind == "comment" || (kind == "attachment" && change[:description] != "")
+          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
@@ -171,7 +176,7 @@ module Migrator
 
         if @users.key?(ticket[:owner])
           owner = trac_mail(ticket[:owner])
-          github_owner = @users[owner]["username"]
+          github_owner = extract_github_owner_username(owner)
           $logger.debug("..owner in trac: #{owner}")
           $logger.debug("..assignee in GitHub: #{github_owner}")
           issue["assignee"] = github_owner
@@ -184,13 +189,7 @@ module Migrator
           # issue["updated_at"] = format_time(ticket[:changetime])
         end
 
-        if issue["closed"]
-          issue["closed_at"] = if closed_time
-                                 format_time(closed_time)
-                               else
-                                 format_time(ticket[:closed_at].to_i)
-                               end
-        end
+        issue["closed_at"] = format_time(closed_time || ticket[:closed_at].to_i) if issue["closed"]
 
         {
           "issue" => issue,
@@ -378,6 +377,17 @@ module Migrator
 
         "[trac:#{ticket[:id]}](#{@trac_ticket_base_url}/#{ticket[:id]})"
       end
+
+      def extract_github_owner_username(owner)
+        if !owner || !@users[owner]
+          raise(
+            StandardError,
+            "Unable to find Github username for #{owner}, this can be set in the config file."
+          )
+        end
+
+        @users[owner]["username"]
+      end
     end
   end
 end

data/lib/tractive/migrator/engine.rb

@@ -63,7 +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"]
+      @delete_mocked_tickets = args[:cfg]["ticket"]["delete_mocked"] if args[:cfg]["ticket"]
     end
 
     def migrate
@@ -74,6 +74,9 @@ module Migrator
       else
         migrate_from_db
       end
+    rescue StandardError => e
+      $logger.error e.message
+      exit 1
     end
 
     private

data/lib/tractive/version.rb

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

data/tractive.gemspec

@@ -35,6 +35,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sequel"
   spec.add_dependency "sqlite3"
   spec.add_dependency "thor"
-
-  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tractive
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.25
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 - open.source@ribose.com
@@ -225,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Exporting tool for Trac